summaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-09-29 18:30:53 +0200
committerKevin Wolf <kwolf@redhat.com>2016-10-07 13:34:22 +0200
commit2d76e724cf9e3f9fec6070a8af79c7ee4c2e763e (patch)
tree771cea6c18fb0f0007ab2d716023e516e329eed3 /block.c
parentbbc8ea98bc8a2ba8174d106184f3089248d5ec5d (diff)
downloadqemu-2d76e724cf9e3f9fec6070a8af79c7ee4c2e763e.tar.gz
block: Add qdev ID to DEVICE_TRAY_MOVED
The event currently only contains the BlockBackend name. However, with anonymous BlockBackends, this is always the empty string. Add the qdev ID (or if none was given, the QOM path) so that the user can still see which device caused the event. Event generation has to be moved from bdrv_eject() to the BlockBackend because the BDS doesn't know the attached device, but that's easy because blk_eject() is the only user of it. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/block.c b/block.c
index 40eb570389..7f3e7bcdc3 100644
--- a/block.c
+++ b/block.c
@@ -3360,17 +3360,10 @@ int bdrv_media_changed(BlockDriverState *bs)
void bdrv_eject(BlockDriverState *bs, bool eject_flag)
{
BlockDriver *drv = bs->drv;
- const char *device_name;
if (drv && drv->bdrv_eject) {
drv->bdrv_eject(bs, eject_flag);
}
-
- device_name = bdrv_get_device_name(bs);
- if (device_name[0] != '\0') {
- qapi_event_send_device_tray_moved(device_name,
- eject_flag, &error_abort);
- }
}
/**