From nobody Fri Nov 14 18:05:12 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589544282; cv=none; d=zohomail.com; s=zohoarc; b=l9oG2AR2O2Ccygwu+GHF8088wanesy7/FYjxvpShajEgYXSRBQolbSO2KLyJz+dxjdI14zmqqU4t618+ux2YsAlphjYfDklBRVbi5Xp5jUL8r4FE7PVO8b+JYOXRTGDVovYsGl02NzqSB5Dm1e+B2kT1ftQVmitA9q/1pu7pqws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589544282; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9nt10F8bJ4+kAVB3QkuSOyaARP+Mcn2yVd7mJYsK9gw=; b=HV+cBW7n68SfHC8w1mKPy9TlS8Tf8VlhsVbg93JYRHztowMfzbRVKZmOTr2yXdkh7whXdPUCsP2Qz/s91S2YJx06YutIkC6AofG+ORgKPn+uwyGsXdLn+fBd9Et72KiOPTYTaPF7z9WfmtnMMO4L91oedUcS1c07FqIlRVtXqfY= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589544282491827.0405210043621; Fri, 15 May 2020 05:04:42 -0700 (PDT) Received: from localhost ([::1]:49462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZ4z-0006dJ-8W for importer@patchew.org; Fri, 15 May 2020 08:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZ3p-0005m9-Ew for qemu-devel@nongnu.org; Fri, 15 May 2020 08:03:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41213 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZZ3n-0005qy-S2 for qemu-devel@nongnu.org; Fri, 15 May 2020 08:03:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-efEaKGT0M--nGArIWnAuGA-1; Fri, 15 May 2020 08:03:24 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26AC918A0721; Fri, 15 May 2020 12:03:23 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-110.ams2.redhat.com [10.36.113.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6105946; Fri, 15 May 2020 12:03:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589544206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9nt10F8bJ4+kAVB3QkuSOyaARP+Mcn2yVd7mJYsK9gw=; b=d5A+zMKvu9LqHvN+N+PvEAnPCMUEODzEIhj4ZBGLpkD9U39GmkLDsQYkiaIOVMU6IFKL7B iXA7uVFFbW7SmjBlc3Py6a3lv2WGiUrfdHHEkc/qYgM9PoJ29nEk/2ShQZ8chcmhOpjWR9 q3R3QIeuNb+WUMtHkYMlomErxLU5Lkg= X-MC-Unique: efEaKGT0M--nGArIWnAuGA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH] replication: Avoid blk_make_empty() on read-only child Date: Fri, 15 May 2020 14:03:18 +0200 Message-Id: <20200515120318.188831-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/14 22:56:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, lukasstraub2@web.de, wencongyang2@huawei.com, xiechanglong.d@gmail.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This is just a bandaid to keep tests/test-replication working after bdrv_make_empty() starts to assert that we're not trying to call it on a read-only child. For the real solution in the future, replication should not steal the BdrvChild from its backing file (this is never correct to do!), but instead have its own child node references, with the appropriate permissions. Signed-off-by: Kevin Wolf --- block/replication.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/block/replication.c b/block/replication.c index f1820ab1d0..ccf7b78160 100644 --- a/block/replication.c +++ b/block/replication.c @@ -343,7 +343,17 @@ static void secondary_do_checkpoint(BDRVReplicationSta= te *s, Error **errp) return; } =20 - ret =3D bdrv_make_empty(s->hidden_disk, errp); + 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); if (ret < 0) { return; } --=20 2.25.4