2018-02-19 12:38:54 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-03-10 17:12:50 +03:00
|
|
|
From: Dietmar Maurer <dietmar@proxmox.com>
|
2020-04-07 17:53:19 +03:00
|
|
|
Date: Mon, 6 Apr 2020 12:16:44 +0200
|
|
|
|
|
Subject: [PATCH] PVE: qapi: modify query machines
|
2017-04-05 11:49:19 +03:00
|
|
|
|
|
|
|
|
provide '*is-current' in MachineInfo struct
|
2019-06-06 13:58:15 +03:00
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
2020-03-10 17:12:50 +03:00
|
|
|
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
|
2017-04-05 11:49:19 +03:00
|
|
|
---
|
2020-03-10 17:12:50 +03:00
|
|
|
hw/core/machine-qmp-cmds.c | 6 ++++++
|
2019-11-20 17:45:35 +03:00
|
|
|
qapi/machine.json | 4 +++-
|
2020-03-10 17:12:50 +03:00
|
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
2017-04-05 11:49:19 +03:00
|
|
|
|
2019-11-20 17:45:35 +03:00
|
|
|
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
|
2023-10-17 15:10:09 +03:00
|
|
|
index 3860a50c3b..40821e2317 100644
|
2019-11-20 17:45:35 +03:00
|
|
|
--- a/hw/core/machine-qmp-cmds.c
|
|
|
|
|
+++ b/hw/core/machine-qmp-cmds.c
|
2023-10-17 15:10:09 +03:00
|
|
|
@@ -91,6 +91,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
2019-11-20 17:45:35 +03:00
|
|
|
info->numa_mem_supported = mc->numa_mem_supported;
|
|
|
|
|
info->deprecated = !!mc->deprecation_reason;
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
info->acpi = !!object_class_property_find(OBJECT_CLASS(mc), "acpi");
|
2020-03-10 17:12:50 +03:00
|
|
|
+
|
2019-11-20 17:45:35 +03:00
|
|
|
+ if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
|
|
|
|
|
+ info->has_is_current = true;
|
|
|
|
|
+ info->is_current = true;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
2020-03-10 17:12:50 +03:00
|
|
|
if (mc->default_cpu_type) {
|
|
|
|
|
info->default_cpu_type = g_strdup(mc->default_cpu_type);
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
}
|
2019-11-20 17:45:35 +03:00
|
|
|
diff --git a/qapi/machine.json b/qapi/machine.json
|
2023-10-17 15:10:09 +03:00
|
|
|
index 5c9a4d55f4..fbb61f18e4 100644
|
2019-11-20 17:45:35 +03:00
|
|
|
--- a/qapi/machine.json
|
|
|
|
|
+++ b/qapi/machine.json
|
2023-10-17 15:10:09 +03:00
|
|
|
@@ -139,6 +139,8 @@
|
2017-04-05 11:49:19 +03:00
|
|
|
#
|
2017-04-05 12:38:26 +03:00
|
|
|
# @is-default: whether the machine is default
|
2017-04-05 11:49:19 +03:00
|
|
|
#
|
2017-04-05 12:38:26 +03:00
|
|
|
+# @is-current: whether this machine is currently used
|
2017-04-05 11:49:19 +03:00
|
|
|
+#
|
|
|
|
|
# @cpu-max: maximum number of CPUs supported by the machine type
|
2023-10-17 15:10:09 +03:00
|
|
|
# (since 1.5)
|
2017-04-05 11:49:19 +03:00
|
|
|
#
|
2023-10-17 15:10:09 +03:00
|
|
|
@@ -163,7 +165,7 @@
|
2017-04-05 11:49:19 +03:00
|
|
|
##
|
|
|
|
|
{ 'struct': 'MachineInfo',
|
|
|
|
|
'data': { 'name': 'str', '*alias': 'str',
|
|
|
|
|
- '*is-default': 'bool', 'cpu-max': 'int',
|
|
|
|
|
+ '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
|
2019-11-20 17:45:35 +03:00
|
|
|
'hotpluggable-cpus': 'bool', 'numa-mem-supported': 'bool',
|
2021-02-11 19:11:11 +03:00
|
|
|
'deprecated': 'bool', '*default-cpu-type': 'str',
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
'*default-ram-id': 'str', 'acpi': 'bool' } }
|