From patchwork Mon Dec 31 12:16:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 208847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 739222C0085 for ; Mon, 31 Dec 2012 23:17:08 +1100 (EST) Received: from localhost ([::1]:55247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TpeIk-0005Jh-IV for incoming@patchwork.ozlabs.org; Mon, 31 Dec 2012 07:17:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TpeI6-0003t1-Sf for qemu-devel@nongnu.org; Mon, 31 Dec 2012 07:16:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TpeI3-0006qh-Qu for qemu-devel@nongnu.org; Mon, 31 Dec 2012 07:16:26 -0500 Received: from smtp.eu.citrix.com ([46.33.159.39]:13564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TpeI3-0006qU-Kt for qemu-devel@nongnu.org; Mon, 31 Dec 2012 07:16:23 -0500 X-IronPort-AV: E=Sophos;i="4.84,385,1355097600"; d="scan'208";a="396010" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 31 Dec 2012 12:16:21 +0000 Received: from mac.citrite.net (10.31.3.229) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.5; Mon, 31 Dec 2012 12:16:21 +0000 From: Roger Pau Monne To: Date: Mon, 31 Dec 2012 13:16:12 +0100 Message-ID: <1356956174-23548-2-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1356956174-23548-1-git-send-email-roger.pau@citrix.com> References: <1356956174-23548-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 46.33.159.39 Cc: Anthony PERARD , xen-devel@lists.xen.org, Stefano Stabellini , Roger Pau Monne Subject: [Qemu-devel] [PATCH RFC 1/3] xen_disk: handle disk files on ramfs/tmpfs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Files that reside on ramfs or tmpfs cannot be opened with O_DIRECT, if first call to bdrv_open fails with errno = EINVAL, try a second call without BDRV_O_NOCACHE. Signed-off-by: Roger Pau Monné Cc: xen-devel@lists.xen.org Cc: Stefano Stabellini Cc: Anthony PERARD --- hw/xen_disk.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index e6bb2f2..a159ee5 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -562,7 +562,7 @@ static void blk_alloc(struct XenDevice *xendev) static int blk_init(struct XenDevice *xendev) { struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); - int index, qflags, info = 0; + int index, qflags, info = 0, rc; /* read xenstore entries */ if (blkdev->params == NULL) { @@ -625,8 +625,18 @@ static int blk_init(struct XenDevice *xendev) xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n"); blkdev->bs = bdrv_new(blkdev->dev); if (blkdev->bs) { - if (bdrv_open(blkdev->bs, blkdev->filename, qflags, - bdrv_find_whitelisted_format(blkdev->fileproto)) != 0) { + rc = bdrv_open(blkdev->bs, blkdev->filename, qflags, + bdrv_find_whitelisted_format(blkdev->fileproto)); + if (rc != 0 && errno == EINVAL) { + /* Files on ramfs or tmpfs cannot be opened with O_DIRECT, + * remove the BDRV_O_NOCACHE flag, and try to open + * the file again. + */ + qflags &= ~BDRV_O_NOCACHE; + rc = bdrv_open(blkdev->bs, blkdev->filename, qflags, + bdrv_find_whitelisted_format(blkdev->fileproto)); + } + if (rc != 0) { bdrv_delete(blkdev->bs); blkdev->bs = NULL; }