ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vvfat.c: handle cross_driver's create_options and create_opts 

vvfat shares create options of qcow driver. To avoid vvfat breaking when
qcow driver changes from QEMUOptionParameter to QemuOpts, let it able
to handle both cases.

Signed-off-by: Chunyan Liu <cyliu@suse.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Chunyan Liu 2014-06-05 17:20:52 +08:00 committed by Stefan Hajnoczi
parent 83d0521a1e
commit facdbb0272
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block/vvfat.c
View File

@ -2910,8 +2910,9 @@ static BlockDriver vvfat_write_target = {
static int enable_write_target(BDRVVVFATState *s, Error **errp) static int enable_write_target(BDRVVVFATState *s, Error **errp)
{ {
BlockDriver *bdrv_qcow; BlockDriver *bdrv_qcow = NULL;
QEMUOptionParameter *options; QemuOptsList *create_opts = NULL;
QemuOpts *opts = NULL;
int ret; int ret;
int size = sector2cluster(s, s->sector_count); int size = sector2cluster(s, s->sector_count);
s->used_clusters = calloc(size, 1); s->used_clusters = calloc(size, 1);
@ -2926,12 +2927,21 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp)
} }
bdrv_qcow = bdrv_find_format("qcow"); bdrv_qcow = bdrv_find_format("qcow");
options = parse_option_parameters("", bdrv_qcow->create_options, NULL); assert(!(bdrv_qcow->create_opts && bdrv_qcow->create_options));
set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512); if (bdrv_qcow->create_options) {
set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:"); create_opts = params_to_opts(bdrv_qcow->create_options);
} else {
create_opts = bdrv_qcow->create_opts;
}
opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512);
qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:");
ret = bdrv_create(bdrv_qcow, s->qcow_filename, options, NULL, errp); ret = bdrv_create(bdrv_qcow, s->qcow_filename, NULL, opts, errp);
free_option_parameters(options); qemu_opts_del(opts);
if (bdrv_qcow->create_options) {
qemu_opts_free(create_opts);
}
if (ret < 0) { if (ret < 0) {
goto err; goto err;
} }