9:08 a.m.
While reviewing a bootindex-related patch, I found out that we can
also drop all the per-device BOOTINDEX capabilities and more.
Ján Tomko (9):
qemu: always assume QEMU_CAPS_PCI_CONFIGFD
qemu: always assume QEMU_CAPS_PCI_BOOTINDEX
qemu: drop unused QEMU_CAPS_DEVICE_USB_NET
qemu: always assume QEMU_CAPS_USB_REDIR_BOOTINDEX
qemu: always assume QEMU_CAPS_USB_HOST_BOOTINDEX
qemu: always assume QEMU_CAPS_VFIO_PCI_BOOTINDEX
qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX
qemu: remove leftover property probing
FIXUP: renumber replies and microcode version
Also available on:
git://repo.or.cz/libvirt/jtomko.git caps
src/qemu/qemu_capabilities.c | 28 --
src/qemu/qemu_capabilities.h | 14 +-
src/qemu/qemu_command.c | 48 +--
src/qemu/qemu_hotplug.c | 3 +-
.../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 262 +++--------------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 266 +++--------------
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 266 +++--------------
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 270 +++--------------
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 9 +-
.../caps_2.10.0.aarch64.replies | 240 +++------------
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 6 +-
.../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 240 +++------------
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 6 +-
.../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 175 +++--------
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 4 +-
.../caps_2.10.0.x86_64.replies | 326 ++++-----------------
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 179 +++--------
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 4 +-
.../caps_2.11.0.x86_64.replies | 272 ++++-------------
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 7 +-
.../caps_2.12.0.aarch64.replies | 252 ++++------------
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 6 +-
.../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 252 ++++------------
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 6 +-
.../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 191 ++++--------
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 4 +-
.../caps_2.12.0.x86_64.replies | 288 +++++-------------
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 7 +-
.../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 292 ++++--------------
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 296 ++++---------------
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 9 +-
.../caps_2.6.0.aarch64.replies | 236 +++------------
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 6 +-
.../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 236 +++------------
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 6 +-
.../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 296 ++++---------------
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 167 +++--------
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 4 +-
.../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 305 ++++---------------
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 175 +++--------
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 4 +-
.../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 305 ++++---------------
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 179 +++--------
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 5 +-
.../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 175 +++--------
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 4 +-
.../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 326 ++++-----------------
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 9 +-
.../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 252 ++++------------
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 6 +-
.../caps_3.0.0.riscv32.replies | 167 +++--------
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
.../caps_3.0.0.riscv64.replies | 167 +++--------
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 288 +++++-------------
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 7 +-
tests/qemuxml2argvtest.c | 9 +-
65 files changed, 1599 insertions(+), 6037 deletions(-)
--
2.16.4
9:08 a.m.
New subject: [libvirt] [PATCH 1/9] qemu: always assume QEMU_CAPS_PCI_CONFIGFD
At the time of its addition in QEMU commit v1.3.0-rc0~572^2
the configfd argument was already supported.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 3 +--
src/qemu/qemu_hotplug.c | 3 +--
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
15 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a075677421..222c344c97 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1193,7 +1193,6 @@ static struct virQEMUCapsStringFlags
virQEMUCapsDevicePropsVirtioSCSI[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
- { "configfd", QEMU_CAPS_PCI_CONFIGFD },
{ "bootindex", QEMU_CAPS_PCI_BOOTINDEX },
};
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 3d3a978759..b8c6dfe54b 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -98,7 +98,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 35 */
X_QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */
- QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */
+ X_QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */
X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */
X_QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */
X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c9e3a91e32..6436086560 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5400,8 +5400,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
bootIndex = *bootHostdevNet;
*bootHostdevNet = 0;
}
- if ((backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) {
+ if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
int configfd = qemuOpenPCIConfig(hostdev);
if (configfd >= 0) {
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index a30cb1f1a0..633e7fc18f 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1644,8 +1644,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
goto error;
releaseaddr = true;
- if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) {
+ if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
configfd = qemuOpenPCIConfig(hostdev);
if (configfd >= 0) {
if (virAsprintf(&configfd_name, "fd-%s", info->alias) <
0)
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 243f3dcdef..122f324668 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 68c1384cf9..7e7981ccfd 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index d29ee50719..a118d466fd 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index f48f78005b..d3575aaea0 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 0896de4a06..236fb8a138 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 41c2f27f63..be6ae99d61 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 62dbcec155..662d714512 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index e7a283d45e..c215ec2997 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 8d43092c86..1e9b9bfd4e 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 6f0403ba48..fd6cea9995 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 37ddad077c..e0e4da9b4e 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -5,7 +5,6 @@
<usedQMP/>
<flag name='kvm'/>
<flag name='no-hpet'/>
- <flag name='pci-configfd'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='pci-bootindex'/>
--
2.16.4
9:25 a.m.
New subject: [libvirt] [PATCH 1/9] qemu: always assume QEMU_CAPS_PCI_CONFIGFD
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
At the time of its addition in QEMU commit v1.3.0-rc0~572^2
the configfd argument was already supported.
By "its addition" I guess you mean pci-assign's, but that's not
immediately clear from the context. If you mention it explicitly
in the commit message,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 2/9] qemu: always assume QEMU_CAPS_PCI_BOOTINDEX
At the time of its addition in QEMU commit v1.3.0-rc0~572^2
the bootindex argument was already supported.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 8 --------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
14 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 222c344c97..ab99b3f1cc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1193,7 +1193,6 @@ static struct virQEMUCapsStringFlags
virQEMUCapsDevicePropsVirtioSCSI[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
- { "bootindex", QEMU_CAPS_PCI_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b8c6dfe54b..b83e380c4a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -121,7 +121,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */
X_QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */
X_QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */
- QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */
+ X_QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */
QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */
/* 55 */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6436086560..88db9c6945 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5335,14 +5335,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
"is not supported with this version of
qemu"));
return -1;
}
- } else {
- if (!virQEMUCapsGet(qemuCaps,
- QEMU_CAPS_PCI_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("booting from assigned PCI devices is
not "
- "supported with this version of
qemu"));
- return -1;
- }
}
}
if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 122f324668..b752b74036 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 7e7981ccfd..2b7ea53144 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index a118d466fd..d6254eb2ba 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index d3575aaea0..13b5d5d9e0 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 236fb8a138..007585924d 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index be6ae99d61..15bf9db373 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 662d714512..666b7bed17 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index c215ec2997..3f51550018 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 1e9b9bfd4e..7021a6dfa3 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index fd6cea9995..360b99fde1 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index e0e4da9b4e..f3db1cb134 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
- <flag name='pci-bootindex'/>
<flag name='ccid-emulated'/>
<flag name='ccid-passthru'/>
<flag name='virtio-tx-alg'/>
--
2.16.4
9:31 a.m.
New subject: [libvirt] [PATCH 2/9] qemu: always assume QEMU_CAPS_PCI_BOOTINDEX
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
At the time of its addition in QEMU commit v1.3.0-rc0~572^2
the bootindex argument was already supported.
Please mention pci-assign here as well.
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
It's really nice that you're mentioning QEMU commits right
in the commit message, by the way :)
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 3/9] qemu: drop unused QEMU_CAPS_DEVICE_USB_NET
Added by commit fc66c1603c and not used since.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
24 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ab99b3f1cc..b4658541c5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1072,7 +1072,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA },
{ "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA },
{ "usb-serial", QEMU_CAPS_DEVICE_USB_SERIAL },
- { "usb-net", QEMU_CAPS_DEVICE_USB_NET },
{ "virtio-rng-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG },
{ "virtio-rng-s390", QEMU_CAPS_DEVICE_VIRTIO_RNG },
{ "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b83e380c4a..0bd280f1d3 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -224,7 +224,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 125 */
QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */
- QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
+ X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */
X_QEMU_CAPS_ADD_FD, /* -add-fd */
QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */
QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index b752b74036..355d9b55af 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -57,7 +57,6 @@
<flag name='cirrus-vga'/>
<flag name='vmware-svga'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 2b7ea53144..903cb5b110 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index d6254eb2ba..f6f4c4bf49 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 13b5d5d9e0..807a0309a8 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index cb2740ad14..df27f3621c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 1add2b6e4b..b3e5c36203 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 007585924d..9e555473ac 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index f6bcc59744..c230df3461 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 3c1a704100..e06b935f95 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -45,7 +45,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 877362eaef..741364d3bc 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index edf944bc35..12b607d7ee 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 15bf9db373..c568a12f7c 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 666b7bed17..0f55489dec 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index f63e141326..ae94e9eeaa 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -47,7 +47,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 8d43234514..b116d425ad 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 3f51550018..f86147a48b 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 7021a6dfa3..b2f221c004 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 360b99fde1..5f78ed2000 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index f3e7d238f7..e05b5b5db4 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -43,7 +43,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index f3db1cb134..86f24c415b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 6892c9bd64..67e0edd13b 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='VGA'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 747f51b799..217fbf119f 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='vmware-svga'/>
<flag name='device-video-primary'/>
<flag name='usb-serial'/>
- <flag name='usb-net'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>
<flag name='rng-random'/>
--
2.16.4
9:35 a.m.
New subject: [libvirt] [PATCH 3/9] qemu: drop unused QEMU_CAPS_DEVICE_USB_NET
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
Added by commit fc66c1603c and not used since.
Most importantly, usb-net was already present in QEMU 1.5.0,
which means we can drop the capability instead of implementing
the missing check. With that mentioned in the commit message,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 4/9] qemu: always assume QEMU_CAPS_USB_REDIR_BOOTINDEX
Added by QEMU commit 65bb3a5 contained in v1.1.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 9 +--------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemuxml2argvtest.c | 3 +--
18 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b4658541c5..288d4461cd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1219,7 +1219,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPiix4PM[]
= {
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER },
- { "bootindex", QEMU_CAPS_USB_REDIR_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0bd280f1d3..48549e8e65 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -210,7 +210,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 115 */
QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
- QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
+ X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */
QEMU_CAPS_DEVICE_QXL, /* -device qxl */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 88db9c6945..3381d6a9f7 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9482,15 +9482,8 @@ qemuBuildRedirdevDevStr(const virDomainDef *def,
}
}
- if (dev->info.bootIndex) {
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("USB redirection booting is not "
- "supported by this version of QEMU"));
- goto error;
- }
+ if (dev->info.bootIndex)
virBufferAsprintf(&buf, ",bootindex=%u", dev->info.bootIndex);
- }
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto error;
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 355d9b55af..141d2b9484 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 903cb5b110..1091a1b213 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index f6f4c4bf49..41979e9dfa 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 807a0309a8..63cb847e7c 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 9e555473ac..c529b09113 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index c230df3461..b539bc71d7 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 12b607d7ee..3d41b8f9f9 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index c568a12f7c..26f50588fc 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 0f55489dec..653d238413 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index f86147a48b..5e93a56432 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index b2f221c004..21a811c9a8 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 5f78ed2000..3ae31609d2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 86f24c415b..20ec3a3311 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 217fbf119f..ed6114f10c 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-redir.bootindex'/>
<flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 35df63b2ac..7d280f41d1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1546,8 +1546,7 @@ mymain(void)
QEMU_CAPS_USB_HUB,
QEMU_CAPS_ICH9_USB_EHCI1,
QEMU_CAPS_USB_REDIR,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_USB_REDIR_BOOTINDEX);
+ QEMU_CAPS_SPICE);
DO_TEST("usb-redir-filter",
QEMU_CAPS_USB_HUB,
QEMU_CAPS_ICH9_USB_EHCI1,
--
2.16.4
9:39 a.m.
New subject: [libvirt] [PATCH 4/9] qemu: always assume QEMU_CAPS_USB_REDIR_BOOTINDEX
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
Added by QEMU commit 65bb3a5 contained in v1.1.
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 5/9] qemu: always assume QEMU_CAPS_USB_HOST_BOOTINDEX
Added by QEMU commit 65bb3a5 contained in v1.1.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 7 -------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemuxml2argvtest.c | 3 +--
25 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 288d4461cd..814712fa6c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1222,7 +1222,6 @@ static struct virQEMUCapsStringFlags
virQEMUCapsDevicePropsUSBRedir[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
- { "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 48549e8e65..9ab8e329f4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -211,7 +211,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 115 */
QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
- QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
+ X_QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */
QEMU_CAPS_DEVICE_QXL, /* -device qxl */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3381d6a9f7..8577641e87 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5337,13 +5337,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
}
}
}
- if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("booting from assigned USB devices is not
"
- "supported with this version of qemu"));
- return -1;
- }
if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
!virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 141d2b9484..5563668d75 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 1091a1b213..710b214628 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 41979e9dfa..5501d4bb37 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 63cb847e7c..2387cbf04d 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index df27f3621c..640fb69143 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -40,7 +40,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index b3e5c36203..7eb72a85db 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index c529b09113..388625156c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index b539bc71d7..b234be563f 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index e06b935f95..84429e8f0e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -40,7 +40,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 741364d3bc..7cd97dd702 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 3d41b8f9f9..41ba01ba03 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 26f50588fc..d4ed1d3eff 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 653d238413..8d4a7785c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index ae94e9eeaa..2ed63c8f38 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -42,7 +42,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index b116d425ad..f66fb172d5 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 5e93a56432..4685a02877 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 21a811c9a8..d8f1888755 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 3ae31609d2..c7a1de6159 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 20ec3a3311..278bd43420 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 67e0edd13b..db8313277a 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index ed6114f10c..faf3e527cc 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7d280f41d1..71abfefb16 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1635,8 +1635,7 @@ mymain(void)
DO_TEST("hostdev-usb-address", NONE);
DO_TEST("hostdev-usb-address-device", NONE);
- DO_TEST("hostdev-usb-address-device-boot",
- QEMU_CAPS_USB_HOST_BOOTINDEX);
+ DO_TEST("hostdev-usb-address-device-boot", NONE);
DO_TEST("hostdev-pci-address", NONE);
DO_TEST("hostdev-pci-address-device", NONE);
DO_TEST("hostdev-vfio",
--
2.16.4
9:41 a.m.
New subject: [libvirt] [PATCH 5/9] qemu: always assume QEMU_CAPS_USB_HOST_BOOTINDEX
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
Added by QEMU commit 65bb3a5 contained in v1.1.
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 6/9] qemu: always assume QEMU_CAPS_VFIO_PCI_BOOTINDEX
Introduced by QEMU commit c29029d which was released in 1.5.0
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 12 ------------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
31 files changed, 1 insertion(+), 42 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 814712fa6c..5a32a0409f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1195,7 +1195,6 @@ static struct virQEMUCapsStringFlags
virQEMUCapsDevicePropsPCIAssign[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
- { "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
{ "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
};
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 9ab8e329f4..0ceb5f3af5 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -247,7 +247,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=xxxx */
QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */
QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */
- QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */
+ X_QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */
QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
/* 145 */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8577641e87..3fd9d78daf 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5325,18 +5325,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
"supported for PCI, USB and SCSI devices"));
return -1;
} else {
- if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
- if (subsys->u.pci.backend ==
- VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
- if (!virQEMUCapsGet(qemuCaps,
- QEMU_CAPS_VFIO_PCI_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("booting from PCI devices assigned with
VFIO "
- "is not supported with this version of
qemu"));
- return -1;
- }
- }
- }
if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
!virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 5563668d75..338c42f70b 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -62,7 +62,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 710b214628..a433fc12f0 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -63,7 +63,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 5501d4bb37..bd5fec9f1a 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -63,7 +63,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 2387cbf04d..17a58a58f3 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 640fb69143..2da02c56be 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -51,7 +51,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 7eb72a85db..34972d614d 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index e9ccc63402..33d404fdc6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 388625156c..d9b5203569 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index ec8330211c..fd70b05fb9 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index b234be563f..334607c9e5 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 84429e8f0e..53cc1d2a0e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -51,7 +51,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 7cd97dd702..48a27a0e72 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index b8e46a970a..4e34bf6e21 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 41ba01ba03..7c994b82b9 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index d4ed1d3eff..ecf207b384 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 8d4a7785c4..142d845281 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 2ed63c8f38..bd1bb7992d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -53,7 +53,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index f66fb172d5..881c002770 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 4685a02877..0317c65531 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index e8939667b3..b33eea90bc 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index d8f1888755..53a792ea9c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index d91182ee84..0705501c1d 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index c7a1de6159..5c87d9484a 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index e05b5b5db4..8c24c0bb02 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index e336cb1950..ee0981da26 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 278bd43420..82ccc49784 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index db8313277a..bf347dac64 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index faf3e527cc..a049fcea20 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='vfio-pci.bootindex'/>
<flag name='scsi-generic'/>
<flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
--
2.16.4
9:50 a.m.
New subject: [libvirt] [PATCH 6/9] qemu: always assume QEMU_CAPS_VFIO_PCI_BOOTINDEX
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
Introduced by QEMU commit c29029d which was released in 1.5.0
s/released/included/
- if (subsys->type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
- if (subsys->u.pci.backend ==
- VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
- if (!virQEMUCapsGet(qemuCaps,
- QEMU_CAPS_VFIO_PCI_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("booting from PCI devices assigned
with VFIO "
- "is not supported with this version of
qemu"));
- return -1;
- }
- }
- }
if (nesting) {
if (nesting->type == NESTING_UNNECESSARY) {
if (!nesting_is_desirable(NESTING_UNNECESSARY)) {
goto ack;
}
}
}
ack:
/* Reviewed-by: Andrea Bolognani <abologna(a)redhat.com> */
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 7/9] qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX
Introduced by QEMU commit 28b77657 in 2011.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 9 ---------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemuxml2argvtest.c | 3 +--
34 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5a32a0409f..202859abac 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1224,7 +1224,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[]
= {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
- { "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0ceb5f3af5..0f69c69136 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -251,7 +251,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
/* 145 */
- QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
+ X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3fd9d78daf..ff9589f593 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5324,15 +5324,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
_("booting from assigned devices is only "
"supported for PCI, USB and SCSI devices"));
return -1;
- } else {
- if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
- !virQEMUCapsGet(qemuCaps,
- QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("booting from assigned SCSI devices is
not"
- " supported with this version of qemu"));
- return -1;
- }
}
}
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 338c42f70b..fd8b56045d 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -63,7 +63,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index a433fc12f0..6831149379 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -64,7 +64,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index bd5fec9f1a..852dcb0226 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -64,7 +64,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 17a58a58f3..af35d676cb 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 2da02c56be..8d22cd8ca6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 34972d614d..ee9faac3cd 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 33d404fdc6..c2b41249da 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index d9b5203569..46f6f6c492 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index fd70b05fb9..fa515d455b 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 334607c9e5..f3be49a288 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 53cc1d2a0e..4f13281e3d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 48a27a0e72..295e6062df 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 4e34bf6e21..d19ad59b31 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 7c994b82b9..16861727cf 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index ecf207b384..7759fe9f99 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 142d845281..d9c352ca17 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index bd1bb7992d..283a290799 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -54,7 +54,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 881c002770..c78fa35834 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 0317c65531..9af99e6244 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index b33eea90bc..ad60b5b6d2 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 53a792ea9c..164639c6e7 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 0705501c1d..5cd2cd8552 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 5c87d9484a..f11af45f57 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 8c24c0bb02..6089f96f72 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index ee0981da26..a5a8d2d551 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -36,7 +36,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 82ccc49784..b1bf8c57e2 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index bf347dac64..9a0281e3c6 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -52,7 +52,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 39cc480dd2..fecef3a0cf 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -26,7 +26,6 @@
<flag name='rng-egd'/>
<flag name='tpm-passthrough'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 344740879e..4cae4fd058 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -26,7 +26,6 @@
<flag name='rng-egd'/>
<flag name='tpm-passthrough'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index a049fcea20..eeb0941f27 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
- <flag name='scsi-generic.bootindex'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 71abfefb16..3f48c79fb1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2435,8 +2435,7 @@ mymain(void)
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
DO_TEST("hostdev-scsi-virtio-scsi",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC,
- QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
+ QEMU_CAPS_DEVICE_SCSI_GENERIC);
DO_TEST("hostdev-scsi-lsi-iscsi",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
QEMU_CAPS_DEVICE_SCSI_GENERIC);
--
2.16.4
9:55 a.m.
New subject: [libvirt] [PATCH 7/9] qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
Introduced by QEMU commit 28b77657 in 2011.
The QEMU version number (v1.0-rc4~21^2~8 in this case) would be
more useful than the year. With that fixed,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 8/9] qemu: remove leftover property probing
Previous commits removed all capabilities from per-device property
probing for:
pci-assign
kvm-pci-assign
usb-host
scsi-generic
Remove them from the virQEMUCapsDeviceProps list and get rid of the
redundant device-list-properties QMP calls.
Note that 'pci-assign' was already useless, because the QMP version
of the device is called 'kvm-pci-assign', see libvirt commit 7257480
from 2012.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 21 ---
.../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 166 -----------------
.../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 170 ------------------
.../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 170 ------------------
.../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 174 ------------------
.../caps_2.10.0.aarch64.replies | 144 ---------------
.../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 144 ---------------
.../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 83 ---------
.../caps_2.10.0.x86_64.replies | 198 ---------------------
.../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 83 ---------
.../caps_2.11.0.x86_64.replies | 144 ---------------
.../caps_2.12.0.aarch64.replies | 148 ---------------
.../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 148 ---------------
.../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 87 ---------
.../caps_2.12.0.x86_64.replies | 148 ---------------
.../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 184 -------------------
.../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 184 -------------------
.../caps_2.6.0.aarch64.replies | 140 ---------------
.../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 140 ---------------
.../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 184 -------------------
.../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 83 ---------
.../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 193 --------------------
.../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 83 ---------
.../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 193 --------------------
.../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 83 ---------
.../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 83 ---------
.../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 198 ---------------------
.../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 148 ---------------
.../caps_3.0.0.riscv32.replies | 87 ---------
.../caps_3.0.0.riscv64.replies | 87 ---------
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 148 ---------------
31 files changed, 4246 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 202859abac..08cf822b88 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1191,9 +1191,6 @@ static struct virQEMUCapsStringFlags
virQEMUCapsDevicePropsVirtioSCSI[] = {
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
};
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
-};
-
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
{ "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
};
@@ -1220,12 +1217,6 @@ static struct virQEMUCapsStringFlags
virQEMUCapsDevicePropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER },
};
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
-};
-
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
-};
-
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
{ "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE },
};
@@ -1340,12 +1331,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
{ "virtio-net-s390", virQEMUCapsDevicePropsVirtioNet,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsVirtioNet),
QEMU_CAPS_DEVICE_VIRTIO_NET },
- { "pci-assign", virQEMUCapsDevicePropsPCIAssign,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsPCIAssign),
- -1 },
- { "kvm-pci-assign", virQEMUCapsDevicePropsPCIAssign,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsPCIAssign),
- -1 },
{ "vfio-pci", virQEMUCapsDevicePropsVfioPCI,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsVfioPCI),
QEMU_CAPS_DEVICE_VFIO_PCI },
@@ -1361,12 +1346,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
{ "usb-redir", virQEMUCapsDevicePropsUSBRedir,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsUSBRedir),
QEMU_CAPS_USB_REDIR },
- { "usb-host", virQEMUCapsDevicePropsUSBHost,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsUSBHost),
- -1 },
- { "scsi-generic", virQEMUCapsDevicePropsSCSIGeneric,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIGeneric),
- QEMU_CAPS_DEVICE_SCSI_GENERIC },
{ "i440FX-pcihost", virQEMUCapsDevicePropsI440FXPCIHost,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsI440FXPCIHost),
-1 },
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 600ca5a6f7..7f192374f1 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -1412,76 +1412,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "command_serr_enable",
- "type": "on/off"
- },
- {
- "name": "multifunction",
- "type": "on/off"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "string"
- },
- {
- "name": "addr",
- "type": "pci-devfn"
- },
- {
- "name": "configfd",
- "type": "string"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -1764,102 +1694,6 @@
"id": "libvirt-21"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "port",
- "type": "string"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "hex32"
- },
- {
- "name": "vendorid",
- "type": "hex32"
- },
- {
- "name": "hostport",
- "type": "string"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index e74ae6b958..59be1efbee 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -1441,76 +1441,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "command_serr_enable",
- "type": "on/off"
- },
- {
- "name": "multifunction",
- "type": "on/off"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "string"
- },
- {
- "name": "addr",
- "type": "pci-devfn"
- },
- {
- "name": "configfd",
- "type": "string"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -1797,106 +1727,6 @@
"id": "libvirt-21"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "serial",
- "type": "string"
- },
- {
- "name": "port",
- "type": "string"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "hex32"
- },
- {
- "name": "vendorid",
- "type": "hex32"
- },
- {
- "name": "hostport",
- "type": "string"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index a6c8e1e459..79cfbf7014 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -1450,76 +1450,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "command_serr_enable",
- "type": "on/off"
- },
- {
- "name": "multifunction",
- "type": "on/off"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "string"
- },
- {
- "name": "addr",
- "type": "pci-devfn"
- },
- {
- "name": "configfd",
- "type": "string"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -1806,106 +1736,6 @@
"id": "libvirt-21"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "serial",
- "type": "string"
- },
- {
- "name": "port",
- "type": "string"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "hex32"
- },
- {
- "name": "vendorid",
- "type": "hex32"
- },
- {
- "name": "hostport",
- "type": "string"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index 88152e56bd..e3655d6458 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -1717,76 +1717,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "command_serr_enable",
- "type": "on/off"
- },
- {
- "name": "multifunction",
- "type": "on/off"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "addr",
- "type": "pci-devfn"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2097,110 +2027,6 @@
"id": "libvirt-21"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "msos-desc",
- "type": "on/off"
- },
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index fee785692f..a4c63f8f6c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -3948,38 +3948,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -4317,118 +4285,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index e3047f133e..a65617bfd4 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -4049,38 +4049,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -4418,118 +4386,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index f30a3eaa2b..e5c6142ee3 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -2695,38 +2695,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2996,57 +2964,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index b3937c1d9c..3ec8b9a492 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -2926,92 +2926,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3461,118 +3375,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index d47a19130c..61492fb702 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -2744,38 +2744,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3050,57 +3018,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index a067b70377..ed6c501d28 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -2923,38 +2923,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3409,118 +3377,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index db5b5140d5..bdc09c1537 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -4251,38 +4251,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -4639,122 +4607,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 786cb1844a..084d6041cb 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -4240,38 +4240,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -4628,122 +4596,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 25a005c5cd..62e0554001 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -2814,38 +2814,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3138,61 +3106,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 9d7e653216..fd0c67844b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -3098,38 +3098,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3598,122 +3566,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 32c31f406d..29999f8227 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -2005,82 +2005,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2423,114 +2347,6 @@
"id": "libvirt-21"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- }
- ],
- "id": "libvirt-23"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 2e93b116f7..1162c2d36c 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -2074,82 +2074,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2520,114 +2444,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 41a2be3a2f..15a54756dc 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -2833,38 +2833,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3145,114 +3113,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index 4a35fee5ed..82fe8fe01e 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -2983,38 +2983,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3295,114 +3263,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 382feee693..e1d1cac40a 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -2152,82 +2152,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2602,114 +2526,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 977c591455..8968ea747c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -1966,38 +1966,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2258,57 +2226,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index aae2b3f4de..58f5b055ef 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -2207,87 +2207,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2719,118 +2638,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 6eae79342e..6e06a1a484 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -2229,38 +2229,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2521,57 +2489,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index dcfa7ea056..98b0cc3bb2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -2322,87 +2322,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2834,118 +2753,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index f98ed20a6b..47d4c9ca6b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -3308,38 +3308,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3677,57 +3645,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "id": "libvirt-20",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index d3b60da4bf..cfa099dc10 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -2410,38 +2410,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -2711,57 +2679,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index c3edcc187d..a6ce25bdcb 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -2498,92 +2498,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device,
example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3033,118 +2947,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 932c418f3f..9b8acd0c24 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -4315,38 +4315,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -4715,122 +4683,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index 97eeec3dbc..864ec55ad3 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1296,38 +1296,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -1486,61 +1454,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index 23188fffb6..65ebb8e27f 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1296,38 +1296,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -1486,61 +1454,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
{
"execute": "device-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index fdab682f94..6087089962 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -3160,38 +3160,6 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
@@ -3672,122 +3640,6 @@
"id": "libvirt-20"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
--
2.16.4
10:02 a.m.
New subject: [libvirt] [PATCH 8/9] qemu: remove leftover property probing
On Fri, 2018-09-07 at 16:08 +0200, Ján Tomko wrote:
Previous commits removed all capabilities from per-device property
probing for:
Add a newline here.
pci-assign
kvm-pci-assign
usb-host
scsi-generic
[...]
- { "scsi-generic", virQEMUCapsDevicePropsSCSIGeneric,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIGeneric),
- QEMU_CAPS_DEVICE_SCSI_GENERIC },
I guess this makes QEMU_CAPS_DEVICE_SCSI_GENERIC next in line
for being dropped? :)
With the fixup commit (9/9) squashed in,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
9:08 a.m.
New subject: [libvirt] [PATCH 9/9] FIXUP: renumber replies and microcode version
---
.../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +-
.../caps_2.10.0.aarch64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 92 +++++++-------
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +-
.../caps_2.10.0.x86_64.replies | 128 +++++++++----------
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +-
.../caps_2.11.0.x86_64.replies | 128 +++++++++----------
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 +-
.../caps_2.12.0.aarch64.replies | 104 +++++++--------
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 104 +++++++--------
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 104 +++++++--------
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +-
.../caps_2.12.0.x86_64.replies | 140 ++++++++++-----------
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 108 ++++++++--------
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 112 ++++++++---------
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +-
.../caps_2.6.0.aarch64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 112 ++++++++---------
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 84 ++++++-------
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 112 ++++++++---------
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 92 +++++++-------
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 112 ++++++++---------
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 96 +++++++-------
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +-
.../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 92 +++++++-------
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 128 +++++++++----------
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +-
.../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 104 +++++++--------
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +-
.../caps_3.0.0.riscv32.replies | 80 ++++++------
.../caps_3.0.0.riscv64.replies | 80 ++++++------
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 140 ++++++++++-----------
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +-
58 files changed, 1586 insertions(+), 1586 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 7f192374f1..88bc93be3a 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -1417,7 +1417,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1459,7 +1459,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1467,7 +1467,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1541,7 +1541,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1549,7 +1549,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1603,7 +1603,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1611,7 +1611,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1653,7 +1653,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1661,7 +1661,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1691,7 +1691,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1699,13 +1699,13 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
"return": [
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1713,7 +1713,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1723,7 +1723,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1731,7 +1731,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1781,7 +1781,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1789,7 +1789,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1803,7 +1803,7 @@
"type": "hex32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1811,7 +1811,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -1845,7 +1845,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -1853,7 +1853,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1883,7 +1883,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1891,7 +1891,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1961,7 +1961,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1969,11 +1969,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -1985,7 +1985,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2023,7 +2023,7 @@
"type": "on/off"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2031,11 +2031,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2047,13 +2047,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2061,7 +2061,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2111,7 +2111,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2119,7 +2119,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2145,12 +2145,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2223,12 +2223,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2306,34 +2306,34 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3034,12 +3034,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3049,7 +3049,7 @@
"capability": "xbzrle"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index fd8b56045d..b791b13830 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -101,7 +101,7 @@
<flag name='mch'/>
<version>1005003</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>50896</microcodeVersion>
+ <microcodeVersion>48498</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index 59be1efbee..ea04d55f2a 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -1446,7 +1446,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1488,7 +1488,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1496,7 +1496,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1570,7 +1570,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1578,7 +1578,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1632,7 +1632,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1640,7 +1640,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1682,7 +1682,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1690,7 +1690,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1724,7 +1724,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1732,7 +1732,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1742,7 +1742,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1750,7 +1750,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1764,7 +1764,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1772,7 +1772,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1822,7 +1822,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1830,7 +1830,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1844,7 +1844,7 @@
"type": "hex32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1852,7 +1852,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -1886,7 +1886,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -1894,7 +1894,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1924,7 +1924,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1932,7 +1932,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2002,7 +2002,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2010,11 +2010,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2026,7 +2026,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2064,7 +2064,7 @@
"type": "on/off"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2072,11 +2072,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2088,13 +2088,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2102,7 +2102,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2152,7 +2152,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2160,7 +2160,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2186,12 +2186,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2272,12 +2272,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2355,34 +2355,34 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -2985,12 +2985,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3012,7 +3012,7 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 6831149379..3a0df4d417 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -106,7 +106,7 @@
<flag name='mch'/>
<version>1006000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>49125</microcodeVersion>
+ <microcodeVersion>46667</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index 79cfbf7014..1261a2bdc1 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -1455,7 +1455,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1497,7 +1497,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1505,7 +1505,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1579,7 +1579,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1587,7 +1587,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1641,7 +1641,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1649,7 +1649,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1691,7 +1691,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1699,7 +1699,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1733,7 +1733,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1741,7 +1741,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1755,7 +1755,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1763,7 +1763,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1781,7 +1781,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1789,7 +1789,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1839,7 +1839,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1847,7 +1847,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1861,7 +1861,7 @@
"type": "hex32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1869,7 +1869,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -1903,7 +1903,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -1911,7 +1911,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1941,7 +1941,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1949,7 +1949,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2019,7 +2019,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2027,11 +2027,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2043,7 +2043,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2081,7 +2081,7 @@
"type": "on/off"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2089,11 +2089,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2105,13 +2105,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2119,7 +2119,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2169,7 +2169,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2177,7 +2177,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2203,12 +2203,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2297,12 +2297,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2380,34 +2380,34 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3200,12 +3200,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3227,7 +3227,7 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 852dcb0226..dede48d65f 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -108,7 +108,7 @@
<flag name='mch'/>
<version>1007000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>54569</microcodeVersion>
+ <microcodeVersion>52111</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index e3655d6458..b6efe1d3a1 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -1722,7 +1722,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1764,7 +1764,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1772,7 +1772,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1858,7 +1858,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1866,7 +1866,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1920,7 +1920,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1928,7 +1928,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1978,7 +1978,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1986,7 +1986,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -2024,7 +2024,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -2032,7 +2032,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2070,7 +2070,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2078,7 +2078,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2128,7 +2128,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2136,7 +2136,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2190,7 +2190,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2198,7 +2198,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2212,7 +2212,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2220,7 +2220,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2254,7 +2254,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2262,7 +2262,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2292,7 +2292,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2300,7 +2300,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2370,7 +2370,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2378,7 +2378,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2432,7 +2432,7 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2440,7 +2440,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2490,7 +2490,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2498,11 +2498,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2514,13 +2514,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2528,7 +2528,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2582,7 +2582,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2590,7 +2590,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2616,12 +2616,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2726,12 +2726,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2812,36 +2812,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3701,12 +3701,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3728,7 +3728,7 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index af35d676cb..05badb6675 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -124,7 +124,7 @@
<flag name='mch'/>
<version>2001001</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>63365</microcodeVersion>
+ <microcodeVersion>60857</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index a4c63f8f6c..c8b73cd7e2 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -3953,7 +3953,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4060,7 +4060,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4068,7 +4068,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4182,7 +4182,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4190,7 +4190,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4266,7 +4266,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4274,11 +4274,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -4290,11 +4290,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4306,11 +4306,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4322,7 +4322,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4395,7 +4395,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4403,11 +4403,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4419,7 +4419,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4476,7 +4476,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4484,7 +4484,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4635,7 +4635,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4643,7 +4643,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4690,7 +4690,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4698,11 +4698,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -4714,7 +4714,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4857,7 +4857,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4865,11 +4865,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4881,7 +4881,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4925,7 +4925,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4933,7 +4933,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5013,12 +5013,12 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5285,12 +5285,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5456,34 +5456,34 @@
"static": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -6628,12 +6628,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -6683,12 +6683,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -16411,12 +16411,12 @@
"meta-type": "object"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -16432,7 +16432,7 @@
"kernel": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 8d22cd8ca6..d1224410f6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -156,7 +156,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>307241</microcodeVersion>
+ <microcodeVersion>305067</microcodeVersion>
<package> (v2.10.0)</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index a65617bfd4..20e5b47541 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -4054,7 +4054,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4161,7 +4161,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4169,7 +4169,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4283,7 +4283,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4291,7 +4291,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4367,7 +4367,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4375,11 +4375,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -4391,11 +4391,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4407,11 +4407,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4423,7 +4423,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4496,7 +4496,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4504,11 +4504,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4520,7 +4520,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4577,7 +4577,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4585,7 +4585,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4736,7 +4736,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4744,7 +4744,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4791,7 +4791,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4799,11 +4799,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -4815,7 +4815,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4958,7 +4958,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4966,11 +4966,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4982,7 +4982,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5026,7 +5026,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5034,7 +5034,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5114,7 +5114,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5122,7 +5122,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5208,12 +5208,12 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5331,12 +5331,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -7512,34 +7512,34 @@
"static": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -8679,12 +8679,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -8734,12 +8734,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -18462,7 +18462,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index ee9faac3cd..8eac816b3a 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -155,7 +155,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>386586</microcodeVersion>
+ <microcodeVersion>384412</microcodeVersion>
<package> (v2.10.0)</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index e5c6142ee3..a79fad62df 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -2700,7 +2700,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2807,7 +2807,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2815,7 +2815,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2929,7 +2929,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2937,11 +2937,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2953,11 +2953,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -2969,11 +2969,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2985,11 +2985,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3001,11 +3001,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3017,7 +3017,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3168,7 +3168,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3176,7 +3176,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3223,7 +3223,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3231,11 +3231,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3247,7 +3247,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3390,7 +3390,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3398,7 +3398,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3460,7 +3460,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3468,7 +3468,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3512,7 +3512,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3520,7 +3520,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3530,12 +3530,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3583,12 +3583,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -4122,34 +4122,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -5254,12 +5254,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5309,12 +5309,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -15037,7 +15037,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -15048,7 +15048,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15088,7 +15088,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15102,11 +15102,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-37",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index c2b41249da..a8cd1fe158 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -118,7 +118,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>307493</microcodeVersion>
+ <microcodeVersion>306247</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index 3ec8b9a492..0f385734b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -2931,7 +2931,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3038,7 +3038,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3046,7 +3046,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3160,7 +3160,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3168,7 +3168,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3244,7 +3244,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3252,7 +3252,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3315,7 +3315,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3323,7 +3323,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3372,7 +3372,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3380,7 +3380,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3418,7 +3418,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3426,7 +3426,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3504,7 +3504,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3512,7 +3512,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3585,7 +3585,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3593,7 +3593,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3607,7 +3607,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3615,7 +3615,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3672,7 +3672,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3680,7 +3680,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3723,7 +3723,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3731,7 +3731,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3826,7 +3826,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3834,7 +3834,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3995,7 +3995,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4003,7 +4003,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4060,7 +4060,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4068,7 +4068,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4164,7 +4164,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4172,7 +4172,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4315,7 +4315,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4323,11 +4323,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4339,7 +4339,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4383,7 +4383,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4391,7 +4391,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4471,7 +4471,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4479,7 +4479,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4514,7 +4514,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4522,7 +4522,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4548,12 +4548,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4742,12 +4742,12 @@
"alias": "q35"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -5082,36 +5082,36 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -6390,12 +6390,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -6445,12 +6445,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16173,7 +16173,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16184,7 +16184,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16363,7 +16363,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16544,7 +16544,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16787,7 +16787,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16801,7 +16801,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -16980,7 +16980,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17161,7 +17161,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -17404,7 +17404,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 46f6f6c492..abe2f8e930 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -197,7 +197,7 @@
<flag name='egl-headless'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>367589</microcodeVersion>
+ <microcodeVersion>364386</microcodeVersion>
<package> (v2.10.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index 61492fb702..3a03f390b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -2749,7 +2749,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2861,7 +2861,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2869,7 +2869,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2983,7 +2983,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2991,11 +2991,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -3007,11 +3007,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -3023,11 +3023,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3039,11 +3039,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3055,11 +3055,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3071,7 +3071,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3222,7 +3222,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3230,7 +3230,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3277,7 +3277,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3285,11 +3285,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3301,7 +3301,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3444,7 +3444,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3452,7 +3452,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3514,7 +3514,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3522,7 +3522,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3566,7 +3566,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3574,7 +3574,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3639,7 +3639,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3647,7 +3647,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3657,12 +3657,12 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3715,12 +3715,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4254,35 +4254,35 @@
"migration-safe": true
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
"emulator"
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5403,12 +5403,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -5466,12 +5466,12 @@
"capability": "x-multifd"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15339,7 +15339,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15350,7 +15350,7 @@
"name": "host"
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -15389,7 +15389,7 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -15403,11 +15403,11 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
- "id": "libvirt-42",
+ "id": "libvirt-38",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index fa515d455b..b1a7b167b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -125,7 +125,7 @@
<flag name='egl-headless'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>346345</microcodeVersion>
+ <microcodeVersion>345099</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index ed6c501d28..c9a9a7043d 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -2928,7 +2928,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3040,7 +3040,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3048,7 +3048,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3162,7 +3162,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3170,7 +3170,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3246,7 +3246,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3254,7 +3254,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3317,7 +3317,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3325,7 +3325,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3374,7 +3374,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3382,7 +3382,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3424,7 +3424,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3432,7 +3432,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3514,7 +3514,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3522,7 +3522,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3595,7 +3595,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3603,7 +3603,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3617,7 +3617,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3625,7 +3625,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3682,7 +3682,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3690,7 +3690,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3733,7 +3733,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3741,7 +3741,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3836,7 +3836,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3844,7 +3844,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4005,7 +4005,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4013,7 +4013,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4070,7 +4070,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4078,7 +4078,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4174,7 +4174,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4182,7 +4182,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4325,7 +4325,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4333,11 +4333,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4349,7 +4349,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4393,7 +4393,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4401,7 +4401,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4481,7 +4481,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4489,7 +4489,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4524,7 +4524,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4532,7 +4532,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4575,12 +4575,12 @@
"type": "int32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4769,12 +4769,12 @@
"cpu-max": 288
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -5088,24 +5088,24 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -5113,12 +5113,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -6413,12 +6413,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -6476,12 +6476,12 @@
"capability": "x-multifd"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16349,7 +16349,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16360,7 +16360,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16540,7 +16540,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16722,7 +16722,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16967,7 +16967,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16981,7 +16981,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17161,7 +17161,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17343,7 +17343,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -17588,7 +17588,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index f3be49a288..90bb897485 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -203,7 +203,7 @@
<flag name='egl-headless'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>371049</microcodeVersion>
+ <microcodeVersion>368875</microcodeVersion>
<package> (v2.11.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index bdc09c1537..4208a66156 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -4256,7 +4256,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4382,7 +4382,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4390,7 +4390,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4504,7 +4504,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4512,7 +4512,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4588,7 +4588,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4596,11 +4596,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -4612,11 +4612,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4628,11 +4628,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4644,7 +4644,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4717,7 +4717,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4725,11 +4725,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4741,7 +4741,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4798,7 +4798,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4806,7 +4806,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4957,7 +4957,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4965,7 +4965,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5012,7 +5012,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5020,11 +5020,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -5036,7 +5036,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5179,7 +5179,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5187,11 +5187,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5203,7 +5203,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5247,7 +5247,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5255,7 +5255,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5335,7 +5335,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5343,7 +5343,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5397,7 +5397,7 @@
"type": "string"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5405,11 +5405,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-35",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -5418,7 +5418,7 @@
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5715,12 +5715,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -5896,35 +5896,35 @@
"static": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
"emulator"
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -7085,12 +7085,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -7152,12 +7152,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -18525,12 +18525,12 @@
"meta-type": "object"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -18546,7 +18546,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 4f13281e3d..d83d8d42f5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -167,7 +167,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>347144</microcodeVersion>
+ <microcodeVersion>344910</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 084d6041cb..bd28546275 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -4245,7 +4245,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4371,7 +4371,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4379,7 +4379,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4493,7 +4493,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4501,7 +4501,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4577,7 +4577,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4585,11 +4585,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -4601,11 +4601,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4617,11 +4617,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4633,7 +4633,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4706,7 +4706,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4714,11 +4714,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4730,7 +4730,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4787,7 +4787,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4795,7 +4795,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4946,7 +4946,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4954,7 +4954,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5001,7 +5001,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5009,11 +5009,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -5025,7 +5025,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5168,7 +5168,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5176,11 +5176,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5192,7 +5192,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5236,7 +5236,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5244,7 +5244,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5324,7 +5324,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5332,7 +5332,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5390,7 +5390,7 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5398,7 +5398,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5452,7 +5452,7 @@
"type": "string"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5460,7 +5460,7 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5621,12 +5621,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -5764,12 +5764,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -7965,35 +7965,35 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -9149,12 +9149,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -9216,12 +9216,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -20589,7 +20589,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 295e6062df..790bebfb4d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -165,7 +165,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>427928</microcodeVersion>
+ <microcodeVersion>425694</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 62e0554001..f98afbceae 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -2819,7 +2819,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2945,7 +2945,7 @@
"type": "str"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2953,7 +2953,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3071,7 +3071,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3079,11 +3079,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -3095,11 +3095,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -3111,11 +3111,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3127,11 +3127,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3143,11 +3143,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3159,7 +3159,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3310,7 +3310,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3318,7 +3318,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3365,7 +3365,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3373,11 +3373,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3389,7 +3389,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3532,7 +3532,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3540,7 +3540,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3602,7 +3602,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3610,7 +3610,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3654,7 +3654,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3662,7 +3662,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3727,7 +3727,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3735,7 +3735,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3750,7 +3750,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3758,7 +3758,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3812,7 +3812,7 @@
"type": "string"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3820,11 +3820,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-35",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -3833,7 +3833,7 @@
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3891,12 +3891,12 @@
"alias": "s390-ccw-virtio"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4431,35 +4431,35 @@
"migration-safe": true
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
"emulator"
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -5584,12 +5584,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -5651,12 +5651,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -17024,7 +17024,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -17035,7 +17035,7 @@
"name": "host"
}
},
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -17073,7 +17073,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -17087,11 +17087,11 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
- "id": "libvirt-44",
+ "id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index d19ad59b31..abc40ec795 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -133,7 +133,7 @@
<flag name='vfio-pci.display'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>375593</microcodeVersion>
+ <microcodeVersion>374287</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z14-base' migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index fd0c67844b..e0b6d2f937 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -3103,7 +3103,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3229,7 +3229,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3237,7 +3237,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3351,7 +3351,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3359,7 +3359,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3435,7 +3435,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3443,7 +3443,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3506,7 +3506,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3514,7 +3514,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3563,7 +3563,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3571,7 +3571,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3613,7 +3613,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3621,7 +3621,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3703,7 +3703,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3711,7 +3711,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3784,7 +3784,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3792,7 +3792,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3806,7 +3806,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3814,7 +3814,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3871,7 +3871,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3879,7 +3879,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3922,7 +3922,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3930,7 +3930,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4025,7 +4025,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4033,7 +4033,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4184,7 +4184,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4192,7 +4192,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4239,7 +4239,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4247,7 +4247,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4343,7 +4343,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4351,7 +4351,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4494,7 +4494,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4502,11 +4502,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4518,7 +4518,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4562,7 +4562,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4570,7 +4570,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4650,7 +4650,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4658,7 +4658,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4697,7 +4697,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4705,7 +4705,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4748,7 +4748,7 @@
"type": "int32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4756,7 +4756,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4810,7 +4810,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4818,11 +4818,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
- "id": "libvirt-40",
+ "id": "libvirt-36",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -4831,7 +4831,7 @@
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -5030,12 +5030,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -5549,12 +5549,12 @@
"migration-safe": true
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5562,12 +5562,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5575,12 +5575,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -6867,12 +6867,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -6934,12 +6934,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -18307,7 +18307,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -18318,7 +18318,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -18508,7 +18508,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -18700,7 +18700,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -18955,7 +18955,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -18969,7 +18969,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19159,7 +19159,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19351,7 +19351,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
@@ -19606,12 +19606,12 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-52"
+ "id": "libvirt-48"
}
{
@@ -19621,7 +19621,7 @@
"cert-chain":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-52"
+ "id": "libvirt-48"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 16861727cf..76e3bd79e7 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -208,7 +208,7 @@
<flag name='vfio-pci.display'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>415790</microcodeVersion>
+ <microcodeVersion>413556</microcodeVersion>
<package>v2.12.0-rc0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 29999f8227..ee248e38aa 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -2010,7 +2010,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2066,7 +2066,7 @@
"type": "str"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2074,7 +2074,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2169,7 +2169,7 @@
"type": "str"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2177,7 +2177,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2234,7 +2234,7 @@
"type": "str"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2242,7 +2242,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2295,7 +2295,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2303,7 +2303,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -2344,7 +2344,7 @@
"type": "str"
}
],
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -2352,7 +2352,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2390,7 +2390,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2398,7 +2398,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2452,7 +2452,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2460,7 +2460,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2520,7 +2520,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2528,7 +2528,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2542,7 +2542,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2550,7 +2550,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2597,7 +2597,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2605,7 +2605,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2638,7 +2638,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2646,7 +2646,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2723,7 +2723,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2731,7 +2731,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2812,7 +2812,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2820,7 +2820,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2850,7 +2850,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2858,7 +2858,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -2935,7 +2935,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -2943,7 +2943,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3028,7 +3028,7 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3036,11 +3036,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-35",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3052,7 +3052,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3091,7 +3091,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3099,7 +3099,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3169,7 +3169,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3177,7 +3177,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3187,7 +3187,7 @@
"type": "uint32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3195,7 +3195,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3221,12 +3221,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3355,12 +3355,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3450,36 +3450,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -4487,12 +4487,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -4522,7 +4522,7 @@
"capability": "events"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 7759fe9f99..d8d2b7939f 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -150,7 +150,7 @@
<flag name='mch'/>
<version>2004000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>80139</microcodeVersion>
+ <microcodeVersion>77219</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 1162c2d36c..6065200d39 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -2079,7 +2079,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2163,7 +2163,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2171,7 +2171,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2266,7 +2266,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2274,7 +2274,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2331,7 +2331,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2339,7 +2339,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2392,7 +2392,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2400,7 +2400,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2441,7 +2441,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2449,7 +2449,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2487,7 +2487,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2495,7 +2495,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2549,7 +2549,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2557,7 +2557,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2617,7 +2617,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2625,7 +2625,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2639,7 +2639,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2647,7 +2647,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2694,7 +2694,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2702,7 +2702,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2735,7 +2735,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2743,7 +2743,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2820,7 +2820,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2828,7 +2828,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2934,7 +2934,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2942,7 +2942,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2982,7 +2982,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2990,7 +2990,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3067,7 +3067,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3075,7 +3075,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3175,7 +3175,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3183,11 +3183,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3199,7 +3199,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3238,7 +3238,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3246,7 +3246,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3316,7 +3316,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3324,7 +3324,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3334,7 +3334,7 @@
"type": "uint32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3342,7 +3342,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3368,12 +3368,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3510,12 +3510,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3605,36 +3605,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -4679,12 +4679,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -4718,12 +4718,12 @@
"capability": "x-postcopy-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -12268,7 +12268,7 @@
"meta-type": "array"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index d9c352ca17..698ea77af6 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -156,7 +156,7 @@
<flag name='mch'/>
<version>2005000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>221107</microcodeVersion>
+ <microcodeVersion>218187</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 15a54756dc..2bf4b91e47 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -2838,7 +2838,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2926,7 +2926,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2934,7 +2934,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3029,7 +3029,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3037,7 +3037,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3094,7 +3094,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3102,11 +3102,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -3118,11 +3118,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3134,11 +3134,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3150,7 +3150,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3210,7 +3210,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3218,11 +3218,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3234,7 +3234,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3281,7 +3281,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3289,7 +3289,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3385,7 +3385,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3393,7 +3393,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3423,7 +3423,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3431,11 +3431,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3447,7 +3447,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3547,7 +3547,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3555,11 +3555,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3571,7 +3571,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3610,7 +3610,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3618,7 +3618,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3688,12 +3688,12 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3868,12 +3868,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3972,34 +3972,34 @@
"name": "pxa270"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4971,12 +4971,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -5010,12 +5010,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -13020,12 +13020,12 @@
"meta-type": "array"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -13041,7 +13041,7 @@
"kernel": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 283a290799..4ca53ff85d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -140,7 +140,7 @@
<flag name='hda-output'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>231952</microcodeVersion>
+ <microcodeVersion>229858</microcodeVersion>
<package></package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index 82fe8fe01e..99af9c8a46 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -2988,7 +2988,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3076,7 +3076,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3084,7 +3084,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3179,7 +3179,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3187,7 +3187,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3244,7 +3244,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3252,11 +3252,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -3268,11 +3268,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3284,11 +3284,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3300,7 +3300,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3360,7 +3360,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3368,11 +3368,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3384,7 +3384,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3431,7 +3431,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3439,7 +3439,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3535,7 +3535,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3543,7 +3543,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3573,7 +3573,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3581,11 +3581,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3597,7 +3597,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3697,7 +3697,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3705,11 +3705,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3721,7 +3721,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3760,7 +3760,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3768,7 +3768,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3838,7 +3838,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3846,7 +3846,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3892,12 +3892,12 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3969,12 +3969,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5276,34 +5276,34 @@
"name": "MPC8541E_v11"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -6270,12 +6270,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -6309,12 +6309,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -14319,7 +14319,7 @@
"meta-type": "array"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index c78fa35834..f2c1e2c5b8 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -135,7 +135,7 @@
<flag name='hda-output'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>266778</microcodeVersion>
+ <microcodeVersion>264684</microcodeVersion>
<package></package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index e1d1cac40a..428903d17d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -2157,7 +2157,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2245,7 +2245,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2253,7 +2253,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2348,7 +2348,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2356,7 +2356,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2413,7 +2413,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2421,7 +2421,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2474,7 +2474,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2482,7 +2482,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2523,7 +2523,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2531,7 +2531,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2569,7 +2569,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2577,7 +2577,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2631,7 +2631,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2639,7 +2639,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2699,7 +2699,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2707,7 +2707,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2721,7 +2721,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2729,7 +2729,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2776,7 +2776,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2784,7 +2784,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2817,7 +2817,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2825,7 +2825,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2902,7 +2902,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2910,7 +2910,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3016,7 +3016,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3024,7 +3024,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3064,7 +3064,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3072,7 +3072,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3149,7 +3149,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3157,7 +3157,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3257,7 +3257,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3265,11 +3265,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3281,7 +3281,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3320,7 +3320,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3328,7 +3328,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3398,7 +3398,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3406,7 +3406,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3416,7 +3416,7 @@
"type": "uint32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3424,7 +3424,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3450,12 +3450,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3568,12 +3568,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3663,36 +3663,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -4786,12 +4786,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -4825,12 +4825,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -12835,7 +12835,7 @@
"meta-type": "array"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 9af99e6244..6ff4e10169 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -168,7 +168,7 @@
<flag name='mch'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>231911</microcodeVersion>
+ <microcodeVersion>228991</microcodeVersion>
<package></package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 8968ea747c..38d1fa6e52 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -1971,7 +1971,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2073,7 +2073,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2081,7 +2081,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2191,7 +2191,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2199,11 +2199,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2215,11 +2215,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -2231,11 +2231,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2247,11 +2247,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -2263,11 +2263,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -2279,7 +2279,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2379,7 +2379,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2387,7 +2387,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2417,7 +2417,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2425,11 +2425,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2441,7 +2441,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2545,7 +2545,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2553,7 +2553,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2610,7 +2610,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2618,7 +2618,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2657,7 +2657,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2665,7 +2665,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2675,12 +2675,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -2713,12 +2713,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2727,34 +2727,34 @@
"name": "host"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3690,12 +3690,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3729,12 +3729,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -12090,7 +12090,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index ad60b5b6d2..bb8849f55c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -105,7 +105,7 @@
<flag name='sdl-gl'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>220386</microcodeVersion>
+ <microcodeVersion>219140</microcodeVersion>
<package></package>
<arch>s390x</arch>
<cpu type='kvm' name='host'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index 58f5b055ef..c764174320 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -2212,7 +2212,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2314,7 +2314,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2322,7 +2322,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2432,7 +2432,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2440,7 +2440,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2512,7 +2512,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2520,7 +2520,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2578,7 +2578,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2586,7 +2586,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2635,7 +2635,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2643,7 +2643,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2681,7 +2681,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2689,7 +2689,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2767,7 +2767,7 @@
"type": "int"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2775,7 +2775,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2844,7 +2844,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2852,7 +2852,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2866,7 +2866,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2874,7 +2874,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2926,7 +2926,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2934,7 +2934,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2972,7 +2972,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2980,7 +2980,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3062,7 +3062,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3070,7 +3070,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3180,7 +3180,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3188,7 +3188,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3228,7 +3228,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3236,7 +3236,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3322,7 +3322,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3330,7 +3330,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3434,7 +3434,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3442,11 +3442,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3458,7 +3458,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3497,7 +3497,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3505,7 +3505,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3580,7 +3580,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3588,7 +3588,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3602,7 +3602,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3610,7 +3610,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3636,12 +3636,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3790,12 +3790,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3888,36 +3888,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5015,12 +5015,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5054,12 +5054,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -13415,7 +13415,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 164639c6e7..40b07a58f0 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -173,7 +173,7 @@
<flag name='mch'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>243599</microcodeVersion>
+ <microcodeVersion>240497</microcodeVersion>
<package> (v2.7.0)</package>
<arch>x86_64</arch>
<cpu type='kvm' name='Opteron_G5'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 6e06a1a484..1836b6bfc9 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -2234,7 +2234,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2336,7 +2336,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2344,7 +2344,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2454,7 +2454,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2462,11 +2462,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2478,11 +2478,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -2494,11 +2494,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2510,11 +2510,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -2526,11 +2526,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -2542,7 +2542,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2647,7 +2647,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2655,7 +2655,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2685,7 +2685,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2693,11 +2693,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2709,7 +2709,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2818,7 +2818,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2826,7 +2826,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2883,7 +2883,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2891,7 +2891,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2930,7 +2930,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2938,7 +2938,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2948,12 +2948,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -2991,12 +2991,12 @@
"alias": "s390-ccw-virtio"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3322,34 +3322,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4310,12 +4310,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4353,12 +4353,12 @@
"capability": "x-colo"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -13128,7 +13128,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -13139,7 +13139,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -13165,7 +13165,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -13179,11 +13179,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-37",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 5cd2cd8552..5c655caff3 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -108,7 +108,7 @@
<flag name='vhost-vsock'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>245800</microcodeVersion>
+ <microcodeVersion>244554</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='zEC12.2-base'
migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index 98b0cc3bb2..33db454cb4 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -2327,7 +2327,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2429,7 +2429,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2437,7 +2437,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2547,7 +2547,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2555,7 +2555,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2627,7 +2627,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2635,7 +2635,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2693,7 +2693,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2701,7 +2701,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2750,7 +2750,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2758,7 +2758,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2796,7 +2796,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2804,7 +2804,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2882,7 +2882,7 @@
"type": "int"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2890,7 +2890,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2959,7 +2959,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2967,7 +2967,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2981,7 +2981,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2989,7 +2989,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3041,7 +3041,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3049,7 +3049,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3087,7 +3087,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3095,7 +3095,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3177,7 +3177,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3185,7 +3185,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3304,7 +3304,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3312,7 +3312,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3352,7 +3352,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3360,7 +3360,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3446,7 +3446,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3454,7 +3454,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3567,7 +3567,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3575,11 +3575,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3591,7 +3591,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3630,7 +3630,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3638,7 +3638,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3713,7 +3713,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3721,7 +3721,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3744,7 +3744,7 @@
"type": "uint32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3752,7 +3752,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3778,12 +3778,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3952,12 +3952,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -4163,36 +4163,36 @@
"static": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5315,12 +5315,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5358,12 +5358,12 @@
"capability": "x-colo"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -14133,7 +14133,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index f11af45f57..f316ab7fbd 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -176,7 +176,7 @@
<flag name='mch'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>260254</microcodeVersion>
+ <microcodeVersion>257152</microcodeVersion>
<package> (v2.8.0)</package>
<arch>x86_64</arch>
<cpu type='kvm' name='host' usable='yes'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index 47d4c9ca6b..c92663e299 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -3313,7 +3313,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3420,7 +3420,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3428,7 +3428,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3542,7 +3542,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3550,7 +3550,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3626,7 +3626,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3634,11 +3634,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -3650,11 +3650,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3666,11 +3666,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3682,7 +3682,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3755,7 +3755,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3763,11 +3763,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3779,7 +3779,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3836,7 +3836,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3844,7 +3844,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3987,7 +3987,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3995,7 +3995,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4034,7 +4034,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4042,11 +4042,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -4058,7 +4058,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4201,7 +4201,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4209,11 +4209,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4225,7 +4225,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4269,7 +4269,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4277,7 +4277,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4357,7 +4357,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4365,7 +4365,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -4451,12 +4451,12 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4569,12 +4569,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -6750,34 +6750,34 @@
"static": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -7887,12 +7887,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -7934,12 +7934,12 @@
"capability": "release-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -17225,7 +17225,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 6089f96f72..af7a11504b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -147,7 +147,7 @@
<flag name='vhost-vsock'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>350302</microcodeVersion>
+ <microcodeVersion>349056</microcodeVersion>
<package> (v2.9.0)</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index cfa099dc10..891cd0180b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -2415,7 +2415,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2522,7 +2522,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2530,7 +2530,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2644,7 +2644,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2652,11 +2652,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2668,11 +2668,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -2684,11 +2684,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2700,11 +2700,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -2716,11 +2716,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -2732,7 +2732,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2875,7 +2875,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2883,7 +2883,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2922,7 +2922,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2930,11 +2930,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2946,7 +2946,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3089,7 +3089,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3097,7 +3097,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3159,7 +3159,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3167,7 +3167,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3211,7 +3211,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3219,7 +3219,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3229,12 +3229,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3277,12 +3277,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3672,34 +3672,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4774,12 +4774,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4821,12 +4821,12 @@
"capability": "release-ram"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -14112,7 +14112,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -14123,7 +14123,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -14150,7 +14150,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -14164,11 +14164,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-37",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index a5a8d2d551..1e44c1952c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -112,7 +112,7 @@
<flag name='vhost-vsock'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>269219</microcodeVersion>
+ <microcodeVersion>267973</microcodeVersion>
<package></package>
<arch>s390x</arch>
<hostCPU type='kvm' model='z13.2-base'
migratability='no'>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index a6ce25bdcb..1057028505 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -2503,7 +2503,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2610,7 +2610,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2618,7 +2618,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2732,7 +2732,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2740,7 +2740,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2816,7 +2816,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2824,7 +2824,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2887,7 +2887,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2895,7 +2895,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2944,7 +2944,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2952,7 +2952,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2990,7 +2990,7 @@
"type": "child<qemu:memory-region>"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2998,7 +2998,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3076,7 +3076,7 @@
"type": "int"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3084,7 +3084,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3157,7 +3157,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3165,7 +3165,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3179,7 +3179,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3187,7 +3187,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3244,7 +3244,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3252,7 +3252,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3295,7 +3295,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3303,7 +3303,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3390,7 +3390,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3398,7 +3398,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3551,7 +3551,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3559,7 +3559,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3608,7 +3608,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3616,7 +3616,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3712,7 +3712,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3720,7 +3720,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3863,7 +3863,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3871,11 +3871,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3887,7 +3887,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3931,7 +3931,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3939,7 +3939,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4019,7 +4019,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4027,7 +4027,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4058,7 +4058,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4066,7 +4066,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4092,12 +4092,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4276,12 +4276,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -4563,36 +4563,36 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5841,12 +5841,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5888,12 +5888,12 @@
"capability": "release-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -15179,7 +15179,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -15190,7 +15190,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -15369,7 +15369,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -15550,7 +15550,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -15791,7 +15791,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -15805,7 +15805,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -15984,7 +15984,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -16165,7 +16165,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -16406,7 +16406,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index b1bf8c57e2..96f21561bd 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -191,7 +191,7 @@
<flag name='mch'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>343578</microcodeVersion>
+ <microcodeVersion>340375</microcodeVersion>
<package> (v2.9.0)</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 9b8acd0c24..eb57c77a90 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -4320,7 +4320,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4454,7 +4454,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4462,7 +4462,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4580,7 +4580,7 @@
"type": "uint32"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4588,7 +4588,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4664,7 +4664,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4672,11 +4672,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -4688,11 +4688,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4704,11 +4704,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4720,7 +4720,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4793,7 +4793,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4801,11 +4801,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4817,7 +4817,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4874,7 +4874,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4882,7 +4882,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5033,7 +5033,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5041,7 +5041,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5088,7 +5088,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5096,11 +5096,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -5112,7 +5112,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5255,7 +5255,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5263,11 +5263,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5279,7 +5279,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5323,7 +5323,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5331,7 +5331,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5411,7 +5411,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5419,7 +5419,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5477,7 +5477,7 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5485,7 +5485,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5535,7 +5535,7 @@
"type": "string"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5543,7 +5543,7 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5714,12 +5714,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -5862,12 +5862,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -8063,35 +8063,35 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -9221,12 +9221,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -9296,12 +9296,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -21460,7 +21460,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 9a0281e3c6..7c674ffb9c 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -165,7 +165,7 @@
<flag name='vfio-pci.display'/>
<version>2012050</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>446365</microcodeVersion>
+ <microcodeVersion>444131</microcodeVersion>
<package>v2.12.0-1689-g518d23a</package>
<arch>ppc64</arch>
<cpu type='kvm' name='default'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index 864ec55ad3..3e8d136a32 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1301,7 +1301,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1419,7 +1419,7 @@
"type": "uint32"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1427,11 +1427,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -1443,11 +1443,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -1459,11 +1459,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-21"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -1475,11 +1475,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -1491,11 +1491,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -1507,11 +1507,11 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-gpu-pci' not found"
@@ -1523,7 +1523,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1570,7 +1570,7 @@
"type": "size"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1578,11 +1578,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -1594,11 +1594,11 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-pci' not found"
@@ -1610,11 +1610,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -1626,7 +1626,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1670,7 +1670,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1678,7 +1678,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1728,7 +1728,7 @@
"type": "string"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1736,11 +1736,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -1749,7 +1749,7 @@
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -1786,23 +1786,23 @@
"cpu-max": 1
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"return": [
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -1810,12 +1810,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2940,12 +2940,12 @@
"option": "drive"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3015,12 +3015,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -14695,5 +14695,5 @@
"meta-type": "object"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index 65ebb8e27f..3631193566 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1301,7 +1301,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1419,7 +1419,7 @@
"type": "uint32"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1427,11 +1427,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -1443,11 +1443,11 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
@@ -1459,11 +1459,11 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-21"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -1475,11 +1475,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -1491,11 +1491,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -1507,11 +1507,11 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-gpu-pci' not found"
@@ -1523,7 +1523,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1570,7 +1570,7 @@
"type": "size"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1578,11 +1578,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -1594,11 +1594,11 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-pci' not found"
@@ -1610,11 +1610,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -1626,7 +1626,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1670,7 +1670,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1678,7 +1678,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1728,7 +1728,7 @@
"type": "string"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1736,11 +1736,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -1749,7 +1749,7 @@
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -1786,23 +1786,23 @@
"cpu-max": 1
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"return": [
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -1810,12 +1810,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2940,12 +2940,12 @@
"option": "drive"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3015,12 +3015,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -14695,5 +14695,5 @@
"meta-type": "object"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 6087089962..17edb990e1 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -3165,7 +3165,7 @@
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3299,7 +3299,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3307,7 +3307,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3425,7 +3425,7 @@
"type": "uint32"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3433,7 +3433,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3509,7 +3509,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3517,7 +3517,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3580,7 +3580,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3588,7 +3588,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3637,7 +3637,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3645,7 +3645,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3687,7 +3687,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3695,7 +3695,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3777,7 +3777,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3785,7 +3785,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3868,7 +3868,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3876,7 +3876,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3890,7 +3890,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3898,7 +3898,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3959,7 +3959,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3967,7 +3967,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4014,7 +4014,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4022,7 +4022,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4121,7 +4121,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4129,7 +4129,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4290,7 +4290,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4298,7 +4298,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4355,7 +4355,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4363,7 +4363,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4459,7 +4459,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4467,7 +4467,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4610,7 +4610,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4618,11 +4618,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4634,7 +4634,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4678,7 +4678,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4686,7 +4686,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4766,7 +4766,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4774,7 +4774,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4813,7 +4813,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4821,7 +4821,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4864,7 +4864,7 @@
"type": "int32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4872,7 +4872,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4922,7 +4922,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4930,11 +4930,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
- "id": "libvirt-40",
+ "id": "libvirt-36",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -4943,7 +4943,7 @@
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -5152,12 +5152,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -5594,12 +5594,12 @@
"migration-safe": true
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5607,12 +5607,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5620,12 +5620,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -6924,12 +6924,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -6999,12 +6999,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -18884,7 +18884,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -18895,7 +18895,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -19088,7 +19088,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -19283,7 +19283,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -19546,7 +19546,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -19560,7 +19560,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19753,7 +19753,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19948,7 +19948,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
@@ -20211,16 +20211,16 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-52"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-52",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index eeb0941f27..1a2d1b6a53 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -210,7 +210,7 @@
<flag name='vfio-pci.display'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>427391</microcodeVersion>
+ <microcodeVersion>425157</microcodeVersion>
<package>v3.0.0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
--
2.16.4
2268
days inactive
2268
days old
17 comments
2 participants
participants (2)
-
Andrea Bolognani -
Ján Tomko