Make qemu-img create options generic
cover Make qemu-img create options generic
Currently, qemu-img and the bdrv_create() interface need to carry parameters for every single option that is used by at least one file format. We already have a few of such format specific options (encryption for qcow2, version 6 header for VMDK, backing file for some formats) and there are more to come (like qcow cluster size).
This patch series changes this into a more generic approach: All block drivers contain a data structure which describes all options this driver recognizes. qemu-img can use this structure then instead of hard-coding every single option. An -o option is introduced for these parameteres, the format is the usual comma separated name=value style as in -drive.
This series is not yet meant to be applied. qemu-img convert still needs to be converted to the new interface and it's not exactly tested extensively (let alone the state after patch 1 or 2 applied without the rest). Maybe it also could use some better identifiers, I'm open for suggestions.
Kevin Wolf (3):
Create qemu-option.h
Convert all block drivers
Convert qemu-img create
Makefile | 2 +- block-cow.c | 24 ++++- block-qcow.c | 28 +++++- block-qcow2.c | 36 ++++++- block-raw-posix.c | 37 +++++-- block-raw-win32.c | 20 +++- block-vmdk.c | 28 +++++- block-vpc.c | 21 +++- block-vvfat.c | 4 +- block.c | 44 ++++++-- block.h | 6 +- block_int.h | 17 ++- qemu-img.c | 133 +++++++++++++++++--------- qemu-option.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-option.h | 61 ++++++++++++ sysemu.h | 2 - vl.c | 38 +------- 17 files changed, 642 insertions(+), 139 deletions(-) create mode 100644 qemu-option.c create mode 100644 qemu-option.h
RFC PATCH 1/3 Create qemu-option.h
This patch creates a new header file and the corresponding implementation file for parsing of parameter strings for options (like used in -drive). Part of this is code moved from vl.c (so qemu-img can use it later).
The idea is to have a data structure describing all accepted parameters. When parsing a parameter string, the structure is copied and filled with the parameter values.
--- Makefile | 2 +- qemu-option.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-option.h | 61 +++++++++++++ sysemu.h | 2 - vl.c | 38 +-------- 5 files changed, 343 insertions(+), 40 deletions(-) create mode 100644 qemu-option.c create mode 100644 qemu-option.h
Makefile +1 -1
@@ -63,7 +63,7 @@ recurse-all: $(SUBDIR_RULES) ####################################################################### # BLOCK_OBJS is code used by both qemu system emulation and qemu-img -BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o +BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o qemu-option.o BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
qemu-option.c new file +280 -0
280 lines not on this page · raw message
qemu-option.h new file +61 -0
61 lines not on this page · raw message
sysemu.h +0 -2
@@ -253,8 +253,6 @@ void do_usb_add(Monitor *mon, const char *devname);void do_usb_del (Monitor *mon,const char *devname);void usb_info (Monitor *mon); -const char *get_opt_name (char *buf,int buf_size,const char *p,char delim); -const char *get_opt_value (char *buf,int buf_size,const char *p);int get_param_value (char *buf,int buf_size,const char *tag,const char *str);int check_params (const char *const *params,const char *str);
vl.c +1 -37
@@ -156,6 +156,7 @@ int main(int argc, char **argv)#include "migration.h" #include "kvm.h" #include "balloon.h" +#include "qemu-option.h" #include "disas.h"
@@ -1807,43 +1808,6 @@ static int socket_init(void) }#endif -const char *get_opt_name (char *buf,int buf_size,const char *p,char delim) -{ -char *q; - - q = buf; -while (*p !='\0' && *p != delim) { -if (q && (q - buf) < buf_size -1 ) - *q++ = *p; - p++; - } -if (q) - *q ='\0' ; - -return p; -} - -const char *get_opt_value (char *buf,int buf_size,const char *p) -{ -char *q; - - q = buf; -while (*p !='\0' ) { -if (*p ==',' ) { -if (*(p +1 ) !=',' ) -break ; - p++; - } -if (q && (q - buf) < buf_size -1 ) - *q++ = *p; - p++; - } -if (q) - *q ='\0' ; - -return p; -} -int get_param_value (char *buf,int buf_size,const char *tag,const char *str) {
Signature · 1 line
1.6.0.6
RFC PATCH 2/3 Convert all block drivers
In reply to Kevin WolfNow we can make use of the newly introduced option structures. Instead of having bdrv_create carry more and more parameters (which are format specific in most cases), just pass a option structure as defined by the driver itself.
bdrv_create2() contains an emulation of the old interface to simplify the transition.
--- block-cow.c | 24 ++++++++++++++++++++---- block-qcow.c | 28 ++++++++++++++++++++++++++-- block-qcow2.c | 36 +++++++++++++++++++++++++++++++----- block-raw-posix.c | 37 +++++++++++++++++++++++++++---------- block-raw-win32.c | 20 ++++++++++++++++---- block-vmdk.c | 28 ++++++++++++++++++++++++++-- block-vpc.c | 21 +++++++++++++++++---- block-vvfat.c | 4 ++-- block.c | 44 +++++++++++++++++++++++++++++++++----------- block.h | 6 +++--- block_int.h | 17 +++++++++++------ qemu-img.c | 2 +- 12 files changed, 213 insertions(+), 54 deletions(-)
block-cow.c +20 -4
@@ -201,15 +201,23 @@ static void cow_close(BlockDriverState *bs)close (s->fd); } -static int cow_create (const char *filename,int64_t image_sectors, -const char *image_filename,int flags) +static int cow_create (const char *filename,QEMUOptionParameter *options) {int fd, cow_fd;struct cow_header_v2 cow_header;struct stat st; +int64_t image_sectors =0 ; +const char *image_filename =NULL ; -if (flags) -return -ENOTSUP ; +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,BLOCK_OPT_SIZE )) { + image_sectors = options->value.n /512 ; + }else if (!strcmp (options->name,BLOCK_OPT_BACKING_FILE )) { + image_filename = options->value.s; + } + options++; + } cow_fd =open (filename,O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,0644 );
@@ -252,6 +260,12 @@ static void cow_flush(BlockDriverState *bs)fsync (s->fd); } +static QEMUOptionParameter cow_create_options[] = { + {BLOCK_OPT_SIZE ,OPT_SIZE }, + {BLOCK_OPT_BACKING_FILE ,OPT_STRING }, + {NULL } +}; +BlockDriver bdrv_cow = { .format_name ="cow" , .instance_size =sizeof (BDRVCowState),
@@ -263,5 +277,7 @@ BlockDriver bdrv_cow = { .bdrv_create = cow_create, .bdrv_flush = cow_flush, .bdrv_is_allocated = cow_is_allocated, + + .create_options = cow_create_options, };#endif
block-qcow.c +26 -2
@@ -766,12 +766,26 @@ static void qcow_close(BlockDriverState *bs)bdrv_delete (s->hd); } -static int qcow_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) +static int qcow_create (const char *filename,QEMUOptionParameter *options) {int fd, header_size, backing_filename_len, l1_size, i, shift;QCowHeader header;uint64_t tmp; +int64_t total_size =0 ; +const char *backing_file =NULL ; +int flags =0 ; + +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,BLOCK_OPT_SIZE )) { + total_size = options->value.n /512 ; + }else if (!strcmp (options->name,BLOCK_OPT_BACKING_FILE )) { + backing_file = options->value.s; + }else if (!strcmp (options->name,BLOCK_OPT_ENCRYPT )) { + flags |= options->value.n ?BLOCK_FLAG_ENCRYPT :0 ; + } + options++; + } fd =open (filename,O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,0644 );if (fd <0 )
@@ -917,6 +931,14 @@ static int qcow_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)return 0 ; } + +static QEMUOptionParameter qcow_create_options[] = { + {BLOCK_OPT_SIZE ,OPT_SIZE }, + {BLOCK_OPT_BACKING_FILE ,OPT_STRING }, + {BLOCK_OPT_ENCRYPT ,OPT_FLAG }, + {NULL } +}; +BlockDriver bdrv_qcow = { .format_name ="qcow" , .instance_size =sizeof (BDRVQcowState),
@@ -934,4 +956,6 @@ BlockDriver bdrv_qcow = { .aiocb_size = sizeof(QCowAIOCB), .bdrv_write_compressed = qcow_write_compressed, .bdrv_get_info = qcow_get_info, + + .create_options = qcow_create_options, };
block-qcow2.c +31 -5
@@ -1696,10 +1696,28 @@ static int qcow_create2(const char *filename, int64_t total_size,return 0 ; } -static int qcow_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) -{ -return qcow_create2 (filename, total_size, backing_file,NULL , flags); +static int qcow_create (const char *filename,QEMUOptionParameter *options) +{ +const char *backing_file =NULL ; +const char *backing_fmt =NULL ; +uint64_t sectors =0 ; +int flags =0 ; + +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,BLOCK_OPT_SIZE )) { + sectors = options->value.n /512 ; + }else if (!strcmp (options->name,BLOCK_OPT_BACKING_FILE )) { + backing_file = options->value.s; + }else if (!strcmp (options->name,BLOCK_OPT_BACKING_FMT )) { + backing_fmt = options->value.s; + }else if (!strcmp (options->name,BLOCK_OPT_ENCRYPT )) { + flags |= options->value.n ?BLOCK_FLAG_ENCRYPT :0 ; + } + options++; + } + +return qcow_create2 (filename, sectors, backing_file, backing_fmt, flags); }static int qcow_make_empty (BlockDriverState *bs)
@@ -2892,6 +2910,14 @@ static int qcow_get_buffer(BlockDriverState *bs, uint8_t *buf,return ret; } +static QEMUOptionParameter qcow_create_options[] = { + {BLOCK_OPT_SIZE ,OPT_SIZE }, + {BLOCK_OPT_BACKING_FILE ,OPT_STRING }, + {BLOCK_OPT_BACKING_FMT ,OPT_STRING }, + {BLOCK_OPT_ENCRYPT ,OPT_FLAG }, + {NULL } +}; +BlockDriver bdrv_qcow2 = { .format_name ="qcow2" , .instance_size =sizeof (BDRVQcowState),
@@ -2919,6 +2945,6 @@ BlockDriver bdrv_qcow2 = { .bdrv_put_buffer = qcow_put_buffer, .bdrv_get_buffer = qcow_get_buffer, - .bdrv_create2 = qcow_create2, + .create_options = qcow_create_options, .bdrv_check = qcow_check, };
block-raw-posix.c +27 -10
@@ -823,13 +823,18 @@ again: }#endif -static int raw_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) +static int raw_create (const char *filename,QEMUOptionParameter *options) {int fd; +int64_t total_size =0 ; -if (flags || backing_file) -return -ENOTSUP ; +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,BLOCK_OPT_SIZE )) { + total_size = options->value.n /512 ; + } + options++; + } fd =open (filename,O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,0644 );
@@ -846,6 +851,12 @@ static void raw_flush(BlockDriverState *bs)fsync (s->fd); } + +static QEMUOptionParameter raw_create_options[] = { + {BLOCK_OPT_SIZE ,OPT_SIZE }, + {NULL } +}; +BlockDriver bdrv_raw = { .format_name ="raw" , .instance_size =sizeof (BDRVRawState),
@@ -866,6 +877,8 @@ BlockDriver bdrv_raw = { .bdrv_truncate = raw_truncate, .bdrv_getlength = raw_getlength, + + .create_options = raw_create_options, };/***********************************************/
@@ -1364,15 +1377,20 @@ static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,#endif /* !linux && !FreeBSD */ #if defined(__linux__) || defined(__FreeBSD__) -static int hdev_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) +static int hdev_create (const char *filename,QEMUOptionParameter *options) {int fd;int ret =0 ;struct stat stat_buf; +int64_t total_size =0 ; -if (flags || backing_file) -return -ENOTSUP ; +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,"size" )) { + total_size = options->value.n /512 ; + } + options++; + } fd =open (filename,O_WRONLY |O_BINARY );if (fd <0 )
@@ -1391,8 +1409,7 @@ static int hdev_create(const char *filename, int64_t total_size,#else /* !(linux || freebsd) */ -static int hdev_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) +static int hdev_create (const char *filename,QEMUOptionParameter *options) {return -ENOTSUP ; }
block-raw-win32.c +16 -4
@@ -210,13 +210,18 @@ static int64_t raw_getlength(BlockDriverState *bs)return l.QuadPart; } -static int raw_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) +static int raw_create (const char *filename,QEMUOptionParameter *options) {int fd; +int64_t total_size =0 ; -if (flags || backing_file) -return -ENOTSUP ; +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,BLOCK_OPT_SIZE )) { + total_size = options->value.n /512 ; + } + options++; + } fd =open (filename,O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,0644 );
@@ -228,6 +233,11 @@ static int raw_create(const char *filename, int64_t total_size,return 0 ; } +static QEMUOptionParameter raw_create_options[] = { + {BLOCK_OPT_SIZE ,OPT_SIZE }, + {NULL } +}; +BlockDriver bdrv_raw = { .format_name ="raw" , .instance_size =sizeof (BDRVRawState),
@@ -239,6 +249,8 @@ BlockDriver bdrv_raw = { .bdrv_write = raw_write, .bdrv_truncate = raw_truncate, .bdrv_getlength = raw_getlength, + + .create_options = raw_create_options, };/***********************************************/
block-vmdk.c +26 -2
@@ -686,8 +686,7 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num,return 0 ; } -static int vmdk_create (const char *filename,int64_t total_size, -const char *backing_file,int flags) +static int vmdk_create (const char *filename,QEMUOptionParameter *options) {int fd, i;VMDK4Header header;
@@ -712,6 +711,21 @@ static int vmdk_create(const char *filename, int64_t total_size,"ddb.adapterType = \"ide\"\n" ;char desc[1024 ];const char *real_filename, *temp_str; +int64_t total_size =0 ; +const char *backing_file =NULL ; +int flags =0 ; + +// Read out options +while (options && options->name) { +if (!strcmp (options->name,BLOCK_OPT_SIZE )) { + total_size = options->value.n /512 ; + }else if (!strcmp (options->name,BLOCK_OPT_BACKING_FILE )) { + backing_file = options->value.s; + }else if (!strcmp (options->name,BLOCK_OPT_COMPAT6 )) { + flags |= options->value.n ?BLOCK_FLAG_COMPAT6 :0 ; + } + options++; + }/* XXX: add support for backing file */ if (backing_file) {
@@ -811,6 +825,14 @@ static void vmdk_flush(BlockDriverState *bs)bdrv_flush (s->hd); } + +static QEMUOptionParameter vmdk_create_options[] = { + {BLOCK_OPT_SIZE ,OPT_SIZE }, + {BLOCK_OPT_BACKING_FILE ,OPT_STRING }, + {BLOCK_OPT_COMPAT6 ,OPT_FLAG }, + {NULL } +}; +BlockDriver bdrv_vmdk = { .format_name ="vmdk" , .instance_size =sizeof (BDRVVmdkState),
@@ -822,4 +844,6 @@ BlockDriver bdrv_vmdk = { .bdrv_create = vmdk_create, .bdrv_flush = vmdk_flush, .bdrv_is_allocated = vmdk_is_allocated, + + .create_options = vmdk_create_options, };
block-vpc.c +17 -4
@@ -476,8 +476,7 @@ static int calculate_geometry(int64_t total_sectors, uint16_t* cyls,return 0 ; } -static int vpc_create (const char *filename,int64_t total_sectors, -const char *backing_file,int flags) +static int vpc_create (const char *filename,QEMUOptionParameter *options) {uint8_t buf[1024 ];struct vhd_footer * footer = (struct vhd_footer *) buf;
@@ -488,10 +487,17 @@ static int vpc_create(const char *filename, int64_t total_sectors,uint8_t heads;uint8_t secs_per_cyl;size_t block_size, num_bat_entries; +int64_t total_sectors =0 ; -if (backing_file !=NULL ) -return -ENOTSUP ; +// Read out options +while (options && options->name) { +if (!strcmp (options->name,"size" )) { + total_sectors = options->value.n /512 ; + } + options++; + } +// Create the file fd =open (filename,O_WRONLY |O_CREAT |O_TRUNC |O_BINARY ,0644 );if (fd <0 )return -EIO ;
@@ -586,6 +592,11 @@ static void vpc_close(BlockDriverState *bs)bdrv_delete (s->hd); } +static QEMUOptionParameter vpc_create_options[] = { + {"size" ,OPT_SIZE }, + {NULL } +}; +BlockDriver bdrv_vpc = { .format_name ="vpc" , .instance_size =sizeof (BDRVVPCState),
@@ -595,4 +606,6 @@ BlockDriver bdrv_vpc = { .bdrv_write = vpc_write, .bdrv_close = vpc_close, .bdrv_create = vpc_create, + + .create_options = vpc_create_options, };
block-vvfat.c +2 -2
@@ -2777,8 +2777,8 @@ static int enable_write_target(BDRVVVFATState *s) s->qcow_filename =qemu_malloc (1024 );get_tmp_filename (s->qcow_filename,1024 ); -if (bdrv_create (&bdrv_qcow, - s->qcow_filename, s->sector_count,"fat:" ,0 ) <0 ) +if (bdrv_create2 (&bdrv_qcow, + s->qcow_filename, s->sector_count,"fat:" ,NULL ,0 ) <0 )return -1 ; s->qcow =bdrv_new ("" );if (s->qcow ==NULL ||bdrv_open (s->qcow, s->qcow_filename,0 ) <0 )
block.c +33 -11
55 lines not on this page · raw message
block.h +3 -3
@@ -3,6 +3,7 @@#include "qemu-aio.h" #include "qemu-common.h" +#include "qemu-option.h" /* block.c */ typedef struct BlockDriver BlockDriver ;
@@ -59,9 +60,8 @@ void bdrv_info_stats(Monitor *mon);void bdrv_init (void );BlockDriver *bdrv_find_format (const char *format_name); -int bdrv_create (BlockDriver *drv, -const char *filename,int64_t size_in_sectors, -const char *backing_file,int flags); +int bdrv_create (BlockDriver *drv,const char * filename, +QEMUOptionParameter *options); int bdrv_create2(BlockDriver *drv, const char *filename, int64_t size_in_sectors, const char *backing_file, const char *backing_format,
block_int.h +11 -6
@@ -25,11 +25,18 @@#define BLOCK_INT_H #include "block.h" +#include "qemu-option.h" #define BLOCK_FLAG_ENCRYPT 1#define BLOCK_FLAG_COMPRESS 2#define BLOCK_FLAG_COMPAT6 4 +#define BLOCK_OPT_SIZE "size" +#define BLOCK_OPT_ENCRYPT "encrpytion" +#define BLOCK_OPT_COMPAT6 "compat6" +#define BLOCK_OPT_BACKING_FILE "backing_file" +#define BLOCK_OPT_BACKING_FMT "backing_fmt" + typedef struct AIOPool { void (*cancel)(BlockDriverAIOCB *acb); int aiocb_size;
@@ -46,8 +53,7 @@ struct BlockDriver {int (*bdrv_write)(BlockDriverState *bs,int64_t sector_num,const uint8_t *buf,int nb_sectors);void (*bdrv_close)(BlockDriverState *bs); -int (*bdrv_create)(const char *filename,int64_t total_sectors, -const char *backing_file,int flags); +int (*bdrv_create)(const char *filename,QEMUOptionParameter *options);void (*bdrv_flush)(BlockDriverState *bs);int (*bdrv_is_allocated)(BlockDriverState *bs,int64_t sector_num,int nb_sectors,int *pnum);
@@ -97,10 +103,9 @@ struct BlockDriver {AIOPool aio_pool; -/* new create with backing file format */ -int (*bdrv_create2)(const char *filename,int64_t total_sectors, -const char *backing_file,const char *backing_format, -int flags); +/* List of options for creating images, terminated by name == NULL */ +QEMUOptionParameter *create_options; +/* Returns number of errors in image, -errno for internal errors */ int (*bdrv_check)(BlockDriverState * bs);
qemu-img.c +1 -1
@@ -552,7 +552,7 @@ static int img_convert(int argc, char **argv)if (flags &BLOCK_FLAG_ENCRYPT && flags &BLOCK_FLAG_COMPRESS )error ("Compression and encryption not supported at the same time" ); - ret =bdrv_create (drv, out_filename, total_sectors, out_baseimg, flags); + ret =bdrv_create2 (drv, out_filename, total_sectors, out_baseimg,NULL , flags);if (ret <0 ) {if (ret == -ENOTSUP ) {error ("Formatting not supported for file format '%s'" , out_fmt);
Signature · 1 line
1.6.0.6
RFC PATCH 3/3 Convert qemu-img create
In reply to Kevin WolfThis patch changes qemu-img to actually use the new bdrv_create interface. It translates the old-style qemu-img options which have been bdrv_create2 parameters or flags so far to option structures. As the generic approach, it introduces an -o option which accepts any parameter the driver knows.
--- qemu-img.c | 131 +++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 86 insertions(+), 45 deletions(-)
qemu-img.c +87 -46
@@ -22,6 +22,7 @@* THE SOFTWARE. */ #include "qemu-common.h" +#include "qemu-option.h" #include "osdep.h" #include "block_int.h" #include <assert.h>
@@ -185,6 +186,7 @@ static int read_password(char *buf, int buf_size) }#endif +static BlockDriverState *bdrv_new_open (const char *filename,const char *fmt) {
@@ -222,14 +224,13 @@ static int img_create(int argc, char **argv)const char *base_fmt =NULL ;const char *filename;const char *base_filename =NULL ; -uint64_t size; -double sizef; -const char *p;BlockDriver *drv; +QEMUOptionParameter *param =NULL ; +char *options =NULL ; flags =0 ;for (;;) { - c =getopt (argc, argv,"F:b:f:he6" ); + c =getopt (argc, argv,"F:b:f:he6o:" );if (c ==-1 )break ;switch (c) {
@@ -251,59 +252,99 @@ static int img_create(int argc, char **argv)case '6' : flags |=BLOCK_FLAG_COMPAT6 ;break ; +case 'o' : + options = optarg; +break ; } }if (optind >= argc)help (); filename = argv[optind++]; - size =0 ; -if (base_filename) { -BlockDriverState *bs; -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); - } +/* Find driver and parse its options */ + drv =bdrv_find_format (fmt); +if (!drv) +error ("Unknown file format '%s'" , fmt); - bs =bdrv_new_open (base_filename, base_fmt); -bdrv_get_geometry (bs, &size); - size *=512 ; -bdrv_delete (bs); +if (options) { + param =parse_option_parameters (options, drv->create_options, param); +if (param ==NULL ) { +error ("Invalid options for file format '%s'." , fmt); + } }else { -if (optind >= argc) -help (); - p = argv[optind]; - sizef =strtod (p, (char **)&p); -if (*p =='M' ) { - size = (uint64_t )(sizef *1024 *1024 ); - }else if (*p =='G' ) { - size = (uint64_t )(sizef *1024 *1024 *1024 ); - }else if (*p =='k' || *p =='K' || *p =='\0' ) { - size = (uint64_t )(sizef *1024 ); - }else { -help (); + param =parse_option_parameters ("" , drv->create_options, param); + } + +/* Add size to parameters */ +if (optind < argc) { +set_option_parameter (param,BLOCK_OPT_SIZE , argv[optind++]); + } + +/* Add old-style options to parameters */ +if (flags &BLOCK_FLAG_ENCRYPT ) { +if (set_option_parameter (param,BLOCK_OPT_ENCRYPT ,"on" )) { +error ("Encryption not supported for file format '%s'" , fmt); } } - drv =bdrv_find_format (fmt); -if (!drv) -error ("Unknown file format '%s'" , fmt); -printf ("Formatting '%s', fmt=%s" , - filename, fmt); -if (flags &BLOCK_FLAG_ENCRYPT ) -printf (", encrypted" ); -if (flags &BLOCK_FLAG_COMPAT6 ) -printf (", compatibility level=6" ); +if (flags &BLOCK_FLAG_COMPAT6 ) { +if (set_option_parameter (param,BLOCK_OPT_COMPAT6 ,"on" )) { +error ("VMDK version 6 not supported for file format '%s'" , fmt); + } + } +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_create2 (drv, filename, size /512 , base_filename, base_fmt, flags); +if (set_option_parameter (param,BLOCK_OPT_BACKING_FILE , base_filename)) { +error ("Backing file not supported for file format '%s'" , fmt); + } + } +if (base_fmt) { +if (set_option_parameter (param,BLOCK_OPT_BACKING_FMT , base_fmt)) { +error ("Backing file format not supported for file format '%s'" , fmt); + } + } + +// The size for the image must always be specified, with one exception: +// If we are using a backing file, we can obtain the size from there +if (get_option_parameter (param,BLOCK_OPT_SIZE )->value.n ==0 ) { + +QEMUOptionParameter *backing_file = +get_option_parameter (param,BLOCK_OPT_BACKING_FILE ); +QEMUOptionParameter *backing_fmt = +get_option_parameter (param,BLOCK_OPT_BACKING_FMT ); + +if (backing_file && backing_file->value.s) { +BlockDriverState *bs; +uint64_t size; +const char *fmt =NULL ; +char buf[32 ]; + +if (backing_fmt && backing_fmt->value.s) { +if (bdrv_find_format (backing_fmt->value.s)) { + fmt = backing_fmt->value.s; + }else { +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); + +snprintf (buf,sizeof (buf),"%" PRId64, size); +set_option_parameter (param,BLOCK_OPT_SIZE , buf); + }else { +error ("Image creation needs a size parameter" ); + } + } + +printf ("Formatting '%s', fmt=%s " , filename, fmt); +print_option_parameters (param); +puts ("" ); + + ret =bdrv_create (drv, filename, param); +free_option_parameters (param); +if (ret <0 ) {if (ret == -ENOTSUP ) {error ("Formatting or formatting option not supported for file format '%s'" , fmt);
Signature · 1 line
1.6.0.6