From nobody Mon Feb 9 20:58:49 2026 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487010224377761.4978265562094; Mon, 13 Feb 2017 10:23:44 -0800 (PST) Received: from localhost ([::1]:58730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdLHp-00015j-Rg for importer@patchew.org; Mon, 13 Feb 2017 13:23:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKMI-0003hD-N1 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:24:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdKMH-0006J5-AY for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:24:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53114) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdKME-0006Fm-BZ; Mon, 13 Feb 2017 12:24:10 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8954DC04B332; Mon, 13 Feb 2017 17:24:10 +0000 (UTC) Received: from noname.redhat.com (ovpn-117-183.ams2.redhat.com [10.36.117.183]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1DHNC3j031842; Mon, 13 Feb 2017 12:24:08 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 13 Feb 2017 18:22:51 +0100 Message-Id: <1487006583-24350-30-git-send-email-kwolf@redhat.com> In-Reply-To: <1487006583-24350-1-git-send-email-kwolf@redhat.com> References: <1487006583-24350-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 13 Feb 2017 17:24:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 29/41] commit: Use real permissions for HMP 'commit' 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, jcody@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a little simpler than the commit block job because it's synchronous and only commits into the immediate backing file, but otherwise doing more or less the same. Signed-off-by: Kevin Wolf --- block/commit.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/block/commit.c b/block/commit.c index 49ffddb..581d161 100644 --- a/block/commit.c +++ b/block/commit.c @@ -396,11 +396,14 @@ fail: int bdrv_commit(BlockDriverState *bs) { BlockBackend *src, *backing; + BlockDriverState *backing_file_bs =3D NULL; + BlockDriverState *commit_top_bs =3D NULL; BlockDriver *drv =3D bs->drv; int64_t sector, total_sectors, length, backing_length; int n, ro, open_flags; int ret =3D 0; uint8_t *buf =3D NULL; + Error *local_err =3D NULL; =20 if (!drv) return -ENOMEDIUM; @@ -423,17 +426,31 @@ int bdrv_commit(BlockDriverState *bs) } } =20 - /* FIXME Use real permissions */ - src =3D blk_new(0, BLK_PERM_ALL); - backing =3D blk_new(0, BLK_PERM_ALL); + src =3D blk_new(BLK_PERM_CONSISTENT_READ, BLK_PERM_ALL); + backing =3D blk_new(BLK_PERM_WRITE, BLK_PERM_ALL); + + ret =3D blk_insert_bs(src, bs, &local_err); + if (ret < 0) { + error_report_err(local_err); + goto ro_cleanup; + } + + /* Insert commit_top block node above backing, so we can write to it */ + backing_file_bs =3D backing_bs(bs); =20 - ret =3D blk_insert_bs(src, bs, NULL); + ret =3D bdrv_new_open_driver(&bdrv_commit_top, &commit_top_bs, NULL, + BDRV_O_RDWR, &local_err); if (ret < 0) { + error_report_err(local_err); goto ro_cleanup; } =20 - ret =3D blk_insert_bs(backing, bs->backing->bs, NULL); + bdrv_set_backing_hd(commit_top_bs, backing_file_bs); + bdrv_set_backing_hd(bs, commit_top_bs); + + ret =3D blk_insert_bs(backing, backing_file_bs, &local_err); if (ret < 0) { + error_report_err(local_err); goto ro_cleanup; } =20 @@ -507,6 +524,10 @@ int bdrv_commit(BlockDriverState *bs) ro_cleanup: qemu_vfree(buf); =20 + if (backing_file_bs) { + bdrv_set_backing_hd(bs, backing_file_bs); + } + bdrv_unref(commit_top_bs); blk_unref(src); blk_unref(backing); =20 --=20 1.8.3.1