From: Laszlo Ersek <[email protected]>

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 <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: John Snow <[email protected]>
Cc: "Gabriel L. Somlo" <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Kevin Wolf <[email protected]>
Cc: [email protected]
Suggested-by: Markus Armbruster <[email protected]>
Signed-off-by: Laszlo Ersek <[email protected]>
Acked-by: Paolo Bonzini <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
---
 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";
 }
 
-- 
MST


Reply via email to