From nobody Sat Feb 7 18:51:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1607441723; cv=none; d=zohomail.com; s=zohoarc; b=age14f//HVdO+ottfxyxL60HoNng70CWol5ZULZUWQ779V0UcFowfTdEuZElz6xLKAeU+ka1eyNLOIrNyyg5aFMeLcE7OlVtqZ1TBN0vJnEcv+GxjBv/sPloZCODRnZsqEccGzd7MJpOcN8vyIArcijLMOsgjeBokv5FMX3Gm/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607441723; 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; bh=D58tN/vx3UBTpaTkJsg7blIu+gKjEJ3T5dYg22f17Ks=; b=SiwtfKZMTzsaevq5PU0Jy+N3r8rfEgs1q+ilTrzRLi8BYOVRrofB11SwQpztOni0q9dPi156SXELHrOp69ZIdBa+X33qc6jkWUFeNyd5jUgpFHeNKWkeMnW4f73G66kUX0gY1q2rb5NGVB77R2XpT9Eyc2/kB/kpOJooQAJEjyU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1607441723520492.3818523395811; Tue, 8 Dec 2020 07:35:23 -0800 (PST) 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-377-NRldEwulP_C6QuufT2TvRg-1; Tue, 08 Dec 2020 10:35:19 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5388D190A7BF; Tue, 8 Dec 2020 15:34:50 +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 0423871C8D; Tue, 8 Dec 2020 15:34:49 +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 7D543180954D; Tue, 8 Dec 2020 15:34:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B8FYj2m030268 for ; Tue, 8 Dec 2020 10:34:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 193522B394; Tue, 8 Dec 2020 15:34:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75E8F60877 for ; Tue, 8 Dec 2020 15:34:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607441721; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D58tN/vx3UBTpaTkJsg7blIu+gKjEJ3T5dYg22f17Ks=; b=f78wRRbX7GtlPI/0LSKVvi1rOQbCGCW82UxRG//dDm3yiHQEV7J/mOAECilLIIALcuqn1t f1aozvOZIRWHcW4iIlv/M/pgKzR1zCtI7Caz/CXzb5O6EIoIJ0rmMSwYbSBiqKei+dGeb/ MFSnSmQC2W8TTu9XlQ5GJ6qptHjShuM= X-MC-Unique: NRldEwulP_C6QuufT2TvRg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/2] qemuDomainCheckpointLoad: Don't align disks when restoring config from disk Date: Tue, 8 Dec 2020 16:34:41 +0100 Message-Id: <5fd12604d11944618a7fdf2a88ab82da1e5f3ae7.1607441649.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The alignment step is not really necessary once we've done it already since we fully populate the definition. In case of checkpoints it was a relic necessary for populating the 'idx' to match checkpoint disk to definition disk, but that was already removed. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7093fc619b..0e5d7423dc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -512,18 +512,11 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, continue; } - def =3D virDomainCheckpointDefParseString(xmlStr, - qemu_driver->xmlopt, - priv->qemuCaps, - flags); - if (!def || virDomainCheckpointAlignDisks(def) < 0) { - /* Nothing we can do here, skip this one */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse checkpoint XML from file '%s= '"), - fullpath); - virObjectUnref(def); + if (!(def =3D virDomainCheckpointDefParseString(xmlStr, + qemu_driver->xmlopt, + priv->qemuCaps, + flags))) continue; - } chk =3D virDomainCheckpointAssignDef(vm->checkpoints, def); if (chk =3D=3D NULL) --=20 2.29.2 From nobody Sat Feb 7 18:51:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1607441729; cv=none; d=zohomail.com; s=zohoarc; b=SoCfzHvrOp6HDqD5d7a0IWAvXl8M6P/LDO6hSSxvuoFjH+yGL9DLDZcBTNxByPO3f4MYeiMD3ncLi4RfXwMCUpaPfbIiMh0S0mLlwFIuATWJZcJu2nua51Zy2xbIP3Xmh9lSaM4goMFHo1fFfxZjDxUSBwZ7yyLNmXQPZS8ax8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607441729; 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; bh=OzZcYOuqPgwRPV9bZLpsR12oCOTPDDhMR91m00g3o/0=; b=aT8T7Ob6eeQX+Z3YPtlEW0dfElqZjPuuOt9MhAfFeILRg4c8r5DrfncLAZ+Bvz/CLwgzyJdHgP+qmvWTCUDSxlS5byBpnN8m9hk8r63zeyw9O4ZGvKRX86Ku/ZLT1zpAo92RFxKmBUiqf1MRHbOG2ooQLB6QAcnL/k8Arv+LIkg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1607441729977751.8604476059832; Tue, 8 Dec 2020 07:35:29 -0800 (PST) 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-90-BscgGycpMiORGS-wohgrRA-1; Tue, 08 Dec 2020 10:35:26 -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 E2D5E81433E; Tue, 8 Dec 2020 15:34:56 +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 B808560636; Tue, 8 Dec 2020 15:34:56 +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 7F9BC1809C9F; Tue, 8 Dec 2020 15:34:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B8FYkUH030279 for ; Tue, 8 Dec 2020 10:34:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id 292652B394; Tue, 8 Dec 2020 15:34:46 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BEEC60877 for ; Tue, 8 Dec 2020 15:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607441728; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=OzZcYOuqPgwRPV9bZLpsR12oCOTPDDhMR91m00g3o/0=; b=IYBKYnHF186atQvP3R0l1yOECAncdzpUT6SKfVbnNUeqW0MUD2h8RvPzUfzTOHa2tT2rZb uGnWY9FRpp6/GWEWHm+Yyt6arCBW+KDLuNMvu8oJzFydCMiizbGtXFVuS74837UMCwoZHI /ICQNgrzrVCdzwFFGj+q63Au6G2KZv8= X-MC-Unique: BscgGycpMiORGS-wohgrRA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/2] qemuDomainCheckpointLoad: Remove stale comment Date: Tue, 8 Dec 2020 16:34:42 +0100 Message-Id: <4d0bb8bc9878eca39d73c3ba7016b44fd728954c.1607441649.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We decided to not do metadata-less checkpoints and checking whether the metadata is consistent is done once the data is actually needed. Remove the comment. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0e5d7423dc..58c376fbe5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -533,13 +533,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, vm->def->name); virDomainCheckpointSetCurrent(vm->checkpoints, current); - /* Note that it is not practical to automatically construct - * checkpoints based solely on qcow2 bitmaps, since qemu does not - * track parent relations which we find important in our metadata. - * Perhaps we could double-check that our just-loaded checkpoint - * metadata is consistent with existing qcow2 bitmaps, but a user - * that changes things behind our backs deserves what happens. */ - virResetLastError(); ret =3D 0; --=20 2.29.2