From patchwork Sun Sep 22 09:39:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 276959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B107F2C00AD for ; Sun, 22 Sep 2013 19:42:22 +1000 (EST) Received: from localhost ([::1]:34539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNgBI-0005Hr-Cx for incoming@patchwork.ozlabs.org; Sun, 22 Sep 2013 05:42:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNg9P-0002w1-Il for qemu-devel@nongnu.org; Sun, 22 Sep 2013 05:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VNg9F-00044W-LT for qemu-devel@nongnu.org; Sun, 22 Sep 2013 05:40:23 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:45037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNg9F-00043x-1q for qemu-devel@nongnu.org; Sun, 22 Sep 2013 05:40:13 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 22 Sep 2013 15:10:03 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 22 Sep 2013 15:10:01 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 65B21394004E for ; Sun, 22 Sep 2013 15:09:46 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8M9gFcG33423364 for ; Sun, 22 Sep 2013 15:12:17 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8M9dwjN032480 for ; Sun, 22 Sep 2013 15:09:58 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r8M9ds4F032443; Sun, 22 Sep 2013 15:09:57 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sun, 22 Sep 2013 17:39:49 +0800 Message-Id: <1379842791-3776-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1379842791-3776-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1379842791-3776-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13092209-4790-0000-0000-00000A72E605 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: kwolf@redhat.com, pbonzini@redhat.com, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH V2 2/4] qemu-nbd: support internal snapshot export X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 c26c98e..e450d04 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -20,6 +20,7 @@ #include "block/block.h" #include "block/nbd.h" #include "qemu/main-loop.h" +#include "block/snapshot.h" #include #include @@ -304,6 +305,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; @@ -315,7 +333,10 @@ 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; + const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:"; struct option lopt[] = { { "help", 0, NULL, 'h' }, { "version", 0, NULL, 'V' }, @@ -328,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 @@ -428,6 +450,14 @@ 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); + } + /* fall through */ case 'r': nbdflags |= NBD_FLAG_READ_ONLY; flags &= ~BDRV_O_RDWR; @@ -581,6 +611,24 @@ int main(int argc, char **argv) error_get_pretty(local_err)); } + 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) { @@ -641,6 +689,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);