From nobody Sun Nov 16 05:56:57 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=1599065380; cv=none; d=zohomail.com; s=zohoarc; b=dqVZtZXu8sd5xA0fszB26KaXBj+K3UTRu2PyTKzOQwrxFeWfp8eJGjo6SVnUFIe5y8w0OJlvxiO791R7bxfrFL3sOqqymgEG8q26z7QFzwD6E0gzcZH3lg0e9/9qREgY9Zw6y95kjLdlj6nSFZNu2gAa95AZpfI7rX5g5vW6eJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599065380; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cVDPPpEZfgvBqHPYP78ibHeFywV1qIbiXW18X7UxDPg=; b=U7d5yiuFgKL18pprhhP+BEo9k1P+gOBeVyNGU0R3PsBMAQCMzDBV89gQWlKIVPHmwAFphj1DbIHKaNPITupMOonk8oKEwuSDxDIT/tBooPjdjh9TYQZVmv1hGvBymdgMdgI7gqTCLErXc5poeEYiJ93iVV2tle8M7EztjRxoACw= 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 15990653804351013.674568421283; Wed, 2 Sep 2020 09:49:40 -0700 (PDT) Received: from localhost ([::1]:60328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVx5-0006bC-JD for importer@patchew.org; Wed, 02 Sep 2020 12:49:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDVwI-0005EX-RL for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:48:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33582 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 1kDVwH-0006r8-6h for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:48:50 -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-514-OEsDglB4OEq2YjHXxr7pOw-1; Wed, 02 Sep 2020 12:48:46 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2DD611091065; Wed, 2 Sep 2020 16:48:45 +0000 (UTC) Received: from localhost (ovpn-114-169.ams2.redhat.com [10.36.114.169]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C67C17C5B5; Wed, 2 Sep 2020 16:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599065328; 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: in-reply-to:in-reply-to:references:references; bh=cVDPPpEZfgvBqHPYP78ibHeFywV1qIbiXW18X7UxDPg=; b=Rgt0MR5whOBQBqIIIRIXtke4oROAGxzr/7cqCc/3SXd8u4vKqNQxl4HL0ghspQorDyzq7o 4+tsWKpoj2zoWRIo+ZUQ/4hrgHUIOwZdQJdpZa49KratNxU2je9rgqRHqT09QurxkPwTi6 jtf7iy39+pbMgMT5lHd9eiWPHLvg1I4= X-MC-Unique: OEsDglB4OEq2YjHXxr7pOw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 1/3] mirror: Set s->base_overlay only if s->base is set Date: Wed, 2 Sep 2020 18:48:39 +0200 Message-Id: <20200902164841.214948-2-mreitz@redhat.com> In-Reply-To: <20200902164841.214948-1-mreitz@redhat.com> References: <20200902164841.214948-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:26:30 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , John Snow , qemu-devel@nongnu.org, Max Reitz 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 way, sync=3Dfull will not need a reference to any node other than the source and the target. Signed-off-by: Max Reitz --- block/mirror.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 26acf4af6f..11ebffdf99 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -42,6 +42,7 @@ typedef struct MirrorBlockJob { BlockBackend *target; BlockDriverState *mirror_top_bs; BlockDriverState *base; + /* Overlay of @base if @base is non-NULL; NULL otherwise */ BlockDriverState *base_overlay; =20 /* The name of the graph node to replace */ @@ -839,8 +840,9 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJo= b *s) return 0; } =20 - ret =3D bdrv_is_allocated_above(bs, s->base_overlay, true, offset,= bytes, - &count); + ret =3D bdrv_is_allocated_above(bs, s->base_overlay, + s->base_overlay !=3D NULL, + offset, bytes, &count); if (ret < 0) { return ret; } @@ -1710,7 +1712,7 @@ static BlockJob *mirror_start_job( s->zero_target =3D zero_target; s->copy_mode =3D copy_mode; s->base =3D base; - s->base_overlay =3D bdrv_find_overlay(bs, base); + s->base_overlay =3D base ? bdrv_find_overlay(bs, base) : NULL; s->granularity =3D granularity; s->buf_size =3D ROUND_UP(buf_size, granularity); s->unmap =3D unmap; --=20 2.26.2 From nobody Sun Nov 16 05:56:57 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=1599065387; cv=none; d=zohomail.com; s=zohoarc; b=OqPOgb8ip/DjqWDdEWkKtFbY08GWh+JE398UfaEc4oTCiPwqKCaOScK2nL9XnWHeQAaUdRddmSqYP8JSBBXVOuPT9N2UnutycoSz36K3p2faVSi4xBYvXWpYz15w45wjvQ7NAH+xKdY05BshWaRrkYeu8KOLqHhrVhikzWSbFmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599065387; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MGWVOZqO5sQSbVg4HnXyePdWDQ+gGvYfruwCmlWmsS4=; b=J17TYqNPw0l5qXXH/R1+4H4/bYMQJxLQ7z6gHAs9h/tOB9NZuqEzmp4pu8aVbM1nkT0YXaNDlyBU72sQ/grZPurAbvzloasOTUBD3KYo/aQz/NHzHeiPpyhrxYuPHMwEhQPeUSNEgCtSGsZ6u0BOO3HJQYCiFedpK5LxgUfcWTs= 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 1599065387126776.0688419941335; Wed, 2 Sep 2020 09:49:47 -0700 (PDT) Received: from localhost ([::1]:32812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVxC-0006uK-DW for importer@patchew.org; Wed, 02 Sep 2020 12:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDVwM-0005N8-Dh for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:48:54 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60241 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 1kDVwK-0006rh-Vr for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:48:54 -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-104-pkDLpt6RMhez_T19b-VCrg-1; Wed, 02 Sep 2020 12:48:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F869100854F; Wed, 2 Sep 2020 16:48:47 +0000 (UTC) Received: from localhost (ovpn-114-169.ams2.redhat.com [10.36.114.169]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7E9E10098AC; Wed, 2 Sep 2020 16:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599065332; 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: in-reply-to:in-reply-to:references:references; bh=MGWVOZqO5sQSbVg4HnXyePdWDQ+gGvYfruwCmlWmsS4=; b=XwjztFV/dSXUFKj/pu0f7EanIUZ/K1oP5EWrrbgLDrcY8Hi1/UGUI6L8EMOXwFNg2bqE6G tbrCZryp2qROnjIawX5aFl/umb+SsNwoLMSVAXUUita4A6BZ3kZSDBr6Ftni7pt5CBED9j 4O1QTGYonHRMLPDNop+MGC7B9cTe0RI= X-MC-Unique: pkDLpt6RMhez_T19b-VCrg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 2/3] mirror: Freeze backing chain for sync=top Date: Wed, 2 Sep 2020 18:48:40 +0200 Message-Id: <20200902164841.214948-3-mreitz@redhat.com> In-Reply-To: <20200902164841.214948-1-mreitz@redhat.com> References: <20200902164841.214948-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:26:30 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , John Snow , qemu-devel@nongnu.org, Max Reitz 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" Reported-by: Kevin Wolf Signed-off-by: Max Reitz --- block/mirror.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 11ebffdf99..27422ab7a5 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -649,8 +649,8 @@ static int mirror_exit_common(Job *job) src =3D mirror_top_bs->backing->bs; target_bs =3D blk_bs(s->target); =20 - if (bdrv_chain_contains(src, target_bs)) { - bdrv_unfreeze_backing_chain(mirror_top_bs, target_bs); + if (s->base) { + bdrv_unfreeze_backing_chain(mirror_top_bs, s->base); } =20 bdrv_release_dirty_bitmap(s->dirty_bitmap); @@ -1780,8 +1780,22 @@ static BlockJob *mirror_start_job( goto fail; } } + } + + if (s->base) { + /* + * For active commit or mirror with sync=3Dtop, we need to + * freeze the backing chain down to the base, because we keep + * pointers to it and its overlay. For other cases (mirror + * with sync=3Dfull or sync=3Dnone), we do not, so there is no + * need to freeze any part of the chain. + * (s->base is non-NULL only in these cases.) + */ + if (target_is_backing) { + assert(s->base =3D=3D target); + } =20 - if (bdrv_freeze_backing_chain(mirror_top_bs, target, errp) < 0) { + if (bdrv_freeze_backing_chain(mirror_top_bs, s->base, errp) < 0) { goto fail; } } --=20 2.26.2 From nobody Sun Nov 16 05:56:57 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=1599065482; cv=none; d=zohomail.com; s=zohoarc; b=mXhhENvdh7sOsINyRxBlVXFKc2mPDESBIpGHbZS+N4QxYVo4eEmZxt1iVjU097aL9IKIepxwHesppgUexPiW4F0uVaOTKqD/9wJ4MVvOC4UlKyytDuB5WDxCW0F/3GQDLpyqUXxK2N2c1uHNHVQxRSlhspwnwKHi1U2SrlpqMfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599065482; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J0RSMoQlFPKoMhJiIrLIMZacDgnHgqBUudsX1B8+tBI=; b=hC4uBe3ZDtQhCejCqRJAZsIbn6PnRTF9z1QVNQ/ArlxtbRWoYDH031T8hD/nOpvJFP+B1dZGIFo8k0sANQ059R+6doXlBA51x8tLG2xQ+7Y0DjzFwSKXbAOhE0I1L583r1OQqdUFype6xPWZRi3yo4eycNHdZSLrhJ/+eKxqOyU= 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 1599065482193335.9058529761422; Wed, 2 Sep 2020 09:51:22 -0700 (PDT) Received: from localhost ([::1]:38416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDVyj-0000ry-FW for importer@patchew.org; Wed, 02 Sep 2020 12:51:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDVwZ-0005uv-9J for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:49:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDVwX-0006sU-JM for qemu-devel@nongnu.org; Wed, 02 Sep 2020 12:49:06 -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-108-JawOd8NUNIW7oxA7CQ4IhQ-1; Wed, 02 Sep 2020 12:48:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A0E71091068; Wed, 2 Sep 2020 16:48:49 +0000 (UTC) Received: from localhost (ovpn-114-169.ams2.redhat.com [10.36.114.169]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B6AF1010405; Wed, 2 Sep 2020 16:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599065344; 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: in-reply-to:in-reply-to:references:references; bh=J0RSMoQlFPKoMhJiIrLIMZacDgnHgqBUudsX1B8+tBI=; b=W/3VPkfLvhjptO4ACY1B2Y2CsIbplPHAxGvhi0nrtMvSzME60K4hSP6SAiXIBnPkTZ+4Wn rcfwm7tE4n8nMs5bH3RCQV+6XlwSwlHBF/TsPluxuFcRuViBbcftIGBBftaSQN8+Omr+V8 qo6gk4gX5JKj4VNfgEKyhNTcq/xZSW8= X-MC-Unique: JawOd8NUNIW7oxA7CQ4IhQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 3/3] iotests/041: x-blockdev-reopen during mirror Date: Wed, 2 Sep 2020 18:48:41 +0200 Message-Id: <20200902164841.214948-4-mreitz@redhat.com> In-Reply-To: <20200902164841.214948-1-mreitz@redhat.com> References: <20200902164841.214948-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 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=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , John Snow , qemu-devel@nongnu.org, Max Reitz 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" Test what happens when you remove the backing file during a mirror with sync=3Dtop. Signed-off-by: Max Reitz --- tests/qemu-iotests/041 | 92 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/041.out | 4 +- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index cdbef3ba20..4ed7e293ae 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -1432,6 +1432,98 @@ class TestFilters(iotests.QMPTestCase): self.complete_and_wait('mirror') =20 =20 +class TestReconfDuringMirror(iotests.QMPTestCase): + def setUp(self): + qemu_img('create', '-f', iotests.imgfmt, backing_img, '1M') + qemu_img('create', '-f', iotests.imgfmt, '-b', backing_img, + '-F', iotests.imgfmt, test_img) + + qemu_io('-c', 'write -P 1 0 1M', test_img) + + self.vm =3D iotests.VM() + self.vm.launch() + + blockdevs =3D ( + { 'node-name': 'backing-file', + 'driver': 'file', + 'filename': backing_img }, + + { 'node-name': 'backing', + 'driver': iotests.imgfmt, + 'file': 'backing-file', + 'read-only': True }, + + { 'node-name': 'source-file', + 'driver': 'file', + 'filename': test_img }, + + { 'node-name': 'source', + 'driver': iotests.imgfmt, + 'file': 'source-file', + 'backing': 'backing' } + ) + + for blockdev in blockdevs: + result =3D self.vm.qmp('blockdev-add', **blockdev) + self.assert_qmp(result, 'return', {}) + + def tearDown(self): + self.vm.shutdown() + + os.remove(test_img) + os.remove(backing_img) + + try: + os.remove(target_img) + except OSError: + pass + + def test_reconf_during_top_mirror(self): + result =3D self.vm.qmp('drive-mirror', + job_id=3D'mirror', + device=3D'source', + sync=3D'top', + target=3Dtarget_img, + speed=3D65536) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp('x-blockdev-reopen', + **{ 'node-name': 'source', + 'driver': iotests.imgfmt, + 'file': 'source-file', + 'backing': None }) + if 'error' in result: + self.assert_qmp(result, 'error/desc', + "Cannot change 'backing' link " + "from 'source' to 'backing'") + + result =3D self.vm.qmp('block-job-set-speed', + device=3D'mirror', speed=3D0) + self.assert_qmp(result, 'return', {}) + + self.complete_and_wait('mirror') + + # Pass + return + + # This is not expected. Let's see what happens when we drop + # the backing file altogether. + for node in ('backing', 'backing-file'): + result =3D self.vm.qmp('blockdev-del', node_name=3Dnode) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp('block-job-set-speed', + device=3D'mirror', speed=3D0) + self.assert_qmp(result, 'return', {}) + + # Completing will now probably result in a segfault, because + # it tries to assign 'backing' as the target's backing node + self.complete_and_wait('mirror') + + # Either way, this is a failure. + self.fail('x-blockdev-reopen should not have succeeded') + + if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D['qcow2', 'qed'], supported_protocols=3D['file'], diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out index 46651953e8..5273ce86c3 100644 --- a/tests/qemu-iotests/041.out +++ b/tests/qemu-iotests/041.out @@ -1,5 +1,5 @@ -..........................................................................= ................................. +..........................................................................= .................................. ---------------------------------------------------------------------- -Ran 107 tests +Ran 108 tests =20 OK --=20 2.26.2