From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com,
armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com,
Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH V3 03/11] block: add snapshot and image info query function
Date: Mon, 14 Jan 2013 15:09:39 +0800 [thread overview]
Message-ID: <1358147387-8221-4-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1358147387-8221-1-git-send-email-xiawenc@linux.vnet.ibm.com>
This patch added function bdrv_query_image_info() and
bdrv_query_snapshot_infolist(), which will return info in qmp object
format. The implementation code are mostly copied from collect_image_info()
and collect_snapshot() in qemu-img.c.
To help filter out snapshot info not needed, a call back function is
added in bdrv_query_snapshot_infolist().
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++
include/block/block.h | 9 ++++
2 files changed, 126 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index 5f95da5..81765a3 100644
--- a/block.c
+++ b/block.c
@@ -2846,6 +2846,123 @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
return 0;
}
+SnapshotInfoList *bdrv_query_snapshot_infolist(BlockDriverState *bs,
+ SnapshotFilterFunc filter,
+ void *opaque,
+ Error **errp)
+{
+ int i, sn_count;
+ QEMUSnapshotInfo *sn_tab = NULL;
+ SnapshotInfoList *info_list, *cur_item = NULL, *head = NULL;
+ sn_count = bdrv_snapshot_list(bs, &sn_tab);
+ if (sn_count < 0) {
+ if (errp != NULL) {
+ error_setg(errp, "bdrv_snapshot_list: error %d\n", sn_count);
+ }
+ return NULL;
+ }
+
+ for (i = 0; i < sn_count; i++) {
+ if (filter && filter(&sn_tab[i], opaque) != 0) {
+ continue;
+ }
+
+ 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) {
+ head = cur_item = info_list;
+ } else {
+ cur_item->next = info_list;
+ cur_item = info_list;
+ }
+
+ }
+
+ g_free(sn_tab);
+ return head;
+}
+
+/* collect all internal snapshot info in a image for ImageInfo */
+static void collect_snapshots_info(BlockDriverState *bs,
+ ImageInfo *info,
+ Error **errp)
+{
+ SnapshotInfoList *info_list;
+
+ info_list = bdrv_query_snapshot_infolist(bs, NULL, NULL, errp);
+ if (info_list != NULL) {
+ info->has_snapshots = true;
+ info->snapshots = info_list;
+ }
+ return;
+}
+
+static void collect_image_info(BlockDriverState *bs,
+ ImageInfo *info)
+{
+ uint64_t total_sectors;
+ char backing_filename[1024];
+ char backing_filename2[1024];
+ BlockDriverInfo bdi;
+ const char *filename;
+
+ filename = bdrv_get_filename(bs);
+ 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;
+ }
+ }
+}
+
+ImageInfo *bdrv_query_image_info(BlockDriverState *bs, Error **errp)
+{
+ ImageInfo *info = g_new0(ImageInfo, 1);
+ collect_image_info(bs, info);
+ collect_snapshots_info(bs, info, errp);
+ return info;
+}
+
BlockInfo *bdrv_query_info(BlockDriverState *bs)
{
BlockInfo *info = g_malloc0(sizeof(*info));
diff --git a/include/block/block.h b/include/block/block.h
index a0fc2a6..67f0d13 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -316,8 +316,17 @@ 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);
+
+typedef int (*SnapshotFilterFunc)(const QEMUSnapshotInfo *sn, void *opaque);
+/* assume bs is already opened, use qapi_free_* to free returned value. */
+SnapshotInfoList *bdrv_query_snapshot_infolist(BlockDriverState *bs,
+ SnapshotFilterFunc filter,
+ void *opaque,
+ Error **errp);
+ImageInfo *bdrv_query_image_info(BlockDriverState *bs, Error **errp);
BlockInfo *bdrv_query_info(BlockDriverState *s);
BlockStats *bdrv_query_stats(const BlockDriverState *bs);
+
int bdrv_can_snapshot(BlockDriverState *bs);
int bdrv_is_snapshot(BlockDriverState *bs);
BlockDriverState *bdrv_snapshots(void);
--
1.7.1
next prev parent reply other threads:[~2013-01-14 7:13 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 7:09 [Qemu-devel] [PATCH V3 00/11] add qmp/hmp interfaces for snapshot info Wenchao Xia
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 01/11] qemu-img: remove unused parameter in collect_image_info() Wenchao Xia
2013-01-14 17:08 ` Luiz Capitulino
2013-01-15 7:27 ` Wenchao Xia
2013-01-15 7:58 ` Wenchao Xia
2013-01-15 11:11 ` Luiz Capitulino
2013-01-16 3:10 ` Wenchao Xia
2013-01-16 17:56 ` Luiz Capitulino
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 02/11] block: add bdrv_get_filename() function Wenchao Xia
2013-01-14 17:08 ` Luiz Capitulino
2013-01-15 7:30 ` Wenchao Xia
2013-01-15 8:40 ` [Qemu-devel] IS_USER(s) in target-arm Shijesta Victor
2013-01-14 7:09 ` Wenchao Xia [this message]
2013-01-14 17:22 ` [Qemu-devel] [PATCH V3 03/11] block: add snapshot and image info query function Luiz Capitulino
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 04/11] qemu-img: switch image retrieving function Wenchao Xia
2013-01-14 11:25 ` Pavel Hrdina
2013-01-14 18:21 ` Luiz Capitulino
2013-01-15 2:37 ` Wenchao Xia
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 05/11] block: rename bdrv_query_info to bdrv_query_block_info Wenchao Xia
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 06/11] qmp: add interface query-images Wenchao Xia
2013-01-14 18:32 ` Luiz Capitulino
2013-01-15 10:27 ` Wenchao Xia
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 07/11] block: export function bdrv_find_snapshot() Wenchao Xia
2013-01-14 23:39 ` Eric Blake
2013-01-15 10:24 ` Wenchao Xia
2013-01-15 17:57 ` Eric Blake
2013-01-16 4:28 ` Wenchao Xia
2013-01-15 12:01 ` Markus Armbruster
2013-01-15 13:18 ` Pavel Hrdina
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 08/11] qmp: add interface query-snapshots Wenchao Xia
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 09/11] hmp: export function hmp_handle_error() Wenchao Xia
2013-01-14 18:38 ` Luiz Capitulino
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 10/11] hmp: retrieve info from qmp for snapshot info Wenchao Xia
2013-01-14 7:09 ` [Qemu-devel] [PATCH V3 11/11] hmp: show snapshot on single block device Wenchao Xia
2013-01-14 11:15 ` Pavel Hrdina
2013-01-14 18:56 ` Luiz Capitulino
2013-01-15 2:36 ` Wenchao Xia
2013-01-15 11:05 ` Luiz Capitulino
2013-01-16 2:51 ` Wenchao Xia
2013-01-14 18:56 ` Luiz Capitulino
2013-01-14 18:58 ` [Qemu-devel] [PATCH V3 00/11] add qmp/hmp interfaces for snapshot info Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358147387-8221-4-git-send-email-xiawenc@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=armbru@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@redhat.com \
--cc=phrdina@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).