mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
qemu: always assume QEMU_CAPS_PCI_BOOTINDEX
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:
parent
e30b5d6b89
commit
9eae152fcb
@ -1192,7 +1192,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
|
||||
};
|
||||
|
||||
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
|
||||
{ "bootindex", QEMU_CAPS_PCI_BOOTINDEX },
|
||||
};
|
||||
|
||||
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
|
||||
|
@ -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 */
|
||||
|
@ -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 &&
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
@ -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'/>
|
||||
|
Loading…
Reference in New Issue
Block a user