From patchwork Mon Mar 11 11:23:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 226531 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 195A32C02AF for ; Mon, 11 Mar 2013 22:29:39 +1100 (EST) Received: from localhost ([::1]:40096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF0vB-0003uc-6I for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2013 07:29:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF0rQ-0006sN-Ab for qemu-devel@nongnu.org; Mon, 11 Mar 2013 07:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UF0rN-0001YS-Vc for qemu-devel@nongnu.org; Mon, 11 Mar 2013 07:25:44 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:35387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UF0rM-0001Xa-Iw for qemu-devel@nongnu.org; Mon, 11 Mar 2013 07:25:41 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Mar 2013 16:51:25 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 11 Mar 2013 16:51:21 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id D8079125804E for ; Mon, 11 Mar 2013 16:56:34 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2BBPTpg25559190 for ; Mon, 11 Mar 2013 16:55:29 +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 r2BBPUAF025254 for ; Mon, 11 Mar 2013 22:25:31 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.175] (may be forged)) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2BBNRVB015564; Mon, 11 Mar 2013 22:25:27 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2013 19:23:09 +0800 Message-Id: <1363000996-13221-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1363000996-13221-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1363000996-13221-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031111-2000-0000-0000-00000B42BDBD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: kwolf@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V9 07/14] 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 Reviewed-by: Eric Blake --- block/qapi.c | 39 ++++++++++++++++++++++++++++++++------- include/block/qapi.h | 6 +++--- qemu-img.c | 7 ++----- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 1d99f5a..b78ea5c 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -111,18 +111,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); @@ -139,8 +143,8 @@ 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)); - if (backing_filename[0] != '\0') { + backing_filename = bs->backing_file; + if (backing_filename && backing_filename[0] != '\0') { info->backing_filename = g_strdup(backing_filename); info->has_backing_filename = true; bdrv_get_full_backing_filename(bs, backing_filename2, @@ -157,4 +161,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: + info->has_snapshots = true; + break; + /* recoverable error */ + case -ENOMEDIUM: + error_free(err); + break; + 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 092ad8c..7ff1f98 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -21,7 +21,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 83532b1..59d900a 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); - if (!bdrv_query_snapshot_info_list(bs, &info->snapshots, - false, NULL)) { - info->has_snapshots = true; + if (bdrv_query_image_info(bs, &info, NULL)) { + goto err; } elem = g_new0(ImageInfoList, 1);