]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: always assume QEMU_CAPS_VFIO_PCI_BOOTINDEX
authorJán Tomko <jtomko@redhat.com>
Fri, 7 Sep 2018 12:46:26 +0000 (14:46 +0200)
committerJán Tomko <jtomko@redhat.com>
Fri, 7 Sep 2018 15:26:17 +0000 (17:26 +0200)
Introduced by QEMU commit c29029d which was included in 1.5.0

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
31 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_command.c
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

index 814712fa6c56c34b39177860eda8c65b42aaaefc..5a32a0409ffb2d01b5def68b47bad9d2ad5ea89f 100644 (file)
@@ -1195,7 +1195,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
-    { "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
     { "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
 };
 
index 9ab8e329f4adafb737b3d354e74dc645ce1c44e5..0ceb5f3af525a17c949f738ad38ed79f96a7de2d 100644 (file)
@@ -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 */
index 8577641e876259b8bdb11ec4948bab20bde4fa77..3fd9d78daf6a56c1ad33fc805bb196fe18eff4fe 100644 (file)
@@ -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)) {
index 5563668d75265c2d97ab8ce80c66c5597e9ea2a8..338c42f70bcae5f7f01a200819fd9a14cdcbefef 100644 (file)
@@ -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'/>
index 710b214628122c65da9591bee1ed04643213b8bb..a433fc12f02f2df49f9a37078f5caf2b45405204 100644 (file)
@@ -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'/>
index 5501d4bb37bd7208249405f78f5100c3fb64459e..bd5fec9f1a44a9a2f3b2ac749365527eb0662b23 100644 (file)
@@ -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'/>
index 2387cbf04dffb9e1681dc14293d33c38915b210c..17a58a58f3c0e4de324ab419ada877c0d3a6dae2 100644 (file)
@@ -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'/>
index 640fb691439fe4b8044d00cce0ce73e394b9d36e..2da02c56be9e355cc45b3c755b8770f4edaac557 100644 (file)
@@ -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'/>
index 7eb72a85dbd598732b3a751539c7a98519001e99..34972d614d528c5cc5e4e0e12b20de3649d5b5e2 100644 (file)
@@ -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'/>
index e9ccc63402167492d232ea2613ec85a03122379d..33d404fdc661eda48dec42f76217c8d0cf64ce0f 100644 (file)
@@ -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'/>
index 388625156c0c49d51600ee48cfbccda36ee6f817..d9b520356924b9d489d7a0e541ea2e52346cf2d7 100644 (file)
@@ -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'/>
index ec8330211c17aec19b237d8cadc9df1f2126f707..fd70b05fb9b5a1c90ae6929f7256ef30d98d3e2c 100644 (file)
@@ -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'/>
index b234be563f76668cde8be796789228c7862c8157..334607c9e580d3afa340aae784bfd4e6adc2b814 100644 (file)
@@ -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'/>
index 84429e8f0ee85552e060eb6b9eb3791c590d6ffc..53cc1d2a0e19ceb4b985f3950572c317b908af92 100644 (file)
@@ -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'/>
index 7cd97dd7022d5b65a7a431f7a4a66ab2b1c0e8b7..48a27a0e72989fc2e7ed192f8dbb6bc1d8d211b6 100644 (file)
@@ -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'/>
index b8e46a970a6509491c1f0ae8e7694b5d28d6b12a..4e34bf6e2126646f75ab7618daaac1590c487df1 100644 (file)
@@ -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'/>
index 41ba01ba03ed779e54e08b2081602f2f41253098..7c994b82b9efc5e3fe28e0ed52415137f54a334c 100644 (file)
@@ -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'/>
index d4ed1d3effa7ed665103f14435455248a786ab52..ecf207b384f80095a141cc70f163af8e7c8de7f0 100644 (file)
@@ -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'/>
index 8d4a7785c4bdf217f3002c62162d41a626bf1abd..142d8452818d9f63248fe7633c6525cf24ea19e8 100644 (file)
@@ -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'/>
index 2ed63c8f382254090933376d2b04cfc5118c2831..bd1bb7992d7392acb4e9337b87e3ff72ff61132d 100644 (file)
@@ -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'/>
index f66fb172d5235050cd2b6b82751cdea964f87a1c..881c002770fb600ed5a49985a395524cad0e901b 100644 (file)
@@ -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'/>
index 4685a02877d4542b0351506c80da913929b5aa44..0317c655316eaa49246d370ff8cda7214c081493 100644 (file)
@@ -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'/>
index e8939667b34fd5335020561e3ba8326554da8c6d..b33eea90bc042b590c95da131100d5a7290b4094 100644 (file)
@@ -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'/>
index d8f1888755ea28d4a59ea64a6da4ccf8e2b97933..53a792ea9c045dabfa7c1498d1acb7d395a4e2e9 100644 (file)
@@ -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'/>
index d91182ee84a3ab94115eae23015b6b4b0d54dd4e..0705501c1df602a2f4faebd9ac89132871470f67 100644 (file)
@@ -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'/>
index c7a1de6159603dbecec6af6edc7929711a15ba1e..5c87d9484a375274c948ceb458506858989ad9c0 100644 (file)
@@ -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'/>
index e05b5b5db4881e04217ffb169e86dbdb9eb48301..8c24c0bb029a972ab8d991866760a8b485eaa91a 100644 (file)
@@ -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'/>
index e336cb19506fe7af383025ff99046fda09c3d952..ee0981da26185d014aa6b629270da01a0ed72a3a 100644 (file)
@@ -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'/>
index 278bd434209af245b77a2b8a877c8d2f397773a6..82ccc49784fff8af736e1958d521bc9243dd5f5c 100644 (file)
@@ -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'/>
index db8313277a35b196530b09cb325e7149f4587cc2..bf347dac646a998295f6f51c2c23b47ee6f48297 100644 (file)
@@ -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'/>
index faf3e527cc8148d001db79491dac5f011460cf71..a049fcea20d42f325a438a78e60400a32d50d180 100644 (file)
@@ -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'/>