diff options
author | 2009-03-28 17:55:19 +0000 | |
---|---|---|
committer | 2009-03-28 17:55:19 +0000 | |
commit | 9230eaf6797ffce465aef2a6c5b26d605c162a24 (patch) | |
tree | 7ab0a286bd63e6715cc7eb13b6e6921464055ce8 /qemu-img.c | |
parent | block-qcow2: keep backing file format in a qcow2 extension (Uri Lublin) (diff) | |
download | qemu-kvm-9230eaf6797ffce465aef2a6c5b26d605c162a24.tar.gz qemu-kvm-9230eaf6797ffce465aef2a6c5b26d605c162a24.tar.bz2 qemu-kvm-9230eaf6797ffce465aef2a6c5b26d605c162a24.zip |
qemu-img: adding a "-F base_fmt" option to "qemu-img create -b" (Uri Lublin)
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 <uril@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6910 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'qemu-img.c')
-rw-r--r-- | qemu-img.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/qemu-img.c b/qemu-img.c index 66ec91cc1..ab380c8a4 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -25,6 +25,7 @@ #include "osdep.h" #include "block_int.h" #include <assert.h> +#include <stdio.h> #ifdef _WIN32 #include <windows.h> @@ -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); |