From: Eduardo Habkost Date: Thu, 18 Jun 2015 16:49:28 +0000 (-0300) Subject: q35: Re-enable FDC on pc-q35-2.3 and older X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=473a49460db0a90bfda046b8f3662b49f94098eb;p=qemu.git q35: Re-enable FDC on pc-q35-2.3 and older commit ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4 doesn't match the patch submitted by Laszlo to qemu-devel. We reuse pc_q35_2_4_machine_options() inside pc_q35_2_3_machine_options(), so we need to undo the no_floppy change in pc_q35_2_3_machine_options(). (This discrepancy was due to a bad merge.) This restores the previous behavior where all the 2.3 and older machines had no_floppy=0. Reported-by: Ján Tomko Reviewed-by: Laszlo Ersek Signed-off-by: Eduardo Habkost Message-id: 1434646168-3100-1-git-send-email-ehabkost@redhat.com Cc: Laszlo Ersek Signed-off-by: Eduardo Habkost [PMM: mention that this was a merge issue, not a review issue] Signed-off-by: Peter Maydell --- diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b68263d231..082cd93bb2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -403,6 +403,7 @@ DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, static void pc_q35_2_3_machine_options(MachineClass *m) { pc_q35_2_4_machine_options(m); + m->no_floppy = 0; m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); }