mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcow2: Fix segfault in qcow2_invalidate_cache

Browse Source 
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>
This commit is contained in:
Kevin Wolf 2013-03-18 13:08:10 +01:00
parent fca23f0ad2
commit acdfb480ba
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/qcow2.c
View File

@ -29,6 +29,7 @@
#include "block/qcow2.h" #include "block/qcow2.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qbool.h"
#include "trace.h" #include "trace.h"
/* /*
@ -520,7 +521,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags)
goto fail; 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)); (s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS));
qemu_opts_del(opts); qemu_opts_del(opts);
@ -930,6 +931,7 @@ static void qcow2_invalidate_cache(BlockDriverState *bs)
AES_KEY aes_encrypt_key; AES_KEY aes_encrypt_key;
AES_KEY aes_decrypt_key; AES_KEY aes_decrypt_key;
uint32_t crypt_method = 0; uint32_t crypt_method = 0;
QDict *options;
/* /*
* Backing files are read-only which makes all of their metadata immutable, * 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); 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)); memset(s, 0, sizeof(BDRVQcowState));
qcow2_open(bs, NULL, flags); qcow2_open(bs, options, flags);
QDECREF(options);
if (crypt_method) { if (crypt_method) {
s->crypt_method = crypt_method; s->crypt_method = crypt_method;

3
block/qcow2.h
View File

@ -58,6 +58,9 @@
#define DEFAULT_CLUSTER_SIZE 65536 #define DEFAULT_CLUSTER_SIZE 65536
#define QCOW2_OPT_LAZY_REFCOUNTS "lazy_refcounts"
typedef struct QCowHeader { typedef struct QCowHeader {
uint32_t magic; uint32_t magic;
uint32_t version; uint32_t version;