]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemu: command: Don't format -device isa-fdc,... twice with two floppy drives
authorPeter Krempa <pkrempa@redhat.com>
Thu, 9 Aug 2018 11:50:22 +0000 (13:50 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 9 Aug 2018 15:00:54 +0000 (17:00 +0200)
commitb8936d265518b07f1b63cb16bce38247fe5ca135
treef48498364516d1a23ebcb0ed725a8f177434147f
parentd61da421abe643c8b3296b341344af4b9d114140
qemu: command: Don't format -device isa-fdc,... twice with two floppy drives

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>
src/qemu/qemu_command.c
tests/qemuxml2argvdata/boot-complex.args
tests/qemuxml2argvdata/boot-strict.args
tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
tests/qemuxml2argvdata/disk-floppy-tray.args
tests/qemuxml2argvdata/disk-floppy.args
tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
tests/qemuxml2argvdata/user-aliases.args