From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54541 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqQbZ-0000uz-Bv for qemu-devel@nongnu.org; Tue, 31 Aug 2010 09:10:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqQbU-0004gm-91 for qemu-devel@nongnu.org; Tue, 31 Aug 2010 09:10:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58970) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqQbU-0004gg-2m for qemu-devel@nongnu.org; Tue, 31 Aug 2010 09:10:20 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7VDAIGs025678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 31 Aug 2010 09:10:18 -0400 From: Kevin Wolf Date: Tue, 31 Aug 2010 15:10:30 +0200 Message-Id: <1283260230-3551-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] block: Fix BDRV_O_CACHE_MASK List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com BDRV_O_CACHE_MASK should have been extended when cache=unsafe introduced a new flag BDRV_O_NO_FLUSH. There are currently no users that would change their behaviour because of this, but let's clean it up before things break. Signed-off-by: Kevin Wolf --- block.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block.h b/block.h index db131a3..5f64380 100644 --- a/block.h +++ b/block.h @@ -35,7 +35,7 @@ typedef struct QEMUSnapshotInfo { #define BDRV_O_NO_BACKING 0x0100 /* don't open the backing file */ #define BDRV_O_NO_FLUSH 0x0200 /* disable flushing on this disk */ -#define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB) +#define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH) #define BDRV_SECTOR_BITS 9 #define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS) -- 1.7.2.2