From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5d0z-0001BE-2E for qemu-devel@nongnu.org; Thu, 18 Jun 2015 12:50:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5d0t-0003Xb-LB for qemu-devel@nongnu.org; Thu, 18 Jun 2015 12:50:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5d0t-0003XX-H5 for qemu-devel@nongnu.org; Thu, 18 Jun 2015 12:50:03 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 24C3E38DCA6 for ; Thu, 18 Jun 2015 16:50:03 +0000 (UTC) From: Eduardo Habkost Date: Thu, 18 Jun 2015 13:49:28 -0300 Message-Id: <1434646168-3100-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] q35: Re-enable FDC on pc-q35-2.3 and older List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laszlo Ersek , =?UTF-8?q?J=C3=A1n=20Tomko?= , Markus Armbruster , "Michael S. Tsirkin" 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 restores the previous behavior where all the 2.3 and older machines had no_floppy=3D0. Reported-by: J=C3=A1n Tomko Cc: Laszlo Ersek Signed-off-by: Eduardo Habkost --- 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 b68263d..082cd93 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 =3D 0; m->alias =3D NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); } --=20 2.1.0