From patchwork Sun Jan 17 14:48:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naphtali Sprei X-Patchwork-Id: 43032 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 CF67EB7CE6 for ; Mon, 18 Jan 2010 01:55:50 +1100 (EST) Received: from localhost ([127.0.0.1]:49651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWWXc-0004yn-2q for incoming@patchwork.ozlabs.org; Sun, 17 Jan 2010 09:55:48 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWWQl-0002Vs-Hu for qemu-devel@nongnu.org; Sun, 17 Jan 2010 09:48:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWWQg-0002S8-5L for qemu-devel@nongnu.org; Sun, 17 Jan 2010 09:48:42 -0500 Received: from [199.232.76.173] (port=53799 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWWQf-0002Rz-WF for qemu-devel@nongnu.org; Sun, 17 Jan 2010 09:48:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33939) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWWQf-0008W4-Dp for qemu-devel@nongnu.org; Sun, 17 Jan 2010 09:48:37 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0HEmapH026174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 17 Jan 2010 09:48:36 -0500 Received: from localhost.localdomain (dhcp-0-60.tlv.redhat.com [10.35.0.60]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0HEmSio022902; Sun, 17 Jan 2010 09:48:35 -0500 From: Naphtali Sprei To: qemu-devel@nongnu.org Date: Sun, 17 Jan 2010 16:48:15 +0200 Message-Id: <1263739695-13043-5-git-send-email-nsprei@redhat.com> In-Reply-To: <1263739695-13043-4-git-send-email-nsprei@redhat.com> References: <1263739695-13043-1-git-send-email-nsprei@redhat.com> <1263739695-13043-2-git-send-email-nsprei@redhat.com> <1263739695-13043-3-git-send-email-nsprei@redhat.com> <1263739695-13043-4-git-send-email-nsprei@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Naphtali Sprei Subject: [Qemu-devel] [PATCH v2 4/4] Disable fall-back to read-only when cannot open drive's file for read-write 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 Signed-off-by: Naphtali Sprei --- block.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 8def3c4..f90e983 100644 --- a/block.c +++ b/block.c @@ -444,8 +444,6 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags, if (flags & (BDRV_O_CACHE_WB|BDRV_O_NOCACHE)) bs->enable_write_cache = 1; - /* Note: for compatibility, we open disk image files as RDWR, and - RDONLY as fallback */ 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)); @@ -459,10 +457,6 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags, ret = -ENOTSUP; } else { ret = drv->bdrv_open(bs, filename, open_flags); - if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) { - ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR); - bs->read_only = 1; - } } if (ret < 0) { qemu_free(bs->opaque);