From nobody Mon Feb 9 20:58:48 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 1487008925330365.10445710938745; Mon, 13 Feb 2017 10:02:05 -0800 (PST) Received: from localhost ([::1]:58575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKwr-0005OW-TW for importer@patchew.org; Mon, 13 Feb 2017 13:02:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKMZ-00042M-Dq for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:24:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdKMY-0006TD-26 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:24:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdKMT-0006Qy-D6; Mon, 13 Feb 2017 12:24:25 -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 99DAC63E0B; Mon, 13 Feb 2017 17:24:25 +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 v1DHNC3r031842; Mon, 13 Feb 2017 12:24:24 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 13 Feb 2017 18:22:59 +0100 Message-Id: <1487006583-24350-38-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.38]); Mon, 13 Feb 2017 17:24:25 +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 37/41] migration/block: Use real permissions 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" Request BLK_PERM_CONSISTENT_READ for the source of block migration, and handle potential permission errors as good as we can in this place (which is not very good, but it matches the other failure cases). Signed-off-by: Kevin Wolf --- migration/block.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/migration/block.c b/migration/block.c index d259936..958d0fc 100644 --- a/migration/block.c +++ b/migration/block.c @@ -379,7 +379,7 @@ static void unset_dirty_tracking(void) } } =20 -static void init_blk_migration(QEMUFile *f) +static int init_blk_migration(QEMUFile *f) { BlockDriverState *bs; BlkMigDevState *bmds; @@ -390,6 +390,8 @@ static void init_blk_migration(QEMUFile *f) BlkMigDevState *bmds; BlockDriverState *bs; } *bmds_bs; + Error *local_err =3D NULL; + int ret; =20 block_mig_state.submitted =3D 0; block_mig_state.read_done =3D 0; @@ -411,12 +413,12 @@ static void init_blk_migration(QEMUFile *f) =20 sectors =3D bdrv_nb_sectors(bs); if (sectors <=3D 0) { + ret =3D sectors; goto out; } =20 bmds =3D g_new0(BlkMigDevState, 1); - /* FIXME Use real permissions */ - bmds->blk =3D blk_new(0, BLK_PERM_ALL); + bmds->blk =3D blk_new(BLK_PERM_CONSISTENT_READ, BLK_PERM_ALL); bmds->blk_name =3D g_strdup(bdrv_get_device_name(bs)); bmds->bulk_completed =3D 0; bmds->total_sectors =3D sectors; @@ -446,7 +448,11 @@ static void init_blk_migration(QEMUFile *f) BlockDriverState *bs =3D bmds_bs[i].bs; =20 if (bmds) { - blk_insert_bs(bmds->blk, bs, &error_abort); + ret =3D blk_insert_bs(bmds->blk, bs, &local_err); + if (ret < 0) { + error_report_err(local_err); + goto out; + } =20 alloc_aio_bitmap(bmds); error_setg(&bmds->blocker, "block device is in use by migratio= n"); @@ -454,8 +460,10 @@ static void init_blk_migration(QEMUFile *f) } } =20 + ret =3D 0; out: g_free(bmds_bs); + return ret; } =20 /* Called with no lock taken. */ @@ -706,7 +714,10 @@ static int block_save_setup(QEMUFile *f, void *opaque) block_mig_state.submitted, block_mig_state.transferred); =20 qemu_mutex_lock_iothread(); - init_blk_migration(f); + ret =3D init_blk_migration(f); + if (ret < 0) { + return ret; + } =20 /* start track dirty blocks */ ret =3D set_dirty_tracking(); --=20 1.8.3.1