[libvirt PATCH 08/12] qemu: retire QEMU_CAPS_VIRTIO_SCSI_IOTHREAD

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- 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