[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 17/34] qcow2: Leave s unchanged on qcow2_update_opti
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 17/34] qcow2: Leave s unchanged on qcow2_update_options() failure |
Date: |
Fri, 8 May 2015 19:21:49 +0200 |
On return, either all new options should be applied to BDRVQcowState (on
success), or all of the old setting should be preserved (on failure).
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 52 ++++++++++++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index a4a267d..abe22f3 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -546,6 +546,9 @@ static int qcow2_update_options(BlockDriverState *bs, QDict
*options,
const char *opt_overlap_check, *opt_overlap_check_template;
int overlap_check_template = 0;
uint64_t l2_cache_size, refcount_cache_size;
+ Qcow2Cache* l2_table_cache;
+ Qcow2Cache* refcount_block_cache;
+ bool use_lazy_refcounts;
int i;
Error *local_err = NULL;
int ret;
@@ -587,28 +590,25 @@ static int qcow2_update_options(BlockDriverState *bs,
QDict *options,
}
/* alloc L2 table/refcount block cache */
- s->l2_table_cache = qcow2_cache_create(bs, l2_cache_size);
- s->refcount_block_cache = qcow2_cache_create(bs, refcount_cache_size);
- if (s->l2_table_cache == NULL || s->refcount_block_cache == NULL) {
+ l2_table_cache = qcow2_cache_create(bs, l2_cache_size);
+ refcount_block_cache = qcow2_cache_create(bs, refcount_cache_size);
+ if (l2_table_cache == NULL || refcount_block_cache == NULL) {
error_setg(errp, "Could not allocate metadata caches");
ret = -ENOMEM;
goto fail;
}
/* Enable lazy_refcounts according to image and command line options */
- s->use_lazy_refcounts = qemu_opt_get_bool(opts, QCOW2_OPT_LAZY_REFCOUNTS,
+ use_lazy_refcounts = qemu_opt_get_bool(opts, QCOW2_OPT_LAZY_REFCOUNTS,
(s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS));
+ if (use_lazy_refcounts && s->qcow_version < 3) {
+ error_setg(errp, "Lazy refcounts require a qcow2 image with at least "
+ "qemu 1.1 compatibility level");
+ ret = -EINVAL;
+ goto fail;
+ }
- s->discard_passthrough[QCOW2_DISCARD_NEVER] = false;
- s->discard_passthrough[QCOW2_DISCARD_ALWAYS] = true;
- s->discard_passthrough[QCOW2_DISCARD_REQUEST] =
- qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_REQUEST,
- flags & BDRV_O_UNMAP);
- s->discard_passthrough[QCOW2_DISCARD_SNAPSHOT] =
- qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_SNAPSHOT, true);
- s->discard_passthrough[QCOW2_DISCARD_OTHER] =
- qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_OTHER, false);
-
+ /* Overlap check options */
opt_overlap_check = qemu_opt_get(opts, QCOW2_OPT_OVERLAP);
opt_overlap_check_template = qemu_opt_get(opts,
QCOW2_OPT_OVERLAP_TEMPLATE);
if (opt_overlap_check_template && opt_overlap_check &&
@@ -640,6 +640,10 @@ static int qcow2_update_options(BlockDriverState *bs,
QDict *options,
goto fail;
}
+ /*
+ * Start updating fields in BDRVQcowState.
+ * After this point no failure is allowed any more.
+ */
s->overlap_check = 0;
for (i = 0; i < QCOW2_OL_MAX_BITNR; i++) {
/* overlap-check defines a template bitmask, but every flag may be
@@ -649,12 +653,20 @@ static int qcow2_update_options(BlockDriverState *bs,
QDict *options,
overlap_check_template & (1 << i)) << i;
}
- if (s->use_lazy_refcounts && s->qcow_version < 3) {
- error_setg(errp, "Lazy refcounts require a qcow2 image with at least "
- "qemu 1.1 compatibility level");
- ret = -EINVAL;
- goto fail;
- }
+ s->l2_table_cache = l2_table_cache;
+ s->refcount_block_cache = refcount_block_cache;
+
+ s->use_lazy_refcounts = use_lazy_refcounts;
+
+ s->discard_passthrough[QCOW2_DISCARD_NEVER] = false;
+ s->discard_passthrough[QCOW2_DISCARD_ALWAYS] = true;
+ s->discard_passthrough[QCOW2_DISCARD_REQUEST] =
+ qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_REQUEST,
+ flags & BDRV_O_UNMAP);
+ s->discard_passthrough[QCOW2_DISCARD_SNAPSHOT] =
+ qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_SNAPSHOT, true);
+ s->discard_passthrough[QCOW2_DISCARD_OTHER] =
+ qemu_opt_get_bool(opts, QCOW2_OPT_DISCARD_OTHER, false);
ret = 0;
fail:
--
1.8.3.1
- Re: [Qemu-block] [PATCH 18/34] qcow2: Fix memory leak in qcow2_update_options() error path, (continued)
[Qemu-block] [PATCH 20/34] qcow2: Support updating driver-specific options in reopen, Kevin Wolf, 2015/05/08
[Qemu-block] [PATCH 19/34] qcow2: Make qcow2_update_options() suitable for transactions, Kevin Wolf, 2015/05/08
[Qemu-block] [PATCH 17/34] qcow2: Leave s unchanged on qcow2_update_options() failure,
Kevin Wolf <=
[Qemu-block] [PATCH 21/34] block: Consider all block layer options in append_open_options, Kevin Wolf, 2015/05/08
[Qemu-block] [PATCH 22/34] block: Exclude nested options only for children in append_open_options(), Kevin Wolf, 2015/05/08
[Qemu-block] [PATCH 23/34] block: Pass driver-specific options to .bdrv_refresh_filename(), Kevin Wolf, 2015/05/08