[libvirt] [PATCH v4 2/2]testcase: Add a new USB option test case

[Li Zhang]

Hi Daniel,

Would you please help review this patch?

Thanks. :)

On 2013年04月07日 16:31, Li Zhang wrote:
> From: Li Zhang <zhlcindy at linux.vnet.ibm.com>
>
> Add one test case to test CLI with -machine xxx,usb=off.
>
> Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
> ---
>   .../qemuxml2argv-machine-usb-opt.args              |  5 +++++
>   .../qemuxml2argv-machine-usb-opt.xml               | 26 ++++++++++++++++++++++
>   tests/qemuxml2argvtest.c                           |  2 ++
>   3 files changed, 33 insertions(+)
>   create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
>   create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml
>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
> new file mode 100644
> index 0000000..ed88850
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
> @@ -0,0 +1,5 @@
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> +-S -machine pc,usb=off -m 214 -smp 1 -nographic \
> +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> +-hda /dev/HostVG/QEMUGuest1 -net none -serial \
> +none -parallel none
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml
> new file mode 100644
> index 0000000..c4d483a
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.xml
> @@ -0,0 +1,26 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219100</memory>
> +  <currentMemory unit='KiB'>219100</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <os>
> +    <type arch='i686' machine='pc'>hvm</type>
> +    <boot dev='hd'/>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu</emulator>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='ide'/>
> +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> +    </disk>
> +    <controller type='usb' index='0'/>
> +    <controller type='ide' index='0'/>
> +    <memballoon model='virtio'/>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index d6575e7..36d5122 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -369,6 +369,8 @@ mymain(void)
>               QEMU_CAPS_DUMP_GUEST_CORE);
>       DO_TEST_FAILURE("machine-core-on", NONE);
>       DO_TEST_FAILURE("machine-core-on", QEMU_CAPS_MACHINE_OPT);
> +    DO_TEST("machine-usb-opt", QEMU_CAPS_MACHINE_OPT,
> +            QEMU_CAPS_MACHINE_USB_OPT);
>       DO_TEST("boot-cdrom", NONE);
>       DO_TEST("boot-network", NONE);
>       DO_TEST("boot-floppy", NONE);