10:59 a.m.
Applies on top of Peter's QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY series
Ján Tomko (12):
qemu: assume QEMU_CAPS_CHARDEV_FILE_APPEND
qemu: retire QEMU_CAPS_CHARDEV_FILE_APPEND
qemu: assume QEMU_CAPS_CHARDEV_LOGFILE
qemu: retire QEMU_CAPS_CHARDEV_LOGFILE
qemu: assume QEMU_CAPS_NEC_USB_XHCI_PORTS
qemu: retire QEMU_CAPS_NEC_USB_XHCI_PORTS
qemu: assume QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
qemu: retire QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
qemu: assume QEMU_CAPS_VIRTIO_PACKED_QUEUES
qemu: retire QEMU_CAPS_VIRTIO_PACKED_QUEUES
qemu: remove qemuValidateDomainVirtioOptions
qemu: do not probe for properties of nec-usb-xhci
src/qemu/qemu_capabilities.c | 25 +--
src/qemu/qemu_capabilities.h | 10 +-
src/qemu/qemu_command.c | 3 +-
src/qemu/qemu_process.c | 21 +-
src/qemu/qemu_validate.c | 80 +------
.../caps_4.2.0.aarch64.replies | 156 +++-----------
.../caps_4.2.0.aarch64.xml | 5 -
.../caps_4.2.0.ppc64.replies | 140 +++---------
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 4 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 4 -
.../caps_4.2.0.x86_64.replies | 168 ++++-----------
.../caps_4.2.0.x86_64.xml | 5 -
.../caps_5.0.0.aarch64.replies | 169 +++------------
.../caps_5.0.0.aarch64.xml | 5 -
.../caps_5.0.0.ppc64.replies | 165 +++-----------
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 5 -
.../caps_5.0.0.riscv64.replies | 153 +++----------
.../caps_5.0.0.riscv64.xml | 5 -
.../caps_5.0.0.x86_64.replies | 181 ++++------------
.../caps_5.0.0.x86_64.xml | 5 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 -
.../caps_5.1.0.x86_64.replies | 185 ++++------------
.../caps_5.1.0.x86_64.xml | 5 -
.../caps_5.2.0.aarch64.replies | 181 ++++------------
.../caps_5.2.0.aarch64.xml | 5 -
.../caps_5.2.0.ppc64.replies | 173 +++------------
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 5 -
.../caps_5.2.0.riscv64.replies | 161 +++-----------
.../caps_5.2.0.riscv64.xml | 5 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 4 -
.../caps_5.2.0.x86_64.replies | 193 ++++-------------
.../caps_5.2.0.x86_64.xml | 5 -
.../caps_6.0.0.aarch64.replies | 191 ++++------------
.../caps_6.0.0.aarch64.xml | 5 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 4 -
.../caps_6.0.0.x86_64.replies | 203 ++++--------------
.../caps_6.0.0.x86_64.xml | 5 -
.../caps_6.1.0.x86_64.replies | 203 ++++--------------
.../caps_6.1.0.x86_64.xml | 5 -
.../caps_6.2.0.aarch64.replies | 191 ++++------------
.../caps_6.2.0.aarch64.xml | 5 -
.../caps_6.2.0.ppc64.replies | 183 +++-------------
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 5 -
.../caps_6.2.0.x86_64.replies | 203 ++++--------------
.../caps_6.2.0.x86_64.xml | 5 -
.../caps_7.0.0.aarch64.replies | 195 ++++-------------
.../caps_7.0.0.aarch64.xml | 5 -
.../caps_7.0.0.ppc64.replies | 183 +++-------------
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 5 -
.../caps_7.0.0.x86_64.replies | 203 ++++--------------
.../caps_7.0.0.x86_64.xml | 5 -
.../caps_7.1.0.x86_64.replies | 203 ++++--------------
.../caps_7.1.0.x86_64.xml | 5 -
.../virtio-options-controller-packed.err | 1 -
.../virtio-options-disk-packed.err | 1 -
.../virtio-options-fs-packed.err | 1 -
.../virtio-options-input-packed.err | 1 -
.../virtio-options-memballoon-packed.err | 1 -
.../virtio-options-net-packed.err | 1 -
.../virtio-options-rng-packed.err | 1 -
.../virtio-options-video-packed.err | 1 -
tests/qemuxml2argvtest.c | 28 +--
tests/qemuxml2xmltest.c | 1 -
63 files changed, 811 insertions(+), 3471 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.err
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 01/12] qemu: assume QEMU_CAPS_CHARDEV_FILE_APPEND
Introduced in QEMU 2.6
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_process.c | 5 +----
src/qemu/qemu_validate.c | 10 +---------
tests/qemuxml2argvtest.c | 4 +---
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 32f03ff79a..aaf51e019a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6571,10 +6571,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver,
/* Whether we should use virtlogd as stdio handler for character
* devices source backend. */
- if (cfg->stdioLogD &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) {
- priv->chardevStdioLogd = true;
- }
+ priv->chardevStdioLogd = cfg->stdioLogD;
/* Track if this domain remembers original owner */
priv->rememberOwner = cfg->rememberOwner;
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 6403266559..245b953c86 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2194,15 +2194,6 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
return -1;
break;
- case VIR_DOMAIN_CHR_TYPE_FILE:
- if (def->data.file.append != VIR_TRISTATE_SWITCH_ABSENT &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("append not supported in this QEMU binary"));
- return -1;
- }
- break;
-
case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_QEMU_VDAGENT)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -2226,6 +2217,7 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
case VIR_DOMAIN_CHR_TYPE_VC:
case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV:
+ case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_STDIO:
case VIR_DOMAIN_CHR_TYPE_UDP:
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 303292c788..bedd190cb1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1579,7 +1579,6 @@ mymain(void)
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("serial-file-log",
- QEMU_CAPS_CHARDEV_FILE_APPEND,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_LOGFILE);
DO_TEST("serial-spiceport",
@@ -1601,8 +1600,7 @@ mymain(void)
DO_TEST("serial-dev-chardev-iobase",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-file-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_CHARDEV_FILE_APPEND);
+ QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-unix-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-file-log");
--
2.37.1
9:54 a.m.
New subject: [libvirt PATCH 01/12] qemu: assume QEMU_CAPS_CHARDEV_FILE_APPEND
On Thu, Aug 25, 2022 at 17:59:24 +0200, Ján Tomko wrote:
Introduced in QEMU 2.6
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_process.c | 5 +----
src/qemu/qemu_validate.c | 10 +---------
tests/qemuxml2argvtest.c | 4 +---
3 files changed, 3 insertions(+), 16 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
10:59 a.m.
New subject: [libvirt PATCH 02/12] qemu: retire QEMU_CAPS_CHARDEV_FILE_APPEND
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
28 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 71018b4f6b..496ea50a6d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -353,7 +353,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"virtio-input-host", /* QEMU_CAPS_VIRTIO_INPUT_HOST */
/* 205 */
- "chardev-file-append", /* QEMU_CAPS_CHARDEV_FILE_APPEND */
+ "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */
"ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */
"ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */
"vserport-change-event", /* QEMU_CAPS_VSERPORT_CHANGE */
@@ -1577,7 +1577,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =
{
{ "blockdev-snapshot/$allow-write-only-overlay",
QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
{ "chardev-add/arg-type/backend/+socket/data/reconnect",
QEMU_CAPS_CHARDEV_RECONNECT },
{ "chardev-add/arg-type/backend/+file/data/logfile",
QEMU_CAPS_CHARDEV_LOGFILE },
- { "chardev-add/arg-type/backend/+file/data/logappend",
QEMU_CAPS_CHARDEV_FILE_APPEND },
{ "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
{ "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform",
QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
{ "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 382c357a78..d855e2ee22 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -331,7 +331,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_VIRTIO_INPUT_HOST, /* -device virtio-input-host-{device,pci} */
/* 205 */
- QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */
+ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */
QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */
QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */
QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index b9863720e8..94e6ba18c8 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -69,7 +69,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index e390a9c0c9..1165c94978 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -65,7 +65,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 7f26f79343..280c9fd71f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -38,7 +38,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index c5a7a7e9dc..95742efbca 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -83,7 +83,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index f42e1164bb..a77488b933 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -71,7 +71,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index cba6dd436a..4bbfda001f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -66,7 +66,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index ec74c80bc4..8633a18946 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -70,7 +70,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index a8706a1b65..085b12a73d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -83,7 +83,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index dabf2f505f..a012488a26 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -21,7 +21,6 @@
<flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='spice-gl'/>
<flag name='chardev-logfile'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index becfb1788d..323e11d079 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -83,7 +83,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index bb0653723f..b27a2688ce 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -70,7 +70,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 0cb79570ea..150dbc451e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -65,7 +65,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index b7ad59760e..9bbc1f8755 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -69,7 +69,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index ab47d468a2..a7c8d2df0c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -37,7 +37,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4ef0efdcd0..236206e146 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -83,7 +83,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 70f09c4ccb..8c18d7e368 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -69,7 +69,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 660ce1b9d8..50dd02ae53 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -37,7 +37,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index f2fd699bfc..924fcf0299 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -82,7 +82,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index e5cb039901..9376cd9396 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 0067b7ba8b..298088c654 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 57e526e38b..89a0bbed18 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -65,7 +65,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 3b2fd0eac8..5afa8fd330 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 2b4deea5f1..e309018311 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 20754737f5..c4d98ab016 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -71,7 +71,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index f168ec4e6b..7059ea0538 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index a0d2698dfe..002088f035 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='chardev-file-append'/>
<flag name='ich9-disable-s3'/>
<flag name='ich9-disable-s4'/>
<flag name='vserport-change-event'/>
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 03/12] qemu: assume QEMU_CAPS_CHARDEV_LOGFILE
Introduced in QEMU 2.6
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_validate.c | 8 --------
tests/qemuxml2argvtest.c | 4 +---
tests/qemuxml2xmltest.c | 1 -
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 245b953c86..bf7228e3ea 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2227,14 +2227,6 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
break;
}
- if (def->logfile) {
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_LOGFILE)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("logfile not supported in this QEMU binary"));
- return -1;
- }
- }
-
return 0;
}
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bedd190cb1..51434ab857 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1579,8 +1579,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("serial-file-log",
- QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_CHARDEV_LOGFILE);
+ QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-spiceport",
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_SPICE,
@@ -2827,7 +2826,6 @@ mymain(void)
QEMU_CAPS_KVM);
DO_TEST("aarch64-pci-serial",
QEMU_CAPS_DEVICE_PCI_SERIAL,
- QEMU_CAPS_CHARDEV_LOGFILE,
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0507b70825..85a57be87a 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -991,7 +991,6 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("aarch64-pci-serial",
QEMU_CAPS_DEVICE_PCI_SERIAL,
- QEMU_CAPS_CHARDEV_LOGFILE,
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 04/12] qemu: retire QEMU_CAPS_CHARDEV_LOGFILE
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
28 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 496ea50a6d..20cea852e0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -364,7 +364,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"spice-gl", /* QEMU_CAPS_SPICE_GL */
"qxl.vram64_size_mb", /* QEMU_CAPS_QXL_VRAM64 */
"qxl-vga.vram64_size_mb", /* X_QEMU_CAPS_QXL_VGA_VRAM64 */
- "chardev-logfile", /* QEMU_CAPS_CHARDEV_LOGFILE */
+ "chardev-logfile", /* X_QEMU_CAPS_CHARDEV_LOGFILE */
/* 215 */
"debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */
@@ -1576,7 +1576,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =
{
{ "blockdev-add/arg-type/+nbd/tls-hostname",
QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME },
{ "blockdev-snapshot/$allow-write-only-overlay",
QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
{ "chardev-add/arg-type/backend/+socket/data/reconnect",
QEMU_CAPS_CHARDEV_RECONNECT },
- { "chardev-add/arg-type/backend/+file/data/logfile",
QEMU_CAPS_CHARDEV_LOGFILE },
{ "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
{ "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform",
QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
{ "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d855e2ee22..7ae30a711a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -343,7 +343,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_SPICE_GL, /* -spice gl */
QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
X_QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
- QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
+ X_QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
/* 215 */
X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 94e6ba18c8..e6ae488dfd 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -72,7 +72,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 1165c94978..a9ec45c769 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 280c9fd71f..7b7e643af9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -40,7 +40,6 @@
<flag name='virtio-input-host'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
- <flag name='chardev-logfile'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 95742efbca..8d63da1712 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index a77488b933..0ec294d060 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 4bbfda001f..9bf376ec22 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -69,7 +69,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 8633a18946..41e7a0c045 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -74,7 +74,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 085b12a73d..8ebea40fe7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index a012488a26..399d37218b 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -23,7 +23,6 @@
<flag name='migrate-rdma'/>
<flag name='vserport-change-event'/>
<flag name='spice-gl'/>
- <flag name='chardev-logfile'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='spice-rendernode'/>
<flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 323e11d079..a415a4dd36 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index b27a2688ce..fdf09432a3 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -73,7 +73,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 150dbc451e..950161e92f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 9bbc1f8755..f5805a1e3f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -73,7 +73,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index a7c8d2df0c..cf83839102 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -39,7 +39,6 @@
<flag name='virtio-input-host'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
- <flag name='chardev-logfile'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 236206e146..24c00ddae6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 8c18d7e368..a3f6196d26 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -72,7 +72,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 50dd02ae53..c9389af189 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -39,7 +39,6 @@
<flag name='virtio-input-host'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
- <flag name='chardev-logfile'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 924fcf0299..24affe0c7c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -89,7 +89,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 9376cd9396..459d064391 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -88,7 +88,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 298088c654..28205f03aa 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -78,7 +78,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 89a0bbed18..8a59a92ed7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 5afa8fd330..85ddd25b6c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -88,7 +88,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index e309018311..f4a0a39e4f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -78,7 +78,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index c4d98ab016..e435624f0e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -74,7 +74,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='chardev-logfile'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7059ea0538..61c4780950 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -88,7 +88,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 002088f035..9f30431c92 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -88,7 +88,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
- <flag name='chardev-logfile'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 05/12] qemu: assume QEMU_CAPS_NEC_USB_XHCI_PORTS
Introduced by QEMU commit 91062ae00fd4a88a40c28288e8ac7fe50ee83adf
released in QEMU 1.3.0
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_command.c | 3 +--
tests/qemuxml2argvtest.c | 7 ++-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 089d0493d9..4d9458702a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2493,8 +2493,7 @@ qemuValidateDomainDeviceDefControllerUSB(const
virDomainControllerDef *def,
}
if (def->opts.usbopts.ports != -1) {
- if ((def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI ||
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI_PORTS)) &&
+ if (def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI &&
def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("usb controller type '%s' doesn't support
'ports' with this QEMU binary"),
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 51434ab857..facbda9d02 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1799,17 +1799,14 @@ mymain(void)
QEMU_CAPS_PIIX3_USB_UHCI);
DO_TEST("usb-controller-xhci",
QEMU_CAPS_PIIX3_USB_UHCI,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_NEC_USB_XHCI_PORTS);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-xhci-autoassign",
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_NEC_USB_XHCI_PORTS,
QEMU_CAPS_USB_HUB);
DO_TEST_PARSE_ERROR("usb-controller-xhci-limit",
QEMU_CAPS_PIIX3_USB_UHCI,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_NEC_USB_XHCI_PORTS);
+ QEMU_CAPS_NEC_USB_XHCI);
DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI);
DO_TEST_FAILURE_NOCAPS("usb-controller-qemu-xhci-unavailable");
DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
--
2.37.1
9:58 a.m.
New subject: [libvirt PATCH 05/12] qemu: assume QEMU_CAPS_NEC_USB_XHCI_PORTS
On Thu, Aug 25, 2022 at 17:59:28 +0200, Ján Tomko wrote:
Introduced by QEMU commit 91062ae00fd4a88a40c28288e8ac7fe50ee83adf
released in QEMU 1.3.0
The release is correct, but the 'p3' property was added by 0846e6359c4.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_command.c | 3 +--
tests/qemuxml2argvtest.c | 7 ++-----
2 files changed, 3 insertions(+), 7 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
10:59 a.m.
New subject: [libvirt PATCH 06/12] qemu: retire QEMU_CAPS_NEC_USB_XHCI_PORTS
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
24 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 20cea852e0..ffb8a79dbb 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -374,7 +374,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"device-tray-moved-event", /* X_QEMU_CAPS_DEVICE_TRAY_MOVED */
/* 220 */
- "nec-usb-xhci-ports", /* QEMU_CAPS_NEC_USB_XHCI_PORTS */
+ "nec-usb-xhci-ports", /* X_QEMU_CAPS_NEC_USB_XHCI_PORTS */
"virtio-scsi-pci.iothread", /* QEMU_CAPS_VIRTIO_SCSI_IOTHREAD */
"name-guest", /* X_QEMU_CAPS_NAME_GUEST */
"qxl.max_outputs", /* X_QEMU_CAPS_QXL_MAX_OUTPUTS */
@@ -1531,7 +1531,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsICH9[] = {
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBNECXHCI[] = {
- { "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7ae30a711a..300045eb1e 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -353,7 +353,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
X_QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
/* 220 */
- QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
+ X_QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
X_QEMU_CAPS_NAME_GUEST, /* -name guest= */
X_QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index e6ae488dfd..99b16bad21 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -72,7 +72,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index a9ec45c769..e38a7db67b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 8d63da1712..469e09c802 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 0ec294d060..5c98763f52 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 9bf376ec22..cb53369486 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -69,7 +69,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 41e7a0c045..8d88ae0b54 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -74,7 +74,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 8ebea40fe7..c2240ac4f4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a415a4dd36..45f418c452 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index fdf09432a3..22bc2ae43d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -73,7 +73,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 950161e92f..dcce3cf446 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index f5805a1e3f..1a7a9e06f9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -73,7 +73,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 24c00ddae6..ede040432a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index a3f6196d26..ae70c914e4 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='mptsas1068'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 24affe0c7c..92d5957221 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -91,7 +91,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 459d064391..d8e49ad8c2 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 28205f03aa..85e4c3f365 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -80,7 +80,6 @@
<flag name='spice-gl'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 8a59a92ed7..718fd57c71 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 85ddd25b6c..77684cdc24 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index f4a0a39e4f..bf24bc3bcf 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -80,7 +80,6 @@
<flag name='spice-gl'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index e435624f0e..2adaffd9e5 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -74,7 +74,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 61c4780950..005ce9fd7c 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 9f30431c92..954d55ad46 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 07/12] qemu: assume QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
All the supported QEMU versions should have iothread support
on the virtio-scsi controllers if they are compiled in.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_process.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index aaf51e019a..f8ce822dda 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5304,8 +5304,6 @@ static int
qemuProcessStartValidateIOThreads(virDomainObj *vm,
virQEMUCaps *qemuCaps)
{
- size_t i;
-
if (vm->def->niothreadids > 0 &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -5313,20 +5311,6 @@ qemuProcessStartValidateIOThreads(virDomainObj *vm,
return -1;
}
- for (i = 0; i < vm->def->ncontrollers; i++) {
- virDomainControllerDef *cont = vm->def->controllers[i];
-
- if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI &&
- cont->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI &&
- cont->iothread > 0 &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("IOThreads for virtio-scsi not supported for "
- "this QEMU"));
- return -1;
- }
- }
-
return 0;
}
--
2.37.1
10:13 a.m.
New subject: [libvirt PATCH 07/12] qemu: assume QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
On Thu, Aug 25, 2022 at 17:59:30 +0200, Ján Tomko wrote:
All the supported QEMU versions should have iothread support
on the virtio-scsi controllers if they are compiled in.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_process.c | 16 ----------------
1 file changed, 16 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
10:59 a.m.
New subject: [libvirt PATCH 08/12] qemu: retire QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
27 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ffb8a79dbb..b22e44d37a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -375,7 +375,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 220 */
"nec-usb-xhci-ports", /* X_QEMU_CAPS_NEC_USB_XHCI_PORTS */
- "virtio-scsi-pci.iothread", /* QEMU_CAPS_VIRTIO_SCSI_IOTHREAD */
+ "virtio-scsi-pci.iothread", /* X_QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
*/
"name-guest", /* X_QEMU_CAPS_NAME_GUEST */
"qxl.max_outputs", /* X_QEMU_CAPS_QXL_MAX_OUTPUTS */
"qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS */
@@ -1463,7 +1463,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsSpaprPCIHostBrid
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
- { "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
};
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 300045eb1e..75ecdfca64 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -354,7 +354,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 220 */
X_QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
- QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
+ X_QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
X_QEMU_CAPS_NAME_GUEST, /* -name guest= */
X_QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 99b16bad21..2d2713f930 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -72,7 +72,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index e38a7db67b..24a885c279 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 7b7e643af9..551b96bc18 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -40,7 +40,6 @@
<flag name='virtio-input-host'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='vhost-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 469e09c802..9efe16eee4 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 5c98763f52..21b499030e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index cb53369486..61e2b59ac6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -69,7 +69,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 8d88ae0b54..d54f8fb8ea 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -74,7 +74,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index c2240ac4f4..9991af58d0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 45f418c452..513bd19275 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 22bc2ae43d..ca543f0b73 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -73,7 +73,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index dcce3cf446..d33196b504 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 1a7a9e06f9..07016c82fd 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -73,7 +73,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index cf83839102..f98f910730 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -39,7 +39,6 @@
<flag name='virtio-input-host'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='vhost-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index ede040432a..c44c2f1f28 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -92,7 +92,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index ae70c914e4..0905ec26ca 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -74,7 +74,6 @@
<flag name='mptsas1068'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index c9389af189..2f7e478a83 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -39,7 +39,6 @@
<flag name='virtio-input-host'/>
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='vhost-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 92d5957221..72300c9a83 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -91,7 +91,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index d8e49ad8c2..75a482d011 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 85e4c3f365..c53106f390 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -80,7 +80,6 @@
<flag name='spice-gl'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 718fd57c71..a11a5ea5fe 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -68,7 +68,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 77684cdc24..e739ee31ac 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index bf24bc3bcf..68c2d46521 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -80,7 +80,6 @@
<flag name='spice-gl'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 2adaffd9e5..8e438044e6 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -74,7 +74,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 005ce9fd7c..72c8bb7f0b 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 954d55ad46..73b53f3089 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -90,7 +90,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
- <flag name='virtio-scsi-pci.iothread'/>
<flag name='intel-iommu'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 09/12] qemu: assume QEMU_CAPS_VIRTIO_PACKED_QUEUES
Added by QEMU commit:
commit 74b3e46630446568aecb0be1c77c4875d7a52f6d
Author: Jason Wang <jasowang(a)redhat.com>
CommitDate: 2019-10-25 07:46:22 -0400
virtio: add property to enable packed virtqueue
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Eugenio Pérez <eperezma(a)redhat.com>
Reviewed-by: Jens Freimann <jfreimann(a)redhat.com>
Message-Id: <20191025083527.30803-9-eperezma(a)redhat.com>
Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
git describe: v4.1.0-1780-g74b3e46630 contains: v4.2.0-rc0~32^2~17
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_validate.c | 10 +---------
.../virtio-options-controller-packed.err | 1 -
.../qemuxml2argvdata/virtio-options-disk-packed.err | 1 -
tests/qemuxml2argvdata/virtio-options-fs-packed.err | 1 -
.../virtio-options-input-packed.err | 1 -
.../virtio-options-memballoon-packed.err | 1 -
.../qemuxml2argvdata/virtio-options-net-packed.err | 1 -
.../qemuxml2argvdata/virtio-options-rng-packed.err | 1 -
.../virtio-options-video-packed.err | 1 -
tests/qemuxml2argvtest.c | 13 -------------
10 files changed, 1 insertion(+), 30 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.err
delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.err
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index bf7228e3ea..b12a873bc8 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1771,19 +1771,11 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type)
static int
qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio,
- virQEMUCaps *qemuCaps)
+ virQEMUCaps *qemuCaps G_GNUC_UNUSED)
{
if (!virtio)
return 0;
- if (virtio->packed != VIR_TRISTATE_SWITCH_ABSENT &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("the packed setting is not supported with this "
- "QEMU binary"));
- return -1;
- }
-
return 0;
}
diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.err
b/tests/qemuxml2argvdata/virtio-options-controller-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-controller-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.err
b/tests/qemuxml2argvdata/virtio-options-disk-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-disk-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.err
b/tests/qemuxml2argvdata/virtio-options-fs-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-fs-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.err
b/tests/qemuxml2argvdata/virtio-options-input-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-input-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.err
b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.err
b/tests/qemuxml2argvdata/virtio-options-net-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-net-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.err
b/tests/qemuxml2argvdata/virtio-options-rng-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-rng-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.err
b/tests/qemuxml2argvdata/virtio-options-video-packed.err
deleted file mode 100644
index b17ed8d359..0000000000
--- a/tests/qemuxml2argvdata/virtio-options-video-packed.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: the packed setting is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index facbda9d02..27b45f6900 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3092,20 +3092,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-options-net-packed");
DO_TEST_CAPS_LATEST("virtio-options-rng-packed");
DO_TEST_CAPS_LATEST("virtio-options-video-packed");
- DO_TEST_PARSE_ERROR("virtio-options-controller-packed",
QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-packed");
- DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-packed");
- DO_TEST_PARSE_ERROR("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_KEYBOARD);
- DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-packed");
DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporting");
- DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-net-packed");
- DO_TEST_PARSE_ERROR("virtio-options-rng-packed",
QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM);
- DO_TEST_PARSE_ERROR("virtio-options-video-packed",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_DEVICE_VHOST_USER_GPU);
DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
QEMU_CAPS_KVM);
--
2.37.1
10:17 a.m.
New subject: [libvirt PATCH 09/12] qemu: assume QEMU_CAPS_VIRTIO_PACKED_QUEUES
On Thu, Aug 25, 2022 at 17:59:32 +0200, Ján Tomko wrote:
Added by QEMU commit:
commit 74b3e46630446568aecb0be1c77c4875d7a52f6d
Author: Jason Wang <jasowang(a)redhat.com>
CommitDate: 2019-10-25 07:46:22 -0400
virtio: add property to enable packed virtqueue
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Eugenio Pérez <eperezma(a)redhat.com>
Reviewed-by: Jens Freimann <jfreimann(a)redhat.com>
Message-Id: <20191025083527.30803-9-eperezma(a)redhat.com>
Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
git describe: v4.1.0-1780-g74b3e46630 contains: v4.2.0-rc0~32^2~17
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
10:59 a.m.
New subject: [libvirt PATCH 10/12] qemu: retire QEMU_CAPS_VIRTIO_PACKED_QUEUES
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 7 +------
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
26 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b22e44d37a..a65235aaee 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -571,7 +571,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 360 */
"fsdev.multidevs", /* QEMU_CAPS_FSDEV_MULTIDEVS */
- "virtio.packed", /* QEMU_CAPS_VIRTIO_PACKED_QUEUES */
+ "virtio.packed", /* X_QEMU_CAPS_VIRTIO_PACKED_QUEUES */
"pcie-root-port.hotplug", /* QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG */
"aio.io_uring", /* QEMU_CAPS_AIO_IO_URING */
"machine.pseries.cap-cfpc", /* QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC
*/
@@ -1406,7 +1406,6 @@ struct virQEMUCapsDevicePropsFlags {
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
{ "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, NULL },
- { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "free-page-reporting", QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, NULL
},
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
};
@@ -1435,7 +1434,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsVirtioBlk[] = {
{ "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL },
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
- { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
};
@@ -1444,7 +1442,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsVirtioNet[] = {
{ "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL },
{ "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL },
{ "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL },
- { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
{ "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL },
};
@@ -1463,7 +1460,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsSpaprPCIHostBrid
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
- { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
};
@@ -1520,7 +1516,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsQxl[] = {
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[] = {
{ "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL, NULL },
- { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
};
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 75ecdfca64..395a3281d3 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -550,7 +550,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 360 */
QEMU_CAPS_FSDEV_MULTIDEVS, /* fsdev.multidevs */
- QEMU_CAPS_VIRTIO_PACKED_QUEUES, /* virtio.packed */
+ X_QEMU_CAPS_VIRTIO_PACKED_QUEUES, /* virtio.packed */
QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */
QEMU_CAPS_AIO_IO_URING, /* -blockdev {...,"aio":"io_uring",...}
*/
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, /* -machine pseries.cap-cfpc */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 2d2713f930..8af26b9e7a 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -123,7 +123,6 @@
<flag name='virtio-net.failover'/>
<flag name='vhost-user-fs'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 551b96bc18..2c4ba45d66 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -92,7 +92,6 @@
<flag name='virtio-net.failover'/>
<flag name='vhost-user-fs'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='tcg'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 9efe16eee4..f282f6d0ab 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -161,7 +161,6 @@
<flag name='virtio-net.failover'/>
<flag name='vhost-user-fs'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 21b499030e..50b42bca78 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -130,7 +130,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 61e2b59ac6..08146d2235 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -132,7 +132,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='machine.pseries.cap-cfpc'/>
<flag name='machine.pseries.cap-sbbc'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index d54f8fb8ea..9376367a6b 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -122,7 +122,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 9991af58d0..0438554086 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -164,7 +164,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 513bd19275..a94cf90d9b 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index ca543f0b73..20101d8c3b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -130,7 +130,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index d33196b504..3ea86de12a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -130,7 +130,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='machine.pseries.cap-cfpc'/>
<flag name='machine.pseries.cap-sbbc'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 07016c82fd..33efb8d367 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -120,7 +120,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index f98f910730..2b65c1a2f2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -93,7 +93,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index c44c2f1f28..0ca9043d73 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 0905ec26ca..8502fca633 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -130,7 +130,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 2f7e478a83..a3a6b57d65 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -92,7 +92,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 72300c9a83..545df89eb1 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='query-named-block-nodes.flat'/>
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 75a482d011..627eeb3395 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index c53106f390..fa329f2cbc 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -139,7 +139,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index a11a5ea5fe..365dd8904d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -129,7 +129,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='machine.pseries.cap-cfpc'/>
<flag name='machine.pseries.cap-sbbc'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index e739ee31ac..cc15970f6d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 68c2d46521..3e60c19a59 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -139,7 +139,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 8e438044e6..6f985a55d0 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -138,7 +138,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='machine.pseries.cap-cfpc'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 72c8bb7f0b..d48c1f733c 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 73b53f3089..eb5af17383 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -163,7 +163,6 @@
<flag name='blockdev-snapshot.allow-write-only-overlay'/>
<flag name='blockdev-reopen'/>
<flag name='fsdev.multidevs'/>
- <flag name='virtio.packed'/>
<flag name='pcie-root-port.hotplug'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
--
2.37.1
10:59 a.m.
New subject: [libvirt PATCH 11/12] qemu: remove qemuValidateDomainVirtioOptions
Now that we assume all the virtio capabilities, this function does not
check anything.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_validate.c | 54 +++-------------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index b12a873bc8..a672450ddd 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1769,17 +1769,6 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type)
}
-static int
-qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio,
- virQEMUCaps *qemuCaps G_GNUC_UNUSED)
-{
- if (!virtio)
- return 0;
-
- return 0;
-}
-
-
/**
* qemuValidateDomainDefVhostUserRequireSharedMemory:
* @def: VM definition
@@ -1970,9 +1959,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
"QEMU binary"));
return -1;
}
-
- if (qemuValidateDomainVirtioOptions(net->virtio, qemuCaps) < 0)
- return -1;
}
if (net->mtu &&
@@ -2391,9 +2377,6 @@ qemuValidateDomainRNGDef(const virDomainRNGDef *def,
return -1;
}
- if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0)
- return -1;
-
return 0;
}
@@ -2804,9 +2787,6 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video,
}
}
- if (qemuValidateDomainVirtioOptions(video->virtio, qemuCaps) < 0)
- return -1;
-
if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB &&
video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -3364,11 +3344,6 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskDef *disk,
return -1;
}
- if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO &&
- qemuValidateDomainVirtioOptions(disk->virtio, qemuCaps) < 0) {
- return -1;
- }
-
if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER) {
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_USER_BLK)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -3655,8 +3630,7 @@ virValidateControllerPCIModelNameToQEMUCaps(int modelName)
static int
-qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerDef
*controller,
- virQEMUCaps *qemuCaps)
+qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerDef
*controller)
{
if (!(controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI &&
(controller->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI ||
@@ -3687,13 +3661,6 @@ qemuValidateDomainDeviceDefControllerAttributes(const
virDomainControllerDef *co
_("'iothread' is only supported for virtio-scsi
controller"));
return -1;
}
- if (qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) < 0)
- return -1;
- }
-
- if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL &&
- qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) < 0) {
- return -1;
}
return 0;
@@ -4225,7 +4192,7 @@ qemuValidateDomainDeviceDefController(const virDomainControllerDef
*controller,
!qemuValidateCheckSCSIControllerModel(qemuCaps, controller->model))
return -1;
- if (qemuValidateDomainDeviceDefControllerAttributes(controller, qemuCaps) < 0)
+ if (qemuValidateDomainDeviceDefControllerAttributes(controller) < 0)
return -1;
switch ((virDomainControllerType)controller->type) {
@@ -4569,9 +4536,6 @@ qemuValidateDomainDeviceDefFS(virDomainFSDef *fs,
return -1;
}
- if (qemuValidateDomainVirtioOptions(fs->virtio, qemuCaps) < 0)
- return -1;
-
return 0;
}
@@ -4694,8 +4658,7 @@ qemuValidateDomainDeviceDefSound(virDomainSoundDef *sound,
static int
-qemuValidateDomainDeviceDefVsock(const virDomainVsockDef *vsock,
- virQEMUCaps *qemuCaps)
+qemuValidateDomainDeviceDefVsock(virQEMUCaps *qemuCaps)
{
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -4704,9 +4667,6 @@ qemuValidateDomainDeviceDefVsock(const virDomainVsockDef *vsock,
return -1;
}
- if (qemuValidateDomainVirtioOptions(vsock->virtio, qemuCaps) < 0)
- return -1;
-
return 0;
}
@@ -4881,9 +4841,6 @@ qemuValidateDomainDeviceDefInput(const virDomainInputDef *input,
return -1;
}
- if (qemuValidateDomainVirtioOptions(input->virtio, qemuCaps) < 0)
- return -1;
-
return 0;
}
@@ -4920,9 +4877,6 @@ qemuValidateDomainDeviceDefMemballoon(const virDomainMemballoonDef
*memballoon,
return -1;
}
- if (qemuValidateDomainVirtioOptions(memballoon->virtio, qemuCaps) < 0)
- return -1;
-
return 0;
}
@@ -5256,7 +5210,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev,
qemuCaps);
case VIR_DOMAIN_DEVICE_VSOCK:
- return qemuValidateDomainDeviceDefVsock(dev->data.vsock, qemuCaps);
+ return qemuValidateDomainDeviceDefVsock(qemuCaps);
case VIR_DOMAIN_DEVICE_TPM:
return qemuValidateDomainDeviceDefTPM(dev->data.tpm, def, qemuCaps);
--
2.37.1
10:21 a.m.
New subject: [libvirt PATCH 11/12] qemu: remove qemuValidateDomainVirtioOptions
On Thu, Aug 25, 2022 at 17:59:34 +0200, Ján Tomko wrote:
Now that we assume all the virtio capabilities, this function does
not
check anything.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_validate.c | 54 +++-------------------------------------
1 file changed, 4 insertions(+), 50 deletions(-)
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
10:59 a.m.
New subject: [libvirt PATCH 12/12] qemu: do not probe for properties of nec-usb-xhci
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 6 -
.../caps_4.2.0.aarch64.replies | 156 +++-----------
.../caps_4.2.0.ppc64.replies | 140 +++---------
.../caps_4.2.0.x86_64.replies | 168 ++++-----------
.../caps_5.0.0.aarch64.replies | 169 +++------------
.../caps_5.0.0.ppc64.replies | 165 +++-----------
.../caps_5.0.0.riscv64.replies | 153 +++----------
.../caps_5.0.0.x86_64.replies | 181 ++++------------
.../caps_5.1.0.x86_64.replies | 185 ++++------------
.../caps_5.2.0.aarch64.replies | 181 ++++------------
.../caps_5.2.0.ppc64.replies | 173 +++------------
.../caps_5.2.0.riscv64.replies | 161 +++-----------
.../caps_5.2.0.x86_64.replies | 193 ++++-------------
.../caps_6.0.0.aarch64.replies | 191 ++++------------
.../caps_6.0.0.x86_64.replies | 203 ++++--------------
.../caps_6.1.0.x86_64.replies | 203 ++++--------------
.../caps_6.2.0.aarch64.replies | 191 ++++------------
.../caps_6.2.0.ppc64.replies | 183 +++-------------
.../caps_6.2.0.x86_64.replies | 203 ++++--------------
.../caps_7.0.0.aarch64.replies | 195 ++++-------------
.../caps_7.0.0.ppc64.replies | 183 +++-------------
.../caps_7.0.0.x86_64.replies | 203 ++++--------------
.../caps_7.1.0.x86_64.replies | 203 ++++--------------
23 files changed, 790 insertions(+), 3199 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a65235aaee..3e9983bb96 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1524,9 +1524,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsICH9[] = {
{ "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL },
};
-static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBNECXHCI[] = {
-};
-
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = {
{ "intremap", QEMU_CAPS_INTEL_IOMMU_INTREMAP, NULL },
{ "caching-mode", QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, NULL },
@@ -1676,9 +1673,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
{ "virtio-balloon-device", virQEMUCapsDevicePropsVirtioBalloon,
G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioBalloon),
-1 },
- { "nec-usb-xhci", virQEMUCapsDevicePropsUSBNECXHCI,
- G_N_ELEMENTS(virQEMUCapsDevicePropsUSBNECXHCI),
- QEMU_CAPS_NEC_USB_XHCI },
{ "intel-iommu", virQEMUCapsDevicePropsIntelIOMMU,
G_N_ELEMENTS(virQEMUCapsDevicePropsIntelIOMMU),
QEMU_CAPS_DEVICE_INTEL_IOMMU },
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index f9515ddf96..f947ce9aee 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -18526,104 +18526,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "intrs",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "failover_pair_id",
- "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": "p3",
- "type": "uint32"
- },
- {
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "slots",
- "type": "uint32"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18725,7 +18633,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18733,7 +18641,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18822,7 +18730,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18830,7 +18738,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18901,7 +18809,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18909,7 +18817,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18974,7 +18882,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18982,7 +18890,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19046,7 +18954,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19054,7 +18962,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19241,12 +19149,12 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19804,7 +19712,7 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19812,7 +19720,7 @@
"arguments": {
"typename": "virt-4.2-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19965,7 +19873,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19973,7 +19881,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20078,12 +19986,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20274,34 +20182,34 @@
"static": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -21469,12 +21377,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -21552,12 +21460,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -21573,7 +21481,7 @@
"kernel": false
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -21584,7 +21492,7 @@
"name": "host"
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -21614,7 +21522,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index cd02535c6f..e31c49f24d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -17919,100 +17919,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "intrs",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "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": "p3",
- "type": "uint32"
- },
- {
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "slots",
- "type": "uint32"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18078,7 +17990,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -18086,7 +17998,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18188,7 +18100,7 @@
"type": "size"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18196,7 +18108,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18285,7 +18197,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18293,7 +18205,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18358,7 +18270,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18366,7 +18278,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18430,12 +18342,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18697,7 +18609,7 @@
"deprecated": false
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18705,7 +18617,7 @@
"arguments": {
"typename": "pseries-4.2-machine"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18904,7 +18816,7 @@
"type": "string"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18912,7 +18824,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19017,12 +18929,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21218,34 +21130,34 @@
"static": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -22384,12 +22296,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22467,7 +22379,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index 2885f63d8e..12ebc41e49 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -18099,104 +18099,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "intrs",
- "type": "uint32"
- },
- {
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "slots",
- "type": "uint32"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18244,7 +18152,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18252,7 +18160,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18299,7 +18207,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18307,7 +18215,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18341,7 +18249,7 @@
"type": "int32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18349,7 +18257,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18451,7 +18359,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18459,7 +18367,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18548,7 +18456,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18556,7 +18464,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18627,7 +18535,7 @@
"type": "uint16"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18635,7 +18543,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18700,7 +18608,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18708,7 +18616,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -18772,7 +18680,7 @@
"type": "int"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -18780,7 +18688,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20334,12 +20242,12 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -20731,7 +20639,7 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -20739,7 +20647,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -20844,12 +20752,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22232,12 +22140,12 @@
"migration-safe": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -22245,12 +22153,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -22258,12 +22166,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -23549,12 +23457,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -23632,16 +23540,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
- "id": "libvirt-46",
+ "id": "libvirt-45",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -23656,7 +23564,7 @@
"name": "host"
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -23958,7 +23866,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -23972,7 +23880,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -24274,7 +24182,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index eebe5150c6..9f7d3da252 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -19796,113 +19796,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20023,7 +19922,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20031,7 +19930,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20125,7 +20024,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20133,7 +20032,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20209,7 +20108,7 @@
"type": "uint16"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20217,7 +20116,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20228,7 +20127,7 @@
"type": "str"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20236,7 +20135,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20306,7 +20205,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20314,7 +20213,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20383,7 +20282,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20391,7 +20290,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20595,12 +20494,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21188,7 +21087,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21196,7 +21095,7 @@
"arguments": {
"typename": "virt-5.0-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21344,7 +21243,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21352,7 +21251,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21442,12 +21341,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21643,24 +21542,24 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -21668,12 +21567,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22831,12 +22730,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -22914,12 +22813,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -22935,7 +22834,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -22946,7 +22845,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -22977,7 +22876,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
index b3dee4130f..aaf69cab46 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
@@ -19595,113 +19595,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19782,7 +19681,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -19790,7 +19689,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19832,7 +19731,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19840,7 +19739,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19961,7 +19860,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19969,7 +19868,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20063,7 +19962,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20071,7 +19970,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20147,7 +20046,7 @@
"type": "uint16"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20155,7 +20054,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20166,7 +20065,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20174,7 +20073,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20244,7 +20143,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20252,7 +20151,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20321,12 +20220,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20596,7 +20495,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20604,7 +20503,7 @@
"arguments": {
"typename": "pseries-5.0-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20813,7 +20712,7 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20821,7 +20720,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20911,12 +20810,12 @@
"type": "string"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23122,24 +23021,24 @@
"static": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23147,12 +23046,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -24289,12 +24188,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24372,7 +24271,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
index efda5c534b..929b2179ae 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
@@ -17931,113 +17931,12 @@
"id": "libvirt-27"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-28"
-}
-
-{
- "return": [
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- }
- ],
- "id": "libvirt-28"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18158,7 +18057,7 @@
"type": "size"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -18166,7 +18065,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18260,7 +18159,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -18268,7 +18167,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18344,7 +18243,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -18352,7 +18251,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18363,7 +18262,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -18371,7 +18270,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18441,7 +18340,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -18449,7 +18348,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -18518,12 +18417,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18581,7 +18480,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -18589,7 +18488,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18679,7 +18578,7 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -18687,7 +18586,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -18777,34 +18676,34 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -20070,12 +19969,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -20153,5 +20052,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index 65cb437fb6..81cfc70dc4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -19336,113 +19336,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19500,7 +19399,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19508,7 +19407,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19561,7 +19460,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19569,7 +19468,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19611,7 +19510,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19619,7 +19518,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19740,7 +19639,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19748,7 +19647,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19842,7 +19741,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19850,7 +19749,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19926,7 +19825,7 @@
"type": "uint16"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19934,7 +19833,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19945,7 +19844,7 @@
"type": "str"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19953,7 +19852,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20023,7 +19922,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20031,7 +19930,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20100,7 +19999,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20108,7 +20007,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21674,12 +21573,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22055,7 +21954,7 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22063,7 +21962,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22153,12 +22052,12 @@
"type": "string"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -23703,12 +23602,12 @@
"migration-safe": true
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -23716,12 +23615,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -23729,12 +23628,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -25010,12 +24909,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -25093,16 +24992,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-46",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -25117,7 +25016,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -25420,7 +25319,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -25434,7 +25333,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -25737,7 +25636,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
index 5461b7054f..51e93819b0 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
@@ -19869,113 +19869,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20033,7 +19932,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20041,7 +19940,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20094,7 +19993,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20102,7 +20001,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20144,7 +20043,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20152,7 +20051,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20273,7 +20172,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20281,7 +20180,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20379,7 +20278,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20387,7 +20286,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20463,7 +20362,7 @@
"type": "uint16"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -20471,7 +20370,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20666,7 +20565,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -20674,7 +20573,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20685,7 +20584,7 @@
"type": "str"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -20693,7 +20592,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20763,7 +20662,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -20771,7 +20670,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -20840,7 +20739,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -20848,7 +20747,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -22434,12 +22333,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22831,7 +22730,7 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -22839,7 +22738,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -22929,12 +22828,12 @@
"type": "string"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24636,12 +24535,12 @@
"migration-safe": true
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24649,12 +24548,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -24662,12 +24561,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -25962,12 +25861,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -26045,16 +25944,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -26069,7 +25968,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -26377,7 +26276,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -26391,7 +26290,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -26699,7 +26598,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
index f126684ee7..fc92caae54 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
@@ -21007,121 +21007,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21163,7 +21054,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -21171,7 +21062,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21292,7 +21183,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -21300,7 +21191,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21398,7 +21289,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21406,7 +21297,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21482,7 +21373,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21490,7 +21381,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21501,7 +21392,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21509,7 +21400,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21579,7 +21470,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21587,7 +21478,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21656,7 +21547,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21664,7 +21555,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21873,12 +21764,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22615,7 +22506,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -22623,7 +22514,7 @@
"arguments": {
"typename": "virt-5.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22786,7 +22677,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -22794,7 +22685,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22879,12 +22770,12 @@
"type": "string"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23118,24 +23009,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23143,12 +23034,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -24325,12 +24216,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -24408,12 +24299,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24429,7 +24320,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -24440,7 +24331,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -24472,7 +24363,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
index 6f6e5031cf..9a0e5622d9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
@@ -20654,121 +20654,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20859,7 +20750,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -20867,7 +20758,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20909,7 +20800,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -20917,7 +20808,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21038,7 +20929,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -21046,7 +20937,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21144,7 +21035,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -21152,7 +21043,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21228,7 +21119,7 @@
"type": "uint16"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -21236,7 +21127,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21247,7 +21138,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -21255,7 +21146,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21325,7 +21216,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -21333,7 +21224,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21402,12 +21293,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21727,7 +21618,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21735,7 +21626,7 @@
"arguments": {
"typename": "pseries-5.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21939,7 +21830,7 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21947,7 +21838,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -22032,12 +21923,12 @@
"type": "string"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -24683,24 +24574,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -24708,12 +24599,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25869,12 +25760,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -25952,7 +25843,7 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
index 443151c391..19fa83490c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
@@ -18975,121 +18975,12 @@
"id": "libvirt-27"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-28"
-}
-
-{
- "return": [
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-28"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19210,7 +19101,7 @@
"type": "size"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -19218,7 +19109,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19316,7 +19207,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -19324,7 +19215,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19400,7 +19291,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -19408,7 +19299,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19419,7 +19310,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -19427,7 +19318,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19497,7 +19388,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -19505,7 +19396,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -19574,12 +19465,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19633,7 +19524,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -19641,7 +19532,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19731,7 +19622,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -19739,7 +19630,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -19824,34 +19715,34 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -21136,12 +21027,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -21219,5 +21110,5 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 0362d62f83..7e96c37f80 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -20456,121 +20456,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20628,7 +20519,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -20636,7 +20527,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20689,7 +20580,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -20697,7 +20588,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20739,7 +20630,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -20747,7 +20638,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20868,7 +20759,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -20876,7 +20767,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20974,7 +20865,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -20982,7 +20873,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21058,7 +20949,7 @@
"type": "uint16"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -21066,7 +20957,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21266,7 +21157,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -21274,7 +21165,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21285,7 +21176,7 @@
"type": "str"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -21293,7 +21184,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21363,7 +21254,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -21371,7 +21262,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21440,7 +21331,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -21448,7 +21339,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -23046,12 +22937,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23509,7 +23400,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -23517,7 +23408,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -23602,12 +23493,12 @@
"type": "string"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -25432,12 +25323,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -25445,12 +25336,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -25458,12 +25349,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -26758,12 +26649,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -26841,16 +26732,16 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -26865,7 +26756,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -27174,7 +27065,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -27188,7 +27079,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -27497,7 +27388,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
index d678db8bed..277180fa89 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
@@ -22844,131 +22844,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23010,7 +22891,7 @@
"type": "uint64"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -23018,7 +22899,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23149,7 +23030,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23157,7 +23038,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23253,7 +23134,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23261,7 +23142,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -23341,7 +23222,7 @@
"type": "int32"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -23349,7 +23230,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -23360,7 +23241,7 @@
"type": "str"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -23368,7 +23249,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -23438,7 +23319,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -23446,7 +23327,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -23515,7 +23396,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -23523,7 +23404,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23732,12 +23613,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24516,7 +24397,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24524,7 +24405,7 @@
"arguments": {
"typename": "virt-6.0-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -24710,7 +24591,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -24718,7 +24599,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -24816,12 +24697,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -25061,24 +24942,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25086,12 +24967,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -26288,12 +26169,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -26375,12 +26256,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26396,7 +26277,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -26407,7 +26288,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -26439,7 +26320,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
index 6af45e0b61..bccf12118a 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
@@ -22186,131 +22186,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22368,7 +22249,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22376,7 +22257,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22439,7 +22320,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22447,7 +22328,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22489,7 +22370,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22497,7 +22378,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22628,7 +22509,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22636,7 +22517,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22732,7 +22613,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22740,7 +22621,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22820,7 +22701,7 @@
"type": "int32"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -22828,7 +22709,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -23050,7 +22931,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -23058,7 +22939,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23069,7 +22950,7 @@
"type": "str"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23077,7 +22958,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23151,7 +23032,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23159,7 +23040,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23228,7 +23109,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23236,7 +23117,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -24882,12 +24763,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25334,7 +25215,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25342,7 +25223,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25440,12 +25321,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27313,12 +27194,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27326,12 +27207,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27339,12 +27220,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -28663,12 +28544,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -28750,12 +28631,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -28765,7 +28646,7 @@
"cert-chain":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh":
"AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
@@ -28776,7 +28657,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29097,7 +28978,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29111,7 +28992,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -29432,7 +29313,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
index 102973ebcc..b7f1337edd 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
@@ -22413,131 +22413,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22595,7 +22476,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -22603,7 +22484,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22666,7 +22547,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -22674,7 +22555,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22716,7 +22597,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -22724,7 +22605,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22860,7 +22741,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -22868,7 +22749,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22964,7 +22845,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -22972,7 +22853,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23052,7 +22933,7 @@
"type": "int32"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -23060,7 +22941,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -23282,7 +23163,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -23290,7 +23171,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23301,7 +23182,7 @@
"type": "str"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -23309,7 +23190,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23388,7 +23269,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -23396,7 +23277,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23470,7 +23351,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -23478,7 +23359,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -25136,12 +25017,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25606,7 +25487,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -25614,7 +25495,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -25717,12 +25598,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27779,12 +27660,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27792,12 +27673,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27805,12 +27686,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -29142,12 +29023,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -29229,16 +29110,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "Failed to open /dev/sev: No such file or directory"
@@ -29253,7 +29134,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29576,7 +29457,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -29590,7 +29471,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -29913,7 +29794,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
index ce01b42dec..61118722a3 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
@@ -23680,131 +23680,12 @@
"id": "libvirt-27"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-28"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- }
- ],
- "id": "libvirt-28"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23846,7 +23727,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -23854,7 +23735,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23990,7 +23871,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -23998,7 +23879,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -24094,7 +23975,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -24102,7 +23983,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -24182,7 +24063,7 @@
"type": "int32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -24190,7 +24071,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -24201,7 +24082,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -24209,7 +24090,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -24284,7 +24165,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -24292,7 +24173,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -24366,7 +24247,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -24374,7 +24255,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -24583,12 +24464,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -25432,7 +25313,7 @@
"deprecated": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -25440,7 +25321,7 @@
"arguments": {
"typename": "virt-6.2-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -25636,7 +25517,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -25644,7 +25525,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -25747,12 +25628,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -25998,24 +25879,24 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -26023,12 +25904,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -27376,12 +27257,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -27463,12 +27344,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27484,7 +27365,7 @@
"kernel": false
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -27495,7 +27376,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -27527,7 +27408,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
index 9b414b5130..0ac9b2cfe2 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
@@ -25600,131 +25600,12 @@
"id": "libvirt-26"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-27"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- }
- ],
- "id": "libvirt-27"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25820,7 +25701,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-27"
}
{
@@ -25828,7 +25709,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25870,7 +25751,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -25878,7 +25759,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26014,7 +25895,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26022,11 +25903,11 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'usb-host' not found"
@@ -26038,7 +25919,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26118,7 +25999,7 @@
"type": "int32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26126,7 +26007,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26137,7 +26018,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26145,7 +26026,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26220,7 +26101,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26228,7 +26109,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26302,12 +26183,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26670,7 +26551,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26678,7 +26559,7 @@
"arguments": {
"typename": "pseries-6.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26910,7 +26791,7 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26918,7 +26799,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27021,12 +26902,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29678,24 +29559,24 @@
"deprecated": false
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29703,12 +29584,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30842,12 +30723,12 @@
"option": "drive"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -30929,7 +30810,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index 6e5e733af5..b4b853eb51 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -25594,131 +25594,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25776,7 +25657,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -25784,7 +25665,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25847,7 +25728,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -25855,7 +25736,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25897,7 +25778,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -25905,7 +25786,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26041,7 +25922,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26049,7 +25930,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26145,7 +26026,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26153,7 +26034,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26233,7 +26114,7 @@
"type": "int32"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26241,7 +26122,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26463,7 +26344,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26471,7 +26352,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26482,7 +26363,7 @@
"type": "str"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -26490,7 +26371,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -26569,7 +26450,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -26577,7 +26458,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -26651,7 +26532,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -26659,7 +26540,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28399,12 +28280,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28887,7 +28768,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -28895,7 +28776,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -28998,12 +28879,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31072,12 +30953,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31085,12 +30966,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31098,12 +30979,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -32435,12 +32316,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -32522,16 +32403,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -32546,7 +32427,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -32879,7 +32760,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -32893,7 +32774,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33226,7 +33107,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
index 670d8abc26..6626778f0f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
@@ -26958,131 +26958,12 @@
"id": "libvirt-27"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-28"
-}
-
-{
- "return": [
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- }
- ],
- "id": "libvirt-28"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27124,7 +27005,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -27132,7 +27013,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27268,7 +27149,7 @@
"type": "PCIELinkSpeed"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -27276,7 +27157,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27372,7 +27253,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -27380,7 +27261,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27460,7 +27341,7 @@
"type": "int32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -27468,7 +27349,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27695,7 +27576,7 @@
"type": "uint64"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27703,7 +27584,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27918,7 +27799,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27926,7 +27807,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28001,7 +27882,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -28009,7 +27890,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28083,7 +27964,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -28091,7 +27972,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -28300,12 +28181,12 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29175,7 +29056,7 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -29183,7 +29064,7 @@
"arguments": {
"typename": "virt-7.0-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29384,7 +29265,7 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -29392,7 +29273,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29495,12 +29376,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29746,24 +29627,24 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -29771,12 +29652,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31128,12 +31009,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31215,12 +31096,12 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31236,7 +31117,7 @@
"kernel": false
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -31247,7 +31128,7 @@
"name": "host"
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -31280,7 +31161,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
index a03fde3f20..84d993a581 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
@@ -26013,131 +26013,12 @@
"id": "libvirt-27"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-28"
-}
-
-{
- "return": [
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-28"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26233,7 +26114,7 @@
"type": "uint64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-28"
}
{
@@ -26241,7 +26122,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26283,7 +26164,7 @@
"type": "uint64"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26291,7 +26172,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26427,7 +26308,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26435,7 +26316,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26531,7 +26412,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26539,7 +26420,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26619,7 +26500,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26627,7 +26508,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26842,7 +26723,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26850,7 +26731,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26929,7 +26810,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26937,7 +26818,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27011,12 +26892,12 @@
"type": "int"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27388,7 +27269,7 @@
"default-ram-id": "ppc_spapr.ram"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27396,7 +27277,7 @@
"arguments": {
"typename": "pseries-7.0-machine"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27628,7 +27509,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27636,7 +27517,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -27739,12 +27620,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -30270,24 +30151,24 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30295,12 +30176,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31498,12 +31379,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31585,7 +31466,7 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
index 6bd815c371..0590294255 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -25910,131 +25910,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26097,7 +25978,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26105,7 +25986,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26168,7 +26049,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26176,7 +26057,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26218,7 +26099,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26226,7 +26107,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26362,7 +26243,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -26370,7 +26251,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26466,7 +26347,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -26474,7 +26355,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26554,7 +26435,7 @@
"type": "int32"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -26562,7 +26443,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26795,7 +26676,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -26803,7 +26684,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27018,7 +26899,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27026,7 +26907,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27105,7 +26986,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27113,7 +26994,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -27187,7 +27068,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -27195,7 +27076,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -28951,12 +28832,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29457,7 +29338,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -29465,7 +29346,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -29568,12 +29449,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -31678,12 +31559,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -31691,12 +31572,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -31704,12 +31585,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -33045,12 +32926,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -33132,16 +33013,16 @@
"capability": "background-snapshot"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -33156,7 +33037,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -33493,7 +33374,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -33507,7 +33388,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -33844,7 +33725,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
index 26768eba9d..ff7fe45538 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
@@ -26642,131 +26642,12 @@
"id": "libvirt-28"
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "nec-usb-xhci"
- },
- "id": "libvirt-29"
-}
-
-{
- "return": [
- {
- "name": "failover_pair_id",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "default-value": -1,
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or
06",
- "type": "int32"
- },
- {
- "default-value": 4294967295,
- "name": "romsize",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 1,
- "name": "rombar",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 0,
- "name": "acpi-index",
- "type": "uint32"
- },
- {
- "default-value": false,
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": "auto",
- "name": "msi",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": "auto",
- "name": "msix",
- "description": "on/off/auto",
- "type": "OnOffAuto"
- },
- {
- "default-value": false,
- "name": "force-pcie-endcap",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": true,
- "name": "superspeed-ports-first",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 16,
- "name": "intrs",
- "type": "uint32"
- },
- {
- "default-value": 64,
- "name": "slots",
- "type": "uint32"
- },
- {
- "name": "host",
- "type": "link<device>"
- },
- {
- "default-value": 4,
- "name": "p3",
- "type": "uint32"
- },
- {
- "default-value": true,
- "name": "streams",
- "description": "on/off",
- "type": "bool"
- },
- {
- "default-value": 4,
- "name": "p2",
- "type": "uint32"
- },
- {
- "name": "xhci-core",
- "type": "child<base-xhci>"
- }
- ],
- "id": "libvirt-29"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26834,7 +26715,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-29"
}
{
@@ -26842,7 +26723,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26905,7 +26786,7 @@
"type": "uint16"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-30"
}
{
@@ -26913,7 +26794,7 @@
"arguments": {
"typename": "nvdimm"
},
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26955,7 +26836,7 @@
"type": "uint64"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-31"
}
{
@@ -26963,7 +26844,7 @@
"arguments": {
"typename": "pcie-root-port"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27099,7 +26980,7 @@
"type": "size"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -27107,7 +26988,7 @@
"arguments": {
"typename": "usb-host"
},
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27203,7 +27084,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-33"
}
{
@@ -27211,7 +27092,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27291,7 +27172,7 @@
"type": "int32"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-34"
}
{
@@ -27299,7 +27180,7 @@
"arguments": {
"typename": "virtio-mem-pci"
},
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27532,7 +27413,7 @@
"type": "child<virtio-mem>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-35"
}
{
@@ -27540,7 +27421,7 @@
"arguments": {
"typename": "virtio-iommu-pci"
},
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27755,7 +27636,7 @@
"type": "link<PCI>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-36"
}
{
@@ -27763,7 +27644,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27842,7 +27723,7 @@
"type": "bool"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-37"
}
{
@@ -27850,7 +27731,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -27924,7 +27805,7 @@
"type": "int"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-38"
}
{
@@ -27932,7 +27813,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
@@ -29725,12 +29606,12 @@
"type": "bool"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-39"
}
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30249,7 +30130,7 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-40"
}
{
@@ -30257,7 +30138,7 @@
"arguments": {
"typename": "none-machine"
},
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
@@ -30370,12 +30251,12 @@
"type": "child<container>"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
@@ -32359,12 +32240,12 @@
"deprecated": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
@@ -32372,12 +32253,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-44"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
@@ -32385,12 +32266,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-45"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
@@ -33726,12 +33607,12 @@
"option": "drive"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
@@ -33821,16 +33702,16 @@
"capability": "postcopy-preempt"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-46"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-48"
+ "id": "libvirt-47"
}
{
- "id": "libvirt-48",
+ "id": "libvirt-47",
"error": {
"class": "GenericError",
"desc": "SEV: Failed to open /dev/sev: No such file or
directory"
@@ -33845,7 +33726,7 @@
"name": "host"
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -34183,7 +34064,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-48"
}
{
@@ -34197,7 +34078,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
@@ -34535,7 +34416,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-49"
}
{
--
2.37.1
10:24 a.m.
New subject: [libvirt PATCH 12/12] qemu: do not probe for properties of nec-usb-xhci
On Thu, Aug 25, 2022 at 17:59:35 +0200, Ján Tomko wrote:
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
Hopefully we will not need to probe any other property.
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
801
days inactive
812
days old
24 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa