From patchwork Wed Mar 16 09:42:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 87200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 44395B6FE9 for ; Wed, 16 Mar 2011 20:46:10 +1100 (EST) Received: from localhost ([127.0.0.1]:44188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PznIo-0005Ny-D0 for incoming@patchwork.ozlabs.org; Wed, 16 Mar 2011 05:46:02 -0400 Received: from [140.186.70.92] (port=41726 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PznFY-0004Na-In for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:42:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PznFW-0008Sb-M1 for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:42:39 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:49274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PznFW-0008ST-Ir for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:42:38 -0400 Received: by gyf1 with SMTP id 1so702480gyf.4 for ; Wed, 16 Mar 2011 02:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=ateRGpY12K4OYmmuuUDhZIqdgJhy/nR+Bj8Y+8YUHjQ=; b=m0A3K9/IGgmOlaHTtKGlgQirr2WX+pmfuwou7ZY2BIMtHzRo9a5rhwPTCXolJGnw7B K6ix4LT6nlvwDjjjKRblBrUmo1F5tRvD17rz+3mjZoP8DAChnf+6UQNIoyu6/XLn+WhV RIG/ejSnQYa3SnlaoPpS0QHFDBuqBF3avlYP4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=QD5LnXTyPHytMsrZZyensJvMb41PSj940pFHBrWkajdCHFcWOV3d/qp4qqTIulnno0 +HEfY5WwrFVmwCmRRhkKpWsB/cnkBXuZKkCjidlq+8EqmNPym0Mq1E22omKqYG1hqJbg MLX2BydR79b6XVbLdR98EcjOra/c/6bDAg6nI= MIME-Version: 1.0 Received: by 10.236.105.204 with SMTP id k52mr495470yhg.177.1300268557923; Wed, 16 Mar 2011 02:42:37 -0700 (PDT) Received: by 10.146.43.25 with HTTP; Wed, 16 Mar 2011 02:42:37 -0700 (PDT) In-Reply-To: <20110315141100.GA30710@lst.de> References: <20110315141049.GA30627@lst.de> <20110315141100.GA30710@lst.de> Date: Wed, 16 Mar 2011 09:42:37 +0000 Message-ID: From: Stefan Hajnoczi To: Christoph Hellwig X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.173 Cc: kwolf@redhat.com, "prerna@linux.vnet.ibm.com Anthony Liguori" , qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [PATCH 1/4] block: clarify the meaning of BDRV_O_NOCACHE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Tue, Mar 15, 2011 at 2:11 PM, Christoph Hellwig wrote: > Change BDRV_O_NOCACHE to only imply bypassing the host OS file cache, > but no writeback semantics.  All existing callers are changed to also > specify BDRV_O_CACHE_WB to give them writeback semantics. > > Signed-off-by: Christoph Hellwig I think there is one hunk missing: Stefan diff --git a/block/qcow2.c b/block/qcow2.c index 75b8bec..db1931b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -229,7 +229,7 @@ static int qcow2_open(BlockDriverState *bs, int flags) } /* alloc L2 table/refcount block cache */ - writethrough = ((flags & BDRV_O_CACHE_MASK) == 0); + writethrough = ((flags & (BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH)) == 0); s->l2_table_cache = qcow2_cache_create(bs, L2_CACHE_SIZE, writethrough); s->refcount_block_cache = qcow2_cache_create(bs, REFCOUNT_CACHE_SIZE, writethrough);