diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-03-16 19:54:38 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-17 15:47:56 +0100 |
| commit | efaa7c4eeb7490c6f37f34fbc77e91f29363eebd (patch) | |
| tree | 20c63d015aed0a3032b58f641c9d43f9ce8b8b8e /block/qcow2.c | |
| parent | e5e785500bf1ca286f9069bc13f3ed8cb2e9eb8a (diff) | |
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 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 3fd664b9ca..5f4fea6a55 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2159,7 +2159,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, return ret; } - blk = blk_new_open("image", filename, NULL, NULL, + blk = blk_new_open(filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, &local_err); if (blk == NULL) { @@ -2224,7 +2224,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, */ options = qdict_new(); qdict_put(options, "driver", qstring_from_str("qcow2")); - blk = blk_new_open("image-qcow2", filename, NULL, options, + blk = blk_new_open(filename, NULL, options, BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, &local_err); if (blk == NULL) { @@ -2286,7 +2286,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, /* Reopen the image without BDRV_O_NO_FLUSH to flush it before returning */ options = qdict_new(); qdict_put(options, "driver", qstring_from_str("qcow2")); - blk = blk_new_open("image-flush", filename, NULL, options, + blk = blk_new_open(filename, NULL, options, BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_BACKING, &local_err); if (blk == NULL) { |