From nobody Wed May 15 22:14:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=web.de Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625681879187215.7958146992927; Wed, 7 Jul 2021 11:17:59 -0700 (PDT) Received: from localhost ([::1]:46702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1C7R-0007yg-Vh for importer@patchew.org; Wed, 07 Jul 2021 14:17:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5X-000560-2R; Wed, 07 Jul 2021 14:15:59 -0400 Received: from mout.web.de ([212.227.17.12]:59807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5V-0004qb-85; Wed, 07 Jul 2021 14:15:58 -0400 Received: from gecko.fritz.box ([89.247.255.194]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Mcpuy-1lSPIV1SCo-00Zw2X; Wed, 07 Jul 2021 20:15:41 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1625681741; bh=7Kj46IqMRPfisjQHLg0tSdUCX4WrO/qJOxJZLFd6LDM=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=qn8u3XSgYRFnyEH9kuiPCvaESsl9iRS8hYwX/sT6cO5M8WilHWRExB/E9YOV/NVZP QkHWSGVQcCKOXsvaj2NMFooWEmwxQx3LDbjfd2eaSjcrvQLXFD+5H+bj7yhGseZhCz NCjDh9sZrQxtZsJO5dxjCF13FJd0pbumeHFt7dAA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Wed, 7 Jul 2021 20:15:39 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 1/4] replication: Remove s->active_disk Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/y=LrgVk7tphqyT_ynQQnbZc"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Provags-ID: V03:K1:w9L5VJkqEf4XzGQR26j8E00B7IaIFM8X2qqmRXUovJeDxnpexep 2fl3chT6/0K56Fx2petfK27Qvedgyj3O6DrswM7vOGl6fSWmPRIhRojnCXOgL6yVLOEaeTI 5x+hVzUUm0j2JTWZxhhWfEZXM+C0JUIvKw9gPO7ioQP9Jrtya+L6Ow5V5W9tV7qwZTID+QP 9DQsRiaKw/Oba/pXlosbw== X-UI-Out-Filterresults: notjunk:1;V03:K0:APelpnyKlbU=:OFHqFsUyYco+p9LOWZihPg 25O+H4BsDALYOTZSMjj6cVXFYGZpXRMZ5MyRWtMRCs3AAv/VFK2KLMzyvmM2LKLdKjePjk9pM YOodvugI0rEi+S+rulxad9xLW4jzAfrGxHnd4HDMbVdaLGfShDE6/SLr9C54GZwAtWa8tvkvv zY/JKvqJjUWJ9yzu5LGQd+E8HmnzTrlomrMHdjxc3wmEYic82p71vrsxguysouWJClgC6JuGt R/Xe0o0i/vys0JM+wjxyGY0IHtW4/0R61K5dNZvzsmkNYbwPFjWndR5T1Kee4Dpubh0wm71cx b0tshjWOPmGs1cJcACKKo4Qovho42k1GYLk1UR1wbwi8/h1EdVoQ3vZWFJhIf9MbX9jm3EDeq psIC6evskuOIolbgET8R+lPy76L0+R/8+BmyxO29n19IHgy3zdVNGADy2gEdFdKL5ZCrFfDXm PCqOQeUaHWVjFyCJ/yiIOucwWLz3yE0q2HGA0o21Iq+QNO0hbX+dVLMos2Bpnl1FsWKwzY6KE jXn4mFZDg6P9DjAYI9W4J5pWLW9vqaXCSuTFVoKRCrnZuidgS5ylqoOEmnB2Km4rNK/leMy6i BfV7KxUZFeC9AQHuUfJGw8cANRUs1knxHFR9is5OqI92ZsbDnv2dvBCQN4stnIVenDHnvx5++ BFLXKBTHgfe2Ifa6ks1+KVl8JnvSIKw5jJs/6WgN5bAdok+iW6LtlCZBKiKVsVW/fV6+tPVL2 9dTqpCv2pMFzrXXuOexpiRNQwj9l2PzCqK4gxGbY8VwqJHxMGPswPrZpdwbbWLkajoirY7yjn uoBu8Lq2yaoANji6hPi93oi8Epyy9aXpQziWLnQETIyWCIfuqBI9FnDjtSOUFQJX94NhLMC07 alHE8lObHSZAWhKlNGrmJTM/OOcJp097VspH1WBRtHGYTJaxm3g6fVYdzL52Uo6GdEwK9RRmg cFi1Y+HsB9rUNmvbIbKL+8tntXPIAtThB3UsvJmScydVAEPVXtbMQdytt1uIL34XKqr7xWxqo apZHlyW7FAOV5PWO5Jl5HIJCibARV90kj/G5R80/2SOz4UcBFsEWlQUgXhdiKJTh5fg4nhLK7 q/xkqLlfeTUbs1TXEIGmrdlFtxQBSZYMSXp Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-block , Wen Congyang , Xie Changlong , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625681880021100003 --Sig_/y=LrgVk7tphqyT_ynQQnbZc Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" s->active_disk is bs->file. Remove it and use local variables instead. Signed-off-by: Lukas Straub Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/replication.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/block/replication.c b/block/replication.c index 52163f2d1f..50940fbe33 100644 --- a/block/replication.c +++ b/block/replication.c @@ -35,7 +35,6 @@ typedef enum { typedef struct BDRVReplicationState { ReplicationMode mode; ReplicationStage stage; - BdrvChild *active_disk; BlockJob *commit_job; BdrvChild *hidden_disk; BdrvChild *secondary_disk; @@ -307,11 +306,15 @@ out: return ret; } -static void secondary_do_checkpoint(BDRVReplicationState *s, Error **errp) +static void secondary_do_checkpoint(BlockDriverState *bs, Error **errp) { + BDRVReplicationState *s =3D bs->opaque; + BdrvChild *active_disk; Error *local_err =3D NULL; int ret; + active_disk =3D bs->file; + if (!s->backup_job) { error_setg(errp, "Backup job was cancelled unexpectedly"); return; @@ -323,13 +326,13 @@ static void secondary_do_checkpoint(BDRVReplicationSt= ate *s, Error **errp) return; } - if (!s->active_disk->bs->drv) { + if (!active_disk->bs->drv) { error_setg(errp, "Active disk %s is ejected", - s->active_disk->bs->node_name); + active_disk->bs->node_name); return; } - ret =3D bdrv_make_empty(s->active_disk, errp); + ret =3D bdrv_make_empty(active_disk, errp); if (ret < 0) { return; } @@ -451,6 +454,7 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, BlockDriverState *bs =3D rs->opaque; BDRVReplicationState *s; BlockDriverState *top_bs; + BdrvChild *active_disk; int64_t active_length, hidden_length, disk_length; AioContext *aio_context; Error *local_err =3D NULL; @@ -488,15 +492,14 @@ static void replication_start(ReplicationState *rs, R= eplicationMode mode, case REPLICATION_MODE_PRIMARY: break; case REPLICATION_MODE_SECONDARY: - s->active_disk =3D bs->file; - if (!s->active_disk || !s->active_disk->bs || - !s->active_disk->bs->backing) { + active_disk =3D bs->file; + if (!active_disk || !active_disk->bs || !active_disk->bs->backing)= { error_setg(errp, "Active disk doesn't have backing file"); aio_context_release(aio_context); return; } - s->hidden_disk =3D s->active_disk->bs->backing; + s->hidden_disk =3D active_disk->bs->backing; if (!s->hidden_disk->bs || !s->hidden_disk->bs->backing) { error_setg(errp, "Hidden disk doesn't have backing file"); aio_context_release(aio_context); @@ -511,7 +514,7 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, } /* verify the length */ - active_length =3D bdrv_getlength(s->active_disk->bs); + active_length =3D bdrv_getlength(active_disk->bs); hidden_length =3D bdrv_getlength(s->hidden_disk->bs); disk_length =3D bdrv_getlength(s->secondary_disk->bs); if (active_length < 0 || hidden_length < 0 || disk_length < 0 || @@ -523,9 +526,9 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, } /* Must be true, or the bdrv_getlength() calls would have failed */ - assert(s->active_disk->bs->drv && s->hidden_disk->bs->drv); + assert(active_disk->bs->drv && s->hidden_disk->bs->drv); - if (!s->active_disk->bs->drv->bdrv_make_empty || + if (!active_disk->bs->drv->bdrv_make_empty || !s->hidden_disk->bs->drv->bdrv_make_empty) { error_setg(errp, "Active disk or hidden disk doesn't support make_em= pty"); @@ -579,7 +582,7 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, s->stage =3D BLOCK_REPLICATION_RUNNING; if (s->mode =3D=3D REPLICATION_MODE_SECONDARY) { - secondary_do_checkpoint(s, errp); + secondary_do_checkpoint(bs, errp); } s->error =3D 0; @@ -608,7 +611,7 @@ static void replication_do_checkpoint(ReplicationState = *rs, Error **errp) } if (s->mode =3D=3D REPLICATION_MODE_SECONDARY) { - secondary_do_checkpoint(s, errp); + secondary_do_checkpoint(bs, errp); } aio_context_release(aio_context); } @@ -645,7 +648,6 @@ static void replication_done(void *opaque, int ret) if (ret =3D=3D 0) { s->stage =3D BLOCK_REPLICATION_DONE; - s->active_disk =3D NULL; s->secondary_disk =3D NULL; s->hidden_disk =3D NULL; s->error =3D 0; @@ -659,11 +661,13 @@ static void replication_stop(ReplicationState *rs, bo= ol failover, Error **errp) { BlockDriverState *bs =3D rs->opaque; BDRVReplicationState *s; + BdrvChild *active_disk; AioContext *aio_context; aio_context =3D bdrv_get_aio_context(bs); aio_context_acquire(aio_context); s =3D bs->opaque; + active_disk =3D bs->file; if (s->stage =3D=3D BLOCK_REPLICATION_DONE || s->stage =3D=3D BLOCK_REPLICATION_FAILOVER) { @@ -698,7 +702,7 @@ static void replication_stop(ReplicationState *rs, bool= failover, Error **errp) } if (!failover) { - secondary_do_checkpoint(s, errp); + secondary_do_checkpoint(bs, errp); s->stage =3D BLOCK_REPLICATION_DONE; aio_context_release(aio_context); return; @@ -706,7 +710,7 @@ static void replication_stop(ReplicationState *rs, bool= failover, Error **errp) s->stage =3D BLOCK_REPLICATION_FAILOVER; s->commit_job =3D commit_active_start( - NULL, s->active_disk->bs, s->secondary_disk->b= s, + NULL, active_disk->bs, s->secondary_disk->bs, JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT, NULL, replication_done, bs, true, errp); break; -- 2.20.1 --Sig_/y=LrgVk7tphqyT_ynQQnbZc Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAmDl70sACgkQNasLKJxd sli2aQ//UWzlBaNqcwGbF8kBHQl6wMK+UYQdvqDM+AUe6wg6VM5RgIP9GtucqOrT 43FMczMqtCcK8PntyDfzhmhQOV6bRNTQ+5GVIEUlXCqomUWlQQzJMo+sKVZvGmWH oyIkzw+lukLYi9kjKmLeKJ6EcFZByOz0EOPxtZH4yA61j8JZVWtP9xMZ8zgjhKQo A2KoMfCbZt1nPUAhp9LBR6sh1NQnaliStp0cw4agKOYwecWdjgWP3CPVZYoJNS62 pvKkTylf0rZkMabsS+MDSUYb9yOBGANw1snB7j32POym0L+YPyMvv/pvjuJwrtih dnYqPUhfRTZn6TOBAOapAME+abiIfj8o3LKrwJcdGlJa6VOBL8p/Sy40zNlErfoL M+n466UGoF/LXFsDQZSW/dWgk6uUN3vJubu/+hmyEZCecAafqjJCfPmezfaTSsCO CIVOEleT3RfKRZhD9AHflPkbx0qM2zVLTRYmt5fegyTwpQ/VtXuzhJf1lmhzntCi 8KYyn69gglNHAB/IAlZrRmSvbkghQeFIwNnKwOMC2L2DXtdyTeeScBcYPLaQH+Vu 4LBNB8OhHMjzCnF7Iw8nNAbEluIZsEboZT+m++G1TR2fc0hVBTRu+LdK2TEBYO5G nbXjpu0Yg60mK1sC1dQFn+LQbkKrr+IKUuqAMRYD23zgAHsx6yQ= =qUuA -----END PGP SIGNATURE----- --Sig_/y=LrgVk7tphqyT_ynQQnbZc-- From nobody Wed May 15 22:14:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=web.de Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625681878973232.37504109881877; Wed, 7 Jul 2021 11:17:58 -0700 (PDT) Received: from localhost ([::1]:46638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1C7R-0007wZ-OJ for importer@patchew.org; Wed, 07 Jul 2021 14:17:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5X-00056q-Hb; Wed, 07 Jul 2021 14:15:59 -0400 Received: from mout.web.de ([212.227.17.12]:33021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5V-0004qe-OI; Wed, 07 Jul 2021 14:15:59 -0400 Received: from gecko.fritz.box ([89.247.255.194]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M8Qtq-1lF9jX2DB4-00vu7Z; Wed, 07 Jul 2021 20:15:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1625681745; bh=z7lrDC5xLnEAIV2unpQs0bzHJemGMfXeo2L4v6OClWg=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=AXHob9JkIZvYZnyyEtMU6GMHND9zhWc32RqB0Rp8FYwDu7WBBMumy6RhgbYYw/vav /DGv4KgD2MqJel1iEYAlTFtiwXPcmJG3m8x0a7UMyoHh3H75wMbEtXXPTg8rp9epGF HZeWKXX5Gi1hi3Om0ngrvXWGXeJCxnyhgaw4bFQA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Wed, 7 Jul 2021 20:15:44 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 2/4] replication: Reduce usage of s->hidden_disk and s->secondary_disk Message-ID: <55248d9609e35b5ec0625a770cc99c5d36a7326f.1625680555.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HQd0stZVGT0FW5Br/pTvs.t"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Provags-ID: V03:K1:W1crjgxwW/hOIFH+ZzKLFTsqjTIoWJ2wwKh6bbLy+G5LMaL1xoa yM7vyqEA2nHjnchsenkQhWjbdD4Y+yCmObIcS9QbQ97KwfRh0Jnx44JmgMDBxPnWUxc2Ttf 5qxqAAdAD4Uslx7czVktofOICRHBkMr2aqrmxtCJMXOowYePz/zdgrkhPk3DK9MS6N5e14x WRz4g99BNk+ayn4pep68w== X-UI-Out-Filterresults: notjunk:1;V03:K0:/OlDzypH+h0=:IeV7H3louI0wef2GC1dwIe EUzbNDaV3BN6bJ3ZtwUZzvqNyNhXKYBc8Azk7H+t8fmTqzuiBYe+S4yO8ls0WObrYkzni9G61 RiVQOxsXxnMI5k0CSdMPpwzcl71H1AoxLqKOHWpHGYFihRImLOqqD8zXQHc/S8rf7IHiANZEx lmtgjjWwEFi5tQzscTeKwvxRSxcTB+SeuZojYZG7odFvyUTYixa8YkUThcVYdSVJoO3ZN/oTx 8D0uyQ92UqFq57O9ThJTehhSJGPPP77OXZVlEM881wXEJN6tUVcxtqpN+zjz4pt8H1/daosXL hQcwL6zPtTTPdpKSuURh7+vV1kK23x2Ibwg84wpDYoFqUfWL495UoNTZeANX+upmuiyYYZdWB WqF+xQksGws9vnQ4lNayHKfk7ZsKzHk05YBsQhVL4lr3Jv5sw2HrjYMo/dWAZwqpb0YeLowU5 9O2gSDgPSQ9cgb4JtzmQqiDo+2gE4FKftSWfN0TgZxXext3dOHtKuI+qkaL71QokkBGAkYuH+ 5pK+SAVJKWiolmIUYN/nH8JMAZ4gRrlsuQjKquX2iJRpZp6jt9WYCv1++oTeqQMyslKddxp24 wTu1v1+n1CFkEuegbpfsjkBZsygjugb/IsC93S1OMcdOnmw7hfjaxJ3OPtkW0TLfcNMwc1xS7 TVDkz9J4zkbZHmb0FQP8QuUAMUiIhglSfjRNwwzCGQs8xl/z8vZGIb/I3kcKlOx8ETaVzZ5cT FfAtzPfUgWO+vD0GozWbRQBjIQaebj1G9zu0TCdvCluKlPjR6iyggXWohEjgh8oxMta8glUA4 Vd9JqomVglC2LzMfclE5nHvNtAz46LXxc9C/qy8BeNyxjSHVZBX2jpW+Amh2TgCM4Igwykz9Q +Z7b9GMZrB7ELncIJonmglEkAoMpTbHWWEisRFj1der7P0fA2crYRnf4krg/dkWICHi3IoIFb XTe8Mnyfi8RsdQ4yqpIof92+DkfZTUA0NVmQG0rfCVhhHsLjcE1Ju1h7ANRWIxrACJS0RQWzX TZm4HHir+TE6UL5u9Ks2hhpOZ3j0d8Dw7bGOZC4wknXgoOHl8gSiwIR9X2d/G3wGZhc6my56+ 7DWVtoD7YDfhRgxANvoCKUolH70FKuOwIur Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-block , Wen Congyang , Xie Changlong , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625681880012100002 --Sig_/HQd0stZVGT0FW5Br/pTvs.t Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In preparation for the next patch, initialize s->hidden_disk and s->secondary_disk later and replace access to them with local variables in the places where they aren't initialized yet. Signed-off-by: Lukas Straub Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/replication.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/block/replication.c b/block/replication.c index 50940fbe33..74adf30f54 100644 --- a/block/replication.c +++ b/block/replication.c @@ -368,27 +368,35 @@ static void reopen_backing_file(BlockDriverState *bs,= bool writable, Error **errp) { BDRVReplicationState *s =3D bs->opaque; + BdrvChild *hidden_disk, *secondary_disk; BlockReopenQueue *reopen_queue =3D NULL; + /* + * s->hidden_disk and s->secondary_disk may not be set yet, as they wi= ll + * only be set after the children are writable. + */ + hidden_disk =3D bs->file->bs->backing; + secondary_disk =3D hidden_disk->bs->backing; + if (writable) { - s->orig_hidden_read_only =3D bdrv_is_read_only(s->hidden_disk->bs); - s->orig_secondary_read_only =3D bdrv_is_read_only(s->secondary_dis= k->bs); + s->orig_hidden_read_only =3D bdrv_is_read_only(hidden_disk->bs); + s->orig_secondary_read_only =3D bdrv_is_read_only(secondary_disk->= bs); } - bdrv_subtree_drained_begin(s->hidden_disk->bs); - bdrv_subtree_drained_begin(s->secondary_disk->bs); + bdrv_subtree_drained_begin(hidden_disk->bs); + bdrv_subtree_drained_begin(secondary_disk->bs); if (s->orig_hidden_read_only) { QDict *opts =3D qdict_new(); qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable); - reopen_queue =3D bdrv_reopen_queue(reopen_queue, s->hidden_disk->b= s, + reopen_queue =3D bdrv_reopen_queue(reopen_queue, hidden_disk->bs, opts, true); } if (s->orig_secondary_read_only) { QDict *opts =3D qdict_new(); qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable); - reopen_queue =3D bdrv_reopen_queue(reopen_queue, s->secondary_disk= ->bs, + reopen_queue =3D bdrv_reopen_queue(reopen_queue, secondary_disk->b= s, opts, true); } @@ -396,8 +404,8 @@ static void reopen_backing_file(BlockDriverState *bs, b= ool writable, bdrv_reopen_multiple(reopen_queue, errp); } - bdrv_subtree_drained_end(s->hidden_disk->bs); - bdrv_subtree_drained_end(s->secondary_disk->bs); + bdrv_subtree_drained_end(hidden_disk->bs); + bdrv_subtree_drained_end(secondary_disk->bs); } static void backup_job_cleanup(BlockDriverState *bs) @@ -454,7 +462,7 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, BlockDriverState *bs =3D rs->opaque; BDRVReplicationState *s; BlockDriverState *top_bs; - BdrvChild *active_disk; + BdrvChild *active_disk, *hidden_disk, *secondary_disk; int64_t active_length, hidden_length, disk_length; AioContext *aio_context; Error *local_err =3D NULL; @@ -499,15 +507,15 @@ static void replication_start(ReplicationState *rs, R= eplicationMode mode, return; } - s->hidden_disk =3D active_disk->bs->backing; - if (!s->hidden_disk->bs || !s->hidden_disk->bs->backing) { + hidden_disk =3D active_disk->bs->backing; + if (!hidden_disk->bs || !hidden_disk->bs->backing) { error_setg(errp, "Hidden disk doesn't have backing file"); aio_context_release(aio_context); return; } - s->secondary_disk =3D s->hidden_disk->bs->backing; - if (!s->secondary_disk->bs || !bdrv_has_blk(s->secondary_disk->bs)= ) { + secondary_disk =3D hidden_disk->bs->backing; + if (!secondary_disk->bs || !bdrv_has_blk(secondary_disk->bs)) { error_setg(errp, "The secondary disk doesn't have block backen= d"); aio_context_release(aio_context); return; @@ -515,8 +523,8 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, /* verify the length */ active_length =3D bdrv_getlength(active_disk->bs); - hidden_length =3D bdrv_getlength(s->hidden_disk->bs); - disk_length =3D bdrv_getlength(s->secondary_disk->bs); + hidden_length =3D bdrv_getlength(hidden_disk->bs); + disk_length =3D bdrv_getlength(secondary_disk->bs); if (active_length < 0 || hidden_length < 0 || disk_length < 0 || active_length !=3D hidden_length || hidden_length !=3D disk_le= ngth) { error_setg(errp, "Active disk, hidden disk, secondary disk's l= ength" @@ -526,10 +534,10 @@ static void replication_start(ReplicationState *rs, R= eplicationMode mode, } /* Must be true, or the bdrv_getlength() calls would have failed */ - assert(active_disk->bs->drv && s->hidden_disk->bs->drv); + assert(active_disk->bs->drv && hidden_disk->bs->drv); if (!active_disk->bs->drv->bdrv_make_empty || - !s->hidden_disk->bs->drv->bdrv_make_empty) { + !hidden_disk->bs->drv->bdrv_make_empty) { error_setg(errp, "Active disk or hidden disk doesn't support make_em= pty"); aio_context_release(aio_context); @@ -544,6 +552,9 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, return; } + s->hidden_disk =3D hidden_disk; + s->secondary_disk =3D secondary_disk; + /* start backup job now */ error_setg(&s->blocker, "Block device is in use by internal backup job"); -- 2.20.1 --Sig_/HQd0stZVGT0FW5Br/pTvs.t Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAmDl71AACgkQNasLKJxd slhIBxAAu5LN5ll6uow+2ju39GkBgMTLgVCOZm+k2+kwTBj4irwJdhHoqRsrHaVS mgBhP2HoVmTnCg+Qw9NIQTjaGdm31mRt4z5wNZxvugl3h2eRslLu4UFwBGwrOnX8 Y7t2R7odEF6mptBkx7WLPMbUrK6e3B1lvUs4CHDwORb91o/mQUa613r3OMbMvHgj xYTbKGjw8Vgk1j65go4ERSHaEafCFylzkIOoHB5t3JGe08n9uq4Ht2Wt9B7H16Jf 1JyNE1xxHF0YBZRkMVGYnf10iDLhFhWwu0DgIaQwD6vWPAyGMYSfsm+jaj617+/J iW4KFz7FccDVGaWeYfOlLLcmpt3yCezGz4J5MkU0I2HMy/RYAMyYy8iERjJjhla7 hKbtNRo1+UxMmAaSi9mJfrobi0KO9efQyf2isOazvFqMxDMUvVyPf9FAzOiIyn5e jIVCT21riL9phATQ1fEVmVs8ykhbEw0Y9FPofsNj0biqlSJ8/65CyYIrsmX7iWIA tEB5WrHZhbiRgs13os6YOPn5vHo4DzfCH+rtetcaBj0zM3HzAPtses3XMK+UqZ9w pRNEBDWfB/1Zz0SsMYb9ge5uKKjSqQzHTYqCxtzR3LfAG+7Bab+OGvlRZ3rcScX0 AfbPaFu/Tt3gfC8vhpNagK7u7GPTrI3lrzwqQCUgGbxivEKN8GQ= =prvG -----END PGP SIGNATURE----- --Sig_/HQd0stZVGT0FW5Br/pTvs.t-- From nobody Wed May 15 22:14:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=web.de Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625681985494242.36046821037758; Wed, 7 Jul 2021 11:19:45 -0700 (PDT) Received: from localhost ([::1]:52884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1C9A-0003dn-GO for importer@patchew.org; Wed, 07 Jul 2021 14:19:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5c-0005JV-EV; Wed, 07 Jul 2021 14:16:04 -0400 Received: from mout.web.de ([212.227.17.11]:58885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5a-0004r8-HF; Wed, 07 Jul 2021 14:16:04 -0400 Received: from gecko.fritz.box ([89.247.255.194]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MSrYf-1lZJPU3eOD-00Rlx9; Wed, 07 Jul 2021 20:15:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1625681750; bh=Rx5u9MK2tSS321EcV50l/vFtq+lVgWxTO7jXhZSKIWE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=BM0T+I2aebuaF9pQLAIDmBhq7IRaTsGGzh2Loi9VA98u41kyehs3sBZDuO+iejtiP 5ABBoWTzT7PbI6psgZnM9V3VvjYTjEe7sXDD6snUsicMF8tM7eOztQcbjpkBwOriBh yXG9FgadhIRYQm+bknHK5UnuELRhOfczjcSxWAII= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Wed, 7 Jul 2021 20:15:48 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 3/4] replication: Properly attach children Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/stI/5VwA19fO2L7Fd1Urtpv"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Provags-ID: V03:K1:ikeZQw6WXgZ4UmytIpVUqFaNXHclrtJqsQ45/jypuIZRTAFzpUC MHpi2ouX1Njd9J6yNGlvVpzQ5gJKhcwYI/xybFLPMnXDsTVCjaiO87IKptOyWik/qafgWaG ur2dxekEPkPJlflH25xWlUWI+BGPDFuCbMKMnR9/Sg9sdPOdA6/j953+0VIaWLAcLqHaeZR 0ZySo1fXt4FbDZIcLCU8g== X-UI-Out-Filterresults: notjunk:1;V03:K0:dLhuvWK5ltg=:EoYKJ6T+zynBaYs4dIC7ew MtignGvjv4i9ti+YvH9NdC3+LGNKtEGyHnpQC2D8JZowrLhZEbu6ZvckC0b8mGZyvxjY/5SY4 IMKX/imrVtSl7WbET5ZQJrRrTBg0Gbhn8ESFQ43G4+tEnV/BeY4RhyP3ZtzZiQXlcalE+JSL3 euBuyUWu7ZNXahSj0oBo6taUycze45N5Cva6ubjh/34qarGJ3al/bJ/tZYDKfwhKlvfr/DKQe 4k9eVdxTQTDJmkKqQsnvJRJhK0iCeThO+fn7OmPaV0lldpyujjiVM8xMkoWitUa2Kb/wf8VEr ZUfOXDzHlJ8WSW9lNZYeFb4qrhsFGGc8442fxjqhhoaG/qWa9x9cAgVP1aBwVIDPyvDBBIE8t 4vmMqzSyG1qy5mVk9jw1EGNorY8S0pDbUm3kcAIQFaHltkeQp9XpJPwjtzk4esCv6HAxwfxN7 992Hf16fDnv5btT6CZd2VuJDhLDBEelNbc25oalRjWlW+NV1+Zw7SKfmvDFgREYNZQKJnLOFI Ilbumpxtv03xZr3gQhNJGOgvDMecqIGSlzyHZEHxtNY7pE+p8TOWvYIw1D1+AkR42/JPt7+dN GaL6WD3hmD19u7+3hAuagRkps66LlD7b2mbzgBEIyGeO4iciSMKebcQ9JZBB/CQkMLRwGALFy BXPe+FiSBL8MlvKhuHKZpX5WaeZwVfH90WC3n7RVkfH9CQuJWdGVVD3+4b/cA35sqQfENFrVX a/RxUMjni9Hjx4sVeBWHofhB9vHBpzsMyXvCc9g6275l8HMKJ7C5DynpX0BltThe+oRIeZmID a9fS8I8sthB6HzQCcLMfDdP+d4eM4/bLMlA76psVyo+BHDu/QeezDC3TLBf82MjM1S9IKxk43 5CS2lNNbf9UD/1nxsEFM4CQXsjDJi2DcsITN6ZgCVQD3nJ/YI2tjUyUqobKQK3yCN9E3xv8Gs vLxixGR/3abcxEu3NkY4Fv+rEcZabd16p4us46dFtnilohvcd0OHR6CfZng303YtAhMu68t9t DUMewcxNqZIIAmFSqG0Wzx0CMlFSWT8Cw4UwK9mzKAUQQ/1K6tV7bHBhgJUk/Gy8FP1QUwXka NY/e8/3mZR3d+ZsMAbYo9nqf+nFgoJdfIpj Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-block , Wen Congyang , Xie Changlong , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625681986854100001 --Sig_/stI/5VwA19fO2L7Fd1Urtpv Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The replication driver needs access to the children block-nodes of it's child so it can issue bdrv_make_empty() and bdrv_co_pwritev() to manage the replication. However, it does this by directly copying the BdrvChilds, which is wrong. Fix this by properly attaching the block-nodes with bdrv_attach_child() and requesting the required permissions. Signed-off-by: Lukas Straub Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/replication.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/block/replication.c b/block/replication.c index 74adf30f54..c0d4a6c264 100644 --- a/block/replication.c +++ b/block/replication.c @@ -165,7 +165,12 @@ static void replication_child_perm(BlockDriverState *b= s, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { - *nperm =3D BLK_PERM_CONSISTENT_READ; + if (role & BDRV_CHILD_PRIMARY) { + *nperm =3D BLK_PERM_CONSISTENT_READ; + } else { + *nperm =3D 0; + } + if ((bs->open_flags & (BDRV_O_INACTIVE | BDRV_O_RDWR)) =3D=3D BDRV_O_R= DWR) { *nperm |=3D BLK_PERM_WRITE; } @@ -552,8 +557,25 @@ static void replication_start(ReplicationState *rs, Re= plicationMode mode, return; } - s->hidden_disk =3D hidden_disk; - s->secondary_disk =3D secondary_disk; + bdrv_ref(hidden_disk->bs); + s->hidden_disk =3D bdrv_attach_child(bs, hidden_disk->bs, "hidden = disk", + &child_of_bds, BDRV_CHILD_DATA, + &local_err); + if (local_err) { + error_propagate(errp, local_err); + aio_context_release(aio_context); + return; + } + + bdrv_ref(secondary_disk->bs); + s->secondary_disk =3D bdrv_attach_child(bs, secondary_disk->bs, + "secondary disk", &child_of_= bds, + BDRV_CHILD_DATA, &local_err); + if (local_err) { + error_propagate(errp, local_err); + aio_context_release(aio_context); + return; + } /* start backup job now */ error_setg(&s->blocker, @@ -659,7 +681,9 @@ static void replication_done(void *opaque, int ret) if (ret =3D=3D 0) { s->stage =3D BLOCK_REPLICATION_DONE; + bdrv_unref_child(bs, s->secondary_disk); s->secondary_disk =3D NULL; + bdrv_unref_child(bs, s->hidden_disk); s->hidden_disk =3D NULL; s->error =3D 0; } else { -- 2.20.1 --Sig_/stI/5VwA19fO2L7Fd1Urtpv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAmDl71QACgkQNasLKJxd sljL9hAAoaIpft95bKdTwxvLyA1o1cuUB7ddTY3J03nQzC80r+12PzLuIucmsOLk Rw2JnMi9anSJHaeBI+0+ey1X0D0aojxYLoo98pL6qrUVnxgm3wqmnbyCueKrkkYG VeyzFWfzDGm8wPh5DMz6YaedYLKz/T0QDEFVVyy0h2JuuWpD1t4KzMBa27aSv2LA CTIxAt6ddDWfijb0foUOzHiqj/0uwLlZXt+hfZlADquOfkpjavxfjx1F6ZULoKl2 hHiNw8lCZieCxACsPZ2nZBMJw3rOXK+NTVqG6bKjuCaqBjH6i54e7l+vw8Wq6hSl Kt7hO47IkGBm4rGNURjurdU3UZc+WNOYNOslz/bs025SLOofOjXOIN5APUJxjqS9 BcwK8ZkqfIpUOgat5X1a/8t+jgbvZfWgNFlFir6gSmaE9NslaQarvUsiLXm8WBI8 8j7BZD1+wDHVB5QQlH3ms2Vxu5mgm6rw8DIOgnLrb3Qxs53MWCOkAmiiX7im6j6u 4+nt3Pxuwa66l8LYOXqeoNUVua9xe4zRmfdcZVmG59labxQKXgubuCTjGr6qVX3M aNPiK2mKDa02d2TiOXeYEv+7NmEd7TNOWValWPgBUa3kIi/RI5dY8iF5J/SiqcpH EqoCN6c1BWoWcO2UnEKT4yJgA3L/kW6bQK0Mh9494yxo8O30cDQ= =fG1E -----END PGP SIGNATURE----- --Sig_/stI/5VwA19fO2L7Fd1Urtpv-- From nobody Wed May 15 22:14:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=web.de Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625681897156653.733185100242; Wed, 7 Jul 2021 11:18:17 -0700 (PDT) Received: from localhost ([::1]:48056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1C7k-0000Rn-3s for importer@patchew.org; Wed, 07 Jul 2021 14:18:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5g-0005Yy-T7; Wed, 07 Jul 2021 14:16:09 -0400 Received: from mout.web.de ([212.227.17.11]:55349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1C5f-0004rT-1E; Wed, 07 Jul 2021 14:16:08 -0400 Received: from gecko.fritz.box ([89.247.255.194]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MYw1v-1lfNgP1FgJ-00VjOZ; Wed, 07 Jul 2021 20:15:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1625681754; bh=1lCdSkXKPIXA8EUvad+VNjRJ1cTFxSQl46tLcmwWdnA=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=fF2CdHTmNLVPN4XQbhEqxcxy6CTUwpnk5fek/mvLgHHJQEQUGu0X4pf6d80labFHe 16WIbxdACsTUWcAFCY1kole7T4PSnyMbGm1FJIqFejbXzWHLCh7lmzqn8x99zn2qoY DuQmDI7OxDwtOoC2NfwfUzjYg/St5gDIIetT7S14= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Wed, 7 Jul 2021 20:15:52 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 4/4] replication: Remove workaround Message-ID: <906c163474aa1fcdf4ffa3cdfb4ad39cb7fc49cb.1625680555.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/lsr67KhdPg/Xvn.jJzN/3f."; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Provags-ID: V03:K1:uF1XdvtZMs4rYPW5bhGhyoxFgvOdljMn+UBPIi0KBK7Mj30xGWX 1H+lwgvw4wfVjmqA08WI/s6iyR9M4TxqjbISEOUxqZ5hjF/VuwTg/kYl9jb4rfWY9TQhy/f f32S3EnMyzbs0SnbdS1YjCw8q4I345Jy0bjgmPkZATG+Iyh7mrUSzrB2OhHLFscslpEB4LO ob9UnYpzCxMdK4xe8n1Tg== X-UI-Out-Filterresults: notjunk:1;V03:K0:nSCu7Hi95Uk=:lPxDpzWGvRGEyD73vzgHoO PU+U/awttdUzrx2kzxCpZmL/7UX9WgOTrwoYdghdsmelBmDmGz2RRXFzeNSQscxyP8GIbNKDx 4UpFVNpuNiadPkBJWhHxIgB4t4JbGwQ6K4LCIxVJt3O20b9ETZ+LfMQpxNMD5nTQ8hOXONzbz t6gSj645uTMiBTgei8rbXYt/igimHpYoM5Jaii78YCCWI6tG9DWgyGShGJOifwqEjNfVA+QWX wMC+6rN/wsB8R+Q4uWKpUhhZQcoRGS9Dg5ONiV8YJgcIYqJ8ZIUGCdjDOj8MZ+UDjIGMqrFe1 Q6hR0zlb+HPd1fK63SmX0pRNgtNxR1DKRNVm9oM4Tolv2pC720qRvoiV2eKE3RUSDaW7+6cQ+ QEJ3TYQbl6So6i8eqH9s5HEfXhMHHTUcd4C187LRm7ZUmCsJojCmN7HpmUUI9XH23qaM9XXJ9 gQ92kIGEJAAVPSSoGXtCoOMqQ9zSBI+OTly5DMfxfK1DIZYPWmC5CgJwIgt8/+/wn+dzL8apR eZqNc6HFjYldKhlNg4COqJboJsXkmkkeQltyLXnLF2U3efJfaEct7+XuiY67EPZPevqNd1uNK RSni6doKLquHRtZ7fRtPEqt6He/bsRR05h3UXdPQImKW0E2+HWTwNFVjh6/RBcEcFa+g9LQ4e GmVsD7HB0mqDFVHrvEu8rozj8RsX/trT0RZ3EtKmTNdFPlKtcxRfGa8MFLQzl6cnzkq7FJfqA OSPNFvgmI2mpWpd9Dn4mnRcyxv+j1Me+5PL/B+38z0iG0zwOK6LjXpBZuB43zkJI/w/sZVYab HLJRaje39ziDYgtcYKqQc97dQRK1gqpLzJEbDAIk19esd1Qj3FDvMmJKKh45/5yj3hhnZgHle AnIFt7HfAWM1f3+zlikKoqBp5coY27HvQ0gH7qdIWui6NQ8pyP0wAR8kJIQA7UQiaHkGW8mkQ 0o1wM40t7hWCuGwkbv220jyxxJj6+ctKULLpRBR14p6uxMJXAkG73gDroopxCWI11JjnCnpvU ry0XY5+KRipJoqp4StFQGOwybI4C7xykExt3gl9i4EGDSrxqGamELhEm9t2pOVF81rdn4HCE4 kHkuuIEbCCj8UQMXjs6HUBRCPEEyQICPM6U Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-block , Wen Congyang , Xie Changlong , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625681897879100001 --Sig_/lsr67KhdPg/Xvn.jJzN/3f. Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove the workaround introduced in commit 6ecbc6c52672db5c13805735ca02784879ce8285 "replication: Avoid blk_make_empty() on read-only child". It is not needed anymore since s->hidden_disk is guaranteed to be writable when secondary_do_checkpoint() runs. Because replication_start(), _do_checkpoint() and _stop() are only called by COLO migration code and COLO-migration doesn't inactivate disks. Signed-off-by: Lukas Straub Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/replication.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/block/replication.c b/block/replication.c index c0d4a6c264..68b46d65a8 100644 --- a/block/replication.c +++ b/block/replication.c @@ -348,17 +348,7 @@ static void secondary_do_checkpoint(BlockDriverState *= bs, Error **errp) return; } - BlockBackend *blk =3D blk_new(qemu_get_current_aio_context(), - BLK_PERM_WRITE, BLK_PERM_ALL); - blk_insert_bs(blk, s->hidden_disk->bs, &local_err); - if (local_err) { - error_propagate(errp, local_err); - blk_unref(blk); - return; - } - - ret =3D blk_make_empty(blk, errp); - blk_unref(blk); + ret =3D bdrv_make_empty(s->hidden_disk, errp); if (ret < 0) { return; } -- 2.20.1 --Sig_/lsr67KhdPg/Xvn.jJzN/3f. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAmDl71gACgkQNasLKJxd sli2WA/+N3OGWmpYFMJmB8qeTdKxXCaMOXHP3YDkAAT7qpTJWUlRbQjigeP2hhEu rLdnOQXt2KUqD3CD9oQdN1F9jkXSJU5d7Cmv6kV7rUXFPnr5h7Iw+5GZbPJ1nWtw g04Q63f9RnFiWLt3nfZOMpl0owuGKbR0BFSwNlGR6wFF4ioA3NF1aqqFkwvsJCNs KfGpBGyZa7cu8q+OkuZH5AUEzLyx27pbAlbz//h6/GUTH/DCvfXFN0oSDK0CLW5h fOdU+7qHr2+8IXSR54+8yPdHFyzTw61XtDcWnunLAD8y9Yas5ics9/TTwkpHMYo7 VzvqvNNrBnP/XTqMChSbE2Ii+Q7DYEA/TTPo2nOv1hsLKSDjL+YGoPP/+8mvDSdK IsRdpWCm6tojm/eMRuhT6AfcVK52cAp2Ak+0ZrhODnq27cJ+PD2E0aqMmWUU6HSO rUsv6ajnuFmzKtZCPrDlPX+AcqSUK8juRm6SkqEkldTVjLfi47tj8N+pk1U9/St/ jWLL/b1ijwusnfcXctri8ZKJYQ+bAosmc4LqzWy54XBD2iEK7jPnK356CjVuIbZ2 AQx6kGOHF7EeH+eGfYGmckaOiENGlxcu9XAcsEuoW2zEAFpD9mERPtCk2fpiz0JU 3H7XWZBocPVGpaGfCN3jgY8ZaNSyUw17FrPNxLgkQvR44vtu4wo= =zESk -----END PGP SIGNATURE----- --Sig_/lsr67KhdPg/Xvn.jJzN/3f.--