From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLzhU-0005yi-77 for qemu-devel@nongnu.org; Wed, 20 Jan 2016 15:49:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLzhT-00017e-Eb for qemu-devel@nongnu.org; Wed, 20 Jan 2016 15:49:56 -0500 References: <1453272694-17106-1-git-send-email-jsnow@redhat.com> <1453272694-17106-4-git-send-email-jsnow@redhat.com> <569FEF2C.3050402@redhat.com> From: John Snow Message-ID: <569FF2EC.4060902@redhat.com> Date: Wed, 20 Jan 2016 15:49:48 -0500 MIME-Version: 1.0 In-Reply-To: <569FEF2C.3050402@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 03/12] fdc: add drive type qapi enum 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 03:33 PM, Eric Blake wrote: > On 01/19/2016 11:51 PM, John Snow wrote: >> Change the floppy drive type to a QAPI enum type, to allow us to >> specify the floppy drive type from the CLI in a forthcoming patch. >> >> Signed-off-by: John Snow >> --- >> hw/block/fdc.c | 80 +++++++++++++++++++++++++------------------------- >> hw/i386/pc.c | 17 ++++++----- >> include/hw/block/fdc.h | 9 +----- >> qapi/block.json | 16 ++++++++++ >> 4 files changed, 66 insertions(+), 56 deletions(-) >> > >> +++ b/qapi/block.json >> @@ -40,6 +40,22 @@ >> 'data': ['auto', 'none', 'lba', 'large', 'rechs']} >> >> ## >> +# @FloppyDriveType >> +# >> +# Type of Floppy drive to be emulated by the Floppy Disk Controller. >> +# >> +# @144: 1.44MB 3.5" drive >> +# @288: 2.88MB 3.5" drive >> +# @120: 1.5MB 5.25" drive > > Umm, how does 120 match with 1.5M? Elsewhere the code comments say: > > /* 1.2 MB 5"1/4 floppy disks */ > > With the typo fixed, > Reviewed-by: Eric Blake > !? just a typo I never noticed... I must have had the "5" buffered because of the 5.25" physical size...