From patchwork Thu Jan 17 07:40:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 213158 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AAA062C007E for ; Thu, 17 Jan 2013 18:57:13 +1100 (EST) Received: from localhost ([::1]:39691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvk8g-000843-MF for incoming@patchwork.ozlabs.org; Thu, 17 Jan 2013 02:43:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvk7R-0005VU-A9 for qemu-devel@nongnu.org; Thu, 17 Jan 2013 02:42:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tvk7Q-0001wu-1z for qemu-devel@nongnu.org; Thu, 17 Jan 2013 02:42:37 -0500 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:32977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvk7P-0001w6-8y for qemu-devel@nongnu.org; Thu, 17 Jan 2013 02:42:35 -0500 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Jan 2013 17:37:28 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp03.au.ibm.com (202.81.31.209) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 17 Jan 2013 17:37:27 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 344B42CE8051 for ; Thu, 17 Jan 2013 18:42:29 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0H7UeVW1180110 for ; Thu, 17 Jan 2013 18:30:40 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0H7gSHZ012268 for ; Thu, 17 Jan 2013 18:42:28 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.253]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0H7e01v007864; Thu, 17 Jan 2013 18:42:26 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2013 15:40:04 +0800 Message-Id: <1358408410-22187-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1358408410-22187-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1358408410-22187-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13011707-6102-0000-0000-000002DDF279 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.145 Cc: aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V4 07/13] block: rename bdrv_query_info to bdrv_query_block_info X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that we have bdrv_query_image_info, rename this function to make it more obvious what it is doing. Reviewed-by: Eric Blake Signed-off-by: Wenchao Xia --- block.c | 4 ++-- include/block/block.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 245a082..1bcd165 100644 --- a/block.c +++ b/block.c @@ -2961,7 +2961,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); @@ -3027,7 +3027,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 b6f80c3..9838c48 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_read_snapshot(BlockDriverState *bs); int bdrv_can_snapshot(BlockDriverState *bs);