From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGBL6-0002SX-PJ for qemu-devel@nongnu.org; Tue, 27 Jan 2015 13:58:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGBKz-00044E-2Q for qemu-devel@nongnu.org; Tue, 27 Jan 2015 13:58:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGBKy-00043x-Qa for qemu-devel@nongnu.org; Tue, 27 Jan 2015 13:58:09 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RIw74u018218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Jan 2015 13:58:08 -0500 Message-ID: <54C7DFBE.7030209@redhat.com> Date: Tue, 27 Jan 2015 11:58:06 -0700 From: Eric Blake MIME-Version: 1.0 References: <1422288204-29271-1-git-send-email-mreitz@redhat.com> <1422288204-29271-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1422288204-29271-4-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0mjcdJhrSkUItlpg6qtoBWwqdEsP4laRe" Subject: Re: [Qemu-devel] [PATCH 03/50] hw/block/fdc: Implement tray status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Jeff Cody , Markus Armbruster , Stefan Hajnoczi , john@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0mjcdJhrSkUItlpg6qtoBWwqdEsP4laRe Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 01/26/2015 09:02 AM, Max Reitz wrote: > The tray of an FDD is open iff there is no medium inserted (there are > only two states for an FDD: "medium inserted" or "no medium inserted").= >=20 > This results in the tray being reported as open if qemu has been starte= d > with the default floppy drive, which breaks some tests. Fix them. >=20 > Signed-off-by: Max Reitz > --- > hw/block/fdc.c | 20 +++++++++++++--- > tests/fdc-test.c | 4 +--- > tests/qemu-iotests/067.out | 60 +++++++-------------------------------= -------- > tests/qemu-iotests/071.out | 2 -- > tests/qemu-iotests/081.out | 1 - > tests/qemu-iotests/087.out | 5 ---- > 6 files changed, 26 insertions(+), 66 deletions(-) >=20 > +++ b/hw/block/fdc.c > @@ -192,6 +192,8 @@ typedef struct FDrive { > uint8_t ro; /* Is read-only */ > uint8_t media_changed; /* Is media changed */ Might be nice someday to make these bool, but not in this patch. > uint8_t media_rate; /* Data rate of medium */ > + > + bool media_inserted; /* Is there a medium in the tray */ > } FDrive; > =20 Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --0mjcdJhrSkUItlpg6qtoBWwqdEsP4laRe Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJUx9++AAoJEKeha0olJ0Nq9WAH/0r2wvZTXnXxGTM+qv3ny/2u /KfqW9Hwd1zlmWQbghjH0IDndPe1f0khnLF0J9reMKc76wJQjeud33gwy59s68dT YMDX6udzUBZCJrHC3GLn2GEOjWUuocEm5dffCEw8+kF44H4FEbU0Jyd+wfD7Hts9 gf/ji0M+//VpKcGGxd8f4PG2nZaZ0wJ8nMoBNoOXb9Rw9uGsXNq1lRs64g10GCe+ IFjEuJqEAkaMaYOIt2myzl5phGHu7VsrdvZVLG92fSUC20xH/afK8SDmCJ8lupge CMf8y2feIzfezm1UTXaNJu1UGyOIOvmyCXbVg4NJE7EhzCjAbmfHLyPrefIlsus= =IWba -----END PGP SIGNATURE----- --0mjcdJhrSkUItlpg6qtoBWwqdEsP4laRe--