diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-08-04 14:09:07 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-08-08 13:05:43 +0200 |
| commit | bd7c41765b9afa93a7f1a42e1ee353282230e2b7 (patch) | |
| tree | 3ccf20ae297ffd3156ffb1484ed428f6038c401c /hw/core | |
| parent | cf5198d58088e3b416fe517b3946e5120b342761 (diff) | |
block/qdev: Let 'drive' property fall back to node name
If a qdev block device is created with an anonymous BlockBackend (i.e.
a node name rather than a BB name was given for the drive property),
qdev used to return an empty string when the property was read. This
patch fixes it to return the node name instead.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/qdev-properties-system.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 2ba2504ea0..e55afe6bf2 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -126,7 +126,16 @@ static void release_drive(Object *obj, const char *name, void *opaque) static char *print_drive(void *ptr) { - return g_strdup(blk_name(ptr)); + const char *name; + + name = blk_name(ptr); + if (!*name) { + BlockDriverState *bs = blk_bs(ptr); + if (bs) { + name = bdrv_get_node_name(bs); + } + } + return g_strdup(name); } static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque, |