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
|
2022-02-11 12:24:33 +03:00
|
|
|
index 4f4ab30f8c..76fff60a6b 100644
|
2019-11-20 17:45:35 +03:00
|
|
|
--- a/hw/core/machine-qmp-cmds.c
|
|
|
|
|
+++ b/hw/core/machine-qmp-cmds.c
|
2022-02-11 12:24:33 +03:00
|
|
|
@@ -99,6 +99,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
|
2020-03-10 17:12:50 +03:00
|
|
|
info->hotpluggable_cpus = mc->has_hotpluggable_cpus;
|
2019-11-20 17:45:35 +03:00
|
|
|
info->numa_mem_supported = mc->numa_mem_supported;
|
|
|
|
|
info->deprecated = !!mc->deprecation_reason;
|
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);
|
|
|
|
|
info->has_default_cpu_type = true;
|
2019-11-20 17:45:35 +03:00
|
|
|
diff --git a/qapi/machine.json b/qapi/machine.json
|
update submodule and patches to 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
index 8b4be9b718..555458f785 100644
|
2019-11-20 17:45:35 +03:00
|
|
|
--- a/qapi/machine.json
|
|
|
|
|
+++ b/qapi/machine.json
|
update submodule and patches to 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
@@ -138,6 +138,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
|
2021-05-27 13:43:32 +03:00
|
|
|
# (since 1.5)
|
2017-04-05 11:49:19 +03:00
|
|
|
#
|
update submodule and patches to 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
@@ -159,7 +161,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',
|
|
|
|
|
'*default-ram-id': 'str' } }
|