From nobody Sat Feb 7 08:45:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1638282815; cv=none; d=zohomail.com; s=zohoarc; b=khxlCVV0vyVJ+JZT1nwyajVR4UujbyQdqWcAYH4FrodkLwSSl61DCDZOh6UGOozOSGoiTEf0yzfdffUVDrBOd+N6J+ExS8HbatD8V7kgkIXczTkF2FY13NLo50ce/RqzYHi0K73zJ3PxjRqGnfcPaMsG/aI3DcCaF+/RYQ2RovU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638282815; 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=A62S3NCUDEylAmEYtyBgqFoK85HGwNs5Pc7QPi83mV0=; b=UOR7qG2TMVJNei/eM1ecszG0z5gdFawvloP9Bz/jMTp6Z/ZmXsjKDzWPkNrZ0+ctMMPzDSXYZxpvaBiVqX6ZEmPUjk5n27KAXBy2l5ThwRA9eamkB2Xuq+N2tjG7XX8ndnbqRy76SMQdEdczTcFsFXOuQEZZ4zHTEoWz27oTH4Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638282815439503.6168672720304; Tue, 30 Nov 2021 06:33:35 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-qKKofbMRPYuqEq2wVWguKw-1; Tue, 30 Nov 2021 09:33:32 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45FEE83DD2F; Tue, 30 Nov 2021 14:33:22 +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 1B83E610A8; Tue, 30 Nov 2021 14:33:22 +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 95EF01806D2E; Tue, 30 Nov 2021 14:33:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AUEXGYc022846 for ; Tue, 30 Nov 2021 09:33:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7AB29610A5; Tue, 30 Nov 2021 14:33:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDA81610A7 for ; Tue, 30 Nov 2021 14:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638282814; 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=A62S3NCUDEylAmEYtyBgqFoK85HGwNs5Pc7QPi83mV0=; b=Ujtm5u7tt9V9/hUpCGh7zGh2SbbPwMtvJ9fKi8WoYNmuv168K9sQsj8tuEpRQ0ci8WZBo6 kpSVXkeUFtUpQdEW0e39gWZMyR3SqDERFwpFIU4280m7Ck3+XHHAo1eif9Ejuc/BkaFRfk 0qEKUtKy5dX5/DS0k+BfhB8dsOWSoxY= X-MC-Unique: qKKofbMRPYuqEq2wVWguKw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/23] qemuCheckpointGetXMLDescUpdateSize: Don't combine automatic freeing with manual Date: Tue, 30 Nov 2021 15:31:59 +0100 Message-Id: <5f2738643ff9ca971167426c19c1f4c136f4e466.1638282671.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.12 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) X-ZM-MESSAGEID: 1638282815980100005 Content-Type: text/plain; charset="utf-8" 'blockNamedNodeData' is declared for automatic freeing but we also free it manually and reuse which is a code pattern we don't normally allow. Rewrite the code to have actually two separate hash tables. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_checkpoint.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4902585e5d..72f34ec86d 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -647,7 +647,8 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; - g_autoptr(GHashTable) blockNamedNodeData =3D NULL; + g_autoptr(GHashTable) nodedataMerge =3D NULL; + g_autoptr(GHashTable) nodedataStats =3D NULL; g_autofree struct qemuCheckpointDiskMap *diskmap =3D NULL; g_autoptr(virJSONValue) recoveractions =3D NULL; g_autoptr(virJSONValue) mergeactions =3D virJSONValueNewArray(); @@ -663,7 +664,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!(blockNamedNodeData =3D qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_= JOB_NONE))) + if (!(nodedataMerge =3D qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_N= ONE))) goto endjob; /* enumerate disks relevant for the checkpoint which are also present = in the @@ -683,7 +684,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, if (!(domdisk =3D virDomainDiskByTarget(vm->def, chkdisk->name))) continue; - if (!qemuBlockBitmapChainIsValid(domdisk->src, chkdef->parent.name= , blockNamedNodeData)) + if (!qemuBlockBitmapChainIsValid(domdisk->src, chkdef->parent.name= , nodedataMerge)) continue; diskmap[ndisks].chkdisk =3D chkdisk; @@ -702,7 +703,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, g_autoptr(virJSONValue) actions =3D NULL; /* possibly delete leftovers from previous cases */ - if (qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData, domd= isk->src, + if (qemuBlockNamedNodeDataGetBitmapByName(nodedataMerge, domdisk->= src, "libvirt-tmp-size-xml"))= { if (!recoveractions) recoveractions =3D virJSONValueNewArray(); @@ -715,7 +716,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, if (qemuBlockGetBitmapMergeActions(domdisk->src, NULL, domdisk->sr= c, chkdef->parent.name, "libvirt-t= mp-size-xml", - NULL, &actions, blockNamedNodeD= ata) < 0) + NULL, &actions, nodedataMerge) = < 0) goto endjob; if (virJSONValueArrayConcat(mergeactions, actions) < 0) @@ -739,8 +740,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, goto endjob; /* now do a final refresh */ - virHashFree(blockNamedNodeData); - if (!(blockNamedNodeData =3D qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_= JOB_NONE))) + if (!(nodedataStats =3D qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_N= ONE))) goto endjob; qemuDomainObjEnterMonitor(driver, vm); @@ -756,7 +756,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, virDomainDiskDef *domdisk =3D diskmap[i].domdisk; qemuBlockNamedNodeDataBitmap *bitmap; - if ((bitmap =3D qemuBlockNamedNodeDataGetBitmapByName(blockNamedNo= deData, domdisk->src, + if ((bitmap =3D qemuBlockNamedNodeDataGetBitmapByName(nodedataStat= s, domdisk->src, "libvirt-tmp-s= ize-xml"))) { chkdisk->size =3D bitmap->dirtybytes; chkdisk->sizeValid =3D true; --=20 2.31.1