From patchwork Sat Apr 13 08:56:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 236309 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 970A52C00C8 for ; Sat, 13 Apr 2013 19:01:00 +1000 (EST) Received: from localhost ([::1]:51238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwKQ-0000SS-Qm for incoming@patchwork.ozlabs.org; Sat, 13 Apr 2013 05:00:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwJb-0008R9-M2 for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:00:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQwJZ-0000jq-ED for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:00:07 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:35832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQwJY-0000bW-Tj for qemu-devel@nongnu.org; Sat, 13 Apr 2013 05:00:05 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 13 Apr 2013 18:55:13 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 13 Apr 2013 18:55:11 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id BC1B92BB0050 for ; Sat, 13 Apr 2013 19:00:00 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3D8kdCW8913186 for ; Sat, 13 Apr 2013 18:46:39 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3D900p9027495 for ; Sat, 13 Apr 2013 19:00:00 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.157]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3D8u24L020091; Sat, 13 Apr 2013 18:59:57 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 13 Apr 2013 16:56:37 +0800 Message-Id: <1365843407-16504-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1365843407-16504-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1365843407-16504-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041308-1396-0000-0000-000002CC4179 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: kwolf@redhat.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V12 08/18] block: add image info query function bdrv_query_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 This patch adds function bdrv_query_image_info(), which will retrieve image info in qmp object format. The implementation is based on the code moved from qemu-img.c, but uses block layer function to get snapshot info. Signed-off-by: Wenchao Xia --- block/qapi.c | 37 +++++++++++++++++++++++++++++++------ include/block/qapi.h | 6 +++--- qemu-img.c | 7 ++----- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 49c0eb0..ac0ab57 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -134,18 +134,22 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, return 0; } -void bdrv_collect_image_info(BlockDriverState *bs, - ImageInfo *info, - const char *filename) +/* return 0 on success, and @p_info will be set only on success. */ +int bdrv_query_image_info(BlockDriverState *bs, + ImageInfo **p_info, + Error **errp) { uint64_t total_sectors; - char backing_filename[1024]; + const char *backing_filename; char backing_filename2[1024]; BlockDriverInfo bdi; + int ret; + Error *err = NULL; + ImageInfo *info = g_new0(ImageInfo, 1); bdrv_get_geometry(bs, &total_sectors); - info->filename = g_strdup(filename); + info->filename = g_strdup(bs->filename); info->format = g_strdup(bdrv_get_format_name(bs)); info->virtual_size = total_sectors * 512; info->actual_size = bdrv_get_allocated_file_size(bs); @@ -162,7 +166,7 @@ void bdrv_collect_image_info(BlockDriverState *bs, info->dirty_flag = bdi.is_dirty; info->has_dirty_flag = true; } - bdrv_get_backing_filename(bs, backing_filename, sizeof(backing_filename)); + backing_filename = bs->backing_file; if (backing_filename[0] != '\0') { info->backing_filename = g_strdup(backing_filename); info->has_backing_filename = true; @@ -180,4 +184,25 @@ void bdrv_collect_image_info(BlockDriverState *bs, info->has_backing_filename_format = true; } } + + ret = bdrv_query_snapshot_info_list(bs, &info->snapshots, false, &err); + switch (ret) { + case 0: + if (info->snapshots) { + info->has_snapshots = true; + } + break; + /* recoverable error */ + case -ENOMEDIUM: + case -ENOTSUP: + error_free(err); + break; + default: + error_propagate(errp, err); + qapi_free_ImageInfo(info); + return ret; + } + + *p_info = info; + return 0; } diff --git a/include/block/qapi.h b/include/block/qapi.h index fe66053..2c62fdf 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -32,7 +32,7 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, SnapshotInfoList **p_list, bool vm_snapshot, Error **errp); -void bdrv_collect_image_info(BlockDriverState *bs, - ImageInfo *info, - const char *filename); +int bdrv_query_image_info(BlockDriverState *bs, + ImageInfo **p_info, + Error **errp); #endif diff --git a/qemu-img.c b/qemu-img.c index f537014..1dd0a60 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1733,11 +1733,8 @@ static ImageInfoList *collect_image_info_list(const char *filename, goto err; } - info = g_new0(ImageInfo, 1); - bdrv_collect_image_info(bs, info, filename); - bdrv_query_snapshot_info_list(bs, &info->snapshots, false, NULL); - if (info->snapshots) { - info->has_snapshots = true; + if (bdrv_query_image_info(bs, &info, NULL)) { + goto err; } elem = g_new0(ImageInfoList, 1);