From: John Snow <jsnow@redhat.com>
To: Eric Blake <eblake@redhat.com>, qemu-block@nongnu.org
Cc: kwolf@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v4 08/12] fdc: add drive type option
Date: Wed, 20 Jan 2016 18:04:41 -0500 [thread overview]
Message-ID: <56A01289.7000804@redhat.com> (raw)
In-Reply-To: <56A00DA6.5040900@redhat.com>
On 01/20/2016 05:43 PM, Eric Blake wrote:
> On 01/19/2016 11:51 PM, John Snow wrote:
>> This patch adds a new explicit Floppy Drive Type option. The existing
>> behavior in QEMU is to automatically guess a drive type based on the
>> media inserted, or if a diskette is not present, arbitrarily assign one.
>>
>> This behavior can be described as "auto." This patch adds the option
>
> I might have written '"auto".' (the '.' is not part of the behavior
> name). But while grammar guides are starting to concede this style,
> they still admit that for a long time English used to always put the
> trailing '.' of a sentence inside the "", regardless of whether the
> quoted material originally included a period at that point or whether it
> was just the speaker ending their sentence on quoted material.
>
"Starting to concede" -- I think Strunk & White disagrees with you on
the concept that this is a cool new thing that young people do!
I will start putting my punctuation outside the quotation marks as soon
as everyone else agrees to stop using two spaces after the full stop.
I am taking no prisoners.
>> to pick an explicit behavior: 120, 144, 288 or none. The new "auto"
>> option is intended to mimic current behavior, while the other types
>> pick one explicitly.
>>
>> 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.)
>>
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> ---
>> hw/block/fdc.c | 26 +++++++++++++++++++++++---
>> 1 file changed, 23 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/block/fdc.c b/hw/block/fdc.c
>> index e9551e5..f475add 100644
>> --- a/hw/block/fdc.c
>> +++ b/hw/block/fdc.c
>> @@ -159,7 +159,6 @@ static FloppyDriveType get_fallback_drive_type(FDrive *drv);
>> static void fd_init(FDrive *drv)
>> {
>> /* Drive */
>> - drv->drive = FLOPPY_DRIVE_TYPE_NONE;
>> drv->perpendicular = 0;
>> /* Disk */
>> drv->disk = FLOPPY_DRIVE_TYPE_NONE;
>> @@ -263,7 +262,7 @@ static int pick_geometry(FDrive *drv)
>> int i, first_match, match;
>>
>> /* We can only pick a geometry if we have a diskette. */
>> - if (!drv->media_inserted) {
>> + if ((!drv->media_inserted) || (drv->drive == FLOPPY_DRIVE_TYPE_NONE)) {
>
> I might have dropped the two inner () pairs. But that's cosmetic.
>
This nit, however, I'll edit.
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
--js
next prev parent reply other threads:[~2016-01-20 23:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 6:51 [Qemu-devel] [PATCH v4 00/12] fdc: fix 2.88mb floppy diskette support John Snow
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 01/12] fdc: move pick_geometry John Snow
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 02/12] fdc: reduce number of pick_geometry arguments John Snow
2016-01-20 20:30 ` Eric Blake
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 03/12] fdc: add drive type qapi enum John Snow
2016-01-20 20:33 ` Eric Blake
2016-01-20 20:49 ` John Snow
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 04/12] fdc: add disk field John Snow
2016-01-20 20:35 ` Eric Blake
2016-01-20 20:59 ` John Snow
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 05/12] fdc: Throw an assertion on misconfigured fd_formats table John Snow
2016-01-20 21:23 ` Eric Blake
2016-01-20 21:33 ` John Snow
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 06/12] fdc: add pick_drive John Snow
2016-01-20 22:30 ` Eric Blake
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 07/12] fdc: Add fallback option John Snow
2016-01-20 22:36 ` Eric Blake
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 08/12] fdc: add drive type option John Snow
2016-01-20 22:43 ` Eric Blake
2016-01-20 23:04 ` John Snow [this message]
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 09/12] fdc: add physical disk sizes John Snow
2016-01-20 22:48 ` Eric Blake
2016-01-20 23:06 ` John Snow
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 10/12] fdc: rework pick_geometry John Snow
2016-01-20 23:45 ` Eric Blake
2016-01-21 20:14 ` John Snow
2016-01-21 20:58 ` Eric Blake
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 11/12] qtest/fdc: Support for 2.88MB drives John Snow
2016-01-21 17:40 ` Eric Blake
2016-01-20 6:51 ` [Qemu-devel] [PATCH v4 12/12] fdc: change auto fallback drive for ISA FDC to 288 John Snow
2016-01-21 17:41 ` Eric Blake
2016-01-20 7:55 ` [Qemu-devel] [Qemu-block] [PATCH v4 00/12] fdc: fix 2.88mb floppy diskette support Denis V. Lunev
2016-01-20 19:40 ` John Snow
2016-01-20 19:43 ` Denis V. Lunev
2016-01-21 10:53 ` Roman Kagan
2016-01-21 14:59 ` John Snow
2016-01-21 15:37 ` Roman Kagan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56A01289.7000804@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).