From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aM1Tr-0005WF-He for qemu-devel@nongnu.org; Wed, 20 Jan 2016 17:44:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aM1Tq-0008RY-CU for qemu-devel@nongnu.org; Wed, 20 Jan 2016 17:43:59 -0500 References: <1453272694-17106-1-git-send-email-jsnow@redhat.com> <1453272694-17106-9-git-send-email-jsnow@redhat.com> From: Eric Blake Message-ID: <56A00DA6.5040900@redhat.com> Date: Wed, 20 Jan 2016 15:43:50 -0700 MIME-Version: 1.0 In-Reply-To: <1453272694-17106-9-git-send-email-jsnow@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HstQ1mV6kcppcSM0u5cPbseOig64cXXUl" Subject: Re: [Qemu-devel] [PATCH v4 08/12] fdc: add drive type option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-block@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HstQ1mV6kcppcSM0u5cPbseOig64cXXUl Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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= =2E >=20 > 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. > 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. >=20 > 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.) >=20 > Signed-off-by: John Snow > --- > hw/block/fdc.c | 26 +++++++++++++++++++++++--- > 1 file changed, 23 insertions(+), 3 deletions(-) >=20 > 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(FDri= ve *drv); > static void fd_init(FDrive *drv) > { > /* Drive */ > - drv->drive =3D FLOPPY_DRIVE_TYPE_NONE; > drv->perpendicular =3D 0; > /* Disk */ > drv->disk =3D FLOPPY_DRIVE_TYPE_NONE; > @@ -263,7 +262,7 @@ static int pick_geometry(FDrive *drv) > int i, first_match, match; > =20 > /* We can only pick a geometry if we have a diskette. */ > - if (!drv->media_inserted) { > + if ((!drv->media_inserted) || (drv->drive =3D=3D FLOPPY_DRIVE_TYPE= _NONE)) { I might have dropped the two inner () pairs. But that's cosmetic. Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --HstQ1mV6kcppcSM0u5cPbseOig64cXXUl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJWoA2mAAoJEKeha0olJ0NqHGkIAKc4DQdScbtbnQiTmBNigi93 K1n07lDr4pgAMxT7R9ypMRP+KDfDnbFqfwfnWUSpSKe2tmBDFdjHBH3lR8yEfHsc 9QnkrJuYIdRRdFV6O4yQJ2+1G2XUOQrU2qt5LNYFoWyiM1wzE7aJm8LNkprtcTel 9IllreVPIMeiBv8QHe2q84T2kTxDNftWg4W5zHzbvemYqbMmkwyaqYbAZWBIJyhV shgOJcl6z6EOdaTqA61uUWp85YUG9d1rY12xWerPhQNQIgtkAkpJJza46tlBoMtI 7tCGGMwOC7YgQAuEv5LZH4dJyLOH7gUBm/vlj5xFk905Hr62yo42ISplLtiQUR0= =KD7f -----END PGP SIGNATURE----- --HstQ1mV6kcppcSM0u5cPbseOig64cXXUl--