mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 01:34:11 +03:00
b8936d2655
Fix regression introduced in <42fd5a58adb>. With q35 machine type which requires the explicitly specified FDC we'd format twoisa-fdc controllers to the command line as the code was moved to a place where it's called per-disk. Move the call back after formatting all disks and reiterate the disks to find the floppy controllers. This also moves the '-global' directive which sets up the default ISA-FDC to the end after all the disks but since we are modifying the properties it is safe to do so. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
49 lines
1.8 KiB
Plaintext
49 lines
1.8 KiB
Plaintext
LC_ALL=C \
|
|
PATH=/bin \
|
|
HOME=/home/test \
|
|
USER=test \
|
|
LOGNAME=test \
|
|
QEMU_AUDIO_DRV=none \
|
|
/usr/bin/qemu-system-i686 \
|
|
-name QEMUGuest1 \
|
|
-S \
|
|
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
|
-m 214 \
|
|
-smp 1,sockets=1,cores=1,threads=1 \
|
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
|
-display none \
|
|
-no-user-config \
|
|
-nodefaults \
|
|
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
|
server,nowait \
|
|
-mon chardev=charmonitor,id=monitor,mode=control \
|
|
-rtc base=utc \
|
|
-no-shutdown \
|
|
-no-acpi \
|
|
-usb \
|
|
-drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
|
|
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
|
|
id=virtio-disk0,bootindex=3 \
|
|
-drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
|
|
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
|
|
id=virtio-disk1 \
|
|
-drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
|
|
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
-drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
|
|
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
|
-drive file=/dev/HostVG/hdc,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\
|
|
readonly=on \
|
|
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\
|
|
bootindex=1 \
|
|
-drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
|
|
-drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
|
|
-global isa-fdc.driveA=drive-fdc0-0-0 \
|
|
-global isa-fdc.bootindexA=4 \
|
|
-global isa-fdc.driveB=drive-fdc0-0-1 \
|
|
-netdev user,id=hostnet0 \
|
|
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,\
|
|
addr=0x3,bootindex=2 \
|
|
-netdev user,id=hostnet1 \
|
|
-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\
|
|
addr=0x4
|