]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: retire QEMU_CAPS_VIRTIO_SCSI_IOTHREAD
authorJán Tomko <jtomko@redhat.com>
Thu, 25 Aug 2022 15:32:19 +0000 (17:32 +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>
27 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.ppc64.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 ffb8a79dbb7195cfd3fdae3c9f78b00118bc4ad7..b22e44d37a17eda8a7866f0544afe0b2f6dbf581 100644 (file)
@@ -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 },
 };
index 300045eb1ebf77cc379fef42aa79b07e16c847c6..75ecdfca64cc6fc0e3cf652fdfc229c8feba5dbf 100644 (file)
@@ -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= */
index 99b16bad2122da60d7e6736b48c11fc66f193bcc..2d2713f93061d06fbf3da7a5997e02ca7093ba69 100644 (file)
@@ -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'/>
index e38a7db67bb926e7d811bdc24c1fdb50547a9095..24a885c2798689732410bee62c91bff45805a5e4 100644 (file)
@@ -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'/>
index 7b7e643af9d3ea7ebdfd84d0b0033fda392b1529..551b96bc1893300dd8408ef3dc648e6c4d0e63b1 100644 (file)
@@ -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'/>
index 469e09c8025d1fd78f407920d1d2f7a351879ad6..9efe16eee4b5720953143c9dc0fa1b3dfc14875c 100644 (file)
@@ -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'/>
index 5c98763f521d12c694705ca9b1dc0a5b3f9bb707..21b499030e3c13cf285d0dfc2bda5f2b827fa84f 100644 (file)
@@ -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'/>
index cb533694866194001928f8ac9caeb4d0cabbc5f0..61e2b59ac685c98ad372812881a0dc1d96eb715d 100644 (file)
@@ -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'/>
index 8d88ae0b54d03c71db18e3a37b847a8db4e52dcd..d54f8fb8ea1948e9b801446cdb1aadec37e69ae6 100644 (file)
@@ -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'/>
index c2240ac4f459d77ba3834ea8cc27f3dce2005324..9991af58d0b0187117e25202b96d74bd04dbba9a 100644 (file)
@@ -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'/>
index 45f418c452ddb60ed73dc662dff5bf5f3a3ffb2f..513bd19275e5387aaa2060acd67c2e96617b6f04 100644 (file)
@@ -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'/>
index 22bc2ae43d5ed040cdac944f1ed71cf87522e529..ca543f0b737e97a64d133b407d17163ad5139de0 100644 (file)
@@ -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'/>
index dcce3cf4463e7c420f4c3e96f096f50460e06729..d33196b50400e4e21b9b3a278564bd4c33ec1a32 100644 (file)
@@ -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'/>
index 1a7a9e06f97e84586e8a115cda97b3170e6904cf..07016c82fdb1fbf0956b6b96fe7d0037e50bcbdc 100644 (file)
@@ -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'/>
index cf83839102e2e1ac74ac4c1bef9992cbd5a824bf..f98f91073094ce3366a8c30bcf2286eab87b4bf6 100644 (file)
@@ -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'/>
index ede040432a454d9445f5768a6ed060e9cbbb73d3..c44c2f1f281f030d03fdfaa6885059539e881cbe 100644 (file)
@@ -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'/>
index ae70c914e4c3092a26bf048e508618f7e380d8e3..0905ec26ca15b7bfb4eeca619d75a7b9a75982f7 100644 (file)
@@ -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'/>
index c9389af189b074e10607d96ad2f341de52cb8f86..2f7e478a834ed5c655d669514a731e4626b0759e 100644 (file)
@@ -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'/>
index 92d5957221e7642566ca469d45dbd25ffd5afd03..72300c9a83e0acbff29952c9747fce3c54946048 100644 (file)
@@ -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'/>
index d8e49ad8c2d50c23abd0774f10e924563d569150..75a482d011468f77c3df67969dcf9e120ea23da9 100644 (file)
@@ -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'/>
index 85e4c3f365abd19a8d6cd30286b16dd1c3563815..c53106f39066fce9c033713702cb6b48019dd4b0 100644 (file)
@@ -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'/>
index 718fd57c71d2f8d3f9ab339a40b765ffc58a8d07..a11a5ea5fe9d59322350aaec607b7748151957e7 100644 (file)
@@ -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'/>
index 77684cdc2429aacac50a6efba0a4061f9d1c48d0..e739ee31acd5060ea327eb3ee4c16b9c13dcdcbe 100644 (file)
@@ -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'/>
index bf24bc3bcf4e6a990d9108d4b0f3fc7783fe625e..68c2d4652128d44a95ab291427db975cad024816 100644 (file)
@@ -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'/>
index 2adaffd9e57669a4a1fc04107b1cc6657cd30717..8e438044e6081fe4446e5f3aaf38562c172a4f5c 100644 (file)
@@ -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'/>
index 005ce9fd7c7011e1e4be33c17cddcdca8dc4f6e2..72c8bb7f0b3ad46fffcdb634930f220683e0ed07 100644 (file)
@@ -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'/>
index 647a716713fa5ad35b4ff7dc5336510cf096b169..5605443a3ebcfe04c9b9bb8f203342053a40e303 100644 (file)
@@ -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'/>