diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-06-10 20:57:48 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-06-16 15:20:37 +0200 |
| commit | 67882b153544f7b29412a5bdf40dd3bbba8d64ae (patch) | |
| tree | 57f17e71e24caef9229288c568186b80a41e3a54 /block/null.c | |
| parent | 274fccee2bf63702b34e3923b1e50a49147a7918 (diff) | |
| download | qemu-67882b153544f7b29412a5bdf40dd3bbba8d64ae.tar.gz qemu-67882b153544f7b29412a5bdf40dd3bbba8d64ae.tar.bz2 qemu-67882b153544f7b29412a5bdf40dd3bbba8d64ae.zip | |
block/null: Implement bdrv_refresh_filename()
The null block driver ignores any filename used for creating its BDSs,
which allows creating such BDSs even without any filename at all. In
that case, we currently construct a JSON filename when queried instead
of a plain "null-co://" or "null-aio://". This patch implements
bdrv_refresh_filename() to remedy this behavior.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-4-mreitz@redhat.com
[mreitz@redhat.com: Added commit message]
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/null.c')
| -rw-r--r-- | block/null.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/block/null.c b/block/null.c index 396500babd..b511010ba5 100644 --- a/block/null.c +++ b/block/null.c @@ -12,6 +12,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "block/block_int.h" #define NULL_OPT_LATENCY "latency-ns" @@ -223,6 +225,20 @@ static int64_t coroutine_fn null_co_get_block_status(BlockDriverState *bs, } } +static void null_refresh_filename(BlockDriverState *bs, QDict *opts) +{ + QINCREF(opts); + qdict_del(opts, "filename"); + + if (!qdict_size(opts)) { + snprintf(bs->exact_filename, sizeof(bs->exact_filename), "%s://", + bs->drv->format_name); + } + + qdict_put(opts, "driver", qstring_from_str(bs->drv->format_name)); + bs->full_open_options = opts; +} + static BlockDriver bdrv_null_co = { .format_name = "null-co", .protocol_name = "null-co", @@ -238,6 +254,8 @@ static BlockDriver bdrv_null_co = { .bdrv_reopen_prepare = null_reopen_prepare, .bdrv_co_get_block_status = null_co_get_block_status, + + .bdrv_refresh_filename = null_refresh_filename, }; static BlockDriver bdrv_null_aio = { @@ -255,6 +273,8 @@ static BlockDriver bdrv_null_aio = { .bdrv_reopen_prepare = null_reopen_prepare, .bdrv_co_get_block_status = null_co_get_block_status, + + .bdrv_refresh_filename = null_refresh_filename, }; static void bdrv_null_init(void) |