From 9bba35d273d094e206e29f5a328f21834a838471 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Thu, 7 Nov 2013 12:59:07 +0100

Subject: [PATCH 68/87] block: move qmp and info dump related code to block/qapi.c

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

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

Patchwork-id: 55557

O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 02/21] block: move qmp and info dump related code to block/qapi.c

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 is a pure code move patch, except following modification:

1 get_human_readable_size() is changed to static function.

2 dump_human_image_info() is renamed to bdrv_image_info_dump().

3 in qmp_query_block() and qmp_query_blockstats, use bdrv_next(bs)

instead of direct traverse of global array 'bdrv_states'.

4 collect_snapshots() and collect_image_info() are renamed, unused parameter

*fmt in collect_image_info() is removed.

5 code style fix.

To avoid conflict and tip better, macro in header file is BLOCK_QAPI_H

instead of QAPI_H. Now block.h and snapshot.h are at the same level in

include path, block_int.h and qapi.h will both include them.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit f364ec65b56b69c55b674cb6560aa1fbbea9e013)

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

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

---

 block.c                   |  185 -----------------------

 block/Makefile.objs       |    2 +-

 block/qapi.c              |  360 +++++++++++++++++++++++++++++++++++++++++++++

 include/block/block.h     |    9 -

 include/block/block_int.h |    1 +

 include/block/qapi.h      |   41 +++++

 qemu-img.c                |  156 +-------------------

 savevm.c                  |    1 +

 8 files changed, 408 insertions(+), 347 deletions(-)

 create mode 100644 block/qapi.c

 create mode 100644 include/block/qapi.h

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

index dccdb2c..e4885da 100644

--- a/block.c

+++ b/block.c

@@ -3266,128 +3266,6 @@ int bdrv_is_allocated_above(BlockDriverState *top,

     return 0;

 }

-BlockInfo *bdrv_query_info(BlockDriverState *bs)

-{

-    BlockInfo *info = g_malloc0(sizeof(*info));

-    info->device = g_strdup(bs->device_name);

-    info->type = g_strdup("unknown");

-    info->locked = bdrv_dev_is_medium_locked(bs);

-    info->removable = bdrv_dev_has_removable_media(bs);

-

-    if (bdrv_dev_has_removable_media(bs)) {

-        info->has_tray_open = true;

-        info->tray_open = bdrv_dev_is_tray_open(bs);

-    }

-

-    if (bdrv_iostatus_is_enabled(bs)) {

-        info->has_io_status = true;

-        info->io_status = bs->iostatus;

-    }

-

-    if (bs->dirty_bitmap) {

-        info->has_dirty = true;

-        info->dirty = g_malloc0(sizeof(*info->dirty));

-        info->dirty->count = bdrv_get_dirty_count(bs) * BDRV_SECTOR_SIZE;

-        info->dirty->granularity =

-            ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bs->dirty_bitmap));

-    }

-

-    if (bs->drv) {

-        info->has_inserted = true;

-        info->inserted = g_malloc0(sizeof(*info->inserted));

-        info->inserted->file = g_strdup(bs->filename);

-        info->inserted->ro = bs->read_only;

-        info->inserted->drv = g_strdup(bs->drv->format_name);

-        info->inserted->encrypted = bs->encrypted;

-        info->inserted->encryption_key_missing = bdrv_key_required(bs);

-

-        if (bs->backing_file[0]) {

-            info->inserted->has_backing_file = true;

-            info->inserted->backing_file = g_strdup(bs->backing_file);

-        }

-

-        info->inserted->backing_file_depth = bdrv_get_backing_file_depth(bs);

-

-        if (bs->io_limits_enabled) {

-            info->inserted->bps =

-                           bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL];

-            info->inserted->bps_rd =

-                           bs->io_limits.bps[BLOCK_IO_LIMIT_READ];

-            info->inserted->bps_wr =

-                           bs->io_limits.bps[BLOCK_IO_LIMIT_WRITE];

-            info->inserted->iops =

-                           bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL];

-            info->inserted->iops_rd =

-                           bs->io_limits.iops[BLOCK_IO_LIMIT_READ];

-            info->inserted->iops_wr =

-                           bs->io_limits.iops[BLOCK_IO_LIMIT_WRITE];

-        }

-    }

-    return info;

-}

-

-BlockInfoList *qmp_query_block(Error **errp)

-{

-    BlockInfoList *head = NULL, **p_next = &head;

-    BlockDriverState *bs;

-

-    QTAILQ_FOREACH(bs, &bdrv_states, list) {

-        BlockInfoList *info = g_malloc0(sizeof(*info));

-        info->value = bdrv_query_info(bs);

-

-        *p_next = info;

-        p_next = &info->next;

-    }

-

-    return head;

-}

-

-BlockStats *bdrv_query_stats(const BlockDriverState *bs)

-{

-    BlockStats *s;

-

-    s = g_malloc0(sizeof(*s));

-

-    if (bs->device_name[0]) {

-        s->has_device = true;

-        s->device = g_strdup(bs->device_name);

-    }

-

-    s->stats = g_malloc0(sizeof(*s->stats));

-    s->stats->rd_bytes = bs->nr_bytes[BDRV_ACCT_READ];

-    s->stats->wr_bytes = bs->nr_bytes[BDRV_ACCT_WRITE];

-    s->stats->rd_operations = bs->nr_ops[BDRV_ACCT_READ];

-    s->stats->wr_operations = bs->nr_ops[BDRV_ACCT_WRITE];

-    s->stats->wr_highest_offset = bs->wr_highest_sector * BDRV_SECTOR_SIZE;

-    s->stats->flush_operations = bs->nr_ops[BDRV_ACCT_FLUSH];

-    s->stats->wr_total_time_ns = bs->total_time_ns[BDRV_ACCT_WRITE];

-    s->stats->rd_total_time_ns = bs->total_time_ns[BDRV_ACCT_READ];

-    s->stats->flush_total_time_ns = bs->total_time_ns[BDRV_ACCT_FLUSH];

-

-    if (bs->file) {

-        s->has_parent = true;

-        s->parent = bdrv_query_stats(bs->file);

-    }

-

-    return s;

-}

-

-BlockStatsList *qmp_query_blockstats(Error **errp)

-{

-    BlockStatsList *head = NULL, **p_next = &head;

-    BlockDriverState *bs;

-

-    QTAILQ_FOREACH(bs, &bdrv_states, list) {

-        BlockStatsList *info = g_malloc0(sizeof(*info));

-        info->value = bdrv_query_stats(bs);

-

-        *p_next = info;

-        p_next = &info->next;

-    }

-

-    return head;

-}

-

 const char *bdrv_get_encrypted_filename(BlockDriverState *bs)

 {

     if (bs->backing_hd && bs->backing_hd->encrypted)

@@ -3623,69 +3501,6 @@ BlockDriverState *bdrv_find_base(BlockDriverState *bs)

     return curr_bs;

 }

-#define NB_SUFFIXES 4

-

-char *get_human_readable_size(char *buf, int buf_size, int64_t size)

-{

-    static const char suffixes[NB_SUFFIXES] = "KMGT";

-    int64_t base;

-    int i;

-

-    if (size <= 999) {

-        snprintf(buf, buf_size, "%" PRId64, size);

-    } else {

-        base = 1024;

-        for(i = 0; i < NB_SUFFIXES; i++) {

-            if (size < (10 * base)) {

-                snprintf(buf, buf_size, "%0.1f%c",

-                         (double)size / base,

-                         suffixes[i]);

-                break;

-            } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {

-                snprintf(buf, buf_size, "%" PRId64 "%c",

-                         ((size + (base >> 1)) / base),

-                         suffixes[i]);

-                break;

-            }

-            base = base * 1024;

-        }

-    }

-    return buf;

-}

-

-char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn)

-{

-    char buf1[128], date_buf[128], clock_buf[128];

-    struct tm tm;

-    time_t ti;

-    int64_t secs;

-

-    if (!sn) {

-        snprintf(buf, buf_size,

-                 "%-10s%-20s%7s%20s%15s",

-                 "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");

-    } else {

-        ti = sn->date_sec;

-        localtime_r(&ti, &tm;;

-        strftime(date_buf, sizeof(date_buf),

-                 "%Y-%m-%d %H:%M:%S", &tm;;

-        secs = sn->vm_clock_nsec / 1000000000;

-        snprintf(clock_buf, sizeof(clock_buf),

-                 "%02d:%02d:%02d.%03d",

-                 (int)(secs / 3600),

-                 (int)((secs / 60) % 60),

-                 (int)(secs % 60),

-                 (int)((sn->vm_clock_nsec / 1000000) % 1000));

-        snprintf(buf, buf_size,

-                 "%-10s%-20s%7s%20s%15s",

-                 sn->id_str, sn->name,

-                 get_human_readable_size(buf1, sizeof(buf1), sn->vm_state_size),

-                 date_buf,

-                 clock_buf);

-    }

-    return buf;

-}

-

 /**************************************************************/

 /* async I/Os */

diff --git a/block/Makefile.objs b/block/Makefile.objs

index 162f270..3db1839 100644

--- a/block/Makefile.objs

+++ b/block/Makefile.objs

@@ -4,7 +4,7 @@ block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o

 block-obj-y += qed-check.o

 block-obj-y += vhdx.o

 block-obj-y += parallels.o blkdebug.o blkverify.o

-block-obj-y += snapshot.o

+block-obj-y += snapshot.o qapi.o

 block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o

 block-obj-$(CONFIG_POSIX) += raw-posix.o

 block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

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

new file mode 100644

index 0000000..155e77e

--- /dev/null

+++ b/block/qapi.c

@@ -0,0 +1,360 @@

+/*

+ * Block layer qmp and info dump related functions

+ *

+ * Copyright (c) 2003-2008 Fabrice Bellard

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#include "block/qapi.h"

+#include "block/block_int.h"

+#include "qmp-commands.h"

+

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

+{

+    int i, sn_count;

+    QEMUSnapshotInfo *sn_tab = NULL;

+    SnapshotInfoList *info_list, *cur_item = NULL;

+    sn_count = bdrv_snapshot_list(bs, &sn_tab);

+

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

+

+        /* XXX: waiting for the qapi to support qemu-queue.h types */

+        if (!cur_item) {

+            info->snapshots = cur_item = info_list;

+        } else {

+            cur_item->next = info_list;

+            cur_item = info_list;

+        }

+

+    }

+

+    g_free(sn_tab);

+}

+

+void bdrv_collect_image_info(BlockDriverState *bs,

+                             ImageInfo *info,

+                             const char *filename)

+{

+    uint64_t total_sectors;

+    char backing_filename[1024];

+    char backing_filename2[1024];

+    BlockDriverInfo bdi;

+

+    bdrv_get_geometry(bs, &total_sectors);

+

+    info->filename        = g_strdup(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);

+    info->has_actual_size = info->actual_size >= 0;

+    if (bdrv_is_encrypted(bs)) {

+        info->encrypted = true;

+        info->has_encrypted = true;

+    }

+    if (bdrv_get_info(bs, &bdi) >= 0) {

+        if (bdi.cluster_size != 0) {

+            info->cluster_size = bdi.cluster_size;

+            info->has_cluster_size = true;

+        }

+        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') {

+        info->backing_filename = g_strdup(backing_filename);

+        info->has_backing_filename = true;

+        bdrv_get_full_backing_filename(bs, backing_filename2,

+                                       sizeof(backing_filename2));

+

+        if (strcmp(backing_filename, backing_filename2) != 0) {

+            info->full_backing_filename =

+                        g_strdup(backing_filename2);

+            info->has_full_backing_filename = true;

+        }

+

+        if (bs->backing_format[0]) {

+            info->backing_filename_format = g_strdup(bs->backing_format);

+            info->has_backing_filename_format = true;

+        }

+    }

+}

+

+BlockInfo *bdrv_query_info(BlockDriverState *bs)

+{

+    BlockInfo *info = g_malloc0(sizeof(*info));

+    info->device = g_strdup(bs->device_name);

+    info->type = g_strdup("unknown");

+    info->locked = bdrv_dev_is_medium_locked(bs);

+    info->removable = bdrv_dev_has_removable_media(bs);

+

+    if (bdrv_dev_has_removable_media(bs)) {

+        info->has_tray_open = true;

+        info->tray_open = bdrv_dev_is_tray_open(bs);

+    }

+

+    if (bdrv_iostatus_is_enabled(bs)) {

+        info->has_io_status = true;

+        info->io_status = bs->iostatus;

+    }

+

+    if (bs->dirty_bitmap) {

+        info->has_dirty = true;

+        info->dirty = g_malloc0(sizeof(*info->dirty));

+        info->dirty->count = bdrv_get_dirty_count(bs) * BDRV_SECTOR_SIZE;

+        info->dirty->granularity =

+         ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bs->dirty_bitmap));

+    }

+

+    if (bs->drv) {

+        info->has_inserted = true;

+        info->inserted = g_malloc0(sizeof(*info->inserted));

+        info->inserted->file = g_strdup(bs->filename);

+        info->inserted->ro = bs->read_only;

+        info->inserted->drv = g_strdup(bs->drv->format_name);

+        info->inserted->encrypted = bs->encrypted;

+        info->inserted->encryption_key_missing = bdrv_key_required(bs);

+

+        if (bs->backing_file[0]) {

+            info->inserted->has_backing_file = true;

+            info->inserted->backing_file = g_strdup(bs->backing_file);

+        }

+

+        info->inserted->backing_file_depth = bdrv_get_backing_file_depth(bs);

+

+        if (bs->io_limits_enabled) {

+            info->inserted->bps =

+                           bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL];

+            info->inserted->bps_rd =

+                           bs->io_limits.bps[BLOCK_IO_LIMIT_READ];

+            info->inserted->bps_wr =

+                           bs->io_limits.bps[BLOCK_IO_LIMIT_WRITE];

+            info->inserted->iops =

+                           bs->io_limits.iops[BLOCK_IO_LIMIT_TOTAL];

+            info->inserted->iops_rd =

+                           bs->io_limits.iops[BLOCK_IO_LIMIT_READ];

+            info->inserted->iops_wr =

+                           bs->io_limits.iops[BLOCK_IO_LIMIT_WRITE];

+        }

+    }

+    return info;

+}

+

+BlockStats *bdrv_query_stats(const BlockDriverState *bs)

+{

+    BlockStats *s;

+

+    s = g_malloc0(sizeof(*s));

+

+    if (bs->device_name[0]) {

+        s->has_device = true;

+        s->device = g_strdup(bs->device_name);

+    }

+

+    s->stats = g_malloc0(sizeof(*s->stats));

+    s->stats->rd_bytes = bs->nr_bytes[BDRV_ACCT_READ];

+    s->stats->wr_bytes = bs->nr_bytes[BDRV_ACCT_WRITE];

+    s->stats->rd_operations = bs->nr_ops[BDRV_ACCT_READ];

+    s->stats->wr_operations = bs->nr_ops[BDRV_ACCT_WRITE];

+    s->stats->wr_highest_offset = bs->wr_highest_sector * BDRV_SECTOR_SIZE;

+    s->stats->flush_operations = bs->nr_ops[BDRV_ACCT_FLUSH];

+    s->stats->wr_total_time_ns = bs->total_time_ns[BDRV_ACCT_WRITE];

+    s->stats->rd_total_time_ns = bs->total_time_ns[BDRV_ACCT_READ];

+    s->stats->flush_total_time_ns = bs->total_time_ns[BDRV_ACCT_FLUSH];

+

+    if (bs->file) {

+        s->has_parent = true;

+        s->parent = bdrv_query_stats(bs->file);

+    }

+

+    return s;

+}

+

+BlockInfoList *qmp_query_block(Error **errp)

+{

+    BlockInfoList *head = NULL, **p_next = &head;

+    BlockDriverState *bs = NULL;

+

+     while ((bs = bdrv_next(bs))) {

+        BlockInfoList *info = g_malloc0(sizeof(*info));

+        info->value = bdrv_query_info(bs);

+

+        *p_next = info;

+        p_next = &info->next;

+    }

+

+    return head;

+}

+

+BlockStatsList *qmp_query_blockstats(Error **errp)

+{

+    BlockStatsList *head = NULL, **p_next = &head;

+    BlockDriverState *bs = NULL;

+

+     while ((bs = bdrv_next(bs))) {

+        BlockStatsList *info = g_malloc0(sizeof(*info));

+        info->value = bdrv_query_stats(bs);

+

+        *p_next = info;

+        p_next = &info->next;

+    }

+

+    return head;

+}

+

+#define NB_SUFFIXES 4

+

+static char *get_human_readable_size(char *buf, int buf_size, int64_t size)

+{

+    static const char suffixes[NB_SUFFIXES] = "KMGT";

+    int64_t base;

+    int i;

+

+    if (size <= 999) {

+        snprintf(buf, buf_size, "%" PRId64, size);

+    } else {

+        base = 1024;

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

+            if (size < (10 * base)) {

+                snprintf(buf, buf_size, "%0.1f%c",

+                         (double)size / base,

+                         suffixes[i]);

+                break;

+            } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {

+                snprintf(buf, buf_size, "%" PRId64 "%c",

+                         ((size + (base >> 1)) / base),

+                         suffixes[i]);

+                break;

+            }

+            base = base * 1024;

+        }

+    }

+    return buf;

+}

+

+char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn)

+{

+    char buf1[128], date_buf[128], clock_buf[128];

+    struct tm tm;

+    time_t ti;

+    int64_t secs;

+

+    if (!sn) {

+        snprintf(buf, buf_size,

+                 "%-10s%-20s%7s%20s%15s",

+                 "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");

+    } else {

+        ti = sn->date_sec;

+        localtime_r(&ti, &tm;;

+        strftime(date_buf, sizeof(date_buf),

+                 "%Y-%m-%d %H:%M:%S", &tm;;

+        secs = sn->vm_clock_nsec / 1000000000;

+        snprintf(clock_buf, sizeof(clock_buf),

+                 "%02d:%02d:%02d.%03d",

+                 (int)(secs / 3600),

+                 (int)((secs / 60) % 60),

+                 (int)(secs % 60),

+                 (int)((sn->vm_clock_nsec / 1000000) % 1000));

+        snprintf(buf, buf_size,

+                 "%-10s%-20s%7s%20s%15s",

+                 sn->id_str, sn->name,

+                 get_human_readable_size(buf1, sizeof(buf1), sn->vm_state_size),

+                 date_buf,

+                 clock_buf);

+    }

+    return buf;

+}

+

+void bdrv_image_info_dump(ImageInfo *info)

+{

+    char size_buf[128], dsize_buf[128];

+    if (!info->has_actual_size) {

+        snprintf(dsize_buf, sizeof(dsize_buf), "unavailable");

+    } else {

+        get_human_readable_size(dsize_buf, sizeof(dsize_buf),

+                                info->actual_size);

+    }

+    get_human_readable_size(size_buf, sizeof(size_buf), info->virtual_size);

+    printf("image: %s\n"

+           "file format: %s\n"

+           "virtual size: %s (%" PRId64 " bytes)\n"

+           "disk size: %s\n",

+           info->filename, info->format, size_buf,

+           info->virtual_size,

+           dsize_buf);

+

+    if (info->has_encrypted && info->encrypted) {

+        printf("encrypted: yes\n");

+    }

+

+    if (info->has_cluster_size) {

+        printf("cluster_size: %" PRId64 "\n", info->cluster_size);

+    }

+

+    if (info->has_dirty_flag && info->dirty_flag) {

+        printf("cleanly shut down: no\n");

+    }

+

+    if (info->has_backing_filename) {

+        printf("backing file: %s", info->backing_filename);

+        if (info->has_full_backing_filename) {

+            printf(" (actual path: %s)", info->full_backing_filename);

+        }

+        putchar('\n');

+        if (info->has_backing_filename_format) {

+            printf("backing file format: %s\n", info->backing_filename_format);

+        }

+    }

+

+    if (info->has_snapshots) {

+        SnapshotInfoList *elem;

+        char buf[256];

+

+        printf("Snapshot list:\n");

+        printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL));

+

+        /* Ideally bdrv_snapshot_dump() would operate on SnapshotInfoList but

+         * we convert to the block layer's native QEMUSnapshotInfo for now.

+         */

+        for (elem = info->snapshots; elem; elem = elem->next) {

+            QEMUSnapshotInfo sn = {

+                .vm_state_size = elem->value->vm_state_size,

+                .date_sec = elem->value->date_sec,

+                .date_nsec = elem->value->date_nsec,

+                .vm_clock_nsec = elem->value->vm_clock_sec * 1000000000ULL +

+                                 elem->value->vm_clock_nsec,

+            };

+

+            pstrcpy(sn.id_str, sizeof(sn.id_str), elem->value->id);

+            pstrcpy(sn.name, sizeof(sn.name), elem->value->name);

+            printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), &sn));

+        }

+    }

+}

diff --git a/include/block/block.h b/include/block/block.h

index fac1282..7695cae 100644

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

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

@@ -7,11 +7,6 @@

 #include "block/coroutine.h"

 #include "qapi/qmp/qobject.h"

 #include "qapi-types.h"

-/*

- * snapshot.h is needed since bdrv_snapshot_dump(), it can be removed when the

- * function is moved to other file.

- */

-#include "block/snapshot.h"

 /* block.c */

 typedef struct BlockDriver BlockDriver;

@@ -353,12 +348,8 @@ void bdrv_get_backing_filename(BlockDriverState *bs,

                                char *filename, int filename_size);

 void bdrv_get_full_backing_filename(BlockDriverState *bs,

                                     char *dest, size_t sz);

-BlockInfo *bdrv_query_info(BlockDriverState *s);

-BlockStats *bdrv_query_stats(const BlockDriverState *bs);

 int bdrv_is_snapshot(BlockDriverState *bs);

-char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn);

-char *get_human_readable_size(char *buf, int buf_size, int64_t size);

 int path_is_absolute(const char *path);

 void path_combine(char *dest, int dest_size,

                   const char *base_path,

diff --git a/include/block/block_int.h b/include/block/block_int.h

index 696bbb9..9348238 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -33,6 +33,7 @@

 #include "qapi/qmp/qerror.h"

 #include "monitor/monitor.h"

 #include "qemu/hbitmap.h"

+#include "block/snapshot.h"

 #define BLOCK_FLAG_ENCRYPT          1

 #define BLOCK_FLAG_COMPAT6          4

diff --git a/include/block/qapi.h b/include/block/qapi.h

new file mode 100644

index 0000000..55d1848

--- /dev/null

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

@@ -0,0 +1,41 @@

+/*

+ * Block layer qmp and info dump related functions

+ *

+ * Copyright (c) 2003-2008 Fabrice Bellard

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#ifndef BLOCK_QAPI_H

+#define BLOCK_QAPI_H

+

+#include "qapi-types.h"

+#include "block/block.h"

+#include "block/snapshot.h"

+

+void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info);

+void bdrv_collect_image_info(BlockDriverState *bs,

+                             ImageInfo *info,

+                             const char *filename);

+BlockInfo *bdrv_query_info(BlockDriverState *s);

+BlockStats *bdrv_query_stats(const BlockDriverState *bs);

+

+char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn);