From nobody Mon Feb 9 06:50:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565280202; cv=none; d=zoho.com; s=zohoarc; b=hRu2rzRCwchKOlHHKkz570f5P/HshyjhplSZmlmWfKObusfDUwQT2DPvWFp21jGkxUXKVI/qyeVQ/Knw7R17OE6YYxxH9+OimjxtcEj+FU1x6paMuIjMWZDl4PLbIQCaybOFhYUq86A9FLEj8ZhiGkyawxfdSJRGnIlGOjTSsbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565280202; h=Content-Type:Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=PD0RaN+PEXEpoibuUOPcCpqcoSnhrUfjRvvrpyM6dBA=; b=R0vJ9ygsBF5q0E4sDpdBE1rlLjF2eHDwkFC8DcRPGMgMkhgXhP3u+GhhTeiU9vdH+CpcTzzrYh+VwchihYkaV6+aP1DVLobMPz42tepuKx4x7PICy4KAUn2lDmHO7oOh89CjgLevEpNEZgZSjED+UNNeeSD3eer5M6IbTDiFQ48= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565280202049543.5489742577284; Thu, 8 Aug 2019 09:03:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B028EC0546D5; Thu, 8 Aug 2019 16:03:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76AFB5D70D; Thu, 8 Aug 2019 16:03:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 292A5180BA9D; Thu, 8 Aug 2019 16:03:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78G0rCU005437 for ; Thu, 8 Aug 2019 12:00:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9F9D7165D9; Thu, 8 Aug 2019 16:00:53 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A635194BB for ; Thu, 8 Aug 2019 16:00:52 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 18:00:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/12] qemu: blockjob: Copy non-detected chain fully in qemuBlockJobRewriteConfigDiskSource X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 08 Aug 2019 16:03:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Rather than copying just the top level image, let's copy the full user provided backing chain. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_blockjob.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 8303567aed..6ac60e86d7 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -521,6 +521,7 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObjPtr vm, { virDomainDiskDefPtr persistDisk =3D NULL; VIR_AUTOUNREF(virStorageSourcePtr) copy =3D NULL; + virStorageSourcePtr n; if (!vm->newDef) return; @@ -531,14 +532,24 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObjPtr v= m, if (!virStorageSourceIsSameLocation(disk->src, persistDisk->src)) return; - if (!(copy =3D virStorageSourceCopy(newsrc, false)) || + if (!(copy =3D virStorageSourceCopy(newsrc, true)) || virStorageSourceInitChainElement(copy, persistDisk->src, true) < 0= ) { VIR_WARN("Unable to update persistent definition on vm %s after bl= ock job", vm->def->name); return; } - qemuBlockJobCleanStorageSourceRuntime(copy); + for (n =3D copy; virStorageSourceIsBacking(n); n =3D n->backingStore) { + qemuBlockJobCleanStorageSourceRuntime(n); + + /* discard any detected backing store */ + if (virStorageSourceIsBacking(n->backingStore) && + n->backingStore->detected) { + virObjectUnref(n->backingStore); + n->backingStore =3D NULL; + break; + } + } virObjectUnref(persistDisk->src); VIR_STEAL_PTR(persistDisk->src, copy); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list