[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCHv2 6/6] tests: Add tests to check the new USB "none" controller



On Thu, Jul 12, 2012 at 11:31:00AM +0200, Peter Krempa wrote:
> This patch adds a set of tests to check parsing of domain XMLs that use
> the "none" controller and some forbidden situations concerning it.
> ---
>  .../qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml |   19 ++++++++++++++++++
>  .../qemuxml2argv-usb-none-other.xml                |   19 ++++++++++++++++++
>  .../qemuxml2argv-usb-none-usbtablet.xml            |   21 ++++++++++++++++++++
>  tests/qemuxml2argvdata/qemuxml2argv-usb-none.args  |    5 ++++
>  tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml   |   16 +++++++++++++++
>  tests/qemuxml2argvtest.c                           |   10 +++++++++
>  6 files changed, 90 insertions(+), 0 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml

I think I'd rather have this merged with patch 4, since it is testing
that addition.


> 
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml
> new file mode 100644
> index 0000000..9eeb953
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml
> @@ -0,0 +1,19 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219136</memory>
> +  <currentMemory unit='KiB'>219136</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <os>
> +    <type arch='i686' machine='pc'>hvm</type>
> +    <boot dev='hd'/>
> +  </os>
> +  <devices>
> +    <emulator>/usr/bin/qemu</emulator>
> +    <controller type='usb' model='none' index='0'/>
> +    <memballoon model='virtio'/>
> +    <hub type='usb'>
> +      <address type='usb' bus='0' port='1'/>
> +    </hub>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml
> new file mode 100644
> index 0000000..64bbba6
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml
> @@ -0,0 +1,19 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219136</memory>
> +  <currentMemory unit='KiB'>219136</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <os>
> +    <type arch='i686' machine='pc'>hvm</type>
> +    <boot dev='hd'/>
> +  </os>
> +  <devices>
> +    <emulator>/usr/bin/qemu</emulator>
> +    <controller type='usb' index='0' model='none'/>
> +    <controller type='usb' index='0'>
> +      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
> +    </controller>
> +    <memballoon model='virtio'/>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml
> new file mode 100644
> index 0000000..9d53cc0
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml
> @@ -0,0 +1,21 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219136</memory>
> +  <currentMemory unit='KiB'>219136</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>
> +    <controller type='usb' model='none' index='0'/>
> +    <input type='tablet' bus='usb'/>
> +    <memballoon model='virtio'/>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
> new file mode 100644
> index 0000000..085b66f
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
> @@ -0,0 +1,5 @@
> +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> +-M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \
> +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
> +-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
> +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml
> new file mode 100644
> index 0000000..69ace41
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml
> @@ -0,0 +1,16 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219136</memory>
> +  <currentMemory unit='KiB'>219136</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <os>
> +    <type arch='i686' machine='pc'>hvm</type>
> +    <boot dev='hd'/>
> +  </os>
> +  <devices>
> +    <emulator>/usr/bin/qemu</emulator>
> +    <controller type='usb' index='0' model='none'/>
> +    <memballoon model='virtio'/>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 56cfc4f..cd5480c 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -683,6 +683,16 @@ mymain(void)
>              QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
>              QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_PIIX3_USB_UHCI,
>              QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1);
> +    DO_TEST("usb-none",
> +            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
> +    DO_TEST_PARSE_ERROR("usb-none-other",
> +            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
> +    DO_TEST_PARSE_ERROR("usb-none-hub",
> +            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
> +            QEMU_CAPS_USB_HUB);
> +    DO_TEST_PARSE_ERROR("usb-none-usbtablet",
> +            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
> +
> 
>      DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE);
> 

ACK

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]