[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] snapshot: export function in block.c
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH 1/6] snapshot: export function in block.c |
Date: |
Mon, 17 Dec 2012 14:25:04 +0800 |
This patch moves bdrv_snapshotfind from savevm.c to block.c and export
it, also added bdrv_deappend in block.c.
Signed-off-by: Wenchao Xia <address@hidden>
---
block.c | 30 ++++++++++++++++++++++++++++++
block.h | 3 +++
savevm.c | 22 ----------------------
3 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/block.c b/block.c
index 0668c4b..61c7c6a 100644
--- a/block.c
+++ b/block.c
@@ -1376,6 +1376,13 @@ void bdrv_append(BlockDriverState *bs_new,
BlockDriverState *bs_top)
bs_new->drv ? bs_new->drv->format_name : "");
}
+/* revert the action */
+void bdrv_deappend(BlockDriverState *bs_new, BlockDriverState *bs_top)
+{
+ bdrv_swap(bs_new, bs_top);
+ /* this is enough? */
+}
+
void bdrv_delete(BlockDriverState *bs)
{
assert(!bs->dev);
@@ -3210,6 +3217,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/block.h b/block.h
index 893448a..2322b13 100644
--- a/block.h
+++ b/block.h
@@ -130,6 +130,7 @@ BlockDriverState *bdrv_new(const char *device_name);
void bdrv_make_anon(BlockDriverState *bs);
void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old);
void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top);
+void bdrv_deappend(BlockDriverState *bs_new, BlockDriverState *bs_top);
void bdrv_delete(BlockDriverState *bs);
int bdrv_parse_cache_flags(const char *mode, int *flags);
int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags);
@@ -330,6 +331,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 5d04d59..c027529 100644
--- a/savevm.c
+++ b/savevm.c
@@ -2061,28 +2061,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
- [Qemu-devel] [PATCH 0/6] snapshot: take snapshots in unified way, Wenchao Xia, 2012/12/17
- [Qemu-devel] [PATCH 2/6] snapshot: add error set function, Wenchao Xia, 2012/12/17
- [Qemu-devel] [PATCH 5/6] snapshot: qmp interface, Wenchao Xia, 2012/12/17
- [Qemu-devel] [PATCH 1/6] snapshot: export function in block.c,
Wenchao Xia <=
- [Qemu-devel] [PATCH 6/6] snapshot: human monitor interface, Wenchao Xia, 2012/12/17
- [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Wenchao Xia, 2012/12/17
- Re: [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Dietmar Maurer, 2012/12/17
- Re: [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Wenchao Xia, 2012/12/17
- Re: [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Dietmar Maurer, 2012/12/17
- Re: [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Wenchao Xia, 2012/12/17
- Re: [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Dietmar Maurer, 2012/12/17
- Re: [Qemu-devel] [PATCH 4/6] snapshot: implemention of common API to take snapshots, Eric Blake, 2012/12/20