[libvirt] [PATCH 2/9] qemu: always assume QEMU_CAPS_PCI_BOOTINDEX

At the time of its addition in QEMU commit v1.3.0-rc0~572^2 the bootindex argument was already supported. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 8 -------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - 14 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 222c344c97..ab99b3f1cc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1193,7 +1193,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = { }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = { - { "bootindex", QEMU_CAPS_PCI_BOOTINDEX }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b8c6dfe54b..b83e380c4a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -121,7 +121,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ X_QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */ X_QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */ - QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ + X_QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ /* 55 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6436086560..88db9c6945 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5335,14 +5335,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, "is not supported with this version of qemu")); return -1; } - } else { - if (!virQEMUCapsGet(qemuCaps, - QEMU_CAPS_PCI_BOOTINDEX)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("booting from assigned PCI devices is not " - "supported with this version of qemu")); - return -1; - } } } if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 122f324668..b752b74036 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 7e7981ccfd..2b7ea53144 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index a118d466fd..d6254eb2ba 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index d3575aaea0..13b5d5d9e0 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 236fb8a138..007585924d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index be6ae99d61..15bf9db373 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 662d714512..666b7bed17 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index c215ec2997..3f51550018 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 1e9b9bfd4e..7021a6dfa3 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index fd6cea9995..360b99fde1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index e0e4da9b4e..f3db1cb134 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='spice'/> <flag name='hda-duplex'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='virtio-tx-alg'/> -- 2.16.4