From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ljg6F-0006Vg-W1 for qemu-devel@nongnu.org; Tue, 17 Mar 2009 16:41:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ljg6B-0006Sl-4t for qemu-devel@nongnu.org; Tue, 17 Mar 2009 16:41:23 -0400 Received: from [199.232.76.173] (port=57243 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ljg6A-0006Sg-Tr for qemu-devel@nongnu.org; Tue, 17 Mar 2009 16:41:19 -0400 Received: from mx1.redhat.com ([66.187.233.31]:45045) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ljg6A-0004Jz-HG for qemu-devel@nongnu.org; Tue, 17 Mar 2009 16:41:18 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n2HKfIb0020333 for ; Tue, 17 Mar 2009 16:41:18 -0400 From: Uri Lublin Date: Tue, 17 Mar 2009 22:40:50 +0200 Message-Id: <1237322452-11337-13-git-send-email-uril@redhat.com> In-Reply-To: <1237322452-11337-12-git-send-email-uril@redhat.com> References: <1237322452-11337-1-git-send-email-uril@redhat.com> <1237322452-11337-2-git-send-email-uril@redhat.com> <1237322452-11337-3-git-send-email-uril@redhat.com> <1237322452-11337-4-git-send-email-uril@redhat.com> <1237322452-11337-5-git-send-email-uril@redhat.com> <1237322452-11337-6-git-send-email-uril@redhat.com> <1237322452-11337-7-git-send-email-uril@redhat.com> <1237322452-11337-8-git-send-email-uril@redhat.com> <1237322452-11337-9-git-send-email-uril@redhat.com> <1237322452-11337-10-git-send-email-uril@redhat.com> <1237322452-11337-11-git-send-email-uril@redhat.com> <1237322452-11337-12-git-send-email-uril@redhat.com> Subject: [Qemu-devel] [PATCH 12/14] block: pass BDRV_BACKING flag to open of a backing file Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Uri Lublin There may exist some actions needed to be taken only by the leaf image (and not backing images), such as keeping track of highest-allocation-offset. Signed-off-by: Uri Lublin --- block.c | 3 ++- block.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 39ff1dd..8d92d9e 100644 --- a/block.c +++ b/block.c @@ -415,7 +415,7 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags, /* Note: for compatibility, we open disk image files as RDWR, and RDONLY as fallback */ if (!(flags & BDRV_O_FILE)) - open_flags = BDRV_O_RDWR | (flags & BDRV_O_CACHE_MASK); + open_flags = BDRV_O_RDWR | (flags & (BDRV_O_CACHE_MASK | BDRV_O_BACKING)); else open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT); ret = drv->bdrv_open(bs, filename, open_flags); @@ -446,6 +446,7 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags, bs->backing_hd = bdrv_new(""); path_combine(backing_filename, sizeof(backing_filename), filename, bs->backing_file); + open_flags |= BDRV_O_BACKING; if (bs->backing_format[0] != '\0') back_drv = bdrv_find_format(bs->backing_format); ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags, diff --git a/block.h b/block.h index fbb445e..18147cf 100644 --- a/block.h +++ b/block.h @@ -56,6 +56,8 @@ typedef struct QEMUSnapshotInfo { #define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_CACHE_DEF) +#define BDRV_O_BACKING 0x0100 /* a backing file */ + void bdrv_info(Monitor *mon); void bdrv_info_stats(Monitor *mon); -- 1.6.0.6