qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 V2 07/11] block: export function bdrv_find_snapshot()
Date: Wed,  9 Jan 2013 13:12:26 +0800	[thread overview]
Message-ID: <1357708350-9917-8-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1357708350-9917-1-git-send-email-xiawenc@linux.vnet.ibm.com>

  This patch move it from savevm.c to block.c and export it.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
 block.c               |   23 +++++++++++++++++++++++
 include/block/block.h |    2 ++
 savevm.c              |   22 ----------------------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/block.c b/block.c
index 8192d8e..b7d2f03 100644
--- a/block.c
+++ b/block.c
@@ -3351,6 +3351,29 @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs,
     return -ENOTSUP;
 }
 
+int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
+                       const char *name)
+{
+    QEMUSnapshotInfo *sn_tab, *sn;
+    int nb_sns, i, ret;
+
+    ret = -ENOENT;
+    nb_sns = bdrv_snapshot_list(bs, &sn_tab);
+    if (nb_sns < 0) {
+        return ret;
+    }
+    for (i = 0; i < nb_sns; i++) {
+        sn = &sn_tab[i];
+        if (!strcmp(sn->id_str, name) || !strcmp(sn->name, name)) {
+            *sn_info = *sn;
+            ret = 0;
+            break;
+        }
+    }
+    g_free(sn_tab);
+    return ret;
+}
+
 /* backing_file can either be relative, or absolute, or a protocol.  If it is
  * relative, it must be relative to the chain.  So, passing in bs->filename
  * from a BDS as backing_file should not be done, as that may be relative to
diff --git a/include/block/block.h b/include/block/block.h
index 5ce817a..c473be5 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -340,6 +340,8 @@ int bdrv_snapshot_list(BlockDriverState *bs,
 int bdrv_snapshot_load_tmp(BlockDriverState *bs,
                            const char *snapshot_name);
 char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn);
+int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
+                       const char *name);
 
 char *get_human_readable_size(char *buf, int buf_size, int64_t size);
 int path_is_absolute(const char *path);
diff --git a/savevm.c b/savevm.c
index 021420f..9af2605 100644
--- a/savevm.c
+++ b/savevm.c
@@ -2036,28 +2036,6 @@ out:
     return ret;
 }
 
-static int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
-                              const char *name)
-{
-    QEMUSnapshotInfo *sn_tab, *sn;
-    int nb_sns, i, ret;
-
-    ret = -ENOENT;
-    nb_sns = bdrv_snapshot_list(bs, &sn_tab);
-    if (nb_sns < 0)
-        return ret;
-    for(i = 0; i < nb_sns; i++) {
-        sn = &sn_tab[i];
-        if (!strcmp(sn->id_str, name) || !strcmp(sn->name, name)) {
-            *sn_info = *sn;
-            ret = 0;
-            break;
-        }
-    }
-    g_free(sn_tab);
-    return ret;
-}
-
 /*
  * Deletes snapshots of a given name in all opened images.
  */
-- 
1.7.1

  parent reply	other threads:[~2013-01-09  5:14 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-09  5:12 [Qemu-devel] [PATCH V2 00/11] add qmp/hmp interfaces for snapshot info Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 01/11] qemu-img: remove unused parameter in collect_image_info() Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 02/11] block: add bdrv_get_filename() function Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 03/11] block: add snapshot and image info query function Wenchao Xia
2013-01-09 15:56   ` Eric Blake
2013-01-10  5:43     ` Wenchao Xia
2013-01-10 13:36       ` Eric Blake
2013-01-11  3:18         ` Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 04/11] qemu-img: switch image retrieving function Wenchao Xia
2013-01-09 16:27   ` Eric Blake
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 05/11] block: rename bdrv_query_info to bdrv_query_block_info Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 06/11] qmp: add interface query-images Wenchao Xia
2013-01-09 22:53   ` Eric Blake
2013-01-09  5:12 ` Wenchao Xia [this message]
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 08/11] qmp: add interface query-snapshots Wenchao Xia
2013-01-09 23:04   ` Eric Blake
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 09/11] hmp: export function hmp_handle_error() Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 10/11] hmp: retrieve info from qmp for snapshot info Wenchao Xia
2013-01-09  5:12 ` [Qemu-devel] [PATCH V2 11/11] hmp: show snapshot on single block device Wenchao Xia

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=1357708350-9917-8-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).