From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHuaa-0001fK-27 for qemu-devel@nongnu.org; Tue, 19 Mar 2013 07:20:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHuaX-0004RX-No for qemu-devel@nongnu.org; Tue, 19 Mar 2013 07:20:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHuaX-0004RG-FB for qemu-devel@nongnu.org; Tue, 19 Mar 2013 07:20:17 -0400 From: Kevin Wolf Date: Tue, 19 Mar 2013 12:19:51 +0100 Message-Id: <1363691994-20571-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1363691994-20571-1-git-send-email-kwolf@redhat.com> References: <1363691994-20571-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] qcow2: Fix segfault in qcow2_invalidate_cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 --- block/qcow2.c | 12 ++++++++++-- block/qcow2.h | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1f99866..98bb7f3 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 103abdb..e4b5e11 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; -- 1.8.1.4