From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56408 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtL2T-0004ul-Po for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:50:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtKiq-0005dB-Nl for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:29:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23916) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtKiq-0005cn-FB for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:29:56 -0400 From: Kevin Wolf Date: Wed, 8 Sep 2010 15:29:41 +0200 Message-Id: <1283952582-17498-25-git-send-email-kwolf@redhat.com> In-Reply-To: <1283952582-17498-1-git-send-email-kwolf@redhat.com> References: <1283952582-17498-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 24/25] 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 --- 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