From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYJfh-0000Nu-OL for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:26:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYJfb-0006qV-FF for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:25:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYJRu-0001zD-1I for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:11:42 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3AIBfJn022654 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Apr 2014 14:11:41 -0400 From: Max Reitz Date: Thu, 10 Apr 2014 20:11:07 +0200 Message-Id: <1397153468-16498-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1397153468-16498-1-git-send-email-mreitz@redhat.com> References: <1397153468-16498-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 4/5] qemu-img: Specify backing file for commit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Introduce a new parameter for qemu-img commit which may be used to explicitly specify the backing file into which an image should be committed if the backing chain has more than a single layer. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Fam Zheng --- qemu-img-cmds.hx | 4 ++-- qemu-img.c | 22 +++++++++++++++------- qemu-img.texi | 8 +++++++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 8bc55cd..e8a5d34 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -22,9 +22,9 @@ STEXI ETEXI DEF("commit", img_commit, - "commit [-q] [-f fmt] [-t cache] [-p] filename") + "commit [-q] [-f fmt] [-t cache] [-b base] [-p] filename") STEXI -@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-p] @var{filename} +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-b @var{base}] [-p] @var{filename} ETEXI DEF("compare", img_compare, diff --git a/qemu-img.c b/qemu-img.c index 0c22b20..5052b6f 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -751,15 +751,16 @@ static void run_block_job(BlockJob *job, struct CommonBlockJobCBInfo *cbi) static int img_commit(int argc, char **argv) { int c, ret, flags; - const char *filename, *fmt, *cache; + const char *filename, *fmt, *cache, *base; BlockDriverState *bs, *base_bs; bool progress = false, quiet = false; Error *local_err = NULL; fmt = NULL; cache = BDRV_DEFAULT_CACHE; + base = NULL; for(;;) { - c = getopt(argc, argv, "f:ht:qp"); + c = getopt(argc, argv, "f:ht:b:qp"); if (c == -1) { break; } @@ -774,6 +775,9 @@ static int img_commit(int argc, char **argv) case 't': cache = optarg; break; + case 'b': + base = optarg; + break; case 'p': progress = true; break; @@ -808,12 +812,16 @@ static int img_commit(int argc, char **argv) qemu_progress_init(progress, 1.f); qemu_progress_print(0.f, 100); - /* This is different from QMP, which by default uses the deepest file in the - * backing chain (i.e., the very base); however, the traditional behavior of - * qemu-img commit is using the immediate backing file. */ - base_bs = bs->backing_hd; + if (base) { + base_bs = bdrv_find_backing_image(bs, base); + } else { + /* This is different from QMP, which by default uses the deepest file in + * the backing chain (i.e., the very base); however, the traditional + * behavior of qemu-img commit is using the immediate backing file. */ + base_bs = bs->backing_hd; + } if (!base_bs) { - error_set(&local_err, QERR_BASE_NOT_FOUND, "NULL"); + error_set(&local_err, QERR_BASE_NOT_FOUND, base ?: "NULL"); goto done; } diff --git a/qemu-img.texi b/qemu-img.texi index 1a9c08f..27b65ae 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -140,7 +140,7 @@ this case. @var{backing_file} will never be modified unless you use the The size can also be specified using the @var{size} option with @code{-o}, it doesn't need to be specified separately in this case. -@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-p] @var{filename} +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-b @var{base}] [-p] @var{filename} Commit the changes recorded in @var{filename} in its base image or backing file. If the backing file is smaller than the snapshot, then the backing file will be @@ -149,6 +149,12 @@ the backing file, the backing file will not be truncated. If you want the backing file to match the size of the smaller snapshot, you can safely truncate it yourself once the commit operation successfully completes. +If the backing chain of the given image file @var{filename} has more than one +layer, the backing file into which the changes will be committed may be +specified as @var{base} (which has to be part of @var{filename}'s backing +chain). If @var{base} is not specified, the immediate backing file of the top +image (which is @var{filename}) will be used. + @item compare [-f @var{fmt}] [-F @var{fmt}] [-p] [-s] [-q] @var{filename1} @var{filename2} Check if two images have the same content. You can compare images with -- 1.9.1