From nobody Tue Feb 10 00:23:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1601298870; cv=none; d=zohomail.com; s=zohoarc; b=JnF1fT2uwQ6ERxZc8VEqPDLX59qWk2UxPwFKGcUp2sx+kl+BnoHwvylSOfTva/iZqnD90XXVAURg4FSDR4CK1yXytNx6wWU2JD0d6JWCDTevwQS1o1NTrxdGjg02rjURrwnBvw7GQYjDWImTm4956lK71Neo0dWBKHTpxEwSqzs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601298870; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=jxFrL/bD6hJWl2Gm/uFIBsTnaTR5QUg3ikPjYyQxgns=; b=EJUstEXJ4lOxcyKiNs0MuYxg0fxOsvxmQ3YYeC40hp00WToNrJwpVgBrwHnMqG0zduPYt/q3lBk3DIr2eejUOGyX+nsF4tO0Gc++SHSuxogNnfZ/pcQNsRrHMWLN2Mq0HozbIoQNB1ZF1quTP8h2vnD5M+ZZ5kCO1hg5k0RcX0w= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=pass 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 1601298870307385.43300385899806; Mon, 28 Sep 2020 06:14:30 -0700 (PDT) Received: from localhost ([::1]:33228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMsz6-0001I9-Tb for importer@patchew.org; Mon, 28 Sep 2020 09:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMsoK-0006Ll-DW; Mon, 28 Sep 2020 09:03:20 -0400 Received: from relay.sw.ru ([185.231.240.75]:59260 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMsoI-0000dk-Kt; Mon, 28 Sep 2020 09:03:20 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1kMsni-001tba-Gl; Mon, 28 Sep 2020 16:02:42 +0300 To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, stefanha@redhat.com, fam@euphon.net, jsnow@redhat.com, armbru@redhat.com, eblake@redhat.com, den@openvz.org, vsementsov@virtuozzo.com, andrey.shinkevich@virtuozzo.com Subject: [PATCH v9 7/9] stream: skip filters when writing backing file name to QCOW2 header Date: Mon, 28 Sep 2020 15:59:59 +0300 Message-Id: <1601298001-774096-8-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1601298001-774096-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1601298001-774096-1-git-send-email-andrey.shinkevich@virtuozzo.com> 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=185.231.240.75; envelope-from=andrey.shinkevich@virtuozzo.com; helo=relay3.sw.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 09:00:28 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Andrey Shinkevich From: Andrey Shinkevich via Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Avoid writing a filter JSON-name to QCOW2 image when the backing file is changed after the block stream job. Signed-off-by: Andrey Shinkevich --- block/stream.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block/stream.c b/block/stream.c index e0540ee..b0719e9 100644 --- a/block/stream.c +++ b/block/stream.c @@ -65,6 +65,7 @@ static int stream_prepare(Job *job) BlockDriverState *bs =3D blk_bs(bjob->blk); BlockDriverState *unfiltered_bs =3D bdrv_skip_filters(bs); BlockDriverState *base =3D bdrv_filter_or_cow_bs(s->above_base); + BlockDriverState *base_metadata =3D bdrv_skip_filters(base); Error *local_err =3D NULL; int ret =3D 0; =20 @@ -73,10 +74,10 @@ static int stream_prepare(Job *job) =20 if (bdrv_cow_child(unfiltered_bs)) { const char *base_id =3D NULL, *base_fmt =3D NULL; - if (base) { - base_id =3D s->backing_file_str; - if (base->drv) { - base_fmt =3D base->drv->format_name; + if (base_metadata) { + base_id =3D base_metadata->filename; + if (base_metadata->drv) { + base_fmt =3D base_metadata->drv->format_name; } } bdrv_set_backing_hd(unfiltered_bs, base, &local_err); --=20 1.8.3.1