Fine with me.
Reviewed-by: Stefan Zimmermann <stzi@xxxxxxxxxxxxxxxxxx>
On Thu, 2015-04-30 at 16:40 -0400, Laine Stump wrote:
> Back in 2013, commit 877bc089 added in some tests that made sure no
> error was generated on a domain definition that had an automatically
> added usb controller if that domain didn't have a PCI bus to attach
> the usb controller to. In particular, two s390-specific tests were
> added, one with <controller type='usb' model='none'/> and another
> (called "s390-piix-controllers") that had both usb and ide
> controllers, but nothing attached to them.
>
> Then in February of this year, commit 09ab9dcc eliminated the annoying
> auto-adding of a usb device for s390 and s390x machines, stating:
>
> "Since s390 does not support usb the default creation of a usb
> controller for a domain should not occur."
>
> Since s390 doesn't support usb and usb controllers aren't added to
> s390 domain definitions automatically, there is no reason to have the
> tests with a usb controller and expect them to succeed. And since the
> only reference of an IDE controller wrt s390 that I've found is in the
> one test case mentioned above, and the commit log that added it
> specifically mentions the purpose to be quieting error messages on
> machines with no PCI bus, I'm assuming that the s390 also doesn't
> support IDE controllers. Based on that reasoning (and the fact that
> s390-piix-controllers causes a test error for an upcoming patch), this
> patch removes those two tests.
> ---
> .../qemuxml2argv-s390-piix-controllers.args | 12 --------
> .../qemuxml2argv-s390-piix-controllers.xml | 34 ----------------------
> .../qemuxml2argv-s390-usb-none.args | 12 --------
> .../qemuxml2argv-s390-usb-none.xml | 29 ------------------
> tests/qemuxml2argvtest.c | 10 -------
> 5 files changed, 97 deletions(-)
> delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args
> delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml
> delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args
> delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml
>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args
> deleted file mode 100644
> index e939be4..0000000
> --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> -/usr/bin/qemu-system-s390x -S -M s390-virtio -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 \
> --device virtio-serial-s390,id=virtio-serial0 -drive \
> -file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
> --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
> --chardev pty,id=charconsole0 \
> --device virtconsole,chardev=charconsole0,id=console0 \
> --object rng-random,id=objrng0,filename=/dev/hwrng \
> --device virtio-rng-s390,rng=objrng0,id=rng0
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml
> deleted file mode 100644
> index a8b72d7..0000000
> --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -<domain type='qemu'>
> - <name>test</name>
> - <memory>219100</memory>
> - <currentMemory>219100</currentMemory>
> - <os>
> - <type arch='s390x' machine='s390-virtio'>hvm</type>
> - </os>
> - <clock offset='utc'/>
> - <on_poweroff>destroy</on_poweroff>
> - <on_reboot>restart</on_reboot>
> - <on_crash>destroy</on_crash>
> - <devices>
> - <emulator>/usr/bin/qemu-system-s390x</emulator>
> - <disk type='block' device='disk'>
> - <source dev='/dev/HostVG/QEMUGuest1'/>
> - <target dev='hda' bus='virtio'/>
> - <boot order='1'/>
> - </disk>
> - <console type='pty'>
> - <target type='virtio'/>
> - </console>
> - <controller type='usb' index='0'>
> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
> - </controller>
> - <controller type='ide' index='0'>
> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
> - </controller>
> - <memballoon model='virtio'>
> - </memballoon>
> - <rng model='virtio'>
> - <backend model='random'>/dev/hwrng</backend>
> - </rng>
> - </devices>
> -</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args
> deleted file mode 100644
> index 51fcfa6..0000000
> --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> -/usr/bin/qemu-system-s390x -S -M s390-virtio -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 \
> --device virtio-serial-s390,id=virtio-serial0 \
> --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
> --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
> --chardev pty,id=charconsole0 \
> --device virtconsole,chardev=charconsole0,id=console0 \
> --object rng-random,id=objrng0,filename=/dev/hwrng \
> --device virtio-rng-s390,rng=objrng0,id=rng0
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml
> deleted file mode 100644
> index f2977b5..0000000
> --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -<domain type='qemu'>
> - <name>test</name>
> - <memory>219100</memory>
> - <currentMemory>219100</currentMemory>
> - <os>
> - <type arch='s390x' machine='s390-virtio'>hvm</type>
> - </os>
> - <clock offset='utc'/>
> - <on_poweroff>destroy</on_poweroff>
> - <on_reboot>restart</on_reboot>
> - <on_crash>destroy</on_crash>
> - <devices>
> - <emulator>/usr/bin/qemu-system-s390x</emulator>
> - <disk type='block' device='disk'>
> - <source dev='/dev/HostVG/QEMUGuest1'/>
> - <target dev='hda' bus='virtio'/>
> - <boot order='1'/>
> - </disk>
> - <console type='pty'>
> - <target type='virtio'/>
> - </console>
> - <controller type='usb' index='0' model='none'/>
> - <memballoon model='virtio'>
> - </memballoon>
> - <rng model='virtio'>
> - <backend model='random'>/dev/hwrng</backend>
> - </rng>
> - </devices>
> -</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 0763068..da5afd4 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1405,16 +1405,6 @@ mymain(void)
> QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG,
> QEMU_CAPS_OBJECT_RNG_RANDOM);
>
> - DO_TEST("s390-usb-none",
> - QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
> - QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
> - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
> -
> - DO_TEST("s390-piix-controllers",
> - QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
> - QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
> - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
> -
> DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB);
> DO_TEST("ppce500-serial", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV);
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list