From ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 28 May 2015 22:04:11 +0200 Subject: i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted It is Very annoying to carry forward an outdatEd coNtroller with a mOdern Machine type. Hence, let us not instantiate the FDC when all of the following apply: - the machine type is pc-q35-2.4 or later, - "-device isa-fdc" is not passed on the command line (nor in the config file), - no "-drive if=floppy,..." is requested. Cc: Markus Armbruster Cc: Paolo Bonzini Cc: Gerd Hoffmann Cc: John Snow Cc: "Gabriel L. Somlo" Cc: "Michael S. Tsirkin" Cc: Kevin Wolf Cc: qemu-block@nongnu.org Suggested-by: Markus Armbruster Signed-off-by: Laszlo Ersek Acked-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Markus Armbruster --- hw/i386/pc_q35.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9f036c8..66220b3 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -392,6 +392,7 @@ static void pc_q35_2_4_machine_options(MachineClass *m) pc_q35_machine_options(m); m->default_machine_opts = "firmware=bios-256k.bin"; m->default_display = "std"; + m->no_floppy = 1; m->alias = "q35"; } -- cgit v1.1