From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NfBR1-0008E3-7n
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 07:12:47 -0500
Received: from [199.232.76.173] (port=40284 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NfBR0-0008Dl-9k
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 07:12:46 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <hch@lst.de>) id 1NfBQx-0000KO-Cl
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 07:12:45 -0500
Received: from verein.lst.de ([213.95.11.210]:47054)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <hch@lst.de>) id 1NfBQt-0000IC-0D
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 07:12:39 -0500
Received: from verein.lst.de (localhost [127.0.0.1])
	by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id
	o1ACCYWY021161
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <qemu-devel@nongnu.org>; Wed, 10 Feb 2010 13:12:34 +0100
Received: (from hch@localhost)
	by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o1ACCYm4021160
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 13:12:34 +0100
Date: Wed, 10 Feb 2010 13:12:34 +0100
From: Christoph Hellwig <hch@lst.de>
Subject: Re: [Qemu-devel] [PATCH] block: saner flags filtering in bdrv_open2
Message-ID: <20100210121234.GA21125@lst.de>
References: <20100128141912.GA3454@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100128141912.GA3454@lst.de>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

ping?

On Thu, Jan 28, 2010 at 03:19:12PM +0100, Christoph Hellwig wrote:
> Clean up the current mess about figuring out which flags to pass to the
> driver.  BDRV_O_FILE, BDRV_O_SNAPSHOT and BDRV_O_NO_BACKING are flags
> only used by the block layer internally so filter them out directly.
> Previously BDRV_O_NO_BACKING could accidentally be passed to the drivers,
> but wasn't ever used.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Index: qemu/block.c
> ===================================================================
> --- qemu.orig/block.c	2010-01-28 15:12:52.316024386 +0100
> +++ qemu/block.c	2010-01-28 15:13:33.419004083 +0100
> @@ -451,13 +451,20 @@ int bdrv_open2(BlockDriverState *bs, con
>          bs->enable_write_cache = 1;
>  
>      bs->read_only = (flags & BDRV_O_RDWR) == 0;
> -    if (!(flags & BDRV_O_FILE)) {
> -        open_flags = (flags & (BDRV_O_RDWR | BDRV_O_CACHE_MASK|BDRV_O_NATIVE_AIO));
> -        if (bs->is_temporary) { /* snapshot should be writeable */
> -            open_flags |= BDRV_O_RDWR;
> -        }
> -    } else {
> -        open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT);
> +
> +    /*
> +     * Clear flags that are internal to the block layer before opening the
> +     * image.
> +     */
> +    open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
> +
> +    /*
> +     * Snapshots should be writeable.
> +     *
> +     * XXX(hch): and what is the point of a snapshot during a read-only open?
> +     */
> +    if (!(flags & BDRV_O_FILE) && bs->is_temporary) {
> +        open_flags |= BDRV_O_RDWR;
>      }
>  
>      ret = drv->bdrv_open(bs, filename, open_flags);
> 
---end quoted text---