qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX

Introduced by QEMU commit 28b77657 in v1.0-rc4~21^2~8. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2025-02-22 03:12:22 +00:00 · 2018-09-07 14:53:02 +02:00 · 2018-09-07 14:53:02 +02:00 · 9b17c9392a
commit 9b17c9392a
parent b5acaaae36
34 changed files with 2 additions and 43 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -1224,7 +1224,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
 };

 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
-    { "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
 };

 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -251,7 +251,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */

    /* 145 */
-    QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
+    X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
    QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
    QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
    QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@ -5324,15 +5324,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
                               _("booting from assigned devices is only "
                                 "supported for PCI, USB and SCSI devices"));
                return -1;
-            } else {
-                if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
-                    !virQEMUCapsGet(qemuCaps,
-                                    QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                   _("booting from assigned SCSI devices is not"
-                                     " supported with this version of qemu"));
-                    return -1;
-                }
            }
        }

--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@ -63,7 +63,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@ -64,7 +64,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='mlock'/>
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@ -64,7 +64,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@ -36,7 +36,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -36,7 +36,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -36,7 +36,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@ -54,7 +54,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@ -36,7 +36,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@ -36,7 +36,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@ -36,7 +36,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -52,7 +52,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -26,7 +26,6 @@
  <flag name='rng-egd'/>
  <flag name='tpm-passthrough'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -26,7 +26,6 @@
  <flag name='rng-egd'/>
  <flag name='tpm-passthrough'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -66,7 +66,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
  <flag name='mem-merge'/>
  <flag name='vnc-websocket'/>
  <flag name='drive-discard'/>
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@ -2436,8 +2436,7 @@ mymain(void)
            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
    DO_TEST("hostdev-scsi-virtio-scsi",
            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_DEVICE_SCSI_GENERIC,
-            QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
+            QEMU_CAPS_DEVICE_SCSI_GENERIC);
    DO_TEST("hostdev-scsi-lsi-iscsi",
            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
            QEMU_CAPS_DEVICE_SCSI_GENERIC);