From 20a9e77dfabb3e664c0873726be1540175a4fda1 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 31 Oct 2014 11:32:55 +0800 Subject: [PATCH] block: Add bdrv_get_node_name This returns the node name of a BDS. Remove the TODO comment and expect the callers to be explicit. Signed-off-by: Fam Zheng Reviewed-by: Eric Blake Reviewed-by: Max Reitz Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block.c | 5 +++++ include/block/block.h | 1 + 2 files changed, 6 insertions(+) diff --git a/block.c b/block.c index e8a0342..866c8b4 100644 --- a/block.c +++ b/block.c @@ -3817,6 +3817,11 @@ BlockDriverState *bdrv_next(BlockDriverState *bs) return QTAILQ_NEXT(bs, device_list); } +const char *bdrv_get_node_name(const BlockDriverState *bs) +{ + return bs->node_name; +} + /* TODO check what callers really want: bs->node_name or blk_name() */ const char *bdrv_get_device_name(const BlockDriverState *bs) { diff --git a/include/block/block.h b/include/block/block.h index c3a68d8..610be9f 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -382,6 +382,7 @@ int bdrv_set_key(BlockDriverState *bs, const char *key); int bdrv_query_missing_keys(void); void bdrv_iterate_format(void (*it)(void *opaque, const char *name), void *opaque); +const char *bdrv_get_node_name(const BlockDriverState *bs); const char *bdrv_get_device_name(const BlockDriverState *bs); int bdrv_get_flags(BlockDriverState *bs); int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, -- 2.7.4