From a19712b0dbe43016fb17ec48bfff2f360225fe97 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:36 +0200 Subject: block: Reset device model callbacks on detach BlockDriverState members change_cb and change_opaque are initially null. The device model may set them, with bdrv_set_change_cb(). If the device model gets detached (hot unplug), they're left dangling. Only safe because device hot unplug automatically destroys the BlockDriverState. But that's a questionable feature, best not to rely on it. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'block.c') diff --git a/block.c b/block.c index 9549b9e..81a8257 100644 --- a/block.c +++ b/block.c @@ -730,6 +730,8 @@ void bdrv_detach(BlockDriverState *bs, DeviceState *qdev) { assert(bs->peer == qdev); bs->peer = NULL; + bs->change_cb = NULL; + bs->change_opaque = NULL; } DeviceState *bdrv_get_attached(BlockDriverState *bs) -- cgit v1.1