aboutsummaryrefslogtreecommitdiff
path: root/device-hotplug.c
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2016-03-16 19:54:38 +0100
committerKevin Wolf <kwolf@redhat.com>2016-03-17 15:47:56 +0100
commitefaa7c4eeb7490c6f37f34fbc77e91f29363eebd (patch)
tree20c63d015aed0a3032b58f641c9d43f9ce8b8b8e /device-hotplug.c
parente5e785500bf1ca286f9069bc13f3ed8cb2e9eb8a (diff)
downloadqemu-efaa7c4eeb7490c6f37f34fbc77e91f29363eebd.zip
qemu-efaa7c4eeb7490c6f37f34fbc77e91f29363eebd.tar.gz
qemu-efaa7c4eeb7490c6f37f34fbc77e91f29363eebd.tar.bz2
blockdev: Split monitor reference from BB creation
Before this patch, blk_new() automatically assigned a name to the new BlockBackend and considered it referenced by the monitor. This patch removes the implicit monitor_add_blk() call from blk_new() (and consequently the monitor_remove_blk() call from blk_delete(), too) and thus blk_new() (and related functions) no longer take a BB name argument. In fact, there is only a single point where blk_new()/blk_new_open() is called and the new BB is monitor-owned, and that is in blockdev_init(). Besides thus relieving us from having to invent names for all of the BBs we use in qemu-img, this fixes a bug where qemu cannot create a new image if there already is a monitor-owned BB named "image". If a BB and its BDS tree are created in a single operation, as of this patch the BDS tree will be created before the BB is given a name (whereas it was the other way around before). This results in minor change to the output of iotest 087, whose reference output is amended accordingly. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'device-hotplug.c')
-rw-r--r--device-hotplug.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/device-hotplug.c b/device-hotplug.c
index 3e5cdaa..126f73c 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -84,6 +84,8 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
err:
if (dinfo) {
- blk_unref(blk_by_legacy_dinfo(dinfo));
+ BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
+ monitor_remove_blk(blk);
+ blk_unref(blk);
}
}