diff options
| author | Max Reitz | 2016-03-16 19:54:38 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2016-03-17 15:47:56 +0100 |
| commit | efaa7c4eeb7490c6f37f34fbc77e91f29363eebd (patch) | |
| tree | 20c63d015aed0a3032b58f641c9d43f9ce8b8b8e /hw | |
| parent | blockdev: Separate BB name management (diff) | |
| download | qemu-efaa7c4eeb7490c6f37f34fbc77e91f29363eebd.tar.gz qemu-efaa7c4eeb7490c6f37f34fbc77e91f29363eebd.tar.xz qemu-efaa7c4eeb7490c6f37f34fbc77e91f29363eebd.zip | |
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 'hw')
| -rw-r--r-- | hw/block/xen_disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 7bd5bdefd3..635328fa69 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -917,7 +917,7 @@ static int blk_connect(struct XenDevice *xendev) /* setup via xenbus -> create new block driver instance */ xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n"); - blkdev->blk = blk_new_open(blkdev->dev, blkdev->filename, NULL, options, + blkdev->blk = blk_new_open(blkdev->filename, NULL, options, qflags, &local_err); if (!blkdev->blk) { xen_be_printf(&blkdev->xendev, 0, "error: %s\n", |