From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDU1b-000740-39 for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:09:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDU1Z-0003zr-GR for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:09:54 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:36514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDU1Y-0003xp-Tp for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:09:53 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Mar 2013 11:36:55 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 434C0394004F for ; Thu, 7 Mar 2013 11:39:49 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2769kwF29688052 for ; Thu, 7 Mar 2013 11:39:46 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2769lL9029768 for ; Thu, 7 Mar 2013 17:09:48 +1100 From: Wenchao Xia Date: Thu, 7 Mar 2013 14:07:12 +0800 Message-Id: <1362636445-7188-8-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V8 07/20] block: add snapshot info query function bdrv_query_snapshot_info_list() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, capitulino@redhat.com, stefanha@gmail.com, armbru@redhat.com, pbonzini@redhat.com, Wenchao Xia This patch adds function bdrv_query_snapshot_info_list(), which will retrieve snapshot info of an image in qmp object format. The implementation is based on the code moved from qemu-img.c with modification to fit more for qmp based block layer API. Signed-off-by: Wenchao Xia --- block/qapi.c | 52 +++++++++++++++++++++++++++++++++++++------------ include/block/qapi.h | 4 ++- qemu-img.c | 4 ++- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 643839c..b503cfa 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -14,29 +14,53 @@ #include "block/qapi.h" #include "block/block_int.h" -void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info) +/* return 0 on success, and @p_list will be set only on success. */ +int bdrv_query_snapshot_info_list(BlockDriverState *bs, + SnapshotInfoList **p_list, + Error **errp) { int i, sn_count; QEMUSnapshotInfo *sn_tab = NULL; - SnapshotInfoList *info_list, *cur_item = NULL; + SnapshotInfoList *info_list, *cur_item = NULL, *head = NULL; + SnapshotInfo *info; + sn_count = bdrv_snapshot_list(bs, &sn_tab); + if (sn_count < 0) { + const char *dev = bdrv_get_device_name(bs); + switch (sn_count) { + case -ENOMEDIUM: + error_setg(errp, "Device '%s' is not inserted", dev); + break; + case -ENOTSUP: + error_setg(errp, + "Device '%s' does not support internal snapshots", + dev); + break; + default: + error_setg(errp, "Can't list snapshots of device '%s': %s", + dev, strerror(-sn_count)); + break; + } + return sn_count; + } for (i = 0; i < sn_count; i++) { - info->has_snapshots = true; - info_list = g_new0(SnapshotInfoList, 1); - info_list->value = g_new0(SnapshotInfo, 1); - info_list->value->id = g_strdup(sn_tab[i].id_str); - info_list->value->name = g_strdup(sn_tab[i].name); - info_list->value->vm_state_size = sn_tab[i].vm_state_size; - info_list->value->date_sec = sn_tab[i].date_sec; - info_list->value->date_nsec = sn_tab[i].date_nsec; - info_list->value->vm_clock_sec = sn_tab[i].vm_clock_nsec / 1000000000; - info_list->value->vm_clock_nsec = sn_tab[i].vm_clock_nsec % 1000000000; + info = g_new0(SnapshotInfo, 1); + info->id = g_strdup(sn_tab[i].id_str); + info->name = g_strdup(sn_tab[i].name); + info->vm_state_size = sn_tab[i].vm_state_size; + info->date_sec = sn_tab[i].date_sec; + info->date_nsec = sn_tab[i].date_nsec; + info->vm_clock_sec = sn_tab[i].vm_clock_nsec / 1000000000; + info->vm_clock_nsec = sn_tab[i].vm_clock_nsec % 1000000000; + + info_list = g_new0(SnapshotInfoList, 1); + info_list->value = info; /* XXX: waiting for the qapi to support qemu-queue.h types */ if (!cur_item) { - info->snapshots = cur_item = info_list; + head = cur_item = info_list; } else { cur_item->next = info_list; cur_item = info_list; @@ -45,6 +69,8 @@ void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info) } g_free(sn_tab); + *p_list = head; + return 0; } void bdrv_collect_image_info(BlockDriverState *bs, diff --git a/include/block/qapi.h b/include/block/qapi.h index a126768..030964b 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -4,7 +4,9 @@ #include "qapi-types.h" #include "block/block.h" -void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info); +int bdrv_query_snapshot_info_list(BlockDriverState *bs, + SnapshotInfoList **p_list, + Error **errp); void bdrv_collect_image_info(BlockDriverState *bs, ImageInfo *info, const char *filename, diff --git a/qemu-img.c b/qemu-img.c index bbc8f5b..32a72f5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1735,7 +1735,9 @@ static ImageInfoList *collect_image_info_list(const char *filename, info = g_new0(ImageInfo, 1); bdrv_collect_image_info(bs, info, filename, fmt); - bdrv_collect_snapshots(bs, info); + if (!bdrv_query_snapshot_info_list(bs, &info->snapshots, NULL)) { + info->has_snapshots = true; + } elem = g_new0(ImageInfoList, 1); elem->value = info; -- 1.7.1