diff options
author | Laszlo Ersek <lersek@redhat.com> | 2015-05-28 22:04:11 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 20:24:07 +0200 |
commit | ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4 (patch) | |
tree | 9a46c5b7038a092ff89e22b1496873ae89fd8010 | |
parent | 6cd2234ccbacf2825372142a2658bf318ce2f848 (diff) | |
download | qemu-ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4.zip qemu-ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4.tar.gz qemu-ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4.tar.bz2 |
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 <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: "Gabriel L. Somlo" <gsomlo@gmail.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-block@nongnu.org
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r-- | hw/i386/pc_q35.c | 1 |
1 files changed, 1 insertions, 0 deletions
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"; } |