From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKAdt-0007E8-Uz for qemu-devel@nongnu.org; Wed, 20 Aug 2014 14:30:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKAdn-0004Ka-Qh for qemu-devel@nongnu.org; Wed, 20 Aug 2014 14:29:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKAdn-0004KU-IW for qemu-devel@nongnu.org; Wed, 20 Aug 2014 14:29:47 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7KITjQF017362 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 20 Aug 2014 14:29:46 -0400 From: Max Reitz Date: Wed, 20 Aug 2014 20:18:00 +0200 Message-Id: <1408558684-14162-11-git-send-email-mreitz@redhat.com> In-Reply-To: <1408558684-14162-1-git-send-email-mreitz@redhat.com> References: <1408558684-14162-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v11 10/14] 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 , 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 --- qemu-img-cmds.hx | 4 ++-- qemu-img.c | 24 +++++++++++++++++------- qemu-img.texi | 9 ++++++++- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index ea41d4f..4331949 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] [-d] [-p] filename") + "commit [-q] [-f fmt] [-t cache] [-b base] [-d] [-p] filename") STEXI -@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-d] [-p] @var{filename} +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-b @var{base}] [-d] [-p] @var{filename} ETEXI DEF("compare", img_compare, diff --git a/qemu-img.c b/qemu-img.c index 1a35449..f330e6d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -763,7 +763,7 @@ static void run_block_job(BlockJob *job, Error **errp) 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, drop = false; Error *local_err = NULL; @@ -771,8 +771,9 @@ static int img_commit(int argc, char **argv) fmt = NULL; cache = BDRV_DEFAULT_CACHE; + base = NULL; for(;;) { - c = getopt(argc, argv, "f:ht:dpq"); + c = getopt(argc, argv, "f:ht:b:dpq"); if (c == -1) { break; } @@ -787,6 +788,11 @@ static int img_commit(int argc, char **argv) case 't': cache = optarg; break; + case 'b': + base = optarg; + /* -b implies -d */ + drop = true; + break; case 'd': drop = true; break; @@ -824,12 +830,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 557b4de..82558b8 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -163,7 +163,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}] [-d] [-p] @var{filename} +@item commit [-q] [-f @var{fmt}] [-t @var{cache}] [-b @var{base}] [-d] [-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 @@ -176,6 +176,13 @@ The image @var{filename} is emptied after the operation has succeeded. If you do not need @var{filename} afterwards and intend to drop it, you may skip emptying @var{filename} by specifying the @code{-d} flag. +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. For reasons of consistency, +explicitly specifying @var{base} will always imply @code{-d}. + @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 -- 2.0.4