NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Add QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE

Browse Source 
This capability will be set when the pcie-pci-bridge device
is available in the QEMU binary.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-01-09 18:05:30 +01:00
parent 33b2df2795
commit 1764a51b95
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -467,6 +467,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"virtio-mouse-ccw", "virtio-mouse-ccw",
"virtio-tablet-ccw", "virtio-tablet-ccw",
"qcow2-luks", "qcow2-luks",
"pcie-pci-bridge",
); );
@ -1706,6 +1707,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtio-keyboard-ccw", QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW }, { "virtio-keyboard-ccw", QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW },
{ "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW }, { "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
{ "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW }, { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
{ "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {

1
src/qemu/qemu_capabilities.h
View File

@ -451,6 +451,7 @@ typedef enum {
QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */ QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */
QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */ QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */
QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */ QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -188,6 +188,7 @@
<flag name='pl011'/> <flag name='pl011'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='qcow2-luks'/> <flag name='qcow2-luks'/>
<flag name='pcie-pci-bridge'/>
<version>2011090</version> <version>2011090</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>342346</microcodeVersion> <microcodeVersion>342346</microcodeVersion>

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

@ -226,6 +226,7 @@
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='qcow2-luks'/> <flag name='qcow2-luks'/>
<flag name='pcie-pci-bridge'/>
<version>2011090</version> <version>2011090</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>390060</microcodeVersion> <microcodeVersion>390060</microcodeVersion>