On 01/29/2016 12:49 PM, Max Reitz wrote: > 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 <mre...@redhat.com> > --- > hw/block/fdc.c | 23 +++------- > tests/fdc-test.c | 2 - > tests/qemu-iotests/118 | 117 > +++++++++++++++---------------------------------- > 3 files changed, 43 insertions(+), 99 deletions(-) >
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
