| Message ID | 1470312547-8034-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/04/2016 06:09 AM, Kevin Wolf wrote: > 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> > --- > v2: > - Check whether the BB has even a BDS inserted. Fixes a segfault with > empty anonymous BlockBackends. > Reviewed-by: Eric Blake <eblake@redhat.com>
Am 04.08.2016 um 14:09 hat Kevin Wolf geschrieben: > 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> Applied to the block branch. Kevin
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 2ba2504..e55afe6 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,
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> --- v2: - Check whether the BB has even a BDS inserted. Fixes a segfault with empty anonymous BlockBackends. hw/core/qdev-properties-system.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)