From patchwork Tue Feb 26 10:40:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 223197 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 013832C0095 for ; Tue, 26 Feb 2013 21:56:37 +1100 (EST) Received: from localhost ([::1]:37589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI0m-0005c6-OE for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 05:43:52 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI0I-0004wj-Nx for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAI0C-0003nc-Rm for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:22 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:36143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAI0C-0003m2-4H for qemu-devel@nongnu.org; Tue, 26 Feb 2013 05:43:16 -0500 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Feb 2013 20:38:26 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 26 Feb 2013 20:38:24 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 6DDEE3578023 for ; Tue, 26 Feb 2013 21:43:06 +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 r1QAUUch9830716 for ; Tue, 26 Feb 2013 21:30:30 +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 r1QAh5qP016119 for ; Tue, 26 Feb 2013 21:43:05 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.152]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1QAeKOC012693; Tue, 26 Feb 2013 21:43:03 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 26 Feb 2013 18:40:21 +0800 Message-Id: <1361875228-15769-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1361875228-15769-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1361875228-15769-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13022610-7014-0000-0000-000002A4014A X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.148 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V7 07/14] 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 71fc9e7..79213d2 100644 --- a/block.c +++ b/block.c @@ -2954,7 +2954,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); @@ -3021,7 +3021,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 f033807..a820184 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -327,7 +327,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); bool bdrv_can_read_snapshot(BlockDriverState *bs); bool bdrv_can_snapshot(BlockDriverState *bs);