From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzSRl-0002yH-VG for qemu-devel@nongnu.org; Wed, 17 Jul 2013 10:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzSRk-0004zs-Jf for qemu-devel@nongnu.org; Wed, 17 Jul 2013 10:11:13 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:58114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzSRj-0004zf-TQ for qemu-devel@nongnu.org; Wed, 17 Jul 2013 10:11:12 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 Jul 2013 19:28:40 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 90C8DE005F for ; Wed, 17 Jul 2013 19:36:18 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6HE76n219005668 for ; Wed, 17 Jul 2013 19:37:07 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r6HE6J7h016812 for ; Thu, 18 Jul 2013 00:06:21 +1000 From: Wenchao Xia Date: Wed, 17 Jul 2013 22:03:53 +0800 Message-Id: <1374069835-14287-3-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1374069835-14287-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1374069835-14287-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/4] qemu-nbd: support internal snapshot export List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com, stefanha@redhat.com, Wenchao Xia 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 --- 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 #include @@ -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