From patchwork Sat Dec 29 08:45:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [05/11] block: rename bdrv_query_info to bdrv_query_block_info From: Wayne Xia X-Patchwork-Id: 208634 Message-Id: <1356770725-4804-6-git-send-email-xiawenc@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Date: Sat, 29 Dec 2012 16:45:19 +0800 Now this function have a mirror name with bdrv_query_image_info to tip well what it is doing. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- block.c | 4 ++-- include/block/block.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index d39da3d..9dcecec 100644 --- a/block.c +++ b/block.c @@ -2964,7 +2964,7 @@ ImageInfo *bdrv_query_image_info(BlockDriverState *bs, Error **errp) return info; } -BlockInfo *bdrv_query_info(BlockDriverState *bs) +BlockInfo *bdrv_query_block_info(BlockDriverState *bs) { BlockInfo *info = g_malloc0(sizeof(*info)); info->device = g_strdup(bs->device_name); @@ -3030,7 +3030,7 @@ BlockInfoList *qmp_query_block(Error **errp) QTAILQ_FOREACH(bs, &bdrv_states, list) { BlockInfoList *info = g_malloc0(sizeof(*info)); - info->value = bdrv_query_info(bs); + info->value = bdrv_query_block_info(bs); *p_next = info; p_next = &info->next; diff --git a/include/block/block.h b/include/block/block.h index 33d7b7c..3b7c818 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -324,7 +324,7 @@ SnapshotInfoList *bdrv_query_snapshot_infolist(BlockDriverState *bs, void *opaque, Error **errp); ImageInfo *bdrv_query_image_info(BlockDriverState *bs, Error **errp); -BlockInfo *bdrv_query_info(BlockDriverState *s); +BlockInfo *bdrv_query_block_info(BlockDriverState *bs); BlockStats *bdrv_query_stats(const BlockDriverState *bs); int bdrv_can_snapshot(BlockDriverState *bs);