From patchwork Mon Jan 14 07:09:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 211723 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 7CCD02C00A4 for ; Mon, 14 Jan 2013 19:00:30 +1100 (EST) Received: from localhost ([::1]:42962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TueF1-0004NX-Ij for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2013 02:13:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TueDy-00021f-Ic for qemu-devel@nongnu.org; Mon, 14 Jan 2013 02:13:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TueDd-0006Lb-Lf for qemu-devel@nongnu.org; Mon, 14 Jan 2013 02:12:50 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:43741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TueDd-0006LM-1O for qemu-devel@nongnu.org; Mon, 14 Jan 2013 02:12:29 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 14 Jan 2013 12:41:25 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 14 Jan 2013 12:41:23 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 0FAE4394004D for ; Mon, 14 Jan 2013 12:42:24 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0E7CMSL48169046 for ; Mon, 14 Jan 2013 12:42:22 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0E7CNYb007856 for ; Mon, 14 Jan 2013 07:12:23 GMT Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.169] (may be forged)) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0E79tJc028786; Mon, 14 Jan 2013 07:12:21 GMT From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2013 15:09:41 +0800 Message-Id: <1358147387-8221-6-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1358147387-8221-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1358147387-8221-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13011407-2674-0000-0000-000007730C44 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 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 V3 05/11] 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 81765a3..502c06e 100644 --- a/block.c +++ b/block.c @@ -2963,7 +2963,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); @@ -3029,7 +3029,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 67f0d13..5ce817a 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);