3 Commits

Author	SHA1	Message	Date
Peter Krempa	17dff35848	qemu: domain: Fix machine type version check for 'isa-fdc' usage ... Starting from pc-q35-2.4 the floppy controller is not enabled by default. Fix the version check so that it does not match 2.11 as being 2.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>	2018-08-09 17:02:00 +02:00
Peter Krempa	b8936d2655	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>	2018-08-09 17:00:54 +02:00
Peter Krempa	d61da421ab	tests: qemuxml2argv: Add 2 floppy drive tests for q35 with 2.9 and 2.11 machine ... The floppy drive command line is different on the q35 machine. Make sure to test that both drives are supported and also multiple machine versions as we generate the commandline differently. Note that both output files show wrong command line which will be fixed subsequently. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>	2018-08-09 17:00:54 +02:00