From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lmb4c-00049i-0R for qemu-devel@nongnu.org; Wed, 25 Mar 2009 17:55:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lmb4W-000478-LU for qemu-devel@nongnu.org; Wed, 25 Mar 2009 17:55:45 -0400 Received: from [199.232.76.173] (port=59997 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lmb4W-000470-FZ for qemu-devel@nongnu.org; Wed, 25 Mar 2009 17:55:40 -0400 Received: from mx2.redhat.com ([66.187.237.31]:47013) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lmb4V-0004PW-Sb for qemu-devel@nongnu.org; Wed, 25 Mar 2009 17:55:40 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n2PLtd4t019905 for ; Wed, 25 Mar 2009 17:55:39 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n2PLtWJo019303 for ; Wed, 25 Mar 2009 17:55:33 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n2PLtXoS031473 for ; Wed, 25 Mar 2009 17:55:38 -0400 From: Uri Lublin Date: Wed, 25 Mar 2009 23:55:12 +0200 Message-Id: <1238018112-7569-5-git-send-email-uril@redhat.com> In-Reply-To: <1238018112-7569-4-git-send-email-uril@redhat.com> References: <1238018112-7569-1-git-send-email-uril@redhat.com> <1238018112-7569-2-git-send-email-uril@redhat.com> <1238018112-7569-3-git-send-email-uril@redhat.com> <1238018112-7569-4-git-send-email-uril@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] qemu-img: adding a "-F base_fmt" option to "qemu-img create -b" Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org If the user specifies the backing file format, then when opening the backing file, there is no need to probe the (backing file) image to figure out its format. This follows my previous patches implementing bdrv_create2 which keeps (for qcow2 only) the backing file format as a qcow2-extension Suggested by Daniel P. Berrange. Signed-off-by: Uri Lublin --- qemu-img.c | 24 ++++++++++++++++++++---- qemu-img.texi | 4 +++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 66ec91c..ab380c8 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -25,6 +25,7 @@ #include "osdep.h" #include "block_int.h" #include +#include #ifdef _WIN32 #include @@ -57,7 +58,7 @@ static void help(void) "QEMU disk image utility\n" "\n" "Command syntax:\n" - " create [-e] [-6] [-b base_image] [-f fmt] filename [size]\n" + " create [-e] [-6] [-F fmt] [-b base_image] [-f fmt] filename [size]\n" " commit [-f fmt] filename\n" " convert [-c] [-e] [-6] [-f fmt] [-O output_fmt] [-B output_base_image] filename [filename2 [...]] output_filename\n" " info [-f fmt] filename\n" @@ -217,6 +218,7 @@ static int img_create(int argc, char **argv) { int c, ret, flags; const char *fmt = "raw"; + const char *base_fmt = NULL; const char *filename; const char *base_filename = NULL; uint64_t size; @@ -226,13 +228,16 @@ static int img_create(int argc, char **argv) flags = 0; for(;;) { - c = getopt(argc, argv, "b:f:he6"); + c = getopt(argc, argv, "F:b:f:he6"); if (c == -1) break; switch(c) { case 'h': help(); break; + case 'F': + base_fmt = optarg; + break; case 'b': base_filename = optarg; break; @@ -253,7 +258,15 @@ static int img_create(int argc, char **argv) size = 0; if (base_filename) { BlockDriverState *bs; - bs = bdrv_new_open(base_filename, NULL); + BlockDriver *base_drv = NULL; + + if (base_fmt) { + base_drv = bdrv_find_format(base_fmt); + if (base_drv == NULL) + error("Unknown basefile format '%s'", base_fmt); + } + + bs = bdrv_new_open(base_filename, base_fmt); bdrv_get_geometry(bs, &size); size *= 512; bdrv_delete(bs); @@ -284,9 +297,12 @@ static int img_create(int argc, char **argv) if (base_filename) { printf(", backing_file=%s", base_filename); + if (base_fmt) + printf(", backing_fmt=%s", + base_fmt); } printf(", size=%" PRIu64 " kB\n", size / 1024); - ret = bdrv_create(drv, filename, size / 512, base_filename, flags); + ret = bdrv_create2(drv, filename, size / 512, base_filename, base_fmt, flags); if (ret < 0) { if (ret == -ENOTSUP) { error("Formatting or formatting option not supported for file format '%s'", fmt); diff --git a/qemu-img.texi b/qemu-img.texi index a40f841..deef2ab 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -8,7 +8,7 @@ usage: qemu-img command [command options] The following commands are supported: @table @option -@item create [-e] [-6] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}] +@item create [-e] [-6] [-F @var{base_fmt}] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}] @item commit [-f @var{fmt}] @var{filename} @item convert [-c] [-e] [-6] [-f @var{fmt}] [-O @var{output_fmt}] [-B @var{output_base_image}] @var{filename} [@var{filename2} [...]] @var{output_filename} @item info [-f @var{fmt}] @var{filename} @@ -27,6 +27,8 @@ forces the output image to be created as a copy on write image of the specified base image; @code{output_base_image} should have the same content as the input's base image, however the path, image format, etc may differ +@item base_fmt +is the disk image format of @var{base_image}. for more information look at @var{fmt} @item fmt is the disk image format. It is guessed automatically in most cases. The following formats are supported: -- 1.6.0.6