diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2013-03-18 13:08:10 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-03-19 11:48:36 +0100 |
| commit | acdfb480ba7e2779bdbffb5280cf12ff6e43669c (patch) | |
| tree | d63aafdf6d124d456a40ebbe61cd0432890ec46a /block | |
| parent | fca23f0ad211e4debf80796a65165d0eea146424 (diff) | |
| download | qemu-acdfb480ba7e2779bdbffb5280cf12ff6e43669c.tar.gz qemu-acdfb480ba7e2779bdbffb5280cf12ff6e43669c.tar.bz2 qemu-acdfb480ba7e2779bdbffb5280cf12ff6e43669c.zip | |
qcow2: Fix segfault in qcow2_invalidate_cache
Need to pass an options QDict to qcow2_open() now. This fixes a segfault
on the migration target with qcow2.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 12 | ||||
| -rw-r--r-- | block/qcow2.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 1f99866cf4..98bb7f31bf 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -29,6 +29,7 @@ #include "block/qcow2.h" #include "qemu/error-report.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qbool.h" #include "trace.h" /* @@ -520,7 +521,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags) goto fail; } - s->use_lazy_refcounts = qemu_opt_get_bool(opts, "lazy_refcounts", + s->use_lazy_refcounts = qemu_opt_get_bool(opts, QCOW2_OPT_LAZY_REFCOUNTS, (s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS)); qemu_opts_del(opts); @@ -930,6 +931,7 @@ static void qcow2_invalidate_cache(BlockDriverState *bs) AES_KEY aes_encrypt_key; AES_KEY aes_decrypt_key; uint32_t crypt_method = 0; + QDict *options; /* * Backing files are read-only which makes all of their metadata immutable, @@ -944,8 +946,14 @@ static void qcow2_invalidate_cache(BlockDriverState *bs) qcow2_close(bs); + options = qdict_new(); + qdict_put(options, QCOW2_OPT_LAZY_REFCOUNTS, + qbool_from_int(s->use_lazy_refcounts)); + memset(s, 0, sizeof(BDRVQcowState)); - qcow2_open(bs, NULL, flags); + qcow2_open(bs, options, flags); + + QDECREF(options); if (crypt_method) { s->crypt_method = crypt_method; diff --git a/block/qcow2.h b/block/qcow2.h index 103abdb2c0..e4b5e11a91 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -58,6 +58,9 @@ #define DEFAULT_CLUSTER_SIZE 65536 + +#define QCOW2_OPT_LAZY_REFCOUNTS "lazy_refcounts" + typedef struct QCowHeader { uint32_t magic; uint32_t version; |