[libvirt] [PATCH v4 1/2] Add USB option capability

[Li Zhang]

Hi Daniel,

Would you help review this ?
I have added the test case in [PTACH v4 2/2].

Thanks. :)

On 2013年04月07日 16:31, Li Zhang wrote:
> From: Li Zhang <zhlcindy at linux.vnet.ibm.com>
>
> To avoid the collision for creating USB controllers in machine->init()
> and -device xx command line, it needs to set usb=off to avoid one USB
> controller created in machine->init(). So that libvirt can use -device
> or -usb to create USB controller sucessfully.
> So QEMU_CAPS_MACHINE_USB_OPT capability is added, and it is for QEMU
> v1.3.0 onwards which supports USB option.
>
> Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
> ---
>   v4 -> v3:
>     * Add one new test case for USB option
>     * Rebase it with latest version
>
>   v3 -> v2:
>     * Set QEMU_CAPS_MACHINE_USB_OPT with help string
>
>   v2 -> v1:
>     * Rename QEMU_CAPS_USB_OPT to QEMU_CAPS_MACHINE_USB_OPT suggested by Daniel
>     * Corret QEMU version with v1.3.0 suggested by Daniel
>
>   src/qemu/qemu_capabilities.c | 9 +++++++++
>   src/qemu/qemu_capabilities.h | 1 +
>   src/qemu/qemu_command.c      | 6 ++++++
>   3 files changed, 16 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 50712b0..07cda1f 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",
> +              "machine-usb-opt",
>       );
>   
>   struct _virQEMUCaps {
> @@ -1078,6 +1079,10 @@ virQEMUCapsComputeCmdFlags(const char *help,
>       if (strstr(help, "-machine"))
>           virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT);
>   
> +     /* USB option is supported v1.3.0 onwards */
> +    if (qemuCaps->version >= 1003000)
> +        virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT);
> +
>       /*
>        * Handling of -incoming arg with varying features
>        *  -incoming tcp    (kvm >= 79, qemu >= 0.10.0)
> @@ -2435,6 +2440,10 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
>   
>       virQEMUCapsInitQMPBasic(qemuCaps);
>   
> +    /* USB option is supported v1.3.0 onwards */
> +    if (qemuCaps->version >= 1003000)
> +        virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT);
> +
>       if (!(archstr = qemuMonitorGetTargetArch(mon)))
>           goto cleanup;
>   
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index b2dc588..9f24d6a 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_MACHINE_USB_OPT    = 137, /* -machine xxx,usb=on/off */
>   
>       QEMU_CAPS_LAST,                   /* this must always be the last item */
>   };
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 53caba5..d051056 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -5234,6 +5234,12 @@ qemuBuildMachineArgStr(virCommandPtr cmd,
>           virCommandAddArg(cmd, "-machine");
>           virBufferAdd(&buf, def->os.machine, -1);
>   
> +        /* To avoid the collision of creating USB controllers when calling
> +         * machine->init in QEMU, it needs to set usb=off
> +         */
> +        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT))
> +            virBufferAsprintf(&buf, ",usb=off");
> +
>           if (def->mem.dump_core) {
>               if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) {
>                   virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",