qemu: always assume QEMU_CAPS_VFIO_PCI_BOOTINDEX

Introduced by QEMU commit c29029d which was included in 1.5.0
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -1195,7 +1195,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
-    { "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
     { "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
 };
 

src/qemu/qemu_capabilities.h

@@ -247,7 +247,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=xxxx */
     QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */
     QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */
-    QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */
+    X_QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */
     QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
 
     /* 145 */

src/qemu/qemu_command.c

@@ -5325,18 +5325,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
                                  "supported for PCI, USB and SCSI devices"));
                 return -1;
             } else {
-                if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-                    if (subsys->u.pci.backend ==
-                        VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
-                        if (!virQEMUCapsGet(qemuCaps,
-                                            QEMU_CAPS_VFIO_PCI_BOOTINDEX)) {
-                            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                           _("booting from PCI devices assigned with VFIO "
-                                             "is not supported with this version of qemu"));
-                            return -1;
-                        }
-                    }
-                }
                 if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
                     !virQEMUCapsGet(qemuCaps,
                                     QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -62,7 +62,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -63,7 +63,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -63,7 +63,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -51,7 +51,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -51,7 +51,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -35,7 +35,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -35,7 +35,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -51,7 +51,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -51,7 +51,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -35,7 +35,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -53,7 +53,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -51,7 +51,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -35,7 +35,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -35,7 +35,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -51,7 +51,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -35,7 +35,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml

@@ -51,7 +51,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>

tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

@@ -65,7 +65,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
   <flag name='scsi-generic'/>
   <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>