8:33 a.m.
We now call 'query-qmp-schema' unconditionally and can extract the
information from there.
Peter Krempa (3):
qemu: capabilities: Probe presence of commands from QMP schema instead
of 'query-commands'
qemu: capabilities: Don't probe 'query-commands'
qemu_monitor: Remove helpers for 'query-commands'
src/qemu/qemu_capabilities.c | 30 +-
src/qemu/qemu_monitor.c | 12 -
src/qemu/qemu_monitor.h | 2 -
src/qemu/qemu_monitor_json.c | 44 -
src/qemu/qemu_monitor_json.h | 5 -
.../caps_4.2.0_aarch64.replies | 700 ++------------
.../caps_4.2.0_ppc64.replies | 678 ++------------
.../caps_4.2.0_s390x.replies | 686 ++------------
.../caps_4.2.0_x86_64.replies | 732 ++-------------
.../caps_5.0.0_aarch64.replies | 704 ++------------
.../caps_5.0.0_ppc64.replies | 690 ++------------
.../caps_5.0.0_riscv64.replies | 682 ++------------
.../caps_5.0.0_x86_64.replies | 736 ++-------------
.../caps_5.1.0_sparc.replies | 629 +------------
.../caps_5.1.0_x86_64.replies | 743 ++-------------
.../caps_5.2.0_aarch64.replies | 735 ++-------------
.../caps_5.2.0_ppc64.replies | 717 ++-------------
.../caps_5.2.0_riscv64.replies | 709 ++------------
.../caps_5.2.0_s390x.replies | 717 ++-------------
.../caps_5.2.0_x86_64.replies | 767 ++--------------
.../caps_6.0.0_aarch64.replies | 732 ++-------------
.../caps_6.0.0_s390x.replies | 714 ++-------------
.../caps_6.0.0_x86_64.replies | 767 ++--------------
.../caps_6.1.0_x86_64.replies | 770 ++--------------
.../caps_6.2.0_aarch64.replies | 739 ++-------------
.../caps_6.2.0_ppc64.replies | 741 ++-------------
.../caps_6.2.0_x86_64.replies | 807 ++--------------
.../caps_7.0.0_aarch64+hvf.replies | 770 ++--------------
.../caps_7.0.0_aarch64.replies | 770 ++--------------
.../caps_7.0.0_ppc64.replies | 745 ++-------------
.../caps_7.0.0_x86_64.replies | 807 ++--------------
.../caps_7.1.0_ppc64.replies | 763 ++--------------
.../caps_7.1.0_x86_64.replies | 825 ++---------------
.../caps_7.2.0_ppc.replies | 772 ++--------------
.../caps_7.2.0_x86_64+hvf.replies | 843 ++---------------
.../caps_7.2.0_x86_64.replies | 843 ++---------------
.../caps_8.0.0_riscv64.replies | 761 ++-------------
.../caps_8.0.0_x86_64.replies | 864 ++----------------
.../caps_8.1.0_s390x.replies | 788 ++--------------
.../caps_8.1.0_x86_64.replies | 864 ++----------------
tests/qemumonitorjsontest.c | 59 --
41 files changed, 2778 insertions(+), 23684 deletions(-)
--
2.41.0
8:33 a.m.
New subject: [PATCH 1/3] qemu: capabilities: Probe presence of commands from QMP schema instead of 'query-commands'
Move the probing code to extract the data from the QMP schema rather
than invoking 'query-commands'. This patch doesn't yet remove the actual
invocation of 'query-commands', just moves the actual probing.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c9f4b17208..76f3c78617 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2605,7 +2605,7 @@ virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps)
static int
-virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
+virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps G_GNUC_UNUSED,
qemuMonitor *mon)
{
g_auto(GStrv) commands = NULL;
@@ -2613,11 +2613,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
if (qemuMonitorGetCommands(mon, &commands) < 0)
return -1;
- virQEMUCapsProcessStringFlags(qemuCaps,
- G_N_ELEMENTS(virQEMUCapsCommands),
- virQEMUCapsCommands,
- commands);
-
return 0;
}
@@ -5523,7 +5518,6 @@ static int
virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps,
qemuMonitor *mon)
{
- struct virQEMUCapsStringFlags *entry;
virJSONValue *schemareply;
g_autoptr(GHashTable) schema = NULL;
size_t i;
@@ -5536,12 +5530,19 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps,
schemareply = NULL;
for (i = 0; i < G_N_ELEMENTS(virQEMUCapsQMPSchemaQueries); i++) {
- entry = virQEMUCapsQMPSchemaQueries + i;
+ struct virQEMUCapsStringFlags *entry = virQEMUCapsQMPSchemaQueries + i;
if (virQEMUQAPISchemaPathExists(entry->value, schema))
virQEMUCapsSet(qemuCaps, entry->flag);
}
+ for (i = 0; i < G_N_ELEMENTS(virQEMUCapsCommands); i++) {
+ struct virQEMUCapsStringFlags *cmd = virQEMUCapsCommands + i;
+
+ if (virQEMUQAPISchemaPathExists(cmd->value, schema))
+ virQEMUCapsSet(qemuCaps, cmd->flag);
+ }
+
return 0;
}
--
2.41.0
8:33 a.m.
New subject: [PATCH 2/3] qemu: capabilities: Don't probe 'query-commands'
The capability code now probes the presence of commands from the QMP
schema instead of using 'query-commands'. Don't call the command and
adjust the '.replies' files.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 15 -
.../caps_4.2.0_aarch64.replies | 700 ++------------
.../caps_4.2.0_ppc64.replies | 678 ++------------
.../caps_4.2.0_s390x.replies | 686 ++------------
.../caps_4.2.0_x86_64.replies | 732 ++-------------
.../caps_5.0.0_aarch64.replies | 704 ++------------
.../caps_5.0.0_ppc64.replies | 690 ++------------
.../caps_5.0.0_riscv64.replies | 682 ++------------
.../caps_5.0.0_x86_64.replies | 736 ++-------------
.../caps_5.1.0_sparc.replies | 629 +------------
.../caps_5.1.0_x86_64.replies | 743 ++-------------
.../caps_5.2.0_aarch64.replies | 735 ++-------------
.../caps_5.2.0_ppc64.replies | 717 ++-------------
.../caps_5.2.0_riscv64.replies | 709 ++------------
.../caps_5.2.0_s390x.replies | 717 ++-------------
.../caps_5.2.0_x86_64.replies | 767 ++--------------
.../caps_6.0.0_aarch64.replies | 732 ++-------------
.../caps_6.0.0_s390x.replies | 714 ++-------------
.../caps_6.0.0_x86_64.replies | 767 ++--------------
.../caps_6.1.0_x86_64.replies | 770 ++--------------
.../caps_6.2.0_aarch64.replies | 739 ++-------------
.../caps_6.2.0_ppc64.replies | 741 ++-------------
.../caps_6.2.0_x86_64.replies | 807 ++--------------
.../caps_7.0.0_aarch64+hvf.replies | 770 ++--------------
.../caps_7.0.0_aarch64.replies | 770 ++--------------
.../caps_7.0.0_ppc64.replies | 745 ++-------------
.../caps_7.0.0_x86_64.replies | 807 ++--------------
.../caps_7.1.0_ppc64.replies | 763 ++--------------
.../caps_7.1.0_x86_64.replies | 825 ++---------------
.../caps_7.2.0_ppc.replies | 772 ++--------------
.../caps_7.2.0_x86_64+hvf.replies | 843 ++---------------
.../caps_7.2.0_x86_64.replies | 843 ++---------------
.../caps_8.0.0_riscv64.replies | 761 ++-------------
.../caps_8.0.0_x86_64.replies | 864 ++----------------
.../caps_8.1.0_s390x.replies | 788 ++--------------
.../caps_8.1.0_x86_64.replies | 864 ++----------------
36 files changed, 2770 insertions(+), 23555 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 76f3c78617..c19e7f0fb0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2604,19 +2604,6 @@ virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps)
}
-static int
-virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps G_GNUC_UNUSED,
- qemuMonitor *mon)
-{
- g_auto(GStrv) commands = NULL;
-
- if (qemuMonitorGetCommands(mon, &commands) < 0)
- return -1;
-
- return 0;
-}
-
-
static int
virQEMUCapsProbeQMPObjectTypes(virQEMUCaps *qemuCaps,
qemuMonitor *mon)
@@ -5602,8 +5589,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0)
return -1;
- if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0)
- return -1;
/* Some capabilities may differ depending on KVM state */
if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
index f8619d8843..28f76b2e96 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
@@ -12614,557 +12614,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "netdev_add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "eject"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -13172,12 +12624,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16435,7 +15887,7 @@
"parent": "base-xhci"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16443,7 +15895,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16723,7 +16175,7 @@
"type": "uint32"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16731,7 +16183,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17052,7 +16504,7 @@
"type": "uint16"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17060,7 +16512,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17243,7 +16695,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17251,11 +16703,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -17267,11 +16719,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -17283,7 +16735,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17433,7 +16885,7 @@
"type": "str"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17441,7 +16893,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17591,7 +17043,7 @@
"type": "uint32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17599,7 +17051,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -17708,7 +17160,7 @@
"type": "uint32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -17716,11 +17168,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -17732,7 +17184,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17815,7 +17267,7 @@
"type": "uint16"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17823,11 +17275,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -17839,7 +17291,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17925,7 +17377,7 @@
"type": "str"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17933,7 +17385,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17984,7 +17436,7 @@
"type": "str"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17992,7 +17444,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18166,7 +17618,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18174,7 +17626,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18235,7 +17687,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18243,11 +17695,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -18259,7 +17711,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -18433,7 +17885,7 @@
"type": "str"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -18441,11 +17893,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -18457,7 +17909,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -18523,7 +17975,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -18531,7 +17983,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -18633,7 +18085,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -18641,7 +18093,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18730,7 +18182,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18738,7 +18190,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18809,7 +18261,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18817,7 +18269,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18882,7 +18334,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18890,7 +18342,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18954,7 +18406,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18962,7 +18414,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19149,12 +18601,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19712,7 +19164,7 @@
"deprecated": false
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19720,7 +19172,7 @@
"arguments": {
"typename": "virt-4.2-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19873,7 +19325,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19881,7 +19333,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19986,12 +19438,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20182,34 +19634,34 @@
"static": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21377,12 +20829,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -21460,12 +20912,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -21481,7 +20933,7 @@
"kernel": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -21492,7 +20944,7 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -21522,7 +20974,7 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -21537,7 +20989,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -21567,7 +21019,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
index e31c49f24d..62393c85fd 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
@@ -12272,551 +12272,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "netdev_add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "eject"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -12824,12 +12282,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15935,7 +15393,7 @@
"parent": "pnv-psi"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15943,7 +15401,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16202,7 +15660,7 @@
"type": "bool"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16210,7 +15668,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16518,7 +15976,7 @@
"type": "uint16"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16526,7 +15984,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -16700,7 +16158,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -16708,11 +16166,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -16724,11 +16182,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -16740,7 +16198,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -16886,7 +16344,7 @@
"type": "str"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -16894,7 +16352,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17032,7 +16490,7 @@
"type": "uint32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17040,7 +16498,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -17137,7 +16595,7 @@
"type": "uint32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -17145,11 +16603,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -17161,7 +16619,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17244,7 +16702,7 @@
"type": "uint16"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17252,11 +16710,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -17268,7 +16726,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17350,7 +16808,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17358,7 +16816,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17405,7 +16863,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17413,7 +16871,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17578,7 +17036,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17586,7 +17044,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -17642,7 +17100,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -17650,11 +17108,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -17666,7 +17124,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -17831,7 +17289,7 @@
"type": "str"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -17839,11 +17297,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -17855,7 +17313,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -17916,7 +17374,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -17924,7 +17382,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -17990,7 +17448,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -17998,7 +17456,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18100,7 +17558,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18108,7 +17566,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18197,7 +17655,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18205,7 +17663,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18270,7 +17728,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18278,7 +17736,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18342,12 +17800,12 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18609,7 +18067,7 @@
"deprecated": false
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18617,7 +18075,7 @@
"arguments": {
"typename": "pseries-4.2-machine"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18816,7 +18274,7 @@
"type": "string"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18824,7 +18282,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18929,12 +18387,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21130,34 +20588,34 @@
"static": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22296,12 +21754,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -22379,7 +21837,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
index 8c7bbb85ec..9c010db799 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
@@ -12665,563 +12665,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "netdev_add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "dump-skeys"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-cpu-model-baseline"
- },
- {
- "name": "query-cpu-model-comparison"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "eject"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -13229,12 +12675,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -14392,7 +13838,7 @@
"parent": "vhost-user-gpu-pci-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -14400,7 +13846,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -14680,7 +14126,7 @@
"type": "int32"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -14688,7 +14134,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -15009,7 +14455,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -15017,7 +14463,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -15200,7 +14646,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -15208,7 +14654,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -15389,7 +14835,7 @@
"type": "uint32"
}
],
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -15397,7 +14843,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -15623,7 +15069,7 @@
"type": "uint32"
}
],
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -15631,7 +15077,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -15719,7 +15165,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -15727,7 +15173,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -15877,7 +15323,7 @@
"type": "bool"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -15885,7 +15331,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -16035,7 +15481,7 @@
"type": "str"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -16043,11 +15489,11 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-hd' not found"
@@ -16059,11 +15505,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -16075,7 +15521,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -16124,7 +15570,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -16132,11 +15578,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -16148,7 +15594,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -16332,7 +15778,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -16340,7 +15786,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -16411,7 +15857,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -16419,11 +15865,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -16435,7 +15881,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -16609,7 +16055,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -16617,7 +16063,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -16701,7 +16147,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -16709,7 +16155,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -16775,7 +16221,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -16783,7 +16229,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -16872,7 +16318,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -16880,7 +16326,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -16969,7 +16415,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -16977,7 +16423,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -17048,7 +16494,7 @@
"type": "uint16"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -17056,7 +16502,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -17121,7 +16567,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -17129,7 +16575,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -17193,12 +16639,12 @@
"type": "int"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -17325,7 +16771,7 @@
"deprecated": false
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -17333,7 +16779,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -17438,12 +16884,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18050,34 +17496,34 @@
"migration-safe": true
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19224,12 +18670,12 @@
"option": "drive"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -19307,7 +18753,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -19318,7 +18764,7 @@
"name": "host"
}
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -19372,7 +18818,7 @@
}
}
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
index a45fd2f669..5abb3d0969 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
@@ -12962,569 +12962,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "netdev_add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "eject"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -13532,12 +12972,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15663,7 +15103,7 @@
"parent": "authz"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15671,7 +15111,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -15951,7 +15391,7 @@
"type": "int32"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -15959,7 +15399,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16280,7 +15720,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16288,7 +15728,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -16471,7 +15911,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -16479,11 +15919,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -16495,11 +15935,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -16511,7 +15951,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -16661,7 +16101,7 @@
"type": "bool"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -16669,7 +16109,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -16819,7 +16259,7 @@
"type": "str"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -16827,7 +16267,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -16936,7 +16376,7 @@
"type": "BlockdevOnError"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -16944,7 +16384,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -17011,7 +16451,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -17019,7 +16459,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17068,7 +16508,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17076,7 +16516,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -17159,7 +16599,7 @@
"type": "BlockdevOnError"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -17167,7 +16607,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17181,7 +16621,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -17189,7 +16629,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17275,7 +16715,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17283,7 +16723,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17334,7 +16774,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17342,7 +16782,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -17445,7 +16885,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -17453,7 +16893,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -17637,7 +17077,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -17645,7 +17085,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -17716,7 +17156,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -17724,7 +17164,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -17824,7 +17264,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -17832,7 +17272,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -18006,7 +17446,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -18014,11 +17454,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -18030,7 +17470,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18096,7 +17536,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18104,7 +17544,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18152,7 +17592,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18160,7 +17600,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18207,7 +17647,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18215,7 +17655,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18249,7 +17689,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18257,7 +17697,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18359,7 +17799,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18367,7 +17807,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18456,7 +17896,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18464,7 +17904,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18535,7 +17975,7 @@
"type": "uint16"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18543,7 +17983,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18608,7 +18048,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18616,7 +18056,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18680,7 +18120,7 @@
"type": "int"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18688,7 +18128,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20242,12 +19682,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20639,7 +20079,7 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20647,7 +20087,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -20752,12 +20192,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22140,12 +21580,12 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22153,12 +21593,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -22166,12 +21606,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -23457,12 +22897,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -23540,16 +22980,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
- "id": "libvirt-45",
+ "id": "libvirt-44",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -23564,7 +23004,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -23866,7 +23306,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -23880,7 +23320,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -24182,7 +23622,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -24197,7 +23637,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -24499,7 +23939,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
index e63c9d5f0a..80cccad97a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
@@ -13423,557 +13423,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -13981,12 +13433,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17364,7 +16816,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17372,7 +16824,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17714,7 +17166,7 @@
"type": "uint32"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17722,7 +17174,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18101,7 +17553,7 @@
"type": "uint16"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18109,7 +17561,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18330,7 +17782,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18338,11 +17790,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -18354,11 +17806,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -18370,7 +17822,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18541,7 +17993,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18549,7 +18001,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18726,7 +18178,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18734,7 +18186,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18862,7 +18314,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18870,11 +18322,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -18886,7 +18338,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18981,7 +18433,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18989,11 +18441,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19005,7 +18457,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19100,7 +18552,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19108,7 +18560,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19161,7 +18613,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19169,7 +18621,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19375,7 +18827,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19383,7 +18835,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19461,7 +18913,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19469,11 +18921,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -19485,7 +18937,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19688,7 +19140,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19696,11 +19148,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19712,7 +19164,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19793,7 +19245,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19801,7 +19253,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -19922,7 +19374,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -19930,7 +19382,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20024,7 +19476,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20032,7 +19484,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20108,7 +19560,7 @@
"type": "uint16"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20116,7 +19568,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20127,7 +19579,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20135,7 +19587,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20205,7 +19657,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20213,7 +19665,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20282,7 +19734,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20290,7 +19742,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20494,12 +19946,12 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21087,7 +20539,7 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21095,7 +20547,7 @@
"arguments": {
"typename": "virt-5.0-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21243,7 +20695,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21251,7 +20703,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21341,12 +20793,12 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21542,24 +20994,24 @@
"static": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21567,12 +21019,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22730,12 +22182,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22813,12 +22265,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -22834,7 +22286,7 @@
"kernel": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -22845,7 +22297,7 @@
"name": "host"
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -22876,7 +22328,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -22891,7 +22343,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -22922,7 +22374,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
index aaf69cab46..2a2f4f174a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
@@ -13364,551 +13364,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -13916,12 +13374,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17163,7 +16621,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17171,7 +16629,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17513,7 +16971,7 @@
"type": "uint32"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17521,7 +16979,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17900,7 +17358,7 @@
"type": "uint16"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17908,7 +17366,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18129,7 +17587,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18137,11 +17595,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -18153,11 +17611,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -18169,7 +17627,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18340,7 +17798,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18348,7 +17806,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18525,7 +17983,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18533,7 +17991,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18661,7 +18119,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18669,11 +18127,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -18685,7 +18143,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18780,7 +18238,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18788,11 +18246,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -18804,7 +18262,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18899,7 +18357,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18907,7 +18365,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18960,7 +18418,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18968,7 +18426,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19174,7 +18632,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19182,7 +18640,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19260,7 +18718,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19268,11 +18726,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -19284,7 +18742,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19487,7 +18945,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19495,11 +18953,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19511,7 +18969,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19592,7 +19050,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19600,7 +19058,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -19681,7 +19139,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -19689,7 +19147,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19731,7 +19189,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19739,7 +19197,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19860,7 +19318,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19868,7 +19326,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19962,7 +19420,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19970,7 +19428,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20046,7 +19504,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20054,7 +19512,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20065,7 +19523,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20073,7 +19531,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20143,7 +19601,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20151,7 +19609,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20220,12 +19678,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20495,7 +19953,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20503,7 +19961,7 @@
"arguments": {
"typename": "pseries-5.0-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20712,7 +20170,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20720,7 +20178,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20810,12 +20268,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23021,24 +22479,24 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -23046,12 +22504,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -24188,12 +23646,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -24271,7 +23729,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
index 929b2179ae..df4e415458 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
@@ -13582,551 +13582,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14134,12 +13592,12 @@
"enabled": false,
"present": false
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15409,7 +14867,7 @@
"parent": "vhost-user-gpu-pci-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15417,7 +14875,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -15759,7 +15217,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -15767,7 +15225,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16146,7 +15604,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16154,7 +15612,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -16375,7 +15833,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -16383,11 +15841,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -16399,11 +15857,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -16415,7 +15873,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -16586,7 +16044,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -16594,7 +16052,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -16771,7 +16229,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -16779,7 +16237,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -16907,7 +16365,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -16915,11 +16373,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -16931,7 +16389,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -16989,7 +16447,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -16997,7 +16455,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -17092,7 +16550,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -17100,11 +16558,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -17116,7 +16574,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17211,7 +16669,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -17219,7 +16677,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17272,7 +16730,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -17280,7 +16738,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -17498,7 +16956,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -17506,7 +16964,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -17596,7 +17054,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -17604,11 +17062,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -17620,7 +17078,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -17823,7 +17281,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -17831,11 +17289,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -17847,7 +17305,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -17928,7 +17386,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -17936,7 +17394,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18057,7 +17515,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18065,7 +17523,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18159,7 +17617,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18167,7 +17625,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18243,7 +17701,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18251,7 +17709,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18262,7 +17720,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18270,7 +17728,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18340,7 +17798,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18348,7 +17806,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18417,12 +17875,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18480,7 +17938,7 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18488,7 +17946,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18578,7 +18036,7 @@
"type": "string"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18586,7 +18044,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18676,34 +18134,34 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -19969,12 +19427,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -20052,5 +19510,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
index 13b9b02e4c..5fa15f8e5e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
@@ -13772,569 +13772,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14342,12 +13782,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16521,7 +15961,7 @@
"parent": "authz"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16529,7 +15969,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16871,7 +16311,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16879,7 +16319,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17258,7 +16698,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17266,7 +16706,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17487,7 +16927,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17495,11 +16935,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -17511,11 +16951,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -17527,7 +16967,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17698,7 +17138,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17706,7 +17146,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17883,7 +17323,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17891,7 +17331,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18019,7 +17459,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18027,7 +17467,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -18100,7 +17540,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -18108,7 +17548,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18166,7 +17606,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18174,7 +17614,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18269,7 +17709,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18277,7 +17717,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18293,7 +17733,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18301,7 +17741,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18396,7 +17836,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18404,7 +17844,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18457,7 +17897,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18465,7 +17905,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18583,7 +18023,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18591,7 +18031,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -18809,7 +18249,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -18817,7 +18257,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -18907,7 +18347,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -18915,7 +18355,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19017,7 +18457,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19025,7 +18465,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19228,7 +18668,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19236,11 +18676,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19252,7 +18692,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19333,7 +18773,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19341,7 +18781,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19399,7 +18839,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19407,7 +18847,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19460,7 +18900,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19468,7 +18908,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19510,7 +18950,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19518,7 +18958,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19639,7 +19079,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19647,7 +19087,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19741,7 +19181,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19749,7 +19189,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19825,7 +19265,7 @@
"type": "uint16"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19833,7 +19273,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19844,7 +19284,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19852,7 +19292,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19922,7 +19362,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19930,7 +19370,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -19999,7 +19439,7 @@
"type": "int"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20007,7 +19447,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21573,12 +21013,12 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21954,7 +21394,7 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21962,7 +21402,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22052,12 +21492,12 @@
"type": "string"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23602,12 +23042,12 @@
"migration-safe": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -23615,12 +23055,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -23628,12 +23068,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24909,12 +24349,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -24992,16 +24432,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
- "id": "libvirt-46",
+ "id": "libvirt-45",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -25016,7 +24456,7 @@
"name": "host"
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -25319,7 +24759,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -25333,7 +24773,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -25636,7 +25076,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -25651,7 +25091,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -25954,7 +25394,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
index 2c198aa867..ebb285f810 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
@@ -14028,554 +14028,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14583,12 +14038,12 @@
"enabled": false,
"present": false
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15214,7 +14669,7 @@
"parent": "sparc-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -15222,11 +14677,11 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
- "id": "libvirt-8",
+ "id": "libvirt-7",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-blk-pci' not found"
@@ -15238,7 +14693,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -15415,7 +14870,7 @@
"type": "int32"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -15423,11 +14878,11 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
- "id": "libvirt-10",
+ "id": "libvirt-9",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-hd' not found"
@@ -15439,11 +14894,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -15455,7 +14910,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -15513,7 +14968,7 @@
"type": "bool"
}
],
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -15521,11 +14976,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
- "id": "libvirt-13",
+ "id": "libvirt-12",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -15537,11 +14992,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
- "id": "libvirt-14",
+ "id": "libvirt-13",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -15553,11 +15008,11 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
- "id": "libvirt-15",
+ "id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-pci' not found"
@@ -15569,11 +15024,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -15585,11 +15040,11 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-device' not found"
@@ -15601,11 +15056,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -15617,7 +15072,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -15687,7 +15142,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -15695,7 +15150,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -15764,12 +15219,12 @@
"type": "int"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
"execute": "query-machines",
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -15863,7 +15318,7 @@
"deprecated": false
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -15871,7 +15326,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -15961,34 +15416,34 @@
"type": "string"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
"return": [
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
"return": [
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -17273,12 +16728,12 @@
"option": "drive"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -17356,5 +16811,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
index d66583fa92..6d16c9fa5e 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
@@ -14202,572 +14202,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "balloon"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "cpu-add"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14775,12 +14212,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17018,7 +16455,7 @@
"parent": "authz"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17026,7 +16463,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17368,7 +16805,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17376,7 +16813,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17767,7 +17204,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17775,7 +17212,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17996,7 +17433,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18004,11 +17441,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -18020,11 +17457,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -18036,7 +17473,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18207,7 +17644,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18215,7 +17652,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18392,7 +17829,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18400,7 +17837,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18528,7 +17965,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18536,7 +17973,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -18609,7 +18046,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -18617,7 +18054,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18675,7 +18112,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -18683,7 +18120,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18778,7 +18215,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18786,7 +18223,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18802,7 +18239,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -18810,7 +18247,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18905,7 +18342,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18913,7 +18350,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18966,7 +18403,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18974,7 +18411,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19092,7 +18529,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19100,7 +18537,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19318,7 +18755,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19326,7 +18763,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19416,7 +18853,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19424,7 +18861,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19526,7 +18963,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19534,7 +18971,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19749,7 +19186,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19757,11 +19194,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19773,7 +19210,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19866,7 +19303,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19874,7 +19311,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19932,7 +19369,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19940,7 +19377,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19993,7 +19430,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20001,7 +19438,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20043,7 +19480,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20051,7 +19488,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20172,7 +19609,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20180,7 +19617,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20278,7 +19715,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20286,7 +19723,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20362,7 +19799,7 @@
"type": "uint16"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20370,7 +19807,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20565,7 +20002,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20573,7 +20010,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20584,7 +20021,7 @@
"type": "str"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20592,7 +20029,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20662,7 +20099,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20670,7 +20107,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20739,7 +20176,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20747,7 +20184,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -22333,12 +21770,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22730,7 +22167,7 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22738,7 +22175,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22828,12 +22265,12 @@
"type": "string"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -24535,12 +23972,12 @@
"migration-safe": true
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24548,12 +23985,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24561,12 +23998,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -25861,12 +25298,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -25944,16 +25381,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -25968,7 +25405,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -26276,7 +25713,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -26290,7 +25727,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -26598,7 +26035,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -26613,7 +26050,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -26921,7 +26358,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
index 8c78533719..e7cdce76ec 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
@@ -14313,584 +14313,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14898,12 +14323,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -18489,7 +17914,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -18497,7 +17922,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -18844,7 +18269,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -18852,7 +18277,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -19248,7 +18673,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -19256,7 +18681,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -19482,7 +18907,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -19490,11 +18915,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -19506,11 +18931,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -19522,7 +18947,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -19704,7 +19129,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -19712,7 +19137,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -19889,7 +19314,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -19897,7 +19322,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -20025,7 +19450,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -20033,11 +19458,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -20049,7 +19474,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -20148,7 +19573,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -20156,11 +19581,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -20172,7 +19597,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20267,7 +19692,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20275,7 +19700,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20328,7 +19753,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20336,7 +19761,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20547,7 +19972,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20555,7 +19980,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -20638,7 +20063,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -20646,11 +20071,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -20662,7 +20087,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -20882,7 +20307,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -20890,11 +20315,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -20906,7 +20331,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -21004,7 +20429,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -21012,7 +20437,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -21054,7 +20479,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -21062,7 +20487,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21183,7 +20608,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21191,7 +20616,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21289,7 +20714,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21297,7 +20722,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21373,7 +20798,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21381,7 +20806,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21392,7 +20817,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21400,7 +20825,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21470,7 +20895,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21478,7 +20903,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21547,7 +20972,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21555,7 +20980,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21764,12 +21189,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22506,7 +21931,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22514,7 +21939,7 @@
"arguments": {
"typename": "virt-5.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22677,7 +22102,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22685,7 +22110,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22770,12 +22195,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23009,24 +22434,24 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -23034,12 +22459,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -24216,12 +23641,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -24299,12 +23724,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24320,7 +23745,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24331,7 +23756,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24363,7 +23788,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24378,7 +23803,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -24410,7 +23835,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
index 9a0e5622d9..1cf12bf77e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
@@ -14254,578 +14254,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14833,12 +14264,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -18136,7 +17567,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -18144,7 +17575,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -18491,7 +17922,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -18499,7 +17930,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18895,7 +18326,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18903,7 +18334,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -19129,7 +18560,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -19137,11 +18568,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -19153,11 +18584,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -19169,7 +18600,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -19351,7 +18782,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -19359,7 +18790,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -19536,7 +18967,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -19544,7 +18975,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -19672,7 +19103,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -19680,11 +19111,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -19696,7 +19127,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -19795,7 +19226,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -19803,11 +19234,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19819,7 +19250,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19914,7 +19345,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19922,7 +19353,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19975,7 +19406,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19983,7 +19414,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20194,7 +19625,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20202,7 +19633,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -20285,7 +19716,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -20293,11 +19724,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -20309,7 +19740,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -20529,7 +19960,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -20537,11 +19968,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -20553,7 +19984,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20651,7 +20082,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20659,7 +20090,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -20750,7 +20181,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -20758,7 +20189,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20800,7 +20231,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20808,7 +20239,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20929,7 +20360,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20937,7 +20368,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21035,7 +20466,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21043,7 +20474,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21119,7 +20550,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21127,7 +20558,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21138,7 +20569,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21146,7 +20577,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21216,7 +20647,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21224,7 +20655,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21293,12 +20724,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21618,7 +21049,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21626,7 +21057,7 @@
"arguments": {
"typename": "pseries-5.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21830,7 +21261,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21838,7 +21269,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21923,12 +21354,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -24574,24 +24005,24 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24599,12 +24030,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25760,12 +25191,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25843,7 +25274,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
index 19fa83490c..715dfc6c2a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
@@ -14469,578 +14469,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -15048,12 +14479,12 @@
"enabled": false,
"present": false
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16367,7 +15798,7 @@
"parent": "vhost-user-gpu-pci-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16375,7 +15806,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16722,7 +16153,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16730,7 +16161,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17126,7 +16557,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -17134,7 +16565,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17360,7 +16791,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17368,11 +16799,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -17384,11 +16815,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -17400,7 +16831,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17582,7 +17013,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17590,7 +17021,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17767,7 +17198,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -17775,7 +17206,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -17903,7 +17334,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -17911,11 +17342,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -17927,7 +17358,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17985,7 +17416,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -17993,7 +17424,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18092,7 +17523,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18100,11 +17531,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -18116,7 +17547,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18211,7 +17642,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18219,7 +17650,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18272,7 +17703,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18280,7 +17711,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18503,7 +17934,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -18511,7 +17942,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -18606,7 +18037,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -18614,11 +18045,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -18630,7 +18061,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -18850,7 +18281,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -18858,11 +18289,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -18874,7 +18305,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -18972,7 +18403,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -18980,7 +18411,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19101,7 +18532,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19109,7 +18540,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19207,7 +18638,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19215,7 +18646,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19291,7 +18722,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19299,7 +18730,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19310,7 +18741,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19318,7 +18749,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19388,7 +18819,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19396,7 +18827,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19465,12 +18896,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19524,7 +18955,7 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19532,7 +18963,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19622,7 +19053,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19630,7 +19061,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19715,34 +19146,34 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21027,12 +20458,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -21110,5 +20541,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
index f89a42680a..758c6607eb 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
@@ -14365,590 +14365,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "dump-skeys"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-cpu-model-baseline"
- },
- {
- "name": "query-cpu-model-comparison"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -14956,12 +14375,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16163,7 +15582,7 @@
"parent": "vhost-user-gpu-pci-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -16171,7 +15590,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16518,7 +15937,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -16526,7 +15945,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16922,7 +16341,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -16930,7 +16349,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17156,7 +16575,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -17164,7 +16583,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -17408,7 +16827,7 @@
"type": "str"
}
],
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -17416,7 +16835,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -17714,7 +17133,7 @@
"type": "bool"
}
],
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -17722,7 +17141,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17850,7 +17269,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -17858,7 +17277,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18040,7 +17459,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18048,7 +17467,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18225,7 +17644,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -18233,11 +17652,11 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-hd' not found"
@@ -18249,11 +17668,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -18265,7 +17684,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18323,7 +17742,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -18331,11 +17750,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -18347,7 +17766,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18570,7 +17989,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -18578,7 +17997,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18673,7 +18092,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -18681,11 +18100,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -18697,7 +18116,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -18917,7 +18336,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -18925,7 +18344,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19053,7 +18472,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19061,7 +18480,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19159,7 +18578,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -19167,7 +18586,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19292,7 +18711,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -19300,11 +18719,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -19316,7 +18735,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19392,7 +18811,7 @@
"type": "uint16"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19400,7 +18819,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19411,7 +18830,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19419,7 +18838,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19489,7 +18908,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19497,7 +18916,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19566,12 +18985,12 @@
"type": "int"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19740,7 +19159,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19748,7 +19167,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19833,12 +19252,12 @@
"type": "string"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20519,34 +19938,34 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21702,12 +21121,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21785,7 +21204,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21796,7 +21215,7 @@
"name": "host"
}
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21852,7 +21271,7 @@
}
}
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
index f224bd2fee..04998336f5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
@@ -14662,596 +14662,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "object-add"
- },
- {
- "name": "device_add"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "change"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "query-cpus"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-events"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "query-migrate-cache-size"
- },
- {
- "name": "migrate-set-cache-size"
- },
- {
- "name": "migrate_set_speed"
- },
- {
- "name": "migrate_set_downtime"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "block_passwd"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -15259,12 +14672,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17534,7 +16947,7 @@
"parent": "authz"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17542,7 +16955,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17889,7 +17302,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -17897,7 +17310,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18293,7 +17706,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18301,7 +17714,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18527,7 +17940,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18535,11 +17948,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -18551,11 +17964,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -18567,7 +17980,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18749,7 +18162,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -18757,7 +18170,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18934,7 +18347,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -18942,7 +18355,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -19070,7 +18483,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -19078,7 +18491,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -19156,7 +18569,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -19164,7 +18577,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -19222,7 +18635,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -19230,7 +18643,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19329,7 +18742,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19337,7 +18750,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19353,7 +18766,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -19361,7 +18774,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19456,7 +18869,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -19464,7 +18877,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19517,7 +18930,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -19525,7 +18938,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19643,7 +19056,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -19651,7 +19064,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19874,7 +19287,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -19882,7 +19295,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19977,7 +19390,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -19985,7 +19398,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20103,7 +19516,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20111,7 +19524,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20331,7 +19744,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20339,11 +19752,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -20355,7 +19768,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20453,7 +19866,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20461,7 +19874,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20519,7 +19932,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20527,7 +19940,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20580,7 +19993,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20588,7 +20001,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20630,7 +20043,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20638,7 +20051,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20759,7 +20172,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20767,7 +20180,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20865,7 +20278,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20873,7 +20286,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20949,7 +20362,7 @@
"type": "uint16"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20957,7 +20370,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21157,7 +20570,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21165,7 +20578,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21176,7 +20589,7 @@
"type": "str"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21184,7 +20597,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21254,7 +20667,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21262,7 +20675,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21331,7 +20744,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21339,7 +20752,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -22937,12 +22350,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -23400,7 +22813,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -23408,7 +22821,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23493,12 +22906,12 @@
"type": "string"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25323,12 +24736,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -25336,12 +24749,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -25349,12 +24762,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -26649,12 +26062,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -26732,16 +26145,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -26756,7 +26169,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -27065,7 +26478,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -27079,7 +26492,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -27388,7 +26801,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -27403,7 +26816,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -27712,7 +27125,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
index ed04553f29..4be2ad5045 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
@@ -15815,581 +15815,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -16397,12 +15825,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -20188,7 +19616,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -20196,7 +19624,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -20570,7 +19998,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -20578,7 +20006,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -20996,7 +20424,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -21004,7 +20432,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -21252,7 +20680,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -21260,11 +20688,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -21276,11 +20704,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -21292,7 +20720,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -21484,7 +20912,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -21492,7 +20920,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -21669,7 +21097,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -21677,7 +21105,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -21805,7 +21233,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -21813,11 +21241,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -21829,7 +21257,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -21926,7 +21354,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -21934,11 +21362,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -21950,7 +21378,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -22055,7 +21483,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -22063,7 +21491,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -22126,7 +21554,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -22134,7 +21562,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -22367,7 +21795,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -22375,7 +21803,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -22458,7 +21886,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -22466,11 +21894,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -22482,7 +21910,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -22719,7 +22147,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -22727,11 +22155,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -22743,7 +22171,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22841,7 +22269,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22849,7 +22277,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -22891,7 +22319,7 @@
"type": "uint64"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -22899,7 +22327,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23030,7 +22458,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23038,7 +22466,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23134,7 +22562,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23142,7 +22570,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23222,7 +22650,7 @@
"type": "int32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23230,7 +22658,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -23241,7 +22669,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -23249,7 +22677,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -23319,7 +22747,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -23327,7 +22755,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -23396,7 +22824,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -23404,7 +22832,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -23613,12 +23041,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -24397,7 +23825,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -24405,7 +23833,7 @@
"arguments": {
"typename": "virt-6.0-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24591,7 +24019,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24599,7 +24027,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -24697,12 +24125,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -24942,24 +24370,24 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24967,12 +24395,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -26169,12 +25597,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -26256,12 +25684,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -26277,7 +25705,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -26288,7 +25716,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26320,7 +25748,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26335,7 +25763,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -26367,7 +25795,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
index 83e75ca0fa..a0a9c42b20 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
@@ -15867,587 +15867,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "dump-skeys"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-cpu-model-baseline"
- },
- {
- "name": "query-cpu-model-comparison"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -16455,12 +15877,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17674,7 +17096,7 @@
"parent": "vhost-user-gpu-pci-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -17682,7 +17104,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -18056,7 +17478,7 @@
"type": "bool"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -18064,7 +17486,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18482,7 +17904,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -18490,7 +17912,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18738,7 +18160,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -18746,7 +18168,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -18995,7 +18417,7 @@
"type": "bool"
}
],
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -19003,7 +18425,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -19301,7 +18723,7 @@
"type": "bool"
}
],
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -19309,7 +18731,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -19437,7 +18859,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -19445,7 +18867,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -19637,7 +19059,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -19645,7 +19067,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -19822,7 +19244,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -19830,11 +19252,11 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-hd' not found"
@@ -19846,11 +19268,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -19862,7 +19284,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19918,7 +19340,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -19926,11 +19348,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19942,7 +19364,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20187,7 +19609,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -20195,7 +19617,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20290,7 +19712,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -20298,11 +19720,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -20314,7 +19736,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -20551,7 +19973,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -20559,7 +19981,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -20687,7 +20109,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -20695,7 +20117,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20793,7 +20215,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -20801,7 +20223,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20926,7 +20348,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -20934,11 +20356,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -20950,7 +20372,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21030,7 +20452,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21038,7 +20460,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21049,7 +20471,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21057,7 +20479,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21127,7 +20549,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21135,7 +20557,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21204,12 +20626,12 @@
"type": "int"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21387,7 +20809,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21395,7 +20817,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21493,12 +20915,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22179,34 +21601,34 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23382,12 +22804,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23469,7 +22891,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23480,7 +22902,7 @@
"name": "host"
}
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23537,7 +22959,7 @@
}
}
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
index d815a91f4c..60451ac4bb 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
@@ -16192,596 +16192,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "x-blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -16789,12 +16202,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -19088,7 +18501,7 @@
"parent": "authz"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -19096,7 +18509,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -19470,7 +18883,7 @@
"type": "bool"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -19478,7 +18891,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -19896,7 +19309,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -19904,7 +19317,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -20152,7 +19565,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -20160,11 +19573,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -20176,11 +19589,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -20192,7 +19605,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -20384,7 +19797,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -20392,7 +19805,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -20569,7 +19982,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -20577,7 +19990,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -20705,7 +20118,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -20713,7 +20126,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -20806,7 +20219,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -20814,7 +20227,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -20870,7 +20283,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -20878,7 +20291,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -20975,7 +20388,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -20983,7 +20396,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -20999,7 +20412,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -21007,7 +20420,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -21112,7 +20525,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -21120,7 +20533,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -21183,7 +20596,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -21191,7 +20604,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -21319,7 +20732,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -21327,7 +20740,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21572,7 +20985,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21580,7 +20993,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21675,7 +21088,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21683,7 +21096,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -21816,7 +21229,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -21824,7 +21237,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22061,7 +21474,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22069,11 +21482,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -22085,7 +21498,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -22183,7 +21596,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -22191,7 +21604,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -22249,7 +21662,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -22257,7 +21670,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22320,7 +21733,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22328,7 +21741,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22370,7 +21783,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22378,7 +21791,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22509,7 +21922,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22517,7 +21930,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22613,7 +22026,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22621,7 +22034,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22701,7 +22114,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22709,7 +22122,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22931,7 +22344,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22939,7 +22352,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22950,7 +22363,7 @@
"type": "str"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22958,7 +22371,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23032,7 +22445,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23040,7 +22453,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23109,7 +22522,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23117,7 +22530,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -24763,12 +24176,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -25215,7 +24628,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -25223,7 +24636,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25321,12 +24734,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -27194,12 +26607,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27207,12 +26620,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27220,12 +26633,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -28544,12 +27957,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -28631,12 +28044,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -28646,7 +28059,7 @@
"cert-chain":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -28657,7 +28070,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -28978,7 +28391,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -28992,7 +28405,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29313,7 +28726,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29328,7 +28741,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -29649,7 +29062,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
index e55adfbe66..8b1eb5d3ae 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
@@ -16331,599 +16331,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -16931,12 +16341,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -19294,7 +18704,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -19302,7 +18712,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -19682,7 +19092,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -19690,7 +19100,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -20108,7 +19518,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -20116,7 +19526,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -20364,7 +19774,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -20372,11 +19782,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -20388,11 +19798,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -20404,7 +19814,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -20596,7 +20006,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -20604,7 +20014,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -20787,7 +20197,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -20795,7 +20205,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -20929,7 +20339,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -20937,7 +20347,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -21030,7 +20440,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -21038,7 +20448,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -21094,7 +20504,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -21102,7 +20512,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -21205,7 +20615,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -21213,7 +20623,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -21229,7 +20639,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -21237,7 +20647,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -21347,7 +20757,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -21355,7 +20765,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -21418,7 +20828,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -21426,7 +20836,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -21554,7 +20964,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -21562,7 +20972,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21801,7 +21211,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -21809,7 +21219,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21898,7 +21308,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -21906,7 +21316,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -22043,7 +21453,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -22051,7 +21461,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22288,7 +21698,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -22296,11 +21706,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -22312,7 +21722,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -22410,7 +21820,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -22418,7 +21828,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -22476,7 +21886,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -22484,7 +21894,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22547,7 +21957,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22555,7 +21965,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22597,7 +22007,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22605,7 +22015,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22741,7 +22151,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22749,7 +22159,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22845,7 +22255,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22853,7 +22263,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22933,7 +22343,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22941,7 +22351,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23163,7 +22573,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23171,7 +22581,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -23182,7 +22592,7 @@
"type": "str"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -23190,7 +22600,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23269,7 +22679,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23277,7 +22687,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23351,7 +22761,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23359,7 +22769,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -25017,12 +24427,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -25487,7 +24897,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -25495,7 +24905,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25598,12 +25008,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -27660,12 +27070,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27673,12 +27083,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27686,12 +27096,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -29023,12 +28433,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -29110,16 +28520,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "Failed to open /dev/sev: No such file or directory"
@@ -29134,7 +28544,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -29457,7 +28867,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -29471,7 +28881,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29794,7 +29204,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29809,7 +29219,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -30132,7 +29542,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
index 20d176e4b7..fd66e700d5 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
@@ -16347,584 +16347,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -16932,12 +16357,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -20919,7 +20344,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -20927,7 +20352,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -21307,7 +20732,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -21315,7 +20740,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -21733,7 +21158,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -21741,7 +21166,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -21989,7 +21414,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -21997,11 +21422,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -22013,11 +21438,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -22029,7 +21454,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -22221,7 +21646,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -22229,7 +21654,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -22412,7 +21837,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -22420,7 +21845,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -22554,7 +21979,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -22562,11 +21987,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -22578,7 +22003,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -22634,7 +22059,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -22642,7 +22067,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -22745,7 +22170,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -22753,11 +22178,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -22769,7 +22194,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -22879,7 +22304,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -22887,7 +22312,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -22950,7 +22375,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -22958,7 +22383,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -23197,7 +22622,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -23205,7 +22630,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -23294,7 +22719,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -23302,11 +22727,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -23318,7 +22743,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -23555,7 +22980,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -23563,11 +22988,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -23579,7 +23004,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -23677,7 +23102,7 @@
"type": "int"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -23685,7 +23110,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23727,7 +23152,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23735,7 +23160,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23871,7 +23296,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23879,7 +23304,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23975,7 +23400,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23983,7 +23408,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -24063,7 +23488,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -24071,7 +23496,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -24082,7 +23507,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -24090,7 +23515,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -24165,7 +23590,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -24173,7 +23598,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -24247,7 +23672,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -24255,7 +23680,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -24464,12 +23889,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -25313,7 +24738,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -25321,7 +24746,7 @@
"arguments": {
"typename": "virt-6.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -25517,7 +24942,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -25525,7 +24950,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -25628,12 +25053,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -25879,24 +25304,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25904,12 +25329,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -27257,12 +26682,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27344,12 +26769,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27365,7 +26790,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27376,7 +26801,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27408,7 +26833,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27423,7 +26848,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -27455,7 +26880,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
index 0ac9b2cfe2..6f0079c815 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
@@ -18832,602 +18832,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -19435,12 +18842,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -22818,7 +22225,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -22826,7 +22233,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23206,7 +22613,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23214,7 +22621,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23632,7 +23039,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23640,7 +23047,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -23888,7 +23295,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -23896,11 +23303,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -23912,11 +23319,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -23928,7 +23335,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24120,7 +23527,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24128,7 +23535,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24311,7 +23718,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24319,7 +23726,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24453,7 +23860,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24461,7 +23868,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24554,7 +23961,7 @@
"type": "uint32"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24562,7 +23969,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24665,7 +24072,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24673,11 +24080,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -24689,7 +24096,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24799,7 +24206,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24807,7 +24214,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24870,7 +24277,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24878,7 +24285,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25117,7 +24524,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25125,7 +24532,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25214,7 +24621,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25222,11 +24629,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -25238,7 +24645,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25475,7 +24882,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25483,11 +24890,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25499,7 +24906,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25597,7 +25004,7 @@
"type": "int"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25605,7 +25012,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25701,7 +25108,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -25709,7 +25116,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25751,7 +25158,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25759,7 +25166,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25895,7 +25302,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25903,11 +25310,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-30",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -25919,7 +25326,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25999,7 +25406,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26007,7 +25414,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26018,7 +25425,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26026,7 +25433,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26101,7 +25508,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26109,7 +25516,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26183,12 +25590,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26551,7 +25958,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26559,7 +25966,7 @@
"arguments": {
"typename": "pseries-6.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26791,7 +26198,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26799,7 +26206,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26902,12 +26309,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29559,24 +28966,24 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29584,12 +28991,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30723,12 +30130,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30810,7 +30217,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
index d7da5068b0..8faf985392 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
@@ -19455,632 +19455,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -20088,12 +19465,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -22471,7 +21848,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -22479,7 +21856,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -22859,7 +22236,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -22867,7 +22244,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23285,7 +22662,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23293,7 +22670,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -23541,7 +22918,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -23549,11 +22926,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -23565,11 +22942,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -23581,7 +22958,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -23773,7 +23150,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -23781,7 +23158,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -23964,7 +23341,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -23972,7 +23349,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24106,7 +23483,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24114,7 +23491,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24207,7 +23584,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24215,7 +23592,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24271,7 +23648,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24279,7 +23656,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24382,7 +23759,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24390,7 +23767,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24406,7 +23783,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24414,7 +23791,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24524,7 +23901,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24532,7 +23909,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24595,7 +23972,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24603,7 +23980,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -24731,7 +24108,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -24739,7 +24116,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24978,7 +24355,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -24986,7 +24363,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25075,7 +24452,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25083,7 +24460,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25224,7 +24601,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25232,7 +24609,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25469,7 +24846,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25477,11 +24854,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25493,7 +24870,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25591,7 +24968,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25599,7 +24976,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25657,7 +25034,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25665,7 +25042,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25728,7 +25105,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25736,7 +25113,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25778,7 +25155,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25786,7 +25163,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25922,7 +25299,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25930,7 +25307,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26026,7 +25403,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26034,7 +25411,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26114,7 +25491,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26122,7 +25499,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26344,7 +25721,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26352,7 +25729,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26363,7 +25740,7 @@
"type": "str"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26371,7 +25748,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26450,7 +25827,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26458,7 +25835,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -26532,7 +25909,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -26540,7 +25917,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -28280,12 +27657,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28768,7 +28145,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28776,7 +28153,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28879,12 +28256,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30953,12 +30330,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -30966,12 +30343,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -30979,12 +30356,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -32316,12 +31693,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -32403,16 +31780,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -32421,11 +31798,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -32440,7 +31817,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -32773,7 +32150,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -32787,7 +32164,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33120,7 +32497,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33135,7 +32512,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -33468,7 +32845,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
index f2854f9fa6..42b1a035d0 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
@@ -19510,611 +19510,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -20122,12 +19520,12 @@
"enabled": false,
"present": false
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24197,7 +23595,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24205,7 +23603,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24585,7 +23983,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24593,7 +23991,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25011,7 +24409,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25019,7 +24417,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25267,7 +24665,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25275,11 +24673,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -25291,11 +24689,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -25307,7 +24705,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25499,7 +24897,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25507,7 +24905,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25690,7 +25088,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25698,7 +25096,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25832,7 +25230,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25840,11 +25238,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -25856,7 +25254,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25912,7 +25310,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25920,7 +25318,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26023,7 +25421,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26031,11 +25429,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -26047,7 +25445,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26157,7 +25555,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26165,7 +25563,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26228,7 +25626,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26236,7 +25634,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26475,7 +25873,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26483,7 +25881,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26572,7 +25970,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26580,11 +25978,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -26596,7 +25994,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26833,7 +26231,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26841,11 +26239,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -26857,7 +26255,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26955,7 +26353,7 @@
"type": "int"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26963,7 +26361,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27005,7 +26403,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27013,7 +26411,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27149,7 +26547,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27157,7 +26555,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27253,7 +26651,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27261,7 +26659,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27341,7 +26739,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27349,7 +26747,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27576,7 +26974,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27584,7 +26982,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27799,7 +27197,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27807,7 +27205,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27882,7 +27280,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27890,7 +27288,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27964,7 +27362,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27972,7 +27370,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28181,12 +27579,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -29056,7 +28454,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -29064,7 +28462,7 @@
"arguments": {
"typename": "virt-7.0-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29265,7 +28663,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29273,7 +28671,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29376,12 +28774,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29627,24 +29025,24 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -29652,12 +29050,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31009,12 +30407,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31096,12 +30494,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31117,7 +30515,7 @@
"kernel": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31128,7 +30526,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31161,7 +30559,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31176,7 +30574,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -31209,7 +30607,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
index b330e842c2..cdcf4fd76f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
@@ -19510,611 +19510,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-gic-capabilities"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -20122,12 +19520,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24197,7 +23595,7 @@
"parent": "sys-bus-device"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24205,7 +23603,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24585,7 +23983,7 @@
"type": "size"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24593,7 +23991,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25011,7 +24409,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25019,7 +24417,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25267,7 +24665,7 @@
"type": "bool"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25275,11 +24673,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -25291,11 +24689,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -25307,7 +24705,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25499,7 +24897,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25507,7 +24905,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25690,7 +25088,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25698,7 +25096,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25832,7 +25230,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25840,11 +25238,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -25856,7 +25254,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25912,7 +25310,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25920,7 +25318,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26023,7 +25421,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26031,11 +25429,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -26047,7 +25445,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26157,7 +25555,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26165,7 +25563,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26228,7 +25626,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26236,7 +25634,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26475,7 +25873,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26483,7 +25881,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26572,7 +25970,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26580,11 +25978,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -26596,7 +25994,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26833,7 +26231,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26841,11 +26239,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -26857,7 +26255,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26955,7 +26353,7 @@
"type": "int"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26963,7 +26361,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27005,7 +26403,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27013,7 +26411,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27149,7 +26547,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27157,7 +26555,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27253,7 +26651,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27261,7 +26659,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27341,7 +26739,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27349,7 +26747,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27576,7 +26974,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27584,7 +26982,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27799,7 +27197,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27807,7 +27205,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27882,7 +27280,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27890,7 +27288,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27964,7 +27362,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27972,7 +27370,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28181,12 +27579,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -29056,7 +28454,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -29064,7 +28462,7 @@
"arguments": {
"typename": "virt-7.0-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29265,7 +28663,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29273,7 +28671,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29376,12 +28774,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29627,24 +29025,24 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -29652,12 +29050,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31009,12 +30407,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31096,12 +30494,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31117,7 +30515,7 @@
"kernel": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31128,7 +30526,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31161,7 +30559,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31176,7 +30574,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -31209,7 +30607,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
index 84d993a581..801285ca00 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
@@ -19156,602 +19156,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -19759,12 +19166,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23162,7 +22569,7 @@
"parent": "e500v2-family-powerpc64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23170,7 +22577,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23550,7 +22957,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23558,7 +22965,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23976,7 +23383,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23984,7 +23391,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24232,7 +23639,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24240,11 +23647,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -24256,11 +23663,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -24272,7 +23679,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24464,7 +23871,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24472,7 +23879,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24655,7 +24062,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24663,7 +24070,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24797,7 +24204,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24805,7 +24212,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24903,7 +24310,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24911,7 +24318,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24967,7 +24374,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24975,7 +24382,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25078,7 +24485,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25086,11 +24493,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -25102,7 +24509,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25212,7 +24619,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25220,7 +24627,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25283,7 +24690,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25291,7 +24698,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25530,7 +24937,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25538,7 +24945,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25627,7 +25034,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25635,11 +25042,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -25651,7 +25058,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25888,7 +25295,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25896,11 +25303,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25912,7 +25319,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26010,7 +25417,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26018,7 +25425,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26114,7 +25521,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26122,7 +25529,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26164,7 +25571,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26172,7 +25579,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26308,7 +25715,7 @@
"type": "size"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26316,7 +25723,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26412,7 +25819,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26420,7 +25827,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26500,7 +25907,7 @@
"type": "int32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26508,7 +25915,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26723,7 +26130,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26731,7 +26138,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26810,7 +26217,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26818,7 +26225,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26892,12 +26299,12 @@
"type": "int"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27269,7 +26676,7 @@
"default-ram-id": "ppc_spapr.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27277,7 +26684,7 @@
"arguments": {
"typename": "pseries-7.0-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27509,7 +26916,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27517,7 +26924,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27620,12 +27027,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30151,24 +29558,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30176,12 +29583,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -31379,12 +30786,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31466,7 +30873,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
index a4b1a8490f..454cffbb14 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
@@ -19742,632 +19742,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -20375,12 +19752,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -22782,7 +22159,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -22790,7 +22167,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23170,7 +22547,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23178,7 +22555,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23596,7 +22973,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -23604,7 +22981,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -23852,7 +23229,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -23860,11 +23237,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -23876,11 +23253,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -23892,7 +23269,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24084,7 +23461,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24092,7 +23469,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24275,7 +23652,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24283,7 +23660,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24417,7 +23794,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -24425,7 +23802,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24523,7 +23900,7 @@
"type": "uint8"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -24531,7 +23908,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24587,7 +23964,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -24595,7 +23972,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24698,7 +24075,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -24706,7 +24083,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24722,7 +24099,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -24730,7 +24107,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24840,7 +24217,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -24848,7 +24225,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24911,7 +24288,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -24919,7 +24296,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25047,7 +24424,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25055,7 +24432,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25294,7 +24671,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25302,7 +24679,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25391,7 +24768,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -25399,7 +24776,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25540,7 +24917,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -25548,7 +24925,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25785,7 +25162,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -25793,11 +25170,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25809,7 +25186,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25907,7 +25284,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25915,7 +25292,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25978,7 +25355,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25986,7 +25363,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26049,7 +25426,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26057,7 +25434,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26099,7 +25476,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26107,7 +25484,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26243,7 +25620,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26251,7 +25628,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26347,7 +25724,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26355,7 +25732,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26435,7 +25812,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26443,7 +25820,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26676,7 +26053,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26684,7 +26061,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26899,7 +26276,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26907,7 +26284,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26986,7 +26363,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26994,7 +26371,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27068,7 +26445,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27076,7 +26453,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -28832,12 +28209,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29338,7 +28715,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29346,7 +28723,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29449,12 +28826,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -31559,12 +30936,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31572,12 +30949,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31585,12 +30962,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -32926,12 +32303,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -33013,16 +32390,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -33031,7 +32408,7 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -33052,7 +32429,7 @@
}
]
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -33063,7 +32440,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -33400,7 +32777,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -33414,7 +32791,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33751,7 +33128,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33766,7 +33143,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -34103,7 +33480,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
index cf23680766..39615ed626 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
@@ -19791,620 +19791,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -20412,12 +19801,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23851,7 +23240,7 @@
"parent": "e500v2-family-powerpc64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23859,7 +23248,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24239,7 +23628,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24247,7 +23636,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24665,7 +24054,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24673,7 +24062,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24921,7 +24310,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24929,11 +24318,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -24945,11 +24334,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -24961,7 +24350,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25153,7 +24542,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25161,7 +24550,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25350,7 +24739,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25358,7 +24747,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25492,7 +24881,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25500,7 +24889,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -25611,7 +25000,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -25619,7 +25008,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25675,7 +25064,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25683,7 +25072,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25786,7 +25175,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25794,11 +25183,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -25810,7 +25199,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25920,7 +25309,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25928,7 +25317,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25991,7 +25380,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25999,7 +25388,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26238,7 +25627,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26246,7 +25635,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26335,7 +25724,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26343,11 +25732,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -26359,7 +25748,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26596,7 +25985,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26604,11 +25993,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -26620,7 +26009,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26718,7 +26107,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -26726,7 +26115,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26822,7 +26211,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26830,7 +26219,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26872,7 +26261,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26880,7 +26269,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27016,7 +26405,7 @@
"type": "size"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27024,7 +26413,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27120,7 +26509,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27128,7 +26517,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27208,7 +26597,7 @@
"type": "int32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27216,7 +26605,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27431,7 +26820,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27439,7 +26828,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27518,7 +26907,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27526,7 +26915,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27600,12 +26989,12 @@
"type": "int"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27986,7 +27375,7 @@
"default-ram-id": "ppc_spapr.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27994,7 +27383,7 @@
"arguments": {
"typename": "pseries-7.1-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28236,7 +27625,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28244,7 +27633,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28357,12 +27746,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30876,24 +30265,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30901,12 +30290,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32104,12 +31493,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -32199,7 +31588,7 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
index 1726cbc5f3..e09f696806 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
@@ -20397,650 +20397,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -21048,12 +20407,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23499,7 +22858,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23507,7 +22866,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23887,7 +23246,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23895,7 +23254,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24313,7 +23672,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24321,7 +23680,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24569,7 +23928,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24577,11 +23936,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -24593,11 +23952,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -24609,7 +23968,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24801,7 +24160,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24809,7 +24168,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24998,7 +24357,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25006,7 +24365,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25140,7 +24499,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25148,7 +24507,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -25259,7 +24618,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -25267,7 +24626,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25323,7 +24682,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25331,7 +24690,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25434,7 +24793,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -25442,7 +24801,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25458,7 +24817,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25466,7 +24825,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25576,7 +24935,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25584,7 +24943,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25647,7 +25006,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25655,7 +25014,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25783,7 +25142,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -25791,7 +25150,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26030,7 +25389,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26038,7 +25397,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26127,7 +25486,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -26135,7 +25494,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26276,7 +25635,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26284,7 +25643,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26521,7 +25880,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26529,11 +25888,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -26545,7 +25904,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26643,7 +26002,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26651,7 +26010,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26719,7 +26078,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26727,7 +26086,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26790,7 +26149,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26798,7 +26157,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26840,7 +26199,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26848,7 +26207,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26984,7 +26343,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26992,7 +26351,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27088,7 +26447,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27096,7 +26455,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27176,7 +26535,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27184,7 +26543,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27417,7 +26776,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27425,7 +26784,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27640,7 +26999,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27648,7 +27007,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27727,7 +27086,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27735,7 +27094,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27809,7 +27168,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27817,7 +27176,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29610,12 +28969,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30134,7 +29493,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30142,7 +29501,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30255,12 +29614,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -32244,12 +31603,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -32257,12 +31616,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -32270,12 +31629,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -33611,12 +32970,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -33706,16 +33065,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -33724,11 +33083,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -33743,7 +33102,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -34081,7 +33440,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -34095,7 +33454,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34433,7 +33792,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34448,7 +33807,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -34786,7 +34145,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
index 2df79da5a5..879b6c0931 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
@@ -20985,641 +20985,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -21627,12 +20995,12 @@
"enabled": false,
"present": false
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24530,7 +23898,7 @@
"parent": "authz"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24538,7 +23906,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24936,7 +24304,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24944,7 +24312,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25368,7 +24736,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25376,7 +24744,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25630,7 +24998,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25638,11 +25006,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -25654,11 +25022,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -25670,7 +25038,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25862,7 +25230,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25870,7 +25238,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -26071,7 +25439,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -26079,7 +25447,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26225,7 +25593,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26233,7 +25601,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -26344,7 +25712,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -26352,7 +25720,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -26408,7 +25776,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -26416,7 +25784,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26531,7 +25899,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26539,11 +25907,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -26555,7 +25923,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26665,7 +26033,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26673,7 +26041,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26736,7 +26104,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26744,7 +26112,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26989,7 +26357,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26997,7 +26365,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27092,7 +26460,7 @@
"type": "size"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27100,11 +26468,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -27116,7 +26484,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27359,7 +26727,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27367,11 +26735,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -27383,7 +26751,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27487,7 +26855,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27495,7 +26863,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27631,7 +26999,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27639,7 +27007,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27735,7 +27103,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27743,7 +27111,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27829,7 +27197,7 @@
"type": "int32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27837,7 +27205,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28058,7 +27426,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28066,7 +27434,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -28150,7 +27518,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -28158,7 +27526,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28237,12 +27605,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28345,7 +27713,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28353,7 +27721,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28466,12 +27834,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30781,34 +30149,34 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -32134,12 +31502,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32229,5 +31597,5 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
index 1883926667..87c553c813 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
@@ -21229,668 +21229,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -21898,12 +21239,12 @@
"enabled": false,
"present": false
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24373,7 +23714,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24381,7 +23722,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24779,7 +24120,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24787,7 +24128,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25211,7 +24552,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25219,7 +24560,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25473,7 +24814,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25481,11 +24822,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -25497,11 +24838,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -25513,7 +24854,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25705,7 +25046,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25713,7 +25054,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25914,7 +25255,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25922,7 +25263,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26068,7 +25409,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26076,7 +25417,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -26187,7 +25528,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -26195,7 +25536,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -26251,7 +25592,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -26259,7 +25600,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26374,7 +25715,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26382,7 +25723,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26398,7 +25739,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26406,7 +25747,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26516,7 +25857,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26524,7 +25865,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26587,7 +25928,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26595,7 +25936,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26723,7 +26064,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26731,7 +26072,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26976,7 +26317,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26984,7 +26325,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27079,7 +26420,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27087,7 +26428,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27228,7 +26569,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27236,7 +26577,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -27479,7 +26820,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -27487,11 +26828,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -27503,7 +26844,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27607,7 +26948,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27615,7 +26956,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27688,7 +27029,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27696,7 +27037,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27759,7 +27100,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27767,7 +27108,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27809,7 +27150,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27817,7 +27158,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27953,7 +27294,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27961,7 +27302,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28057,7 +27398,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28065,7 +27406,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28151,7 +27492,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28159,7 +27500,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28398,7 +27739,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28406,7 +27747,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28627,7 +27968,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28635,7 +27976,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28719,7 +28060,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28727,7 +28068,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28806,7 +28147,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28814,7 +28155,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30607,12 +29948,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31149,7 +30490,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31157,7 +30498,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -31270,12 +30611,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -33259,12 +32600,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -33272,12 +32613,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -33285,12 +32626,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -34626,12 +33967,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -34721,16 +34062,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -34739,11 +34080,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -34758,7 +34099,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -35096,7 +34437,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -35110,7 +34451,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -35448,7 +34789,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -35463,7 +34804,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -35801,7 +35142,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
index 6a465f6856..074c917ee9 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
@@ -21229,668 +21229,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -21898,12 +21239,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24373,7 +23714,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -24381,7 +23722,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24779,7 +24120,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24787,7 +24128,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25211,7 +24552,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -25219,7 +24560,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25473,7 +24814,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25481,11 +24822,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -25497,11 +24838,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -25513,7 +24854,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25705,7 +25046,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25713,7 +25054,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25914,7 +25255,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25922,7 +25263,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26068,7 +25409,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26076,7 +25417,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -26187,7 +25528,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -26195,7 +25536,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -26251,7 +25592,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -26259,7 +25600,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26374,7 +25715,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -26382,7 +25723,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26398,7 +25739,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26406,7 +25747,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26516,7 +25857,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26524,7 +25865,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26587,7 +25928,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -26595,7 +25936,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26723,7 +26064,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26731,7 +26072,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26976,7 +26317,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26984,7 +26325,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27079,7 +26420,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27087,7 +26428,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27228,7 +26569,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27236,7 +26577,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -27479,7 +26820,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -27487,11 +26828,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -27503,7 +26844,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27607,7 +26948,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27615,7 +26956,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27688,7 +27029,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27696,7 +27037,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27759,7 +27100,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27767,7 +27108,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27809,7 +27150,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27817,7 +27158,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27953,7 +27294,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27961,7 +27302,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28057,7 +27398,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28065,7 +27406,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28151,7 +27492,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -28159,7 +27500,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28398,7 +27739,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28406,7 +27747,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28627,7 +27968,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28635,7 +27976,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28719,7 +28060,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28727,7 +28068,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28806,7 +28147,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28814,7 +28155,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -30607,12 +29948,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31149,7 +30490,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -31157,7 +30498,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -31270,12 +30611,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -33259,12 +32600,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -33272,12 +32613,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -33285,12 +32626,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -34626,12 +33967,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -34721,16 +34062,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -34739,11 +34080,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -34758,7 +34099,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -35096,7 +34437,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -35110,7 +34451,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -35448,7 +34789,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -35463,7 +34804,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -35801,7 +35142,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
index f6bebee386..e4b9114820 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
@@ -20681,638 +20681,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -21320,12 +20691,12 @@
"enabled": false,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23331,7 +22702,7 @@
"parent": "virtio-vga-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23339,7 +22710,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23737,7 +23108,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -23745,7 +23116,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24169,7 +23540,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24177,7 +23548,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24431,7 +23802,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -24439,11 +23810,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -24455,11 +23826,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -24471,7 +23842,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24663,7 +24034,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -24671,7 +24042,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24872,7 +24243,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -24880,7 +24251,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25026,7 +24397,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -25034,11 +24405,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -25050,7 +24421,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25165,7 +24536,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -25173,11 +24544,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -25189,7 +24560,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25299,7 +24670,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -25307,7 +24678,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25552,7 +24923,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -25560,7 +24931,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25655,7 +25026,7 @@
"type": "size"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -25663,11 +25034,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -25679,7 +25050,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25922,7 +25293,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -25930,11 +25301,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25946,7 +25317,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26050,7 +25421,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -26058,7 +25429,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26194,7 +25565,7 @@
"type": "size"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -26202,11 +25573,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -26218,7 +25589,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26304,7 +25675,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -26312,7 +25683,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26533,7 +25904,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26541,7 +25912,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26625,7 +25996,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26633,7 +26004,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26712,12 +26083,12 @@
"type": "int"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26792,7 +26163,7 @@
"default-ram-id": "riscv_virt_board.ram"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26800,7 +26171,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26933,7 +26304,7 @@
"type": "child<container>"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26941,7 +26312,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27054,24 +26425,24 @@
"type": "child<container>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27079,12 +26450,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28455,12 +27826,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -28550,5 +27921,5 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
index 94a36dbbc2..fa3e16af9a 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
@@ -22490,689 +22490,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "cxl-inject-correctable-error"
- },
- {
- "name": "cxl-inject-uncorrectable-errors"
- },
- {
- "name": "query-cryptodev"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-audiodevs"
- },
- {
- "name": "xen-event-inject"
- },
- {
- "name": "xen-event-list"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-migrationthreads"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -23180,12 +22500,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -25755,7 +25075,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -25763,7 +25083,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -26161,7 +25481,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -26169,7 +25489,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -26593,7 +25913,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -26601,7 +25921,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -26855,7 +26175,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -26863,11 +26183,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -26879,11 +26199,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -26895,7 +26215,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -27087,7 +26407,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -27095,7 +26415,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -27296,7 +26616,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -27304,7 +26624,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -27450,7 +26770,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -27458,7 +26778,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -27569,7 +26889,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -27577,7 +26897,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -27633,7 +26953,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -27641,7 +26961,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -27756,7 +27076,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -27764,7 +27084,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27780,7 +27100,7 @@
"type": "uint32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -27788,7 +27108,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27898,7 +27218,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -27906,7 +27226,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -27969,7 +27289,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -27977,7 +27297,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28105,7 +27425,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28113,7 +27433,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28358,7 +27678,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28366,7 +27686,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28461,7 +27781,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28469,7 +27789,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28615,7 +27935,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28623,7 +27943,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28866,7 +28186,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -28874,11 +28194,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -28890,7 +28210,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -28994,7 +28314,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29002,7 +28322,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29075,7 +28395,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29083,7 +28403,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29146,7 +28466,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29154,7 +28474,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29196,7 +28516,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29204,7 +28524,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29340,7 +28660,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29348,7 +28668,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29444,7 +28764,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29452,7 +28772,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29538,7 +28858,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29546,7 +28866,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29790,7 +29110,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -29798,7 +29118,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30019,7 +29339,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30027,7 +29347,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30111,7 +29431,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30119,7 +29439,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30198,7 +29518,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30206,7 +29526,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -32023,12 +31343,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32644,7 +31964,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -32652,7 +31972,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -32765,12 +32085,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -34861,12 +34181,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -34874,12 +34194,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -34887,12 +34207,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -36345,12 +35665,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -36440,16 +35760,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -36458,11 +35778,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -36477,7 +35797,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -36820,7 +36140,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -36834,7 +36154,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -37177,7 +36497,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -37192,7 +36512,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -37641,7 +36961,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
index ba343b0694..57ce64e88e 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
@@ -21901,665 +21901,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "cxl-inject-correctable-error"
- },
- {
- "name": "cxl-inject-uncorrectable-errors"
- },
- {
- "name": "query-cryptodev"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-audiodevs"
- },
- {
- "name": "dump-skeys"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "query-cpu-model-baseline"
- },
- {
- "name": "query-cpu-model-comparison"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-migrationthreads"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -22567,12 +21911,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23898,7 +23242,7 @@
"parent": "vhost-user-gpu-pci-base-type"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -23906,7 +23250,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24310,7 +23654,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -24318,7 +23662,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24748,7 +24092,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -24756,7 +24100,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25016,7 +24360,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -25024,7 +24368,7 @@
"arguments": {
"typename": "virtio-blk-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -25297,7 +24641,7 @@
"type": "str"
}
],
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
@@ -25305,7 +24649,7 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -25609,7 +24953,7 @@
"type": "bool"
}
],
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
@@ -25617,7 +24961,7 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25751,7 +25095,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -25759,7 +25103,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25962,7 +25306,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -25970,7 +25314,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26171,7 +25515,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -26179,11 +25523,11 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-hd' not found"
@@ -26195,11 +25539,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -26211,11 +25555,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -26227,7 +25571,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26478,7 +25822,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -26486,7 +25830,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26581,7 +25925,7 @@
"type": "size"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -26589,11 +25933,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -26605,7 +25949,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26854,7 +26198,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -26862,7 +26206,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -26996,7 +26340,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -27004,7 +26348,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27108,7 +26452,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -27116,7 +26460,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27241,7 +26585,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -27249,11 +26593,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -27265,7 +26609,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27351,7 +26695,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
@@ -27359,7 +26703,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27586,7 +26930,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -27594,7 +26938,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27679,7 +27023,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27687,7 +27031,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27766,12 +27110,12 @@
"type": "int"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28038,7 +27382,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -28046,7 +27390,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -28159,12 +27503,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -28881,34 +28225,34 @@
"deprecated": false
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30129,12 +29473,12 @@
"option": "drive"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30224,7 +29568,7 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30235,7 +29579,7 @@
"name": "host"
}
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30298,7 +29642,7 @@
}
}
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
index 21ce2566d3..fac0263314 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
@@ -22713,689 +22713,9 @@
"id": "libvirt-4"
}
-{
- "execute": "query-commands",
- "id": "libvirt-5"
-}
-
-{
- "return": [
- {
- "name": "device_add"
- },
- {
- "name": "cxl-inject-correctable-error"
- },
- {
- "name": "cxl-inject-uncorrectable-errors"
- },
- {
- "name": "query-cryptodev"
- },
- {
- "name": "x-query-virtio-queue-element"
- },
- {
- "name": "x-query-virtio-vhost-queue-status"
- },
- {
- "name": "x-query-virtio-queue-status"
- },
- {
- "name": "x-query-virtio-status"
- },
- {
- "name": "x-query-virtio"
- },
- {
- "name": "query-stats-schemas"
- },
- {
- "name": "query-stats"
- },
- {
- "name": "query-pci"
- },
- {
- "name": "query-acpi-ospm-status"
- },
- {
- "name": "query-audiodevs"
- },
- {
- "name": "xen-event-inject"
- },
- {
- "name": "xen-event-list"
- },
- {
- "name": "query-sgx-capabilities"
- },
- {
- "name": "query-sgx"
- },
- {
- "name": "query-sev-attestation-report"
- },
- {
- "name": "sev-inject-launch-secret"
- },
- {
- "name": "query-sev-capabilities"
- },
- {
- "name": "query-sev-launch-measure"
- },
- {
- "name": "query-sev"
- },
- {
- "name": "rtc-reset-reinjection"
- },
- {
- "name": "query-command-line-options"
- },
- {
- "name": "query-fdsets"
- },
- {
- "name": "remove-fd"
- },
- {
- "name": "add-fd"
- },
- {
- "name": "closefd"
- },
- {
- "name": "getfd"
- },
- {
- "name": "human-monitor-command"
- },
- {
- "name": "x-exit-preconfig"
- },
- {
- "name": "cont"
- },
- {
- "name": "stop"
- },
- {
- "name": "query-iothreads"
- },
- {
- "name": "query-name"
- },
- {
- "name": "add_client"
- },
- {
- "name": "query-yank"
- },
- {
- "name": "yank"
- },
- {
- "name": "replay-seek"
- },
- {
- "name": "replay-delete-break"
- },
- {
- "name": "replay-break"
- },
- {
- "name": "query-replay"
- },
- {
- "name": "query-cpu-definitions"
- },
- {
- "name": "query-cpu-model-expansion"
- },
- {
- "name": "dumpdtb"
- },
- {
- "name": "x-query-usb"
- },
- {
- "name": "x-query-roms"
- },
- {
- "name": "x-query-rdma"
- },
- {
- "name": "x-query-ramblock"
- },
- {
- "name": "x-query-profile"
- },
- {
- "name": "x-query-opcount"
- },
- {
- "name": "x-query-numa"
- },
- {
- "name": "x-query-jit"
- },
- {
- "name": "x-query-irq"
- },
- {
- "name": "query-memory-devices"
- },
- {
- "name": "query-memory-size-summary"
- },
- {
- "name": "query-balloon"
- },
- {
- "name": "balloon"
- },
- {
- "name": "set-numa-node"
- },
- {
- "name": "query-hotpluggable-cpus"
- },
- {
- "name": "query-memdev"
- },
- {
- "name": "pmemsave"
- },
- {
- "name": "memsave"
- },
- {
- "name": "query-kvm"
- },
- {
- "name": "inject-nmi"
- },
- {
- "name": "system_wakeup"
- },
- {
- "name": "system_powerdown"
- },
- {
- "name": "system_reset"
- },
- {
- "name": "query-vm-generation-id"
- },
- {
- "name": "query-uuid"
- },
- {
- "name": "query-target"
- },
- {
- "name": "query-current-machine"
- },
- {
- "name": "query-machines"
- },
- {
- "name": "query-cpus-fast"
- },
- {
- "name": "device_del"
- },
- {
- "name": "device-list-properties"
- },
- {
- "name": "object-del"
- },
- {
- "name": "object-add"
- },
- {
- "name": "qom-list-properties"
- },
- {
- "name": "qom-list-types"
- },
- {
- "name": "qom-set"
- },
- {
- "name": "qom-get"
- },
- {
- "name": "qom-list"
- },
- {
- "name": "query-qmp-schema"
- },
- {
- "name": "quit"
- },
- {
- "name": "query-commands"
- },
- {
- "name": "query-version"
- },
- {
- "name": "qmp_capabilities"
- },
- {
- "name": "trace-event-set-state"
- },
- {
- "name": "trace-event-get-state"
- },
- {
- "name": "transaction"
- },
- {
- "name": "snapshot-delete"
- },
- {
- "name": "snapshot-load"
- },
- {
- "name": "snapshot-save"
- },
- {
- "name": "query-migrationthreads"
- },
- {
- "name": "query-vcpu-dirty-limit"
- },
- {
- "name": "cancel-vcpu-dirty-limit"
- },
- {
- "name": "set-vcpu-dirty-limit"
- },
- {
- "name": "query-dirty-rate"
- },
- {
- "name": "calc-dirty-rate"
- },
- {
- "name": "migrate-pause"
- },
- {
- "name": "migrate-recover"
- },
- {
- "name": "query-colo-status"
- },
- {
- "name": "xen-colo-do-checkpoint"
- },
- {
- "name": "query-xen-replication-status"
- },
- {
- "name": "xen-set-replication"
- },
- {
- "name": "xen-load-devices-state"
- },
- {
- "name": "xen-set-global-dirty-log"
- },
- {
- "name": "xen-save-devices-state"
- },
- {
- "name": "migrate-incoming"
- },
- {
- "name": "migrate"
- },
- {
- "name": "migrate-continue"
- },
- {
- "name": "migrate_cancel"
- },
- {
- "name": "x-colo-lost-heartbeat"
- },
- {
- "name": "migrate-start-postcopy"
- },
- {
- "name": "query-migrate-parameters"
- },
- {
- "name": "migrate-set-parameters"
- },
- {
- "name": "query-migrate-capabilities"
- },
- {
- "name": "migrate-set-capabilities"
- },
- {
- "name": "query-migrate"
- },
- {
- "name": "client_migrate_info"
- },
- {
- "name": "display-update"
- },
- {
- "name": "display-reload"
- },
- {
- "name": "query-display-options"
- },
- {
- "name": "input-send-event"
- },
- {
- "name": "send-key"
- },
- {
- "name": "query-mice"
- },
- {
- "name": "change-vnc-password"
- },
- {
- "name": "query-vnc-servers"
- },
- {
- "name": "query-vnc"
- },
- {
- "name": "query-spice"
- },
- {
- "name": "screendump"
- },
- {
- "name": "expire_password"
- },
- {
- "name": "set_password"
- },
- {
- "name": "query-tpm"
- },
- {
- "name": "query-tpm-types"
- },
- {
- "name": "query-tpm-models"
- },
- {
- "name": "query-rocker-of-dpa-groups"
- },
- {
- "name": "query-rocker-of-dpa-flows"
- },
- {
- "name": "query-rocker-ports"
- },
- {
- "name": "query-rocker"
- },
- {
- "name": "announce-self"
- },
- {
- "name": "query-rx-filter"
- },
- {
- "name": "netdev_del"
- },
- {
- "name": "netdev_add"
- },
- {
- "name": "set_link"
- },
- {
- "name": "query-dump-guest-memory-capability"
- },
- {
- "name": "query-dump"
- },
- {
- "name": "dump-guest-memory"
- },
- {
- "name": "chardev-send-break"
- },
- {
- "name": "chardev-remove"
- },
- {
- "name": "chardev-change"
- },
- {
- "name": "chardev-add"
- },
- {
- "name": "ringbuf-read"
- },
- {
- "name": "ringbuf-write"
- },
- {
- "name": "query-chardev-backends"
- },
- {
- "name": "query-chardev"
- },
- {
- "name": "query-block-exports"
- },
- {
- "name": "block-export-del"
- },
- {
- "name": "block-export-add"
- },
- {
- "name": "nbd-server-stop"
- },
- {
- "name": "nbd-server-remove"
- },
- {
- "name": "nbd-server-add"
- },
- {
- "name": "nbd-server-start"
- },
- {
- "name": "blockdev-snapshot-delete-internal-sync"
- },
- {
- "name": "blockdev-snapshot-internal-sync"
- },
- {
- "name": "x-blockdev-set-iothread"
- },
- {
- "name": "x-blockdev-change"
- },
- {
- "name": "block-set-write-threshold"
- },
- {
- "name": "x-blockdev-amend"
- },
- {
- "name": "blockdev-create"
- },
- {
- "name": "blockdev-del"
- },
- {
- "name": "blockdev-reopen"
- },
- {
- "name": "blockdev-add"
- },
- {
- "name": "block-job-finalize"
- },
- {
- "name": "block-job-dismiss"
- },
- {
- "name": "block-job-complete"
- },
- {
- "name": "block-job-resume"
- },
- {
- "name": "block-job-pause"
- },
- {
- "name": "block-job-cancel"
- },
- {
- "name": "block-job-set-speed"
- },
- {
- "name": "block-stream"
- },
- {
- "name": "blockdev-mirror"
- },
- {
- "name": "x-debug-block-dirty-bitmap-sha256"
- },
- {
- "name": "block-dirty-bitmap-merge"
- },
- {
- "name": "block-dirty-bitmap-disable"
- },
- {
- "name": "block-dirty-bitmap-enable"
- },
- {
- "name": "block-dirty-bitmap-clear"
- },
- {
- "name": "block-dirty-bitmap-remove"
- },
- {
- "name": "block-dirty-bitmap-add"
- },
- {
- "name": "drive-mirror"
- },
- {
- "name": "x-debug-query-block-graph"
- },
- {
- "name": "query-named-block-nodes"
- },
- {
- "name": "blockdev-backup"
- },
- {
- "name": "drive-backup"
- },
- {
- "name": "block-commit"
- },
- {
- "name": "change-backing-file"
- },
- {
- "name": "blockdev-snapshot"
- },
- {
- "name": "blockdev-snapshot-sync"
- },
- {
- "name": "block_resize"
- },
- {
- "name": "query-block-jobs"
- },
- {
- "name": "query-blockstats"
- },
- {
- "name": "query-block"
- },
- {
- "name": "block-latency-histogram-set"
- },
- {
- "name": "block_set_io_throttle"
- },
- {
- "name": "blockdev-change-medium"
- },
- {
- "name": "blockdev-insert-medium"
- },
- {
- "name": "blockdev-remove-medium"
- },
- {
- "name": "blockdev-close-tray"
- },
- {
- "name": "blockdev-open-tray"
- },
- {
- "name": "eject"
- },
- {
- "name": "query-pr-managers"
- },
- {
- "name": "query-jobs"
- },
- {
- "name": "job-finalize"
- },
- {
- "name": "job-dismiss"
- },
- {
- "name": "job-complete"
- },
- {
- "name": "job-cancel"
- },
- {
- "name": "job-resume"
- },
- {
- "name": "job-pause"
- },
- {
- "name": "set-action"
- },
- {
- "name": "watchdog-set-action"
- },
- {
- "name": "query-status"
- }
- ],
- "id": "libvirt-5"
-}
-
{
"execute": "query-kvm",
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
@@ -23403,12 +22723,12 @@
"enabled": true,
"present": true
},
- "id": "libvirt-6"
+ "id": "libvirt-5"
}
{
"execute": "qom-list-types",
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -26014,7 +25334,7 @@
"parent": "x86_64-cpu"
}
],
- "id": "libvirt-7"
+ "id": "libvirt-6"
}
{
@@ -26022,7 +25342,7 @@
"arguments": {
"typename": "virtio-blk-pci"
},
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -26426,7 +25746,7 @@
"type": "str"
}
],
- "id": "libvirt-8"
+ "id": "libvirt-7"
}
{
@@ -26434,7 +25754,7 @@
"arguments": {
"typename": "virtio-net-pci"
},
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -26864,7 +26184,7 @@
"type": "bool"
}
],
- "id": "libvirt-9"
+ "id": "libvirt-8"
}
{
@@ -26872,7 +26192,7 @@
"arguments": {
"typename": "virtio-scsi-pci"
},
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -27132,7 +26452,7 @@
"type": "child<virtio-scsi-device>"
}
],
- "id": "libvirt-10"
+ "id": "libvirt-9"
}
{
@@ -27140,11 +26460,11 @@
"arguments": {
"typename": "virtio-net-ccw"
},
- "id": "libvirt-11"
+ "id": "libvirt-10"
}
{
- "id": "libvirt-11",
+ "id": "libvirt-10",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-net-ccw' not found"
@@ -27156,11 +26476,11 @@
"arguments": {
"typename": "virtio-scsi-ccw"
},
- "id": "libvirt-12"
+ "id": "libvirt-11"
}
{
- "id": "libvirt-12",
+ "id": "libvirt-11",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-scsi-ccw' not found"
@@ -27172,7 +26492,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -27375,7 +26695,7 @@
"type": "int32"
}
],
- "id": "libvirt-13"
+ "id": "libvirt-12"
}
{
@@ -27383,7 +26703,7 @@
"arguments": {
"typename": "scsi-hd"
},
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -27584,7 +26904,7 @@
"type": "int32"
}
],
- "id": "libvirt-14"
+ "id": "libvirt-13"
}
{
@@ -27592,7 +26912,7 @@
"arguments": {
"typename": "ide-hd"
},
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -27738,7 +27058,7 @@
"type": "int32"
}
],
- "id": "libvirt-15"
+ "id": "libvirt-14"
}
{
@@ -27746,7 +27066,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -27863,7 +27183,7 @@
"type": "link<irq>"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-15"
}
{
@@ -27871,7 +27191,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -27927,7 +27247,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-16"
}
{
@@ -27935,7 +27255,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -28050,7 +27370,7 @@
"type": "bool"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-17"
}
{
@@ -28058,7 +27378,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28074,7 +27394,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-18"
}
{
@@ -28082,7 +27402,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28198,7 +27518,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-19"
}
{
@@ -28206,7 +27526,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28275,7 +27595,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-20"
}
{
@@ -28283,7 +27603,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28417,7 +27737,7 @@
"type": "int32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-21"
}
{
@@ -28425,7 +27745,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28676,7 +27996,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-22"
}
{
@@ -28684,7 +28004,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28779,7 +28099,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-23"
}
{
@@ -28787,7 +28107,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28943,7 +28263,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-24"
}
{
@@ -28951,7 +28271,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -29200,7 +28520,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-25"
}
{
@@ -29208,11 +28528,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -29224,7 +28544,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29328,7 +28648,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -29336,7 +28656,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29409,7 +28729,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -29417,7 +28737,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29486,7 +28806,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -29494,7 +28814,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29536,7 +28856,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -29544,7 +28864,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29686,7 +29006,7 @@
"type": "size"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -29694,7 +29014,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29790,7 +29110,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -29798,7 +29118,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29884,7 +29204,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -29892,7 +29212,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30142,7 +29462,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -30150,7 +29470,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30377,7 +29697,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -30385,7 +29705,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30474,7 +29794,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -30482,7 +29802,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30561,7 +29881,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -30569,7 +29889,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -32446,12 +31766,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33087,7 +32407,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -33095,7 +32415,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -33208,12 +32528,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -35456,12 +34776,12 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -35469,12 +34789,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -35482,12 +34802,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -36953,12 +36273,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -37048,16 +36368,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -37066,11 +36386,11 @@
{
"execute": "query-sgx-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SGX is not enabled in KVM"
@@ -37085,7 +36405,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -37443,7 +36763,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -37457,7 +36777,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -37815,7 +37135,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -37830,7 +37150,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
@@ -38294,7 +37614,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-50"
}
{
--
2.41.0
8:33 a.m.
New subject: [PATCH 3/3] qemu_monitor: Remove helpers for 'query-commands'
Now that we don't use it for probing at all we can remove all the
corresponding monitor code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 12 --------
src/qemu/qemu_monitor.h | 2 --
src/qemu/qemu_monitor_json.c | 44 ---------------------------
src/qemu/qemu_monitor_json.h | 5 ---
tests/qemumonitorjsontest.c | 59 ------------------------------------
5 files changed, 122 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 73a019e732..c680c4b804 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3308,18 +3308,6 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig)
}
-int
-qemuMonitorGetCommands(qemuMonitor *mon,
- char ***commands)
-{
- VIR_DEBUG("commands=%p", commands);
-
- QEMU_CHECK_MONITOR(mon);
-
- return qemuMonitorJSONGetCommands(mon, commands);
-}
-
-
GHashTable *
qemuMonitorGetCommandLineOptions(qemuMonitor *mon)
{
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8f1bfc702a..6c590933aa 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1171,8 +1171,6 @@ int qemuMonitorGetCPUModelComparison(qemuMonitor *mon,
qemuMonitorCPUModelInfo *
qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig);
-int qemuMonitorGetCommands(qemuMonitor *mon,
- char ***commands);
GHashTable *qemuMonitorGetCommandLineOptions(qemuMonitor *mon);
int qemuMonitorGetKVMState(qemuMonitor *mon,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 2ece33a651..d9e9a4481c 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5256,50 +5256,6 @@ qemuMonitorJSONGetCPUModelComparison(qemuMonitor *mon,
}
-int qemuMonitorJSONGetCommands(qemuMonitor *mon,
- char ***commands)
-{
- g_autoptr(virJSONValue) cmd = NULL;
- g_autoptr(virJSONValue) reply = NULL;
- virJSONValue *data;
- g_auto(GStrv) commandlist = NULL;
- size_t n = 0;
- size_t i;
-
- *commands = NULL;
-
- if (!(cmd = qemuMonitorJSONMakeCommand("query-commands", NULL)))
- return -1;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- return -1;
-
- if (!(data = qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY)))
- return -1;
-
- n = virJSONValueArraySize(data);
-
- /* null-terminated list */
- commandlist = g_new0(char *, n + 1);
-
- for (i = 0; i < n; i++) {
- virJSONValue *child = virJSONValueArrayGet(data, i);
- const char *tmp;
-
- if (!(tmp = virJSONValueObjectGetString(child, "name"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("query-commands reply data was missing
'name'"));
- return -1;
- }
-
- commandlist[i] = g_strdup(tmp);
- }
-
- *commands = g_steal_pointer(&commandlist);
- return n;
-}
-
-
static int
qemuMonitorJSONGetCommandLineOptionsWorker(size_t pos G_GNUC_UNUSED,
virJSONValue *item,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 802f6e7b44..06023b98ea 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -472,11 +472,6 @@ qemuMonitorJSONGetCPUModelComparison(qemuMonitor *mon,
char **result)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
-int
-qemuMonitorJSONGetCommands(qemuMonitor *mon,
- char ***commands)
- ATTRIBUTE_NONNULL(2);
-
GHashTable *
qemuMonitorJSONGetCommandLineOptions(qemuMonitor *mon);
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 8ef4ea7056..4672b0a8ff 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -491,64 +491,6 @@ testQemuMonitorJSONGetCPUDefinitions(const void *opaque)
}
-static int
-testQemuMonitorJSONGetCommands(const void *opaque)
-{
- const testGenericData *data = opaque;
- virDomainXMLOption *xmlopt = data->xmlopt;
- g_auto(GStrv) commands = NULL;
- int ncommands = 0;
- g_autoptr(qemuMonitorTest) test = NULL;
-
- if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
- return -1;
-
- if (qemuMonitorTestAddItem(test, "query-commands",
- "{ "
- " \"return\": [ "
- " { "
- " \"name\": \"system_wakeup\"
"
- " }, "
- " { "
- " \"name\": \"cont\" "
- " }, "
- " { "
- " \"name\": \"quit\" "
- " } "
- " ]"
- "}") < 0)
- return -1;
-
- if ((ncommands = qemuMonitorGetCommands(qemuMonitorTestGetMonitor(test),
- &commands)) < 0)
- return -1;
-
- if (ncommands != 3) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "ncommands %d is not 3", ncommands);
- return -1;
- }
-
-#define CHECK(i, wantname) \
- do { \
- if (STRNEQ(commands[i], (wantname))) { \
- virReportError(VIR_ERR_INTERNAL_ERROR, \
- "name %s is not %s", \
- commands[i], (wantname)); \
- return -1; \
- } \
- } while (0)
-
- CHECK(0, "system_wakeup");
- CHECK(1, "cont");
- CHECK(2, "quit");
-
-#undef CHECK
-
- return 0;
-}
-
-
static int
testQemuMonitorJSONGetTPMModels(const void *opaque)
{
@@ -2888,7 +2830,6 @@ mymain(void)
DO_TEST(GetVersion);
DO_TEST(GetMachines);
DO_TEST(GetCPUDefinitions);
- DO_TEST(GetCommands);
DO_TEST(GetTPMModels);
if (qemuMonitorJSONTestAttachChardev(driver.xmlopt, qapiData.schema) < 0)
ret = -1;
--
2.41.0
8:54 a.m.
On a Friday in 2023, Peter Krempa wrote:
We now call 'query-qmp-schema' unconditionally and can extract
the
information from there.
Peter Krempa (3):
qemu: capabilities: Probe presence of commands from QMP schema instead
of 'query-commands'
qemu: capabilities: Don't probe 'query-commands'
qemu_monitor: Remove helpers for 'query-commands'
There's one more reference to query-commands in a comment in
qemuMonitorJSONQueryCPUModelExpansionOne
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
496
days inactive
496
days old
4 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa