Revert "hw/block/fdc: Implement tray status"
commitabb3e55b5b718d6392441f56ba0729a62105ac56
authorMax Reitz <mreitz@redhat.com>
Fri, 29 Jan 2016 19:49:12 +0000 (29 20:49 +0100)
committerMax Reitz <mreitz@redhat.com>
Tue, 2 Feb 2016 16:47:04 +0000 (2 17:47 +0100)
tree0ad6175829f45cb7a7095ef5fcc373a5a8b52f73
parent12c7ec87a7d88919b23736176eba3118d1521372
Revert "hw/block/fdc: Implement tray status"

This reverts the changes that commit
2e1280e8ff95b3145bc6262accc9d447718e5318 applied to hw/block/fdc.c;
also, an additional case of drv->media_inserted use has crept in since,
which is replaced by a call to blk_is_inserted().

That commit changed tests/fdc-test.c, too, because after it, one less
TRAY_MOVED event would be emitted when executing 'change' on an empty
drive. However, now, no TRAY_MOVED events will be emitted at all, and
the tray_open status returned by query-block will always be false,
necessitating (different) changes to tests/fdc-test.c and iotest 118,
which is why this patch is not a pure revert of said commit.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 1454096953-31773-4-git-send-email-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
hw/block/fdc.c
tests/fdc-test.c
tests/qemu-iotests/118