From nobody Fri Nov 7 11:34:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539113862807698.4632635983907; Tue, 9 Oct 2018 12:37:42 -0700 (PDT) Received: from localhost ([::1]:53543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9xp7-0002md-KM for importer@patchew.org; Tue, 09 Oct 2018 15:37:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9xnG-0001fI-0G for qemu-devel@nongnu.org; Tue, 09 Oct 2018 15:35:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9xnD-0007K0-Ep for qemu-devel@nongnu.org; Tue, 09 Oct 2018 15:35:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9xn6-0007Gl-Vl; Tue, 09 Oct 2018 15:35:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 411A63083390; Tue, 9 Oct 2018 19:35:36 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-66.ams2.redhat.com [10.36.116.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6D15600C1; Tue, 9 Oct 2018 19:35:34 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 9 Oct 2018 21:35:24 +0200 Message-Id: <20181009193524.19052-5-kwolf@redhat.com> In-Reply-To: <20181009193524.19052-1-kwolf@redhat.com> References: <20181009193524.19052-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 09 Oct 2018 19:35:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] file-posix: Support auto-read-only option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If read-only=3Doff, but auto-read-only=3Don are given, open the file read-write if we have the permissions, but instead of erroring out for read-only files, just degrade to read-only. Signed-off-by: Kevin Wolf --- block/file-posix.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 2da3a76355..69b312a3a3 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -450,6 +450,7 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, int fd, ret; struct stat st; OnOffAuto locking; + bool auto_readonly =3D bdrv_flags & BDRV_O_AUTO_RDONLY; =20 opts =3D qemu_opts_create(&raw_runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); @@ -527,6 +528,18 @@ static int raw_open_common(BlockDriverState *bs, QDict= *options, =20 s->fd =3D -1; fd =3D qemu_open(filename, s->open_flags, 0644); + + if (auto_readonly && fd < 0 && (errno =3D=3D EACCES || errno =3D=3D ER= OFS)) { + ret =3D bdrv_set_read_only(bs, true, errp); + if (ret < 0) { + goto fail; + } + bdrv_flags &=3D ~BDRV_O_RDWR; + raw_parse_flags(bdrv_flags, &s->open_flags); + assert(!(s->open_flags & O_CREAT)); + fd =3D qemu_open(filename, s->open_flags); + } + if (fd < 0) { ret =3D -errno; error_setg_errno(errp, errno, "Could not open '%s'", filename); --=20 2.13.6