[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v24 13/31] vvfat.c: handle cross_driver's create_opt
From: |
Chunyan Liu |
Subject: |
[Qemu-devel] [PATCH v24 13/31] vvfat.c: handle cross_driver's create_options and create_opts |
Date: |
Thu, 3 Apr 2014 17:54:31 +0800 |
vvfat shares create options of qcow driver. To avoid vvfat broken when
qcow driver changes from QEMUOptionParameter to QemuOpts, let it able
to handle both cases.
Signed-off-by: Chunyan Liu <address@hidden>
---
Changes:
* Initialize opts and create_opts to NULL
block/vvfat.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 4390b12..fdfe3e7 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2907,7 +2907,8 @@ static BlockDriver vvfat_write_target = {
static int enable_write_target(BDRVVVFATState *s)
{
BlockDriver *bdrv_qcow;
- QEMUOptionParameter *options;
+ QemuOptsList *create_opts = NULL;
+ QemuOpts *opts = NULL;
Error *local_err = NULL;
int ret;
int size = sector2cluster(s, s->sector_count);
@@ -2922,11 +2923,17 @@ static int enable_write_target(BDRVVVFATState *s)
}
bdrv_qcow = bdrv_find_format("qcow");
- options = parse_option_parameters("", bdrv_qcow->create_options, NULL);
- set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512);
- set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:");
+ assert(!(bdrv_qcow->create_opts && bdrv_qcow->create_options));
+ if (bdrv_qcow->create_options) {
+ 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, &local_err);
+ ret = bdrv_create(bdrv_qcow, s->qcow_filename, NULL, opts, &local_err);
if (ret < 0) {
qerror_report_err(local_err);
error_free(local_err);
@@ -2955,6 +2962,8 @@ static int enable_write_target(BDRVVVFATState *s)
return 0;
err:
+ qemu_opts_del(opts);
+ qemu_opts_free(create_opts);
g_free(s->qcow_filename);
s->qcow_filename = NULL;
return ret;
--
1.7.12.4
- Re: [Qemu-devel] [PATCH v24 04/31] QemuOpts: change opt->name|str from (const char *) to (char *), (continued)
- [Qemu-devel] [PATCH v24 08/31] QemuOpts: add conversion between QEMUOptionParameter to QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 06/31] QemuOpts: add qemu_opt_get_*_del functions for replace work, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 07/31] QemuOpts: add qemu_opts_print_help to replace print_option_help, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 10/31] QemuOpts: check NULL input for qemu_opts_del, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 12/31] change block layer to support both QemuOpts and QEMUOptionParamter, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 11/31] qemu_opts_print: change fprintf stderr to printf, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 15/31] gluster.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 14/31] cow.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 13/31] vvfat.c: handle cross_driver's create_options and create_opts,
Chunyan Liu <=
- [Qemu-devel] [PATCH v24 16/31] iscsi.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 20/31] raw-posix.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 22/31] raw_bsd.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 19/31] qed.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 21/31] raw-win32.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 17/31] qcow.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 18/31] qcow2.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 23/31] rbd.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 26/31] vdi.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03
- [Qemu-devel] [PATCH v24 28/31] vmdk.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/04/03