From nobody Thu Nov 13 13:37:42 2025 Delivered-To: importer@patchew.org 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580421044640250.97160524805224; Thu, 30 Jan 2020 13:50:44 -0800 (PST) Received: from localhost ([::1]:39768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixHhz-0004mA-0s for importer@patchew.org; Thu, 30 Jan 2020 16:50:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33207) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixHcM-0004cZ-Cc for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:44:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixHcL-0003jK-8J for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:44:54 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:28057 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixHcL-0003hQ-3u for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:44:53 -0500 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-30-Q5sZa6z6PLiJ-7bKOj1P9g-1; Thu, 30 Jan 2020 16:44:51 -0500 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 1CE8773418; Thu, 30 Jan 2020 21:44:50 +0000 (UTC) Received: from localhost (ovpn-204-145.brq.redhat.com [10.40.204.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A7BBD84BCE; Thu, 30 Jan 2020 21:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580420692; 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=lyBO0LHcnSgut5s8ijX92IhUO31aC59wxCEUTOSlOFo=; b=c1PML+xUcLJRn6lieD/iP8OlbEV3WYTPtbpXr9R7iYaFVXFwRLwH7bzBsBikrPdmWdzJP0 XhwP9TzSPD5FamcTnkvQQrqzhKcv0ldIKOWXKfTAj0uRoLSAx1yAzMNMfWr1NO4zexcNTe M9gJQf3rMf47FDlUpemgf/8M6mDwXzo= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 07/21] blkverify: Implement .bdrv_recurse_can_replace() Date: Thu, 30 Jan 2020 22:44:17 +0100 Message-Id: <20200130214431.333510-8-mreitz@redhat.com> In-Reply-To: <20200130214431.333510-1-mreitz@redhat.com> References: <20200130214431.333510-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: Q5sZa6z6PLiJ-7bKOj1P9g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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-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" Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/blkverify.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/block/blkverify.c b/block/blkverify.c index 304b0a1368..0add3ab483 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -282,6 +282,20 @@ static bool blkverify_recurse_is_first_non_filter(Bloc= kDriverState *bs, return bdrv_recurse_is_first_non_filter(s->test_file->bs, candidate); } =20 +static bool blkverify_recurse_can_replace(BlockDriverState *bs, + BlockDriverState *to_replace) +{ + BDRVBlkverifyState *s =3D bs->opaque; + + /* + * blkverify quits the whole qemu process if there is a mismatch + * between bs->file->bs and s->test_file->bs. Therefore, we know + * know that both must match bs and we can recurse down to either. + */ + return bdrv_recurse_can_replace(bs->file->bs, to_replace) || + bdrv_recurse_can_replace(s->test_file->bs, to_replace); +} + static void blkverify_refresh_filename(BlockDriverState *bs) { BDRVBlkverifyState *s =3D bs->opaque; @@ -328,6 +342,7 @@ static BlockDriver bdrv_blkverify =3D { =20 .is_filter =3D true, .bdrv_recurse_is_first_non_filter =3D blkverify_recurse_is_first_non_f= ilter, + .bdrv_recurse_can_replace =3D blkverify_recurse_can_replace, }; =20 static void bdrv_blkverify_init(void) --=20 2.24.1