mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-23 16:10:54 +00:00
fcbfd58429
The implicit IDE, USB, and video controllers provided by the PIIX3 chipset in the pc-* machinetypes are not present on other machinetypes, so we shouldn't be doing the special checking for them. This patch places those validation checks into a separate function that is only called for machine types that have a PIIX3 chip (which happens to be the i440fx-based pc-* machine types). One qemuxml2argv test data file had to be changed - the pseries-usb-multi test had included a piix3-usb-uhci device, which was being placed at a specific address, and also had slot 2 auto reserved for a video device, but the pseries virtual machine doesn't actually have a PIIX3 chip, so even if there was a piix3-usb-uhci driver for it, the device wouldn't need to reside at slot 1 function 2. I just changed the .argv file to have the generic slot info for the two devices that results when the special PIIX3 code isn't executed.
9 lines
468 B
Plaintext
9 lines
468 B
Plaintext
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
|
|
/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -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 piix3-usb-uhci,id=usb,bus=pci,addr=0x1 \
|
|
-device pci-ohci,id=usb1,bus=pci,addr=0x2 -chardev \
|
|
pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000
|