On 08.05.2015 19:21, Kevin Wolf wrote:
Eventually we want to be able to change options at runtime. As a first
step towards that goal, separate some option handling code from the
general initialisation code in qcow2_open().
Signed-off-by: Kevin Wolf kw...@redhat.com
---
block/qcow2.c | 135 +-
1 file changed, 76 insertions(+), 59 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index b9a72e3..db535d4 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
[snip]
@@ -549,8 +623,6 @@ static int qcow2_open(BlockDriverState *bs, QDict *options,
int flags,
Error *local_err = NULL;
uint64_t ext_end;
uint64_t l1_vm_state_index;
-const char *opt_overlap_check, *opt_overlap_check_template;
-int overlap_check_template = 0;
uint64_t l2_cache_size, refcount_cache_size;
ret = bdrv_pread(bs-file, 0, header, sizeof(header));
@@ -924,69 +996,14 @@ static int qcow2_open(BlockDriverState *bs, QDict
*options, int flags,
}
/* Enable lazy_refcounts according to image and command line options */
[...]
+ret = qcow2_update_options(bs, opts, flags, errp);
+if (ret 0) {
The comment looks a bit strange now, because qcow2_update_options()
doesn't update just lazy_refcounts.
Max
