From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO6Me-0006gZ-5h for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO6MY-0006cF-6N for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:12:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO6MX-0006c9-SD for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:11:58 -0400 From: Stefan Hajnoczi Date: Thu, 13 Mar 2014 15:11:00 +0100 Message-Id: <1394719868-24312-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1394719868-24312-1-git-send-email-stefanha@redhat.com> References: <1394719868-24312-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL v2 for-2.0 16/24] qcow2: Keep option in qcow2_invalidate_cache() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Stefan Hajnoczi , Anthony Liguori From: Kevin Wolf Instead of manually building a list of all options from BDRVQcowState values just reuse the options that were used to open the image. qcow2_open() won't fully use all of the options in the QDict, but that's okay. This fixes all of the driver-specific options in qcow2, except for lazy-refcounts, which was special cased before. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- block/qcow2.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b5b1e8c..ec23cc4 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1178,11 +1178,8 @@ static void qcow2_invalidate_cache(BlockDriverState *bs) bdrv_invalidate_cache(bs->file); - options = qdict_new(); - qdict_put(options, QCOW2_OPT_LAZY_REFCOUNTS, - qbool_from_int(s->use_lazy_refcounts)); - memset(s, 0, sizeof(BDRVQcowState)); + options = qdict_clone_shallow(bs->options); qcow2_open(bs, options, flags, NULL); QDECREF(options); -- 1.8.5.3