[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/14] qemu-img: adding a "-F base_fmt" option to "q
From: |
Uri Lublin |
Subject: |
[Qemu-devel] [PATCH 04/14] qemu-img: adding a "-F base_fmt" option to "qemu-img create -b" |
Date: |
Tue, 17 Mar 2009 22:40:42 +0200 |
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 <address@hidden>
---
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 <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);
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
address@hidden create [-e] [-6] [-b @var{base_image}] [-f @var{fmt}]
@var{filename} address@hidden
address@hidden create [-e] [-6] [-F @var{base_fmt}] [-b @var{base_image}] [-f
@var{fmt}] @var{filename} address@hidden
@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} address@hidden [...]]
@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
address@hidden 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
- [Qemu-devel] [PATCH 00/14] block (mostly qcow2) changes (v6), Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 01/14] Introducing qcow2 extensions, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 02/14] block: support known backing format for image create and open, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 03/14] block-qcow2: keep backing file format in a qcow2 extension, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 04/14] qemu-img: adding a "-F base_fmt" option to "qemu-img create -b",
Uri Lublin <=
- [Qemu-devel] [PATCH 05/14] block-qcow2: keep highest allocated offset, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 06/14] block-qcow2: export highest-alloc through BlockDriverInfo and get_info(), Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 07/14] block: info blockstats: show highest_allocated if exists, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 08/14] Add a bdrv_close_all() and call it at the end of main(), Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 09/14] block-qcow2: keep highest alloc offset in a qcow2 extension, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 10/14] qemu-img: info: show highest_alloc if exists, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 11/14] qcow2: qcow_read_extensions: make "advance offset over extension" common, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 12/14] block: pass BDRV_BACKING flag to open of a backing file, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 13/14] block: keep flags an image was opened with, Uri Lublin, 2009/03/17
- [Qemu-devel] [PATCH 14/14] block-qcow2: do not keep track of highest-alloc for backing files, Uri Lublin, 2009/03/17