From patchwork Sat Dec 29 08:45:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 208634 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 3E5B92C00EC for ; Sat, 29 Dec 2012 20:06:32 +1100 (EST) Received: from localhost ([::1]:56854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5i-0005m3-9p for incoming@patchwork.ozlabs.org; Sat, 29 Dec 2012 03:48:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5W-0005Xs-AN for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tos5T-0005Ol-US for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:14 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:45041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5T-0005OR-AQ for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:11 -0500 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Dec 2012 14:17:10 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 29 Dec 2012 14:17:03 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id CB94DE004B for ; Sat, 29 Dec 2012 14:18:02 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBT8lxMv22872178 for ; Sat, 29 Dec 2012 14:17:59 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBT8m0nu021634 for ; Sat, 29 Dec 2012 19:48:01 +1100 Received: from RedHat62GAWSWenchao ([9.125.29.43]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBT8jCUh014358; Sat, 29 Dec 2012 19:47:58 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 29 Dec 2012 16:45:19 +0800 Message-Id: <1356770725-4804-6-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1356770725-4804-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12122908-4790-0000-0000-0000063A7609 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 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 Subject: [Qemu-devel] [PATCH 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 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);