From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aM1qD-00068m-5z for qemu-devel@nongnu.org; Wed, 20 Jan 2016 18:07:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aM1qC-000700-8r for qemu-devel@nongnu.org; Wed, 20 Jan 2016 18:07:05 -0500 References: <1453272694-17106-1-git-send-email-jsnow@redhat.com> <1453272694-17106-10-git-send-email-jsnow@redhat.com> <56A00EC9.9000702@redhat.com> From: John Snow Message-ID: <56A01312.80708@redhat.com> Date: Wed, 20 Jan 2016 18:06:58 -0500 MIME-Version: 1.0 In-Reply-To: <56A00EC9.9000702@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 09/12] fdc: add physical disk sizes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-block@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org On 01/20/2016 05:48 PM, Eric Blake wrote: > On 01/19/2016 11:51 PM, John Snow wrote: >> 2.88MB capable drives can accept 1.44MB floppies, >> for instance. To rework the pick_geometry function, >> we need to know if our current drive can even accept >> the type of disks we're considering. >> >> NB: This allows us to distinguish between all of the >> "total sectors" collisions between 1.20MB and 1.44MB >> diskette types, by using the physical drive size as a >> differentiator. >> >> Signed-off-by: John Snow >> --- >> hw/block/fdc.c | 40 ++++++++++++++++++++++++++++++++-------- >> 1 file changed, 32 insertions(+), 8 deletions(-) >> > >> +/* In many cases, the total sector size of a format is enough to uniquely >> + * identify it. However, there are some total sector collisions between >> + * formats of different physical size, and these are noted below by >> + * highlighting the total sector size for entries with collisions. */ >> static const FDFormat fd_formats[] = { >> /* First entry is default format */ >> /* 1.44 MB 3"1/2 floppy disks */ >> - { FLOPPY_DRIVE_TYPE_144, 18, 80, 1, FDRIVE_RATE_500K, }, >> - { FLOPPY_DRIVE_TYPE_144, 20, 80, 1, FDRIVE_RATE_500K, }, >> + { FLOPPY_DRIVE_TYPE_144, 18, 80, 1, FDRIVE_RATE_500K, }, /* 3.5" 2880 */ >> + { FLOPPY_DRIVE_TYPE_144, 20, 80, 1, FDRIVE_RATE_500K, }, /* 3.5" 3200 */ >> { FLOPPY_DRIVE_TYPE_144, 21, 80, 1, FDRIVE_RATE_500K, }, >> { FLOPPY_DRIVE_TYPE_144, 21, 82, 1, FDRIVE_RATE_500K, }, >> { FLOPPY_DRIVE_TYPE_144, 21, 83, 1, FDRIVE_RATE_500K, }, >> @@ -85,7 +95,7 @@ static const FDFormat fd_formats[] = { >> { FLOPPY_DRIVE_TYPE_288, 44, 80, 1, FDRIVE_RATE_1M, }, >> { FLOPPY_DRIVE_TYPE_288, 48, 80, 1, FDRIVE_RATE_1M, }, >> /* 720 kB 3"1/2 floppy disks */ >> - { FLOPPY_DRIVE_TYPE_144, 9, 80, 1, FDRIVE_RATE_250K, }, >> + { FLOPPY_DRIVE_TYPE_144, 9, 80, 1, FDRIVE_RATE_250K, }, /* 3.5" 1400 */ > > Typo? I think you meant 1440. > Good catch. >> +__attribute__((__unused__)) >> +static FDriveSize drive_size(FloppyDriveType drive) >> +{ >> + switch (drive) { >> + case FLOPPY_DRIVE_TYPE_120: >> + return FDRIVE_SIZE_525; >> + case FLOPPY_DRIVE_TYPE_144: >> + case FLOPPY_DRIVE_TYPE_288: >> + return FDRIVE_SIZE_350; >> + default: >> + return FDRIVE_SIZE_UNKNOWN; >> + } >> +} > > With that fixed, > Reviewed-by: Eric Blake > Thanks, --js