From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com,
stefanha@redhat.com, Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 2/4] qemu-nbd: support internal snapshot export
Date: Wed, 17 Jul 2013 22:03:53 +0800 [thread overview]
Message-ID: <1374069835-14287-3-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1374069835-14287-1-git-send-email-xiawenc@linux.vnet.ibm.com>
Now it is possible to directly export an internal snapshot, which
can be used to probe the snapshot's contents without qemu-img
convert.
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
qemu-nbd.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 9c31d45..46be2b2 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -19,6 +19,7 @@
#include "qemu-common.h"
#include "block/block.h"
#include "block/nbd.h"
+#include "block/snapshot.h"
#include <stdarg.h>
#include <stdio.h>
@@ -303,6 +304,23 @@ static void nbd_accept(void *opaque)
}
}
+#define SNAPSHOT_OPT_ID "id"
+#define SNAPSHOT_OPT_NAME "name"
+
+static QEMUOptionParameter snapshot_options[] = {
+ {
+ .name = SNAPSHOT_OPT_ID,
+ .type = OPT_STRING,
+ .help = "snapshot id"
+ },
+ {
+ .name = SNAPSHOT_OPT_NAME,
+ .type = OPT_STRING,
+ .help = "snapshot name"
+ },
+ { NULL }
+};
+
int main(int argc, char **argv)
{
BlockDriverState *bs;
@@ -314,7 +332,11 @@ int main(int argc, char **argv)
char *device = NULL;
int port = NBD_DEFAULT_PORT;
off_t fd_size;
- const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:t";
+ QEMUOptionParameter *sn_param = NULL;
+ const QEMUOptionParameter *sn_param_id, *sn_param_name;
+ const char *sn_id = NULL, *sn_name = NULL;
+ Error *local_err = NULL;
+ const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:";
struct option lopt[] = {
{ "help", 0, NULL, 'h' },
{ "version", 0, NULL, 'V' },
@@ -327,6 +349,7 @@ int main(int argc, char **argv)
{ "connect", 1, NULL, 'c' },
{ "disconnect", 0, NULL, 'd' },
{ "snapshot", 0, NULL, 's' },
+ { "snapshot-load", 1, NULL, 'l' },
{ "nocache", 0, NULL, 'n' },
{ "cache", 1, NULL, QEMU_NBD_OPT_CACHE },
#ifdef CONFIG_LINUX_AIO
@@ -426,6 +449,13 @@ int main(int argc, char **argv)
errx(EXIT_FAILURE, "Offset must be positive `%s'", optarg);
}
break;
+ case 'l':
+ sn_param = parse_option_parameters(optarg,
+ snapshot_options, sn_param);
+ if (!sn_param) {
+ errx(EXIT_FAILURE,
+ "Invalid snapshot-load options '%s'", optarg);
+ }
case 'r':
nbdflags |= NBD_FLAG_READ_ONLY;
flags &= ~BDRV_O_RDWR;
@@ -578,6 +608,24 @@ int main(int argc, char **argv)
err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]);
}
+ if (sn_param) {
+ sn_param_id = get_option_parameter(sn_param, SNAPSHOT_OPT_ID);
+ sn_param_name = get_option_parameter(sn_param, SNAPSHOT_OPT_NAME);
+ if (sn_param_id) {
+ sn_id = sn_param_id->value.s;
+ }
+ if (sn_param_name) {
+ sn_name = sn_param_name->value.s;
+ }
+ ret = bdrv_snapshot_load_tmp(bs, sn_id, sn_name, &local_err);
+ if (ret < 0) {
+ errno = -ret;
+ err(EXIT_FAILURE,
+ "Failed to load snapshot, reason:\n%s",
+ error_get_pretty(local_err));
+ }
+ }
+
fd_size = bdrv_getlength(bs);
if (partition != -1) {
@@ -638,6 +686,10 @@ int main(int argc, char **argv)
unlink(sockpath);
}
+ if (sn_param) {
+ free_option_parameters(sn_param);
+ }
+
if (device) {
void *ret;
pthread_join(client_thread, &ret);
--
1.7.1
next prev parent reply other threads:[~2013-07-17 14:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 14:03 [Qemu-devel] [PATCH 0/4] export internal snapshot by qemu-nbd Wenchao Xia
2013-07-17 14:03 ` [Qemu-devel] [PATCH 1/4] snapshot: distinguish id and name in load_tmp Wenchao Xia
2013-07-17 14:03 ` Wenchao Xia [this message]
2013-07-17 14:03 ` [Qemu-devel] [PATCH 3/4] qemu-nbd: add doc for internal snapshot export Wenchao Xia
2013-07-26 8:11 ` Stefan Hajnoczi
2013-07-29 1:57 ` Wenchao Xia
2013-07-29 7:39 ` Stefan Hajnoczi
2013-07-17 14:03 ` [Qemu-devel] [PATCH 4/4] qemu-iotests: add 057 internal snapshot export with qemu-nbd case Wenchao Xia
2013-07-17 14:23 ` [Qemu-devel] [PATCH 0/4] export internal snapshot by qemu-nbd Eric Blake
2013-07-17 15:21 ` Kevin Wolf
2013-07-18 2:28 ` Wenchao Xia
2013-07-18 7:15 ` Fam Zheng
2013-07-19 6:29 ` Wenchao Xia
2013-07-19 8:20 ` Kevin Wolf
2013-07-22 5:20 ` Wenchao Xia
2013-07-18 5:43 ` Stefan Hajnoczi
2013-07-19 9:03 ` Wenchao Xia
2013-07-19 9:19 ` Kevin Wolf
2013-07-19 10:02 ` Wenchao Xia
2013-07-22 2:10 ` Fam Zheng
2013-07-22 3:26 ` Wenchao Xia
2013-07-25 2:30 ` Wenchao Xia
2013-07-25 8:06 ` Stefan Hajnoczi
2013-07-26 2:23 ` Wenchao Xia
2013-07-26 8:20 ` Stefan Hajnoczi
2013-07-29 2:05 ` 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=1374069835-14287-3-git-send-email-xiawenc@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=dietmar@proxmox.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.