]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: retire QEMU_CAPS_VIRTIO_PACKED_QUEUES
authorJán Tomko <jtomko@redhat.com>
Thu, 25 Aug 2022 15:47:11 +0000 (17:47 +0200)
committerJán Tomko <jtomko@redhat.com>
Wed, 7 Sep 2022 10:05:40 +0000 (12:05 +0200)
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
26 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml

index b22e44d37a17eda8a7866f0544afe0b2f6dbf581..a65235aaeee657bce84fe4830479041f7486c093 100644 (file)
@@ -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 },
 };
 
index 75ecdfca64cc6fc0e3cf652fdfc229c8feba5dbf..395a3281d33a355786faba77b82e54ceb63b59b1 100644 (file)
@@ -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 */
index 2d2713f93061d06fbf3da7a5997e02ca7093ba69..8af26b9e7aa5d2bcfdb4f55063787eb69036043a 100644 (file)
   <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'/>
index 551b96bc1893300dd8408ef3dc648e6c4d0e63b1..2c4ba45d66fbff703bb1a588723ab8be9c56ee67 100644 (file)
@@ -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'/>
index 9efe16eee4b5720953143c9dc0fa1b3dfc14875c..f282f6d0ab007e8bb72e58a1bdd8072b8647bb49 100644 (file)
   <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'/>
index 21b499030e3c13cf285d0dfc2bda5f2b827fa84f..50b42bca78212ed22d41c95240694f3bc709a650 100644 (file)
   <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'/>
index 61e2b59ac685c98ad372812881a0dc1d96eb715d..08146d22358a6176be9410be11981c7de39ea7b2 100644 (file)
   <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'/>
index d54f8fb8ea1948e9b801446cdb1aadec37e69ae6..9376367a6bebfd8038e7f52eb19b634d5588feab 100644 (file)
   <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'/>
index 9991af58d0b0187117e25202b96d74bd04dbba9a..0438554086ba4207a14812ab4f63e419bcef88ed 100644 (file)
   <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'/>
index 513bd19275e5387aaa2060acd67c2e96617b6f04..a94cf90d9bd8d93c9e6b4afa00d64040e434ed3f 100644 (file)
   <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'/>
index ca543f0b737e97a64d133b407d17163ad5139de0..20101d8c3be05de1d4401d290da1cd5ca8b7ebe7 100644 (file)
   <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'/>
index d33196b50400e4e21b9b3a278564bd4c33ec1a32..3ea86de12a5b4b5bb71cc0a86e82157ce4779bb8 100644 (file)
   <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'/>
index 07016c82fdb1fbf0956b6b96fe7d0037e50bcbdc..33efb8d36780c5e2618cdfe9a3f95c20a2222751 100644 (file)
   <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'/>
index f98f91073094ce3366a8c30bcf2286eab87b4bf6..2b65c1a2f28c7e49a7fc558a61fe6b67b6530571 100644 (file)
@@ -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'/>
index c44c2f1f281f030d03fdfaa6885059539e881cbe..0ca9043d738466ea9f12e49a07dc99de8b491a4b 100644 (file)
   <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'/>
index 0905ec26ca15b7bfb4eeca619d75a7b9a75982f7..8502fca63301d0c27d80642fac37556035d320b5 100644 (file)
   <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'/>
index 2f7e478a834ed5c655d669514a731e4626b0759e..a3a6b57d657586542af3ba0cd076f41fa7adc8e4 100644 (file)
@@ -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'/>
index 72300c9a83e0acbff29952c9747fce3c54946048..545df89eb1ed78844858c45998e81f819b55ed3b 100644 (file)
   <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'/>
index 75a482d011468f77c3df67969dcf9e120ea23da9..627eeb339592f0a0a02042d291d0ef2209e6fa16 100644 (file)
   <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'/>
index c53106f39066fce9c033713702cb6b48019dd4b0..fa329f2cbcb174a346c53236b77076d262939fa4 100644 (file)
   <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'/>
index a11a5ea5fe9d59322350aaec607b7748151957e7..365dd8904d61f6bc1541b221e536dab87c73a9d2 100644 (file)
   <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'/>
index e739ee31acd5060ea327eb3ee4c16b9c13dcdcbe..cc15970f6d641e77e153592b4e4ef3a2ea31ffb5 100644 (file)
   <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'/>
index 68c2d4652128d44a95ab291427db975cad024816..3e60c19a598e6627c770aa929577201e6451ef85 100644 (file)
   <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'/>
index 8e438044e6081fe4446e5f3aaf38562c172a4f5c..6f985a55d0c26782798eb61340a0267daafd4a77 100644 (file)
   <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'/>
index 72c8bb7f0b3ad46fffcdb634930f220683e0ed07..d48c1f733ce0c1cc62058ed4508864c08dd7480a 100644 (file)
   <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'/>
index 5605443a3ebcfe04c9b9bb8f203342053a40e303..9fb4ca58fa25b9643ca51511fa14e06b3e70cc19 100644 (file)
   <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'/>