External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: always assume QEMU_CAPS_PCI_BOOTINDEX

Browse Source 
At the time of the addition of 'pci-assign' in QEMU commit
v1.3.0-rc0~572^2 the bootindex argument was already supported.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-09-07 13:31:23 +02:00
parent e30b5d6b89
commit 9eae152fcb
14 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -1192,7 +1192,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
{ "bootindex", QEMU_CAPS_PCI_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

8
src/qemu/qemu_command.c
View File

@ -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 &&

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -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'/>