From patchwork Fri Jan 22 20:50:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 8092831 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 74C379F440 for ; Fri, 22 Jan 2016 20:53:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEF53204DE for ; Fri, 22 Jan 2016 20:53:36 +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 8725320145 for ; Fri, 22 Jan 2016 20:53:35 +0000 (UTC) Received: from localhost ([::1]:55460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMii6-0006c7-Ue for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Jan 2016 15:53:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMifs-0002Lo-Pf for qemu-devel@nongnu.org; Fri, 22 Jan 2016 15:51:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMifr-0003h0-1F for qemu-devel@nongnu.org; Fri, 22 Jan 2016 15:51:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMifo-0003e5-3m; Fri, 22 Jan 2016 15:51:12 -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 B0BA6C0ED3E1; Fri, 22 Jan 2016 20:51:11 +0000 (UTC) Received: from scv.usersys.redhat.com (vpn-56-29.rdu2.redhat.com [10.10.56.29]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0MKp570022541; Fri, 22 Jan 2016 15:51:11 -0500 From: John Snow To: qemu-block@nongnu.org Date: Fri, 22 Jan 2016 15:50:59 -0500 Message-Id: <1453495865-9649-7-git-send-email-jsnow@redhat.com> In-Reply-To: <1453495865-9649-1-git-send-email-jsnow@redhat.com> References: <1453495865-9649-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 v5 06/12] fdc: add pick_drive 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 Split apart pick_geometry by creating a pick_drive routine that will only ever called during device bring-up instead of relying on pick_geometry to be used in both cases. With this change, the drive field is changed to be 'write once'. It is not altered after the initialization routines exit. media_validated does not need to be migrated. The target VM will just revalidate the media on post_load anyway. Reviewed-by: Eric Blake Signed-off-by: John Snow --- hw/block/fdc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index a8f0cf2..f8e070e 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -151,6 +151,7 @@ typedef struct FDrive { uint8_t media_rate; /* Data rate of medium */ bool media_inserted; /* Is there a medium in the tray */ + bool media_validated; /* Have we validated the media? */ } FDrive; static void fd_init(FDrive *drv) @@ -162,6 +163,8 @@ static void fd_init(FDrive *drv) drv->disk = FLOPPY_DRIVE_TYPE_NONE; drv->last_sect = 0; drv->max_track = 0; + drv->ro = true; + drv->media_changed = 1; } #define NUM_SIDES(drv) ((drv)->flags & FDISK_DBL_SIDES ? 2 : 1) @@ -244,13 +247,24 @@ static void fd_recalibrate(FDrive *drv) fd_seek(drv, 0, 0, 1, 1); } -static void pick_geometry(FDrive *drv) +/** + * Determine geometry based on inserted diskette. + * Will not operate on an empty drive. + * + * @return: 0 on success, -1 if the drive is empty. + */ +static int pick_geometry(FDrive *drv) { BlockBackend *blk = drv->blk; const FDFormat *parse; uint64_t nb_sectors, size; int i, first_match, match; + /* We can only pick a geometry if we have a diskette. */ + if (!drv->media_inserted) { + return -1; + } + blk_get_geometry(blk, &nb_sectors); match = -1; first_match = -1; @@ -290,31 +304,51 @@ static void pick_geometry(FDrive *drv) } drv->max_track = parse->max_track; drv->last_sect = parse->last_sect; - drv->drive = parse->drive; - drv->disk = drv->media_inserted ? parse->drive : FLOPPY_DRIVE_TYPE_NONE; + drv->disk = parse->drive; drv->media_rate = parse->rate; + return 0; +} + +static void pick_drive_type(FDrive *drv) +{ + if (pick_geometry(drv) == 0) { + drv->drive = drv->disk; + } else { + /* Legacy behavior: default to 1.44MB floppy */ + drv->drive = FLOPPY_DRIVE_TYPE_144; + } } /* Revalidate a disk drive after a disk change */ static void fd_revalidate(FDrive *drv) { + int rc; + FLOPPY_DPRINTF("revalidate\n"); if (drv->blk != NULL) { drv->ro = blk_is_read_only(drv->blk); - pick_geometry(drv); if (!drv->media_inserted) { FLOPPY_DPRINTF("No disk in drive\n"); - } else { - FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", - (drv->flags & FDISK_DBL_SIDES) ? 2 : 1, - drv->max_track, drv->last_sect, - drv->ro ? "ro" : "rw"); + drv->disk = FLOPPY_DRIVE_TYPE_NONE; + } else if (!drv->media_validated) { + rc = pick_geometry(drv); + if (rc) { + FLOPPY_DPRINTF("Could not validate floppy drive media"); + } else { + drv->media_validated = true; + FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", + (drv->flags & FDISK_DBL_SIDES) ? 2 : 1, + drv->max_track, drv->last_sect, + drv->ro ? "ro" : "rw"); + } } } else { FLOPPY_DPRINTF("No drive connected\n"); drv->last_sect = 0; drv->max_track = 0; drv->flags &= ~FDISK_DBL_SIDES; + drv->drive = FLOPPY_DRIVE_TYPE_NONE; + drv->disk = FLOPPY_DRIVE_TYPE_NONE; } } @@ -2185,6 +2219,7 @@ static void fdctrl_change_cb(void *opaque, bool load) drive->media_inserted = load && drive->blk && blk_is_inserted(drive->blk); drive->media_changed = 1; + drive->media_validated = false; fd_revalidate(drive); } @@ -2221,11 +2256,12 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, Error **errp) } fd_init(drive); - fdctrl_change_cb(drive, 0); if (drive->blk) { blk_set_dev_ops(drive->blk, &fdctrl_block_ops, drive); drive->media_inserted = blk_is_inserted(drive->blk); + pick_drive_type(drive); } + fd_revalidate(drive); } }