From patchwork Sat Dec 29 08:45:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 208625 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 04C562C00EC for ; Sat, 29 Dec 2012 19:48:53 +1100 (EST) Received: from localhost ([::1]:57943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos67-0006MJ-8O for incoming@patchwork.ozlabs.org; Sat, 29 Dec 2012 03:48:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5H-0004nW-MN for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:48:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tos5G-0005Nu-IJ for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:47:59 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:40681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tos5F-0005Ne-VA for qemu-devel@nongnu.org; Sat, 29 Dec 2012 03:47:58 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Dec 2012 14:17:02 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 29 Dec 2012 14:17:01 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 4C9D0E004B for ; Sat, 29 Dec 2012 14:17:53 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBT8loGk41811988 for ; Sat, 29 Dec 2012 14:17:50 +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 qBT8lpmP021307 for ; Sat, 29 Dec 2012 19:47:51 +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 qBT8jCUf014358; Sat, 29 Dec 2012 19:47:48 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 29 Dec 2012 16:45:17 +0800 Message-Id: <1356770725-4804-4-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-3864-0000-0000-0000063136A0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.3 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 03/11] qemu-img: remove parameter filename in collect_image_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 Switch the filename getting from parameter to block function, now collect_image_info depends only on *bs. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- qemu-img.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 5a4df3a..d70435f 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1180,15 +1180,17 @@ static void dump_json_image_info(ImageInfo *info) QDECREF(str); } +/* Assume bs is already openned. */ static void collect_image_info(BlockDriverState *bs, - ImageInfo *info, - const char *filename) + ImageInfo *info) { uint64_t total_sectors; char backing_filename[1024]; char backing_filename2[1024]; BlockDriverInfo bdi; + const char *filename; + filename = bdrv_get_filename(bs); bdrv_get_geometry(bs, &total_sectors); info->filename = g_strdup(filename); @@ -1356,7 +1358,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, } info = g_new0(ImageInfo, 1); - collect_image_info(bs, info, filename); + collect_image_info(bs, info); collect_snapshots(bs, info); elem = g_new0(ImageInfoList, 1);