From patchwork Mon Jan 25 19:41:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 8115071 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AFD2C9F6DA for ; Mon, 25 Jan 2016 19:41:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E0FE2010B for ; Mon, 25 Jan 2016 19:41:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 685AA20279 for ; Mon, 25 Jan 2016 19:41:53 +0000 (UTC) Received: from localhost ([::1]:40510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNn1M-0001QJ-QA for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Jan 2016 14:41:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNn16-0001JX-GC for qemu-devel@nongnu.org; Mon, 25 Jan 2016 14:41:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNn15-0000sx-7i for qemu-devel@nongnu.org; Mon, 25 Jan 2016 14:41:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNn15-0000sp-1v for qemu-devel@nongnu.org; Mon, 25 Jan 2016 14:41:35 -0500 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 A9D6CC0AC917; Mon, 25 Jan 2016 19:41:34 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-163.bos.redhat.com [10.18.17.163]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0PJfQNI006389; Mon, 25 Jan 2016 14:41:34 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 25 Jan 2016 14:41:25 -0500 Message-Id: <1453750885-16066-14-git-send-email-jsnow@redhat.com> In-Reply-To: <1453750885-16066-1-git-send-email-jsnow@redhat.com> References: <1453750885-16066-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, jsnow@redhat.com Subject: [Qemu-devel] [PULL 13/13] fdc: change auto fallback drive for ISA FDC to 288 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The 2.88 drive is more suitable as a default because it can still read 1.44 images correctly, but the reverse is not true. Since there exist virtio-win drivers that are shipped on 2.88 floppy images, this patch will allow VMs booted without a floppy disk inserted to later insert a 2.88MB floppy and have that work. This patch has been tested with msdos, freedos, fedora, windows 8 and windows 10 without issue: if problems do arise for certain guests being unable to cope with 2.88MB drives as the default, they are in the minority and can use type=144 as needed (or insert a proper boot medium and omit type=144/288 or use type=auto) to obtain different drive types. As icing, the default will remain auto/144 for any pre-2.6 machine types, hopefully minimizing the impact of this change in legacy hw to basically zero. Reviewed-by: Eric Blake Signed-off-by: John Snow Message-id: 1453495865-9649-13-git-send-email-jsnow@redhat.com --- hw/block/fdc.c | 2 +- include/hw/compat.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 6e0c5fc..e3b0e1e 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2543,7 +2543,7 @@ static Property isa_fdc_properties[] = { FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), DEFINE_PROP_DEFAULT("fallback", FDCtrlISABus, state.fallback, - FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, + FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, FloppyDriveType), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/compat.h b/include/hw/compat.h index 491884b..2ebe739 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -3,6 +3,10 @@ #define HW_COMPAT_2_5 \ {\ + .driver = "isa-fdc",\ + .property = "fallback",\ + .value = "144",\ + },{\ .driver = "pvscsi",\ .property = "x-old-pci-configuration",\ .value = "on",\