9:45 a.m.
Ján Tomko (6):
qemu: always assume QEMU_CAPS_DUMP_GUEST_MEMORY
qemu: retire QEMU_CAPS_DUMP_GUEST_MEMORY
qemu: always assume QEMU_CAPS_*_HOLE64_SIZE
qemu: Retire QEMU_CAPS_I440FX_PCI_HOLE64_SIZE
qemu: retire QEMU_CAPS_Q35_PCI_HOLE64_SIZE
qemu: do not probe for -pcihost properties
src/qemu/qemu_capabilities.c | 21 +-
src/qemu/qemu_capabilities.h | 6 +-
src/qemu/qemu_driver.c | 6 -
src/qemu/qemu_validate.c | 14 -
.../caps_4.2.0.aarch64.replies | 140 ++++----
.../caps_4.2.0.aarch64.xml | 1 -
.../caps_4.2.0.ppc64.replies | 128 +++-----
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
.../caps_4.2.0.s390x.replies | 114 +++----
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
.../caps_4.2.0.x86_64.replies | 264 ++++-----------
.../caps_4.2.0.x86_64.xml | 3 -
.../caps_5.0.0.aarch64.replies | 144 ++++-----
.../caps_5.0.0.aarch64.xml | 1 -
.../caps_5.0.0.ppc64.replies | 140 ++++----
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
.../caps_5.0.0.riscv64.replies | 128 +++-----
.../caps_5.0.0.riscv64.xml | 1 -
.../caps_5.0.0.x86_64.replies | 277 ++++------------
.../caps_5.0.0.x86_64.xml | 3 -
.../caps_5.1.0.sparc.replies | 86 ++---
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
.../caps_5.1.0.x86_64.replies | 291 ++++-------------
.../caps_5.1.0.x86_64.xml | 3 -
.../caps_5.2.0.aarch64.replies | 148 ++++-----
.../caps_5.2.0.aarch64.xml | 1 -
.../caps_5.2.0.ppc64.replies | 140 ++++----
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
.../caps_5.2.0.riscv64.replies | 128 +++-----
.../caps_5.2.0.riscv64.xml | 1 -
.../caps_5.2.0.s390x.replies | 118 +++----
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
.../caps_5.2.0.x86_64.replies | 291 ++++-------------
.../caps_5.2.0.x86_64.xml | 3 -
.../caps_6.0.0.aarch64.replies | 148 ++++-----
.../caps_6.0.0.aarch64.xml | 1 -
.../caps_6.0.0.s390x.replies | 118 +++----
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
.../caps_6.0.0.x86_64.replies | 291 ++++-------------
.../caps_6.0.0.x86_64.xml | 3 -
.../caps_6.1.0.x86_64.replies | 301 ++++--------------
.../caps_6.1.0.x86_64.xml | 3 -
.../caps_6.2.0.aarch64.replies | 148 ++++-----
.../caps_6.2.0.aarch64.xml | 1 -
.../caps_6.2.0.ppc64.replies | 140 ++++----
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
.../caps_6.2.0.x86_64.replies | 301 ++++--------------
.../caps_6.2.0.x86_64.xml | 3 -
.../caps_7.0.0.aarch64.replies | 152 ++++-----
.../caps_7.0.0.aarch64.xml | 1 -
.../caps_7.0.0.ppc64.replies | 140 ++++----
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
.../caps_7.0.0.x86_64.replies | 301 ++++--------------
.../caps_7.0.0.x86_64.xml | 3 -
.../caps_7.1.0.x86_64.replies | 301 ++++--------------
.../caps_7.1.0.x86_64.xml | 3 -
tests/qemuxml2argvdata/pcihole64-none.err | 1 -
tests/qemuxml2argvdata/pcihole64-none.xml | 25 --
tests/qemuxml2argvtest.c | 6 +-
tests/qemuxml2xmloutdata/pcihole64-none.xml | 30 --
tests/qemuxml2xmltest.c | 8 +-
61 files changed, 1457 insertions(+), 3582 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.err
delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.xml
delete mode 100644 tests/qemuxml2xmloutdata/pcihole64-none.xml
--
2.37.1
9:45 a.m.
New subject: [libvirt PATCH 1/6] qemu: always assume QEMU_CAPS_DUMP_GUEST_MEMORY
Introduced back in 2012 by QEMU commit:
commit 783e9b4826b95e53e33c42db6b4bd7d89bdff147
introduce a new monitor command 'dump-guest-memory' to dump guest's
memory
Released in QEMU 1.2.0
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_driver.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 637a748c85..707f4cc1bb 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3052,12 +3052,6 @@ qemuDumpToFd(virQEMUDriver *driver,
bool detach = false;
int ret = -1;
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DUMP_GUEST_MEMORY)) {
- virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("dump-guest-memory is not supported"));
- return -1;
- }
-
detach = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DUMP_COMPLETED);
if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0)
--
2.37.1
9:45 a.m.
New subject: [libvirt PATCH 2/6] qemu: retire QEMU_CAPS_DUMP_GUEST_MEMORY
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
28 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f7986ef938..d1d740d0b2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -196,7 +196,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"ide-cd", /* X_QEMU_CAPS_IDE_CD */
"no-user-config", /* X_QEMU_CAPS_NO_USER_CONFIG */
"hda-micro", /* QEMU_CAPS_HDA_MICRO */
- "dump-guest-memory", /* QEMU_CAPS_DUMP_GUEST_MEMORY */
+ "dump-guest-memory", /* X_QEMU_CAPS_DUMP_GUEST_MEMORY */
/* 95 */
"nec-usb-xhci", /* QEMU_CAPS_NEC_USB_XHCI */
@@ -1205,7 +1205,6 @@ struct virQEMUCapsStringFlags {
struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
- { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY },
{ "query-spice", QEMU_CAPS_SPICE },
{ "query-vnc", QEMU_CAPS_VNC },
{ "nbd-server-start", QEMU_CAPS_NBD_SERVER },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index cccb3659aa..440561d496 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -174,7 +174,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
X_QEMU_CAPS_IDE_CD, /* -device ide-cd */
X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */
QEMU_CAPS_HDA_MICRO, /* -device hda-micro */
- QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */
+ X_QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */
/* 95 */
QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index de3ef449fe..5e95d09e10 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -19,7 +19,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 173023c704..85a89af2ac 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -18,7 +18,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 141d82857f..69fe7d3447 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
- <flag name='dump-guest-memory'/>
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='usb-redir.filter'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 04c3b206f7..35bdba931d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -24,7 +24,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 9d876a3408..58a65d247a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -19,7 +19,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index b1353f23eb..a22bff9f1e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -18,7 +18,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 92e51a478a..6d537abbdd 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -21,7 +21,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 70843813bc..e35ba8111f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -24,7 +24,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 7c2a77e7c5..dabf2f505f 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -8,7 +8,6 @@
<flag name='usb-redir'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
- <flag name='dump-guest-memory'/>
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index c427737724..f16ed680df 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -24,7 +24,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index b3099f138a..e48bf28996 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -19,7 +19,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index cab644c543..9dc12389f0 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -18,7 +18,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 5b86d9bfc6..bb5c298277 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -21,7 +21,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index e491de1c71..ac861cf914 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
- <flag name='dump-guest-memory'/>
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='usb-redir.filter'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 5fe99a7e79..84dab41317 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -24,7 +24,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 5a43616888..1c4825330b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -18,7 +18,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index a6fcfed213..8210fe7406 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -9,7 +9,6 @@
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
- <flag name='dump-guest-memory'/>
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='usb-redir.filter'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index b96c8c2d2b..9a43c0dc60 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -23,7 +23,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 35bd9b6327..6c657f6f16 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -23,7 +23,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 663b94b1ff..b4a9a12d6e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -22,7 +22,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 2468780a51..3d18388695 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -17,7 +17,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index e3f9ee47bd..09f012875d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -23,7 +23,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 5ca77807ef..c3a626f3b1 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -22,7 +22,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index cd41a08fa9..df835b8fa5 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -21,7 +21,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 86fe88b878..f444d70827 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -23,7 +23,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 7f17b2360a..6c8b54b3cc 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -23,7 +23,6 @@
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='hda-micro'/>
- <flag name='dump-guest-memory'/>
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
--
2.37.1
9:45 a.m.
New subject: [libvirt PATCH 3/6] qemu: always assume QEMU_CAPS_*_HOLE64_SIZE
Introduced back in 2013 by QEMU commit:
commit 398489018183d613306ab022653552247d93919f
pc: limit 64 bit hole to 2G by default
Released in 1.6.0
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_validate.c | 14 ----------
tests/qemuxml2argvdata/pcihole64-none.err | 1 -
tests/qemuxml2argvdata/pcihole64-none.xml | 25 -----------------
tests/qemuxml2argvtest.c | 6 ++---
tests/qemuxml2xmloutdata/pcihole64-none.xml | 30 ---------------------
tests/qemuxml2xmltest.c | 8 +++---
6 files changed, 5 insertions(+), 79 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.err
delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.xml
delete mode 100644 tests/qemuxml2xmloutdata/pcihole64-none.xml
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 41765bba37..703d9776a9 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -3984,13 +3984,6 @@ qemuValidateDomainDeviceDefControllerPCI(const
virDomainControllerDef *cont,
"supported for machine '%s'"),
def->os.machine);
return -1;
}
-
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_I440FX_PCI_HOLE64_SIZE)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("64-bit PCI hole size setting is not supported
"
- "with this QEMU binary"));
- return -1;
- }
}
break;
@@ -4002,13 +3995,6 @@ qemuValidateDomainDeviceDefControllerPCI(const
virDomainControllerDef *cont,
"supported for machine '%s'"),
def->os.machine);
return -1;
}
-
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_Q35_PCI_HOLE64_SIZE)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("64-bit PCI hole size setting is not supported
"
- "with this QEMU binary"));
- return -1;
- }
}
break;
diff --git a/tests/qemuxml2argvdata/pcihole64-none.err
b/tests/qemuxml2argvdata/pcihole64-none.err
deleted file mode 100644
index 049065a763..0000000000
--- a/tests/qemuxml2argvdata/pcihole64-none.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: 64-bit PCI hole size setting is not supported with this QEMU
binary
diff --git a/tests/qemuxml2argvdata/pcihole64-none.xml
b/tests/qemuxml2argvdata/pcihole64-none.xml
deleted file mode 100644
index e924747418..0000000000
--- a/tests/qemuxml2argvdata/pcihole64-none.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<domain type='qemu'>
- <name>foo</name>
- <uuid>c84fc647-6198-4ff9-bf81-d65a1f8f5ec0</uuid>
- <memory unit='KiB'>2097152</memory>
- <currentMemory unit='KiB'>2097152</currentMemory>
- <vcpu placement='static' cpuset='0-1'>2</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='pci' index='0' model='pci-root'>
- <pcihole64 unit='KiB'>0</pcihole64>
- </controller>
- <controller type='usb' index='0'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8933e373f7..639443b8a8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2796,13 +2796,11 @@ mymain(void)
DO_TEST("hotplug-base",
QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
- DO_TEST_PARSE_ERROR_NOCAPS("pcihole64-none");
+ DO_TEST_NOCAPS("pcihole64");
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
+ QEMU_CAPS_DEVICE_QXL);
DO_TEST_NOCAPS("arm-vexpressa9-nodevs");
DO_TEST_NOCAPS("arm-vexpressa9-basic");
diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml
b/tests/qemuxml2xmloutdata/pcihole64-none.xml
deleted file mode 100644
index c4b12510bf..0000000000
--- a/tests/qemuxml2xmloutdata/pcihole64-none.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='qemu'>
- <name>foo</name>
- <uuid>c84fc647-6198-4ff9-bf81-d65a1f8f5ec0</uuid>
- <memory unit='KiB'>2097152</memory>
- <currentMemory unit='KiB'>2097152</currentMemory>
- <vcpu placement='static' cpuset='0-1'>2</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='pci' index='0' model='pci-root'>
- <pcihole64 unit='KiB'>0</pcihole64>
- </controller>
- <controller type='usb' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </memballoon>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index af0e2c930f..d9e393a2fb 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1027,14 +1027,12 @@ mymain(void)
DO_TEST("s390-serial-2", QEMU_CAPS_CCW);
DO_TEST("s390-serial-console", QEMU_CAPS_CCW);
- DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
- DO_TEST("pcihole64-gib", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
- DO_TEST("pcihole64-none", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
+ DO_TEST_NOCAPS("pcihole64");
+ DO_TEST_NOCAPS("pcihole64-gib");
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
+ QEMU_CAPS_DEVICE_QXL);
DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC);
DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC);
--
2.37.1
9:45 a.m.
New subject: [libvirt PATCH 4/6] qemu: Retire QEMU_CAPS_I440FX_PCI_HOLE64_SIZE
We no longer use it.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
11 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d1d740d0b2..a771a30d60 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -277,7 +277,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 150 */
"dmi-to-pci-bridge", /* QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE */
- "i440fx-pci-hole64-size", /* QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */
+ "i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE
*/
"q35-pci-hole64-size", /* QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
"usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */
"usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */
@@ -1501,7 +1501,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsUSBRedir[] = {
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
- { "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQ35PCIHost[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 440561d496..885f3208d9 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -255,7 +255,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 150 */
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
- QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
+ X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */
QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 35bdba931d..b73180bb3e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index e35ba8111f..aa3d5284ba 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index f16ed680df..986fe82f67 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 84dab41317..468b68b83c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 9a43c0dc60..ec480a31c7 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 6c657f6f16..db6cf821fe 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 09f012875d..cb88b80333 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index f444d70827..1465d0f3a4 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 6c8b54b3cc..51b3b5943c 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='i440fx-pci-hole64-size'/>
<flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
--
2.37.1
9:45 a.m.
New subject: [libvirt PATCH 5/6] qemu: retire QEMU_CAPS_Q35_PCI_HOLE64_SIZE
We no longer use it.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
11 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a771a30d60..01fce36399 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -278,7 +278,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 150 */
"dmi-to-pci-bridge", /* QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE */
"i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE
*/
- "q35-pci-hole64-size", /* QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
+ "q35-pci-hole64-size", /* X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
"usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */
"usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */
@@ -1504,7 +1504,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsI440FXPCIHost[]
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQ35PCIHost[] = {
- { "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 885f3208d9..8e777297f6 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -256,7 +256,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 150 */
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
- QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
+ X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */
QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index b73180bb3e..0cce31600d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index aa3d5284ba..e41f083b8b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 986fe82f67..62b680d044 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 468b68b83c..c97ba19b32 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index ec480a31c7..d5075e550d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index db6cf821fe..7a54069b3d 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index cb88b80333..8d62f989f3 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 1465d0f3a4..a1a2d65c89 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 51b3b5943c..a7a3bd7f4a 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='dmi-to-pci-bridge'/>
- <flag name='q35-pci-hole64-size'/>
<flag name='usb-storage'/>
<flag name='usb-storage.removable'/>
<flag name='virtio-mmio'/>
--
2.37.1
9:45 a.m.
New subject: [libvirt PATCH 6/6] qemu: do not probe for -pcihost properties
Now that we no longer care about any of their properties, there's no need
to call `device-list-properties` on these devices.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 12 -
.../caps_4.2.0.aarch64.replies | 140 ++++----
.../caps_4.2.0.ppc64.replies | 128 +++-----
.../caps_4.2.0.s390x.replies | 114 +++----
.../caps_4.2.0.x86_64.replies | 264 ++++-----------
.../caps_5.0.0.aarch64.replies | 144 ++++-----
.../caps_5.0.0.ppc64.replies | 140 ++++----
.../caps_5.0.0.riscv64.replies | 128 +++-----
.../caps_5.0.0.x86_64.replies | 277 ++++------------
.../caps_5.1.0.sparc.replies | 86 ++---
.../caps_5.1.0.x86_64.replies | 291 ++++-------------
.../caps_5.2.0.aarch64.replies | 148 ++++-----
.../caps_5.2.0.ppc64.replies | 140 ++++----
.../caps_5.2.0.riscv64.replies | 128 +++-----
.../caps_5.2.0.s390x.replies | 118 +++----
.../caps_5.2.0.x86_64.replies | 291 ++++-------------
.../caps_6.0.0.aarch64.replies | 148 ++++-----
.../caps_6.0.0.s390x.replies | 118 +++----
.../caps_6.0.0.x86_64.replies | 291 ++++-------------
.../caps_6.1.0.x86_64.replies | 301 ++++--------------
.../caps_6.2.0.aarch64.replies | 148 ++++-----
.../caps_6.2.0.ppc64.replies | 140 ++++----
.../caps_6.2.0.x86_64.replies | 301 ++++--------------
.../caps_7.0.0.aarch64.replies | 152 ++++-----
.../caps_7.0.0.ppc64.replies | 140 ++++----
.../caps_7.0.0.x86_64.replies | 301 ++++--------------
.../caps_7.1.0.x86_64.replies | 301 ++++--------------
27 files changed, 1446 insertions(+), 3444 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 01fce36399..c5338f6830 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1500,12 +1500,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER, NULL },
};
-static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
-};
-
-static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQ35PCIHost[] = {
-};
-
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {
{ "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL },
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
@@ -1663,12 +1657,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
{ "usb-redir", virQEMUCapsDevicePropsUSBRedir,
G_N_ELEMENTS(virQEMUCapsDevicePropsUSBRedir),
QEMU_CAPS_USB_REDIR },
- { "i440FX-pcihost", virQEMUCapsDevicePropsI440FXPCIHost,
- G_N_ELEMENTS(virQEMUCapsDevicePropsI440FXPCIHost),
- -1 },
- { "q35-pcihost", virQEMUCapsDevicePropsQ35PCIHost,
- G_N_ELEMENTS(virQEMUCapsDevicePropsQ35PCIHost),
- -1 },
{ "usb-storage", virQEMUCapsDevicePropsUSBStorage,
G_N_ELEMENTS(virQEMUCapsDevicePropsUSBStorage),
QEMU_CAPS_DEVICE_USB_STORAGE },
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 06e00fe169..f9515ddf96 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -17727,44 +17727,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -17847,7 +17815,7 @@
"type": "uint16"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -17855,11 +17823,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -17871,7 +17839,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -17957,7 +17925,7 @@
"type": "str"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -17965,7 +17933,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18016,7 +17984,7 @@
"type": "str"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18024,7 +17992,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18198,7 +18166,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18206,7 +18174,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -18267,7 +18235,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -18275,11 +18243,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -18291,7 +18259,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -18465,7 +18433,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -18473,11 +18441,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -18489,7 +18457,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -18555,7 +18523,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -18563,7 +18531,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -18647,7 +18615,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -18655,7 +18623,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18757,7 +18725,7 @@
"type": "size"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18765,7 +18733,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18854,7 +18822,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18862,7 +18830,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18933,7 +18901,7 @@
"type": "uint16"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18941,7 +18909,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19006,7 +18974,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19014,7 +18982,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19078,7 +19046,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19086,7 +19054,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19273,12 +19241,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -19836,7 +19804,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -19844,7 +19812,7 @@
"arguments": {
"typename": "virt-4.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -19997,7 +19965,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20005,7 +19973,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20110,12 +20078,12 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20306,34 +20274,34 @@
"static": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"return": [
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -21501,12 +21469,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -21584,12 +21552,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -21605,7 +21573,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -21616,7 +21584,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -21646,7 +21614,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index a0d3f217c8..cd02535c6f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -17156,44 +17156,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -17276,7 +17244,7 @@
"type": "uint16"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -17284,11 +17252,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -17300,7 +17268,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -17382,7 +17350,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -17390,7 +17358,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -17437,7 +17405,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -17445,7 +17413,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -17610,7 +17578,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -17618,7 +17586,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -17674,7 +17642,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -17682,11 +17650,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -17698,7 +17666,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -17863,7 +17831,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -17871,11 +17839,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -17887,7 +17855,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -17948,7 +17916,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -17956,7 +17924,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -18036,7 +18004,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -18044,7 +18012,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18110,7 +18078,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18118,7 +18086,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18220,7 +18188,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18228,7 +18196,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18317,7 +18285,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18325,7 +18293,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -18390,7 +18358,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -18398,7 +18366,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -18462,12 +18430,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -18729,7 +18697,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -18737,7 +18705,7 @@
"arguments": {
"typename": "pseries-4.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -18936,7 +18904,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -18944,7 +18912,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -19049,12 +19017,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21250,34 +21218,34 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -22416,12 +22384,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -22499,7 +22467,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index e0994fec0f..b7e6abb749 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -16130,45 +16130,13 @@
{
"execute": "device-list-properties",
"arguments": {
- "typename": "i440FX-pcihost"
+ "typename": "kvm-pit"
},
"id": "libvirt-19"
}
{
"id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-20"
-}
-
-{
- "id": "libvirt-20",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pit"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -16180,7 +16148,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -16364,7 +16332,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -16372,7 +16340,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -16443,7 +16411,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -16451,11 +16419,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -16467,7 +16435,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -16641,7 +16609,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -16649,7 +16617,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -16733,7 +16701,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -16741,7 +16709,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -16807,7 +16775,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -16815,7 +16783,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -16904,7 +16872,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -16912,7 +16880,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -16927,7 +16895,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -16935,7 +16903,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -17024,7 +16992,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -17032,7 +17000,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -17103,7 +17071,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -17111,7 +17079,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -17176,7 +17144,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -17184,7 +17152,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -17248,12 +17216,12 @@
"type": "int"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -17380,7 +17348,7 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -17388,7 +17356,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -17493,12 +17461,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -18105,34 +18073,34 @@
"migration-safe": true
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -19279,12 +19247,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -19362,7 +19330,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -19373,7 +19341,7 @@
"name": "host"
}
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -19427,7 +19395,7 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index a201fc2882..2885f63d8e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -17071,152 +17071,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "short_root_bus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "io-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "ram-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "short_root_bus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -17299,7 +17159,7 @@
"type": "BlockdevOnError"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -17307,7 +17167,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -17321,7 +17181,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -17329,7 +17189,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -17415,7 +17275,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -17423,7 +17283,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -17474,7 +17334,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -17482,7 +17342,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -17585,7 +17445,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -17593,7 +17453,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -17777,7 +17637,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -17785,7 +17645,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -17856,7 +17716,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -17864,7 +17724,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -17964,7 +17824,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -17972,7 +17832,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -18146,7 +18006,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -18154,11 +18014,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -18170,7 +18030,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18236,7 +18096,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18244,7 +18104,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18328,7 +18188,7 @@
"type": "uint32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18336,7 +18196,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18384,7 +18244,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18392,7 +18252,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -18439,7 +18299,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -18447,7 +18307,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -18481,7 +18341,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -18489,7 +18349,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -18591,7 +18451,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -18599,7 +18459,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -18688,7 +18548,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -18696,7 +18556,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -18767,7 +18627,7 @@
"type": "uint16"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -18775,7 +18635,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -18840,7 +18700,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -18848,7 +18708,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -18912,7 +18772,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -18920,7 +18780,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -20474,12 +20334,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -20871,7 +20731,7 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -20879,7 +20739,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -20984,12 +20844,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -22372,12 +22232,12 @@
"migration-safe": true
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -22385,12 +22245,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -22398,12 +22258,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -23689,12 +23549,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -23772,16 +23632,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -23796,7 +23656,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -24098,7 +23958,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -24112,7 +23972,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
@@ -24414,7 +24274,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index 29bde0357f..eebe5150c6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -18881,44 +18881,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -19013,7 +18981,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -19021,11 +18989,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19037,7 +19005,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -19132,7 +19100,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -19140,7 +19108,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19193,7 +19161,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19201,7 +19169,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19407,7 +19375,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19415,7 +19383,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19493,7 +19461,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19501,11 +19469,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -19517,7 +19485,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19720,7 +19688,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19728,11 +19696,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19744,7 +19712,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19825,7 +19793,7 @@
"type": "int"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19833,7 +19801,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19926,7 +19894,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19934,7 +19902,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20055,7 +20023,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20063,7 +20031,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20157,7 +20125,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20165,7 +20133,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20241,7 +20209,7 @@
"type": "uint16"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20249,7 +20217,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20260,7 +20228,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20268,7 +20236,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20338,7 +20306,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20346,7 +20314,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -20415,7 +20383,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -20423,7 +20391,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -20627,12 +20595,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -21220,7 +21188,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -21228,7 +21196,7 @@
"arguments": {
"typename": "virt-5.0-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21376,7 +21344,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21384,7 +21352,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -21474,12 +21442,12 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -21675,24 +21643,24 @@
"static": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -21700,12 +21668,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -22863,12 +22831,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -22946,12 +22914,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -22967,7 +22935,7 @@
"kernel": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -22978,7 +22946,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -23009,7 +22977,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
index ceee1fb025..b3dee4130f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
@@ -18680,44 +18680,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -18812,7 +18780,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -18820,11 +18788,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -18836,7 +18804,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -18931,7 +18899,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -18939,7 +18907,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18992,7 +18960,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19000,7 +18968,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19206,7 +19174,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19214,7 +19182,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19292,7 +19260,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19300,11 +19268,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -19316,7 +19284,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19519,7 +19487,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19527,11 +19495,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19543,7 +19511,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19624,7 +19592,7 @@
"type": "int"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19632,7 +19600,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19725,7 +19693,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19733,7 +19701,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -19814,7 +19782,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -19822,7 +19790,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19864,7 +19832,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19872,7 +19840,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19993,7 +19961,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20001,7 +19969,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20095,7 +20063,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20103,7 +20071,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20179,7 +20147,7 @@
"type": "uint16"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20187,7 +20155,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -20198,7 +20166,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -20206,7 +20174,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -20276,7 +20244,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -20284,7 +20252,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20353,12 +20321,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20628,7 +20596,7 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20636,7 +20604,7 @@
"arguments": {
"typename": "pseries-5.0-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20845,7 +20813,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20853,7 +20821,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -20943,12 +20911,12 @@
"type": "string"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23154,24 +23122,24 @@
"static": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -23179,12 +23147,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -24321,12 +24289,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -24404,7 +24372,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
index df993441a2..efda5c534b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
@@ -16992,44 +16992,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -17124,7 +17092,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -17132,11 +17100,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -17148,7 +17116,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -17243,7 +17211,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -17251,7 +17219,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -17304,7 +17272,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -17312,7 +17280,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -17530,7 +17498,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -17538,7 +17506,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -17628,7 +17596,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -17636,11 +17604,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -17652,7 +17620,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -17855,7 +17823,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -17863,11 +17831,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -17879,7 +17847,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -17960,7 +17928,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -17968,7 +17936,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18061,7 +18029,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -18069,7 +18037,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18190,7 +18158,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -18198,7 +18166,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18292,7 +18260,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -18300,7 +18268,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -18376,7 +18344,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -18384,7 +18352,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -18395,7 +18363,7 @@
"type": "str"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -18403,7 +18371,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -18473,7 +18441,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -18481,7 +18449,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -18550,12 +18518,12 @@
"type": "int"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -18613,7 +18581,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -18621,7 +18589,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -18711,7 +18679,7 @@
"type": "string"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -18719,7 +18687,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -18809,34 +18777,34 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"return": [
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -20102,12 +20070,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -20185,5 +20153,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index bd508473a2..65cb437fb6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -18169,161 +18169,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<qemu:memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -18418,7 +18269,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -18426,7 +18277,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -18442,7 +18293,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -18450,7 +18301,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18545,7 +18396,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18553,7 +18404,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18606,7 +18457,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18614,7 +18465,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -18732,7 +18583,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -18740,7 +18591,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -18958,7 +18809,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -18966,7 +18817,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19056,7 +18907,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19064,7 +18915,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -19166,7 +19017,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -19174,7 +19025,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19377,7 +19228,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19385,11 +19236,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19401,7 +19252,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -19482,7 +19333,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -19490,7 +19341,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19583,7 +19434,7 @@
"type": "uint32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19591,7 +19442,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19649,7 +19500,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19657,7 +19508,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19710,7 +19561,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19718,7 +19569,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19760,7 +19611,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19768,7 +19619,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19889,7 +19740,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19897,7 +19748,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -19991,7 +19842,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -19999,7 +19850,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20075,7 +19926,7 @@
"type": "uint16"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20083,7 +19934,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20094,7 +19945,7 @@
"type": "str"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20102,7 +19953,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20172,7 +20023,7 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20180,7 +20031,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -20249,7 +20100,7 @@
"type": "int"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -20257,7 +20108,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -21823,12 +21674,12 @@
"type": "bool"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -22204,7 +22055,7 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -22212,7 +22063,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -22302,12 +22153,12 @@
"type": "string"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -23852,12 +23703,12 @@
"migration-safe": true
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -23865,12 +23716,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -23878,12 +23729,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -25159,12 +25010,12 @@
"option": "drive"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -25242,16 +25093,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-49",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -25266,7 +25117,7 @@
"name": "host"
}
},
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
@@ -25569,7 +25420,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
@@ -25583,7 +25434,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -25886,7 +25737,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies
index 461c6817d2..2c198aa867 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies
@@ -15519,45 +15519,13 @@
{
"execute": "device-list-properties",
"arguments": {
- "typename": "i440FX-pcihost"
+ "typename": "kvm-pit"
},
"id": "libvirt-13"
}
{
"id": "libvirt-13",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pit"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -15569,11 +15537,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
- "id": "libvirt-16",
+ "id": "libvirt-14",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -15585,11 +15553,11 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-pci' not found"
@@ -15601,11 +15569,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -15617,11 +15585,11 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-device' not found"
@@ -15633,11 +15601,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -15649,7 +15617,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -15719,7 +15687,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -15727,7 +15695,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -15796,12 +15764,12 @@
"type": "int"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
"execute": "query-machines",
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -15895,7 +15863,7 @@
"deprecated": false
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -15903,7 +15871,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -15993,34 +15961,34 @@
"type": "string"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
"return": [
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
"return": [
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -17305,12 +17273,12 @@
"option": "drive"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -17388,5 +17356,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
index 900acb1ed4..5461b7054f 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
@@ -18678,171 +18678,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<qemu:memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -18937,7 +18778,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -18945,7 +18786,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -18961,7 +18802,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -18969,7 +18810,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19064,7 +18905,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19072,7 +18913,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19125,7 +18966,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19133,7 +18974,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19251,7 +19092,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19259,7 +19100,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -19477,7 +19318,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -19485,7 +19326,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19575,7 +19416,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19583,7 +19424,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -19685,7 +19526,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -19693,7 +19534,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19908,7 +19749,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19916,11 +19757,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -19932,7 +19773,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20025,7 +19866,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20033,7 +19874,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20126,7 +19967,7 @@
"type": "uint32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20134,7 +19975,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20192,7 +20033,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20200,7 +20041,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20253,7 +20094,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20261,7 +20102,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20303,7 +20144,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20311,7 +20152,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -20432,7 +20273,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -20440,7 +20281,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -20538,7 +20379,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -20546,7 +20387,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20622,7 +20463,7 @@
"type": "uint16"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20630,7 +20471,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20825,7 +20666,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -20833,7 +20674,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20844,7 +20685,7 @@
"type": "str"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -20852,7 +20693,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -20922,7 +20763,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -20930,7 +20771,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -20999,7 +20840,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -21007,7 +20848,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -22593,12 +22434,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -22990,7 +22831,7 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -22998,7 +22839,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -23088,12 +22929,12 @@
"type": "string"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -24795,12 +24636,12 @@
"migration-safe": true
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -24808,12 +24649,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -24821,12 +24662,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -26121,12 +25962,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -26204,16 +26045,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-50",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -26228,7 +26069,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -26536,7 +26377,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -26550,7 +26391,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -26858,7 +26699,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
index 0203bbd399..f126684ee7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
@@ -20044,44 +20044,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -20180,7 +20148,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -20188,11 +20156,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -20204,7 +20172,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -20299,7 +20267,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -20307,7 +20275,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -20360,7 +20328,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -20368,7 +20336,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -20579,7 +20547,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -20587,7 +20555,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -20670,7 +20638,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -20678,11 +20646,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -20694,7 +20662,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20914,7 +20882,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20922,11 +20890,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -20938,7 +20906,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -21036,7 +21004,7 @@
"type": "int"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -21044,7 +21012,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -21145,7 +21113,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -21153,7 +21121,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -21195,7 +21163,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -21203,7 +21171,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -21324,7 +21292,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -21332,7 +21300,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -21430,7 +21398,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -21438,7 +21406,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -21514,7 +21482,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -21522,7 +21490,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -21533,7 +21501,7 @@
"type": "str"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -21541,7 +21509,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21611,7 +21579,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21619,7 +21587,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21688,7 +21656,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21696,7 +21664,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -21905,12 +21873,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -22647,7 +22615,7 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -22655,7 +22623,7 @@
"arguments": {
"typename": "virt-5.2-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -22818,7 +22786,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -22826,7 +22794,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -22911,12 +22879,12 @@
"type": "string"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23150,24 +23118,24 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -23175,12 +23143,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -24357,12 +24325,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -24440,12 +24408,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -24461,7 +24429,7 @@
"kernel": false
}
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -24472,7 +24440,7 @@
"name": "host"
}
},
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -24504,7 +24472,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
index 86ea403662..6f6e5031cf 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
@@ -19691,44 +19691,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -19827,7 +19795,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -19835,11 +19803,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19851,7 +19819,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -19946,7 +19914,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -19954,7 +19922,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -20007,7 +19975,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -20015,7 +19983,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -20226,7 +20194,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -20234,7 +20202,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -20317,7 +20285,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -20325,11 +20293,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -20341,7 +20309,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20561,7 +20529,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20569,11 +20537,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -20585,7 +20553,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -20683,7 +20651,7 @@
"type": "int"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -20691,7 +20659,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -20792,7 +20760,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -20800,7 +20768,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20891,7 +20859,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20899,7 +20867,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20941,7 +20909,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20949,7 +20917,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -21070,7 +21038,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -21078,7 +21046,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -21176,7 +21144,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -21184,7 +21152,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -21260,7 +21228,7 @@
"type": "uint16"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -21268,7 +21236,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21279,7 +21247,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21287,7 +21255,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21357,7 +21325,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21365,7 +21333,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -21434,12 +21402,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21759,7 +21727,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21767,7 +21735,7 @@
"arguments": {
"typename": "pseries-5.2-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -21971,7 +21939,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -21979,7 +21947,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -22064,12 +22032,12 @@
"type": "string"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -24715,24 +24683,24 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -24740,12 +24708,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -25901,12 +25869,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -25984,7 +25952,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
index 4931b4ff1c..443151c391 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
@@ -17988,44 +17988,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -18124,7 +18092,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -18132,11 +18100,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -18148,7 +18116,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18243,7 +18211,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18251,7 +18219,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18304,7 +18272,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18312,7 +18280,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -18535,7 +18503,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -18543,7 +18511,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -18638,7 +18606,7 @@
"type": "bool"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -18646,11 +18614,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -18662,7 +18630,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -18882,7 +18850,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -18890,11 +18858,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -18906,7 +18874,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19004,7 +18972,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19012,7 +18980,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -19113,7 +19081,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -19121,7 +19089,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19242,7 +19210,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19250,7 +19218,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19348,7 +19316,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19356,7 +19324,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19432,7 +19400,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19440,7 +19408,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19451,7 +19419,7 @@
"type": "str"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19459,7 +19427,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19529,7 +19497,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19537,7 +19505,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -19606,12 +19574,12 @@
"type": "int"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -19665,7 +19633,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -19673,7 +19641,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -19763,7 +19731,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -19771,7 +19739,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -19856,34 +19824,34 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"return": [
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -21168,12 +21136,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -21251,5 +21219,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
index ab1c2034af..720bf54649 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
@@ -18329,45 +18329,13 @@
{
"execute": "device-list-properties",
"arguments": {
- "typename": "i440FX-pcihost"
+ "typename": "kvm-pit"
},
"id": "libvirt-19"
}
{
"id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-20"
-}
-
-{
- "id": "libvirt-20",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pit"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -18379,7 +18347,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18602,7 +18570,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -18610,7 +18578,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18705,7 +18673,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -18713,11 +18681,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -18729,7 +18697,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -18949,7 +18917,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -18957,7 +18925,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19085,7 +19053,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -19093,7 +19061,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -19191,7 +19159,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -19199,7 +19167,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19324,7 +19292,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -19332,7 +19300,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19348,7 +19316,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -19356,11 +19324,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
- "id": "libvirt-30",
+ "id": "libvirt-28",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -19372,7 +19340,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19448,7 +19416,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -19456,7 +19424,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19467,7 +19435,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -19475,7 +19443,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19545,7 +19513,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -19553,7 +19521,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -19622,12 +19590,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19796,7 +19764,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -19804,7 +19772,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -19889,12 +19857,12 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -20575,34 +20543,34 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -21758,12 +21726,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -21841,7 +21809,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -21852,7 +21820,7 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -21908,7 +21876,7 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 3ea7d87aec..0362d62f83 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -19225,171 +19225,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<qemu:memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<qemu:memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<qemu:memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -19488,7 +19329,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -19496,7 +19337,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -19512,7 +19353,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -19520,7 +19361,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19615,7 +19456,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -19623,7 +19464,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19676,7 +19517,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -19684,7 +19525,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19802,7 +19643,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -19810,7 +19651,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -20033,7 +19874,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -20041,7 +19882,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20136,7 +19977,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20144,7 +19985,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -20262,7 +20103,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -20270,7 +20111,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -20490,7 +20331,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -20498,11 +20339,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -20514,7 +20355,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20612,7 +20453,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -20620,7 +20461,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20721,7 +20562,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -20729,7 +20570,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20787,7 +20628,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -20795,7 +20636,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20848,7 +20689,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -20856,7 +20697,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20898,7 +20739,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -20906,7 +20747,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21027,7 +20868,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21035,7 +20876,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21133,7 +20974,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21141,7 +20982,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -21217,7 +21058,7 @@
"type": "uint16"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -21225,7 +21066,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21425,7 +21266,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -21433,7 +21274,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -21444,7 +21285,7 @@
"type": "str"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -21452,7 +21293,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -21522,7 +21363,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -21530,7 +21371,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -21599,7 +21440,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -21607,7 +21448,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -23205,12 +23046,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -23668,7 +23509,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -23676,7 +23517,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -23761,12 +23602,12 @@
"type": "string"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -25591,12 +25432,12 @@
"deprecated": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -25604,12 +25445,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -25617,12 +25458,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -26917,12 +26758,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -27000,16 +26841,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-50",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -27024,7 +26865,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -27333,7 +27174,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -27347,7 +27188,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -27656,7 +27497,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
index 1b9fd6b18a..d678db8bed 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
@@ -21824,44 +21824,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -21958,7 +21926,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -21966,11 +21934,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -21982,7 +21950,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -22087,7 +22055,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -22095,7 +22063,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -22158,7 +22126,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -22166,7 +22134,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -22399,7 +22367,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -22407,7 +22375,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -22490,7 +22458,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -22498,11 +22466,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -22514,7 +22482,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -22751,7 +22719,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -22759,11 +22727,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -22775,7 +22743,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -22873,7 +22841,7 @@
"type": "int"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -22881,7 +22849,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -22992,7 +22960,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -23000,7 +22968,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -23042,7 +23010,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -23050,7 +23018,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -23181,7 +23149,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -23189,7 +23157,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -23285,7 +23253,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -23293,7 +23261,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -23373,7 +23341,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -23381,7 +23349,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -23392,7 +23360,7 @@
"type": "str"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -23400,7 +23368,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -23470,7 +23438,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -23478,7 +23446,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -23547,7 +23515,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -23555,7 +23523,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -23764,12 +23732,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -24548,7 +24516,7 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -24556,7 +24524,7 @@
"arguments": {
"typename": "virt-6.0-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -24742,7 +24710,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -24750,7 +24718,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -24848,12 +24816,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -25093,24 +25061,24 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -25118,12 +25086,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -26320,12 +26288,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -26407,12 +26375,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -26428,7 +26396,7 @@
"kernel": false
}
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -26439,7 +26407,7 @@
"name": "host"
}
},
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -26471,7 +26439,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
index 388f95d3d1..cb225eab00 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
@@ -19924,45 +19924,13 @@
{
"execute": "device-list-properties",
"arguments": {
- "typename": "i440FX-pcihost"
+ "typename": "kvm-pit"
},
"id": "libvirt-19"
}
{
"id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-20"
-}
-
-{
- "id": "libvirt-20",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pit"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -19974,7 +19942,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -20219,7 +20187,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -20227,7 +20195,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -20322,7 +20290,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -20330,11 +20298,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -20346,7 +20314,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -20583,7 +20551,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -20591,7 +20559,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20719,7 +20687,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -20727,7 +20695,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -20825,7 +20793,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -20833,7 +20801,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -20958,7 +20926,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -20966,7 +20934,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -20982,7 +20950,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -20990,11 +20958,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
- "id": "libvirt-30",
+ "id": "libvirt-28",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -21006,7 +20974,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -21086,7 +21054,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -21094,7 +21062,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -21105,7 +21073,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -21113,7 +21081,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -21183,7 +21151,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -21191,7 +21159,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -21260,12 +21228,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21443,7 +21411,7 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -21451,7 +21419,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -21549,12 +21517,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -22235,34 +22203,34 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -23438,12 +23406,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23525,7 +23493,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23536,7 +23504,7 @@
"name": "host"
}
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -23593,7 +23561,7 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
index 2577587d9b..6af45e0b61 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
@@ -20873,171 +20873,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -21134,7 +20975,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -21142,7 +20983,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -21158,7 +20999,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -21166,7 +21007,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -21271,7 +21112,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -21279,7 +21120,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -21342,7 +21183,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -21350,7 +21191,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -21478,7 +21319,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -21486,7 +21327,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -21731,7 +21572,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -21739,7 +21580,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -21834,7 +21675,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -21842,7 +21683,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -21975,7 +21816,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -21983,7 +21824,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -22220,7 +22061,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -22228,11 +22069,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -22244,7 +22085,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -22342,7 +22183,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -22350,7 +22191,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -22461,7 +22302,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -22469,7 +22310,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -22527,7 +22368,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -22535,7 +22376,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -22598,7 +22439,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -22606,7 +22447,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -22648,7 +22489,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -22656,7 +22497,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -22787,7 +22628,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -22795,7 +22636,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -22891,7 +22732,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -22899,7 +22740,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -22979,7 +22820,7 @@
"type": "int32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -22987,7 +22828,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -23209,7 +23050,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -23217,7 +23058,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -23228,7 +23069,7 @@
"type": "str"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -23236,7 +23077,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -23310,7 +23151,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -23318,7 +23159,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23387,7 +23228,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23395,7 +23236,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -25041,12 +24882,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -25493,7 +25334,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -25501,7 +25342,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -25599,12 +25440,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -27472,12 +27313,12 @@
"deprecated": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -27485,12 +27326,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -27498,12 +27339,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -28822,12 +28663,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -28909,12 +28750,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
@@ -28924,7 +28765,7 @@
"cert-chain":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
@@ -28935,7 +28776,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -29256,7 +29097,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -29270,7 +29111,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -29591,7 +29432,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
index 42c64d946a..102973ebcc 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
@@ -21097,181 +21097,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -21374,7 +21205,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -21382,7 +21213,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -21398,7 +21229,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -21406,7 +21237,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -21516,7 +21347,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -21524,7 +21355,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -21587,7 +21418,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -21595,7 +21426,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -21723,7 +21554,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -21731,7 +21562,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -21970,7 +21801,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -21978,7 +21809,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -22067,7 +21898,7 @@
"type": "size"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -22075,7 +21906,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -22212,7 +22043,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -22220,7 +22051,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -22457,7 +22288,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -22465,11 +22296,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -22481,7 +22312,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -22579,7 +22410,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -22587,7 +22418,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -22698,7 +22529,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -22706,7 +22537,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -22764,7 +22595,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -22772,7 +22603,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -22835,7 +22666,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -22843,7 +22674,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -22885,7 +22716,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -22893,7 +22724,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -23029,7 +22860,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -23037,7 +22868,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -23133,7 +22964,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -23141,7 +22972,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -23221,7 +23052,7 @@
"type": "int32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -23229,7 +23060,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -23451,7 +23282,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -23459,7 +23290,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -23470,7 +23301,7 @@
"type": "str"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -23478,7 +23309,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -23557,7 +23388,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -23565,7 +23396,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23639,7 +23470,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -23647,7 +23478,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -25305,12 +25136,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -25775,7 +25606,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -25783,7 +25614,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -25886,12 +25717,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -27948,12 +27779,12 @@
"deprecated": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -27961,12 +27792,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -27974,12 +27805,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -29311,12 +29142,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -29398,16 +29229,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-50",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "Failed to open /dev/sev: No such file or directory"
@@ -29422,7 +29253,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -29745,7 +29576,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -29759,7 +29590,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -30082,7 +29913,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
index 1a660ffd4d..ce01b42dec 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
@@ -22637,44 +22637,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -22777,7 +22745,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -22785,11 +22753,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -22801,7 +22769,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -22911,7 +22879,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -22919,7 +22887,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -22982,7 +22950,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -22990,7 +22958,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -23229,7 +23197,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -23237,7 +23205,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -23326,7 +23294,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -23334,11 +23302,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -23350,7 +23318,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -23587,7 +23555,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -23595,11 +23563,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -23611,7 +23579,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -23709,7 +23677,7 @@
"type": "int"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -23717,7 +23685,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -23828,7 +23796,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -23836,7 +23804,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -23878,7 +23846,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -23886,7 +23854,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -24022,7 +23990,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -24030,7 +23998,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -24126,7 +24094,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -24134,7 +24102,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -24214,7 +24182,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -24222,7 +24190,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -24233,7 +24201,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -24241,7 +24209,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -24316,7 +24284,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -24324,7 +24292,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -24398,7 +24366,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -24406,7 +24374,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -24615,12 +24583,12 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -25464,7 +25432,7 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -25472,7 +25440,7 @@
"arguments": {
"typename": "virt-6.2-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -25668,7 +25636,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -25676,7 +25644,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -25779,12 +25747,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -26030,24 +25998,24 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -26055,12 +26023,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -27408,12 +27376,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -27495,12 +27463,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -27516,7 +27484,7 @@
"kernel": false
}
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -27527,7 +27495,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -27559,7 +27527,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
index 915b6a0584..9b414b5130 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
@@ -24557,44 +24557,12 @@
"id": "libvirt-16"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-17"
-}
-
-{
- "id": "libvirt-17",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -24697,7 +24665,7 @@
"type": "bool"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -24705,11 +24673,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -24721,7 +24689,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -24831,7 +24799,7 @@
"type": "bool"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -24839,7 +24807,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -24902,7 +24870,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -24910,7 +24878,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25149,7 +25117,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25157,7 +25125,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25246,7 +25214,7 @@
"type": "uint32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25254,11 +25222,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -25270,7 +25238,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -25507,7 +25475,7 @@
"type": "bool"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -25515,11 +25483,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25531,7 +25499,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -25629,7 +25597,7 @@
"type": "int"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -25637,7 +25605,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -25748,7 +25716,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -25756,7 +25724,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -25852,7 +25820,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -25860,7 +25828,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -25902,7 +25870,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -25910,7 +25878,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -26046,7 +26014,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -26054,11 +26022,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -26070,7 +26038,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26150,7 +26118,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26158,7 +26126,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26169,7 +26137,7 @@
"type": "str"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26177,7 +26145,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26252,7 +26220,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26260,7 +26228,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26334,12 +26302,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -26702,7 +26670,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -26710,7 +26678,7 @@
"arguments": {
"typename": "pseries-6.2-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -26942,7 +26910,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -26950,7 +26918,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -27053,12 +27021,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -29710,24 +29678,24 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -29735,12 +29703,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -30874,12 +30842,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -30961,7 +30929,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index e235532d62..6e5e733af5 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -24274,181 +24274,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -24551,7 +24382,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -24559,7 +24390,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -24575,7 +24406,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -24583,7 +24414,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -24693,7 +24524,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -24701,7 +24532,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -24764,7 +24595,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -24772,7 +24603,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -24900,7 +24731,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -24908,7 +24739,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -25147,7 +24978,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -25155,7 +24986,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -25244,7 +25075,7 @@
"type": "size"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -25252,7 +25083,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -25393,7 +25224,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -25401,7 +25232,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -25638,7 +25469,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -25646,11 +25477,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25662,7 +25493,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -25760,7 +25591,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -25768,7 +25599,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -25879,7 +25710,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -25887,7 +25718,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -25945,7 +25776,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -25953,7 +25784,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -26016,7 +25847,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -26024,7 +25855,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26066,7 +25897,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26074,7 +25905,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26210,7 +26041,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26218,7 +26049,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26314,7 +26145,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26322,7 +26153,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26402,7 +26233,7 @@
"type": "int32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26410,7 +26241,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -26632,7 +26463,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -26640,7 +26471,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -26651,7 +26482,7 @@
"type": "str"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -26659,7 +26490,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -26738,7 +26569,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -26746,7 +26577,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -26820,7 +26651,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -26828,7 +26659,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -28568,12 +28399,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -29056,7 +28887,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -29064,7 +28895,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -29167,12 +28998,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -31241,12 +31072,12 @@
"deprecated": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -31254,12 +31085,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -31267,12 +31098,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -32604,12 +32435,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -32691,16 +32522,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-50",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -32715,7 +32546,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -33048,7 +32879,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -33062,7 +32893,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -33395,7 +33226,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
index 15aa136a96..670d8abc26 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
@@ -25915,44 +25915,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -26055,7 +26023,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -26063,11 +26031,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -26079,7 +26047,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -26189,7 +26157,7 @@
"type": "bool"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -26197,7 +26165,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -26260,7 +26228,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -26268,7 +26236,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -26507,7 +26475,7 @@
"type": "bool"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -26515,7 +26483,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -26604,7 +26572,7 @@
"type": "uint32"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -26612,11 +26580,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -26628,7 +26596,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -26865,7 +26833,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -26873,11 +26841,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -26889,7 +26857,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -26987,7 +26955,7 @@
"type": "int"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -26995,7 +26963,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -27106,7 +27074,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -27114,7 +27082,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -27156,7 +27124,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -27164,7 +27132,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -27300,7 +27268,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -27308,7 +27276,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -27404,7 +27372,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -27412,7 +27380,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -27492,7 +27460,7 @@
"type": "int32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -27500,7 +27468,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -27727,7 +27695,7 @@
"type": "uint64"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -27735,7 +27703,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -27950,7 +27918,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -27958,7 +27926,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -28033,7 +28001,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -28041,7 +28009,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -28115,7 +28083,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -28123,7 +28091,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -28332,12 +28300,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -29207,7 +29175,7 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -29215,7 +29183,7 @@
"arguments": {
"typename": "virt-7.0-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -29416,7 +29384,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -29424,7 +29392,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -29527,12 +29495,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -29778,24 +29746,24 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -29803,12 +29771,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -31160,12 +31128,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -31247,12 +31215,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -31268,7 +31236,7 @@
"kernel": false
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -31279,7 +31247,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -31312,7 +31280,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
index 439f31267b..a03fde3f20 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
@@ -24970,44 +24970,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "id": "libvirt-18",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'i440FX-pcihost' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'q35-pcihost' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -25110,7 +25078,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -25118,11 +25086,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -25134,7 +25102,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -25244,7 +25212,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -25252,7 +25220,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25315,7 +25283,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25323,7 +25291,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25562,7 +25530,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25570,7 +25538,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -25659,7 +25627,7 @@
"type": "size"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -25667,11 +25635,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -25683,7 +25651,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -25920,7 +25888,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -25928,11 +25896,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-26",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25944,7 +25912,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -26042,7 +26010,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
@@ -26050,7 +26018,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -26161,7 +26129,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -26169,7 +26137,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -26265,7 +26233,7 @@
"type": "uint64"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -26273,7 +26241,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -26315,7 +26283,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -26323,7 +26291,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -26459,7 +26427,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -26467,7 +26435,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26563,7 +26531,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26571,7 +26539,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26651,7 +26619,7 @@
"type": "int32"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26659,7 +26627,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26874,7 +26842,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26882,7 +26850,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26961,7 +26929,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26969,7 +26937,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -27043,12 +27011,12 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -27420,7 +27388,7 @@
"default-ram-id": "ppc_spapr.ram"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -27428,7 +27396,7 @@
"arguments": {
"typename": "pseries-7.0-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -27660,7 +27628,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -27668,7 +27636,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -27771,12 +27739,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -30302,24 +30270,24 @@
"deprecated": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -30327,12 +30295,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -31530,12 +31498,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -31617,7 +31585,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
index 620442704a..6bd815c371 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -24590,181 +24590,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -24867,7 +24698,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -24875,7 +24706,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -24891,7 +24722,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -24899,7 +24730,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -25009,7 +24840,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -25017,7 +24848,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25080,7 +24911,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25088,7 +24919,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25216,7 +25047,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25224,7 +25055,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -25463,7 +25294,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -25471,7 +25302,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -25560,7 +25391,7 @@
"type": "size"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -25568,7 +25399,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -25709,7 +25540,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -25717,7 +25548,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -25954,7 +25785,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -25962,11 +25793,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -25978,7 +25809,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -26076,7 +25907,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -26084,7 +25915,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -26195,7 +26026,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -26203,7 +26034,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -26266,7 +26097,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -26274,7 +26105,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -26337,7 +26168,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -26345,7 +26176,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26387,7 +26218,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -26395,7 +26226,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26531,7 +26362,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -26539,7 +26370,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26635,7 +26466,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -26643,7 +26474,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26723,7 +26554,7 @@
"type": "int32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -26731,7 +26562,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -26964,7 +26795,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -26972,7 +26803,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -27187,7 +27018,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -27195,7 +27026,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -27274,7 +27105,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -27282,7 +27113,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -27356,7 +27187,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -27364,7 +27195,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -29120,12 +28951,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -29626,7 +29457,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -29634,7 +29465,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -29737,12 +29568,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -31847,12 +31678,12 @@
"deprecated": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -31860,12 +31691,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -31873,12 +31704,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -33214,12 +33045,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -33301,16 +33132,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-50",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -33325,7 +33156,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -33662,7 +33493,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -33676,7 +33507,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -34013,7 +33844,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
index d893d67ea8..26768eba9d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
@@ -25322,181 +25322,12 @@
"id": "libvirt-17"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "i440FX-pcihost"
- },
- "id": "libvirt-18"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "default-value": 2147483648,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-18"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "q35-pcihost"
- },
- "id": "libvirt-19"
-}
-
-{
- "return": [
- {
- "default-value": false,
- "name": "bypass-iommu",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "x-config-reg-migration-enabled",
- "type": "bool"
- },
- {
- "default-value": 34359738368,
- "name": "pci-hole64-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "below-4g-mem-size",
- "type": "size"
- },
- {
- "default-value": 0,
- "name": "short_root_bus",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pci-hole64-fix",
- "type": "bool"
- },
- {
- "default-value": 2952790016,
- "name": "MCFG",
- "type": "uint64"
- },
- {
- "default-value": 0,
- "name": "above-4g-mem-size",
- "type": "size"
- },
- {
- "name": "mcfg_size",
- "type": "uint64"
- },
- {
- "name": "pci-hole64-end",
- "type": "uint64"
- },
- {
- "name": "pci-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pci-conf-data[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole-start",
- "type": "uint32"
- },
- {
- "name": "system-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "io-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "mch",
- "type": "child<mch>"
- },
- {
- "name": "pci-hole-end",
- "type": "uint32"
- },
- {
- "name": "pci-conf-idx[0]",
- "type": "child<memory-region>"
- },
- {
- "name": "pci-hole64-start",
- "type": "uint64"
- },
- {
- "name": "ram-mem",
- "type": "link<memory-region>"
- },
- {
- "name": "pcie-mmcfg-mmio[0]",
- "type": "child<memory-region>"
- }
- ],
- "id": "libvirt-19"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -25599,7 +25430,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -25607,7 +25438,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -25623,7 +25454,7 @@
"type": "uint32"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -25631,7 +25462,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -25741,7 +25572,7 @@
"type": "uint32"
}
],
- "id": "libvirt-22"
+ "id": "libvirt-20"
}
{
@@ -25749,7 +25580,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25812,7 +25643,7 @@
"type": "uint32"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-21"
}
{
@@ -25820,7 +25651,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25948,7 +25779,7 @@
"type": "int32"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-22"
}
{
@@ -25956,7 +25787,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -26195,7 +26026,7 @@
"type": "child<virtio-gpu-device>"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-23"
}
{
@@ -26203,7 +26034,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -26292,7 +26123,7 @@
"type": "size"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-24"
}
{
@@ -26300,7 +26131,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -26441,7 +26272,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-25"
}
{
@@ -26449,7 +26280,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -26686,7 +26517,7 @@
"type": "child<virtio-balloon-device>"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-26"
}
{
@@ -26694,11 +26525,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-29"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -26710,7 +26541,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -26808,7 +26639,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-28"
}
{
@@ -26816,7 +26647,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -26927,7 +26758,7 @@
"type": "child<base-xhci>"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-29"
}
{
@@ -26935,7 +26766,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -27003,7 +26834,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-30"
}
{
@@ -27011,7 +26842,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -27074,7 +26905,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -27082,7 +26913,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -27124,7 +26955,7 @@
"type": "uint64"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-32"
}
{
@@ -27132,7 +26963,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -27268,7 +27099,7 @@
"type": "size"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-33"
}
{
@@ -27276,7 +27107,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -27372,7 +27203,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-34"
}
{
@@ -27380,7 +27211,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -27460,7 +27291,7 @@
"type": "int32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-35"
}
{
@@ -27468,7 +27299,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -27701,7 +27532,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-36"
}
{
@@ -27709,7 +27540,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -27924,7 +27755,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-37"
}
{
@@ -27932,7 +27763,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -28011,7 +27842,7 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-38"
}
{
@@ -28019,7 +27850,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -28093,7 +27924,7 @@
"type": "int"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-39"
}
{
@@ -28101,7 +27932,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
@@ -29894,12 +29725,12 @@
"type": "bool"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -30418,7 +30249,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-41"
}
{
@@ -30426,7 +30257,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
@@ -30539,12 +30370,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-42"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
@@ -32528,12 +32359,12 @@
"deprecated": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
@@ -32541,12 +32372,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-46"
+ "id": "libvirt-44"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
@@ -32554,12 +32385,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-47"
+ "id": "libvirt-45"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
@@ -33895,12 +33726,12 @@
"option": "drive"
}
],
- "id": "libvirt-48"
+ "id": "libvirt-46"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
@@ -33990,16 +33821,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-49"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-50"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-50",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -34014,7 +33845,7 @@
"name": "host"
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -34352,7 +34183,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-49"
}
{
@@ -34366,7 +34197,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
@@ -34704,7 +34535,7 @@
}
}
},
- "id": "libvirt-52"
+ "id": "libvirt-50"
}
{
--
2.37.1
7:34 a.m.
New subject: [libvirt PATCH 6/6] qemu: do not probe for -pcihost properties
On Fri, Aug 19, 2022 at 16:45:35 +0200, Ján Tomko wrote:
Now that we no longer care about any of their properties, there's
no need
to call `device-list-properties` on these devices.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 12 -
.../caps_4.2.0.aarch64.replies | 140 ++++----
.../caps_4.2.0.ppc64.replies | 128 +++-----
.../caps_4.2.0.s390x.replies | 114 +++----
.../caps_4.2.0.x86_64.replies | 264 ++++-----------
.../caps_5.0.0.aarch64.replies | 144 ++++-----
.../caps_5.0.0.ppc64.replies | 140 ++++----
.../caps_5.0.0.riscv64.replies | 128 +++-----
.../caps_5.0.0.x86_64.replies | 277 ++++------------
.../caps_5.1.0.sparc.replies | 86 ++---
.../caps_5.1.0.x86_64.replies | 291 ++++-------------
.../caps_5.2.0.aarch64.replies | 148 ++++-----
.../caps_5.2.0.ppc64.replies | 140 ++++----
.../caps_5.2.0.riscv64.replies | 128 +++-----
.../caps_5.2.0.s390x.replies | 118 +++----
.../caps_5.2.0.x86_64.replies | 291 ++++-------------
.../caps_6.0.0.aarch64.replies | 148 ++++-----
.../caps_6.0.0.s390x.replies | 118 +++----
.../caps_6.0.0.x86_64.replies | 291 ++++-------------
.../caps_6.1.0.x86_64.replies | 301 ++++--------------
.../caps_6.2.0.aarch64.replies | 148 ++++-----
.../caps_6.2.0.ppc64.replies | 140 ++++----
.../caps_6.2.0.x86_64.replies | 301 ++++--------------
.../caps_7.0.0.aarch64.replies | 152 ++++-----
.../caps_7.0.0.ppc64.replies | 140 ++++----
.../caps_7.0.0.x86_64.replies | 301 ++++--------------
.../caps_7.1.0.x86_64.replies | 301 ++++--------------
27 files changed, 1446 insertions(+), 3444 deletions(-)
Currently there indeed isn't any property that would look interesting
enough for us to keep probing the properties.
7:34 a.m.
On Fri, Aug 19, 2022 at 16:45:29 +0200, Ján Tomko wrote:
Ján Tomko (6):
qemu: always assume QEMU_CAPS_DUMP_GUEST_MEMORY
qemu: retire QEMU_CAPS_DUMP_GUEST_MEMORY
qemu: always assume QEMU_CAPS_*_HOLE64_SIZE
qemu: Retire QEMU_CAPS_I440FX_PCI_HOLE64_SIZE
qemu: retire QEMU_CAPS_Q35_PCI_HOLE64_SIZE
qemu: do not probe for -pcihost properties
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
823
days inactive
826
days old
8 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa