Re: [libvirt] [PATCH v2 1/2] Introduce QEMU_CAPS_ARM_VIRT_PCI

On 06/11/2015 02:40 AM, Pavel Fedin wrote: > This capability specifies that "virt" machine on ARM has PCI controller. Enabled when version is at least 2.3.0. > > Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com&gt; > --- > src/qemu/qemu_capabilities.c | 5 +++++ > src/qemu/qemu_capabilities.h | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c > index ca7a7c2..2eccc97 100644 > --- a/src/qemu/qemu_capabilities.c > +++ b/src/qemu/qemu_capabilities.c > @@ -285,6 +285,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, > "dea-key-wrap", > "pci-serial", > "aarch64-off", > + "arm-virt-pci", > ); > > > @@ -1330,6 +1331,10 @@ virQEMUCapsComputeCmdFlags(const char *help, > virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); > } > > + if (version >= 2003000) { > + virQEMUCapsSet(qemuCaps, QEMU_CAPS_ARM_VIRT_PCI); > + } > + > return 0; > } > > diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h > index b5a7770..3c1a8b9 100644 > --- a/src/qemu/qemu_capabilities.h > +++ b/src/qemu/qemu_capabilities.h > @@ -229,6 +229,7 @@ typedef enum { > QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ > QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ > QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ > + QEMU_CAPS_ARM_VIRT_PCI = 190, /* ARM 'virt' machine has PCI bus */ > > QEMU_CAPS_LAST, /* this must always be the last item */ > } virQEMUCapsFlags; > ACK and pushed, tweaked to avoid the conflict with .git (since additions to qemu_capabilities are always conflicting, it's better to get this in early)