From patchwork Wed Dec 16 22:16:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 557793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1CEBA1402C9 for ; Thu, 17 Dec 2015 09:18:58 +1100 (AEDT) Received: from localhost ([::1]:49644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9KPP-0000X9-QQ for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2015 17:18:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9KN2-0004Us-Ph for qemu-devel@nongnu.org; Wed, 16 Dec 2015 17:16:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9KN1-000867-Na for qemu-devel@nongnu.org; Wed, 16 Dec 2015 17:16:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9KMz-00083d-7x; Wed, 16 Dec 2015 17:16:25 -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 E47BF693D9; Wed, 16 Dec 2015 22:16:24 +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 tBGMGJhn025928; Wed, 16 Dec 2015 17:16:24 -0500 From: John Snow To: qemu-block@nongnu.org Date: Wed, 16 Dec 2015 17:16:13 -0500 Message-Id: <1450304177-3935-8-git-send-email-jsnow@redhat.com> In-Reply-To: <1450304177-3935-1-git-send-email-jsnow@redhat.com> References: <1450304177-3935-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: kwolf@redhat.com, John Snow , armbru@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v3 07/11] fdc: implement new drive type property 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Respect the drive type as given via the CLI. Set the type given by the CLI during fd_init. If the type remains the default (auto), we'll attempt to scan an inserted diskette if present to determine a type. If auto is selected but no diskette is present, we fall back to a predetermined default (currently 1.44MB to match legacy QEMU behavior.) The pick_geometry algorithm is modified to only allow matches outside of the existing drive type for the new auto behavior. If a user specifies the "none" type, QEMU will not report this drive to the CMOS. Signed-off-by: John Snow --- hw/block/fdc.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index e752758..f44472c 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -155,13 +155,11 @@ typedef struct FDrive { bool media_inserted; /* Is there a medium in the tray */ } FDrive; - static FloppyDriveType get_fallback_drive_type(FDrive *drv); static void fd_init(FDrive *drv) { /* Drive */ - drv->drive = FLOPPY_DRIVE_TYPE_NONE; /* FIXME: Obey CLI properties */ drv->perpendicular = 0; /* Disk */ drv->disk = FLOPPY_DRIVE_TYPE_NONE; @@ -274,7 +272,7 @@ static bool pick_geometry(FDrive *drv) break; } if (drv->drive == parse->drive || - drv->drive == FLOPPY_DRIVE_TYPE_NONE) { + drv->drive == FLOPPY_DRIVE_TYPE_AUTO) { size = (parse->max_head + 1) * parse->max_track * parse->last_sect; if (nb_sectors == size) { @@ -288,7 +286,10 @@ static bool pick_geometry(FDrive *drv) } if (match == -1) { if (first_match == -1) { - match = 1; + /* No entry found: drive_type was NONE or we neglected to add any + * candidate geometries for our drive type into the fd_formats table + */ + match = ARRAY_SIZE(fd_formats) - 1; } else { match = first_match; } @@ -316,9 +317,19 @@ static bool pick_geometry(FDrive *drv) static void pick_drive_type(FDrive *drv) { - if (pick_geometry(drv)) { - drv->drive = drv->disk; + if (drv->drive != FLOPPY_DRIVE_TYPE_AUTO) { + return; } + + if (!drv->media_inserted) { + drv->drive = get_fallback_drive_type(drv); + } else { + if (pick_geometry(drv)) { + drv->drive = drv->disk; + } + } + + g_assert(drv->drive != FLOPPY_DRIVE_TYPE_AUTO); } /* Revalidate a disk drive after a disk change */