On 04/17/2013 01:58 PM, Laine Stump wrote:
On 04/03/2013 11:50 AM, Ján Tomko wrote:
> From: liguang <lig.fnst(a)cn.fujitsu.com>
>
> ---
> src/qemu/qemu_capabilities.c | 2 ++
> src/qemu/qemu_capabilities.h | 1 +
> src/qemu/qemu_command.c | 15 ++++++++++++++-
> tests/qemuhelptest.c | 21 ++++++++++++++-------
> 4 files changed, 31 insertions(+), 8 deletions(-)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index aa381b4..4377e08 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -216,6 +216,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
>
> "ipv6-migration", /* 135 */
> "machine-opt",
> + "pci-bridge",
> );
>
> struct _virQEMUCaps {
> @@ -1357,6 +1358,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
> { "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG },
> { "rng-random", QEMU_CAPS_OBJECT_RNG_RANDOM },
> { "rng-egd", QEMU_CAPS_OBJECT_RNG_EGD },
> + { "pci-bridge", QEMU_CAPS_DEVICE_PCI_BRIDGE },
> };
>
> static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index b2dc588..e3bba52 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -176,6 +176,7 @@ enum virQEMUCapsFlags {
> QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */
> QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */
> QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/
> + QEMU_CAPS_DEVICE_PCI_BRIDGE = 137, /* -device pci-bridge */
>
> QEMU_CAPS_LAST, /* this must always be the last item */
> };
Another problem - I don't see anywhere that QEMU_CAPS_DEVICE_PCI_BRIDGE
is being turned on.
Nevermind. Now I see how it works - the entry in
virQEMUCapsObjectTypes[] causes a check, which will set it. *So* much
simpler than the older help output parsing...