From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZA6hs-0001TR-DE for qemu-devel@nongnu.org; Tue, 30 Jun 2015 21:20:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZA6hr-00088i-4S for qemu-devel@nongnu.org; Tue, 30 Jun 2015 21:20:56 -0400 From: John Snow Date: Tue, 30 Jun 2015 21:20:33 -0400 Message-Id: <1435713640-12362-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1435713640-12362-1-git-send-email-jsnow@redhat.com> References: <1435713640-12362-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [RFC 03/10] fdc: respect default drive type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, John Snow , armbru@redhat.com, qemu-devel@nongnu.org Respect the default drive type as proffered via the CLI. This patch overloads the "drive out" parameter of pick_geometry to be used as a "default hint" which is offered by fd_revalidate. Signed-off-by: John Snow --- hw/block/fdc.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 1023a01..87fd770 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -128,7 +128,13 @@ static void pick_geometry(BlockBackend *blk, int *nb_heads, /* Pick a default drive type if there's no media inserted AND we have * not yet announced our drive type to the CMOS. */ if (!blk_is_inserted(blk) && drive_in == FDRIVE_DRV_NONE) { - parse = &fd_formats[0]; + for (i = 0; ; i++) { + parse = &fd_formats[i]; + if ((parse->drive == FDRIVE_DRV_NONE) || + (parse->drive == *drive)) { + break; + } + } goto out; } @@ -295,11 +301,13 @@ static void fd_recalibrate(FDrive *drv) fd_seek(drv, 0, 0, 1, 1); } +static FDriveType get_default_drive_type(FDrive *drv); + /* Revalidate a disk drive after a disk change */ static void fd_revalidate(FDrive *drv) { int nb_heads, max_track, last_sect, ro; - FDriveType drive; + FDriveType drive = get_default_drive_type(drv); FDriveRate rate; FLOPPY_DPRINTF("revalidate\n"); @@ -609,6 +617,21 @@ typedef struct FDCtrlISABus { int32_t bootindexB; } FDCtrlISABus; +static FDriveType get_default_drive_type(FDrive *drv) +{ + FDCtrl *fdctrl = drv->fdctrl; + + if (0 < MAX_FD && (&fdctrl->drives[0] == drv)) { + return fdctrl->defaultA; + } + + if (1 < MAX_FD && (&fdctrl->drives[1] == drv)) { + return fdctrl->defaultB; + } + + return FDRIVE_DEFAULT; +} + static uint32_t fdctrl_read (void *opaque, uint32_t reg) { FDCtrl *fdctrl = opaque; -- 2.1.0