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"). > > This results in the tray being reported as open if qemu has been started > with the default floppy drive, which breaks some tests. Fix them. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > 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(-) >
> +++ 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;
>
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
