[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 5/7] qemu-img: add -L for snapshot in convert
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V3 5/7] qemu-img: add -L for snapshot in convert |
Date: |
Thu, 26 Sep 2013 08:16:06 +0800 |
Now qemu-img convert have similar options as qemu-nbd for internal
snapshot.
Signed-off-by: Wenchao Xia <address@hidden>
---
qemu-img.c | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 6df58ed..a784ad4 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1140,6 +1140,7 @@ static int img_convert(int argc, char **argv)
int min_sparse = 8; /* Need at least 4k of zeros for sparse detection */
bool quiet = false;
Error *local_err = NULL;
+ QemuOpts *sn_opts = NULL;
fmt = NULL;
out_fmt = "raw";
@@ -1148,7 +1149,7 @@ static int img_convert(int argc, char **argv)
compress = 0;
skip_create = 0;
for(;;) {
- c = getopt(argc, argv, "f:O:B:s:hce6o:pS:t:qn");
+ c = getopt(argc, argv, "f:O:B:s:hce6o:pS:t:qnL:");
if (c == -1) {
break;
}
@@ -1183,6 +1184,9 @@ static int img_convert(int argc, char **argv)
case 's':
snapshot_name = optarg;
break;
+ case 'L':
+ sn_opts = qemu_opts_parse(&internal_snapshot_opts, optarg, 0);
+ break;
case 'S':
{
int64_t sval;
@@ -1254,7 +1258,12 @@ static int img_convert(int argc, char **argv)
total_sectors += bs_sectors;
}
- if (snapshot_name != NULL) {
+ if (sn_opts) {
+ ret = bdrv_snapshot_load_tmp(bs[0],
+ qemu_opt_get(sn_opts, SNAPSHOT_OPT_ID),
+ qemu_opt_get(sn_opts, SNAPSHOT_OPT_NAME),
+ &local_err);
+ } else if (snapshot_name != NULL) {
if (bs_n > 1) {
error_report("No support for concatenating multiple snapshot");
ret = -1;
@@ -1262,13 +1271,13 @@ static int img_convert(int argc, char **argv)
}
bdrv_snapshot_load_tmp_by_id_or_name(bs[0], snapshot_name, &local_err);
- if (error_is_set(&local_err)) {
- error_report("Failed to load snapshot: %s",
- error_get_pretty(local_err));
- error_free(local_err);
- ret = -1;
- goto out;
- }
+ }
+ if (error_is_set(&local_err)) {
+ error_report("Failed to load snapshot: %s",
+ error_get_pretty(local_err));
+ error_free(local_err);
+ ret = -1;
+ goto out;
}
/* Find driver and parse its options */
@@ -1559,6 +1568,9 @@ out:
free_option_parameters(create_options);
free_option_parameters(param);
qemu_vfree(buf);
+ if (sn_opts) {
+ qemu_opts_del(sn_opts);
+ }
if (out_bs) {
bdrv_unref(out_bs);
}
--
1.7.1
- [Qemu-devel] [PATCH V3 0/7] export internal snapshot by qemu-nbd, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 2/7] qemu-nbd: support internal snapshot export, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 4/7] qemu-iotests: add 058 internal snapshot export with qemu-nbd case, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 1/7] snapshot: distinguish id and name in load_tmp, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 3/7] qemu-nbd: add doc for internal snapshot export, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 6/7] qemu-img: add doc for param -L in convert, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 7/7] qemu-iotests: add test for snapshot in qemu-img convert, Wenchao Xia, 2013/09/25
- [Qemu-devel] [PATCH V3 5/7] qemu-img: add -L for snapshot in convert,
Wenchao Xia <=
- Re: [Qemu-devel] [PATCH V3 0/7] export internal snapshot by qemu-nbd, Wenchao Xia, 2013/09/30