Received: from [140.186.70.92] (port=55316 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8N4-0000EJ-8W for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ov8N3-0004Ls-02 for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18413) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ov8N2-0004Ll-NH for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:52 -0400 From: Kevin Wolf Date: Mon, 13 Sep 2010 14:42:47 +0200 Message-Id: <1284381771-7333-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1284381771-7333-1-git-send-email-kwolf@redhat.com> References: <1284381771-7333-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.13][PATCH 09/13] block: Fix BDRV_O_CACHE_MASK List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 (cherry picked from commit ceb25e5c7554255931f7f5647d3ad9df36111f53) --- 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