mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-26 23:55:23 +00:00
548ba43028
Back in 2013, commit877bc089added 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. This was done because, at that time, libvirt was automatically adding a usb controller to *any* domain definition that didn't have one. Along with permitting the controller, two s390-specific tests were added to ensure this behavior was maintained - 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, commit09ab9dcceliminated 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." Although, as verified here, the s390 doesn't support usb, and usb controllers aren't currently added to s390 domain definitions automatically, there are likely still some domain definitions in the wild that have a usb controller (which was added *by libvirt*, not by the user), so we will keep the tests verifying that behavior for now. But this patch changes the names of the tests to reflect that they don't actually contain a valid s390 config; this way future developers won't propagate the incorrect idea that an s390 virtual machine can have a USB (or IDE) bus. In the case of the IDE controller, though, libvirt has never automatically added an IDE controller unless a user added an IDE disk (which itself would have caused an error), and we specifically *do* want to begin generating an error when someone tries to add an IDE controller to a domain that can't support one. For that reason, while renaming the sz390-piix-controllers patch, this patch removes the <controller type='ide'...> from it (otherwise the upcoming patch would break make check)
13 lines
685 B
Plaintext
13 lines
685 B
Plaintext
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
|