From c4aaafbe296b0e38a54191d294436ffd718a2c7b Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Wed, 6 Nov 2013 16:53:27 +0100

Subject: [PATCH 70/87] block: add snapshot info query function bdrv_query_snapshot_info_list()

RH-Author: Max Reitz <mreitz@redhat.com>

Message-id: <1383756824-6921-5-git-send-email-mreitz@redhat.com>

Patchwork-id: 55559

O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 04/21] block: add snapshot info query function bdrv_query_snapshot_info_list()

Bugzilla: 980771

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>

BZ: 980771

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 <xiawenc@linux.vnet.ibm.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

(cherry picked from commit fb0ed4539c6f02fa9e5a3cf9df2549713451eeca)

Signed-off-by: Max Reitz <mreitz@redhat.com>

---

 block/qapi.c         | 55 +++++++++++++++++++++++++++++++++++++++-------------

 include/block/qapi.h |  4 +++-

 qemu-img.c           |  5 ++++-

 3 files changed, 49 insertions(+), 15 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/qapi.c         |   55 ++++++++++++++++++++++++++++++++++++++-----------

 include/block/qapi.h |    4 ++-

 qemu-img.c           |    5 +++-

 3 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/block/qapi.c b/block/qapi.c

index 794dbf8..1ed56da 100644

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -26,29 +26,56 @@

 #include "block/block_int.h"

 #include "qmp-commands.h"

-void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info)

+/*

+ * Returns 0 on success, with *p_list either set to describe snapshot

+ * information, or NULL because there are no snapshots.  Returns -errno on

+ * error, with *p_list untouched.

+ */

+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_errno(errp, -sn_count,

+                             "Can't list snapshots of device '%s'", dev);

+            break;

+        }

+        return sn_count;

+    }

     for (i = 0; i < sn_count; i++) {

-        info->has_snapshots = true;

-        info_list = g_new0(SnapshotInfoList, 1);

+        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->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_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;

@@ -57,6 +84,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 e6e568d..4f223d1 100644

--- a/include/block/qapi.h

+++ b/include/block/qapi.h

@@ -29,7 +29,9 @@

 #include "block/block.h"

 #include "block/snapshot.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 97b4212..e1fb148 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -1686,7 +1686,10 @@ static ImageInfoList *collect_image_info_list(const char *filename,

         info = g_new0(ImageInfo, 1);

         bdrv_collect_image_info(bs, info, filename);

-        bdrv_collect_snapshots(bs, info);

+        bdrv_query_snapshot_info_list(bs, &info->snapshots, NULL);

+        if (info->snapshots) {

+            info->has_snapshots = true;

+        }

         elem = g_new0(ImageInfoList, 1);

         elem->value = info;

-- 

1.7.1