From nobody Tue Feb 10 08:27:45 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=1625819337; cv=none; d=zohomail.com; s=zohoarc; b=J3l9Zr6FNL6afdxDaY4BybHxTCXLDUUXQ6Z8jSuaZRMSs/3B/iM5aPoMxfh2gOLW5WsAOrHZFM6OVOmQqSgG2CQ1bxLsl+Pv1/0Qa+3oooVekfk0e3pJx+9Dcm1uZMAK22P24FNUr0kmZasLbIzORVNjC6sXjNKc6OLrJxrOQhE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625819337; h=Content-Type:Content-Transfer-Encoding:Cc: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=4KcH+vMx/tU7hdapDDIQSG6QGbFzW3fN2cdjO53dGYY=; b=NQaGU1Pf0qsS0ggVBM3Q0tY4CMQEl2FTB5N3j8uqC7sMUN7ElXaRZDo2fKd6XX7QMbLlg8uorKBoDmQDRtsvV9ko1rywGVMrzQsQXadQOibQa5QevQF9ixNU9kgiYZgsrvZp/dmtTRL6SD60ZCycIzI529XGLmAG2YVaIKRbtZY= 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) 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 1625819337816241.79610951531754; Fri, 9 Jul 2021 01:28:57 -0700 (PDT) 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-3-qdXB2gjyMZedb0TPB_qwUw-1; Fri, 09 Jul 2021 04:28:55 -0400 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 14B3119200D0; Fri, 9 Jul 2021 08:28: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 E712960CCC; Fri, 9 Jul 2021 08:28: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 A641E18005A2; Fri, 9 Jul 2021 08:28:49 +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 1698SDVY005810 for ; Fri, 9 Jul 2021 04:28:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC82860854; Fri, 9 Jul 2021 08:28:13 +0000 (UTC) Received: from work.redhat.com (ovpn-113-189.ams2.redhat.com [10.36.113.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D60660843; Fri, 9 Jul 2021 08:28:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625819336; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4KcH+vMx/tU7hdapDDIQSG6QGbFzW3fN2cdjO53dGYY=; b=U+CHURF+iogSpAYL3RRvXILvCyWq+Lw5tCLDA7z38K7gRP91lmx7p222eCPxIWo8qCHh6Y brhp3IY11hKTI6LHMITIUyyaY9CpYNvCZDQBhP02AYUZflXAFp3D/bxVq393vhPEyud557 9BFAxY01IaeUaIhlQYyjP4BA/qnNV/U= X-MC-Unique: qdXB2gjyMZedb0TPB_qwUw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] qemuMonitorGetMemoryDeviceInfo: Assign hash table only on success Date: Fri, 9 Jul 2021 10:27:37 +0200 Message-Id: <20210709082739.29043-9-twiederh@redhat.com> In-Reply-To: <20210709082739.29043-1-twiederh@redhat.com> References: <20210709082739.29043-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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: 1625819338532100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/qemu/qemu_monitor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 8f35b4240f..8646efe9c4 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4238,6 +4238,7 @@ int qemuMonitorGetMemoryDeviceInfo(qemuMonitor *mon, GHashTable **info) { + GHashTable *hash; int ret; =20 VIR_DEBUG("info=3D%p", info); @@ -4246,14 +4247,14 @@ qemuMonitorGetMemoryDeviceInfo(qemuMonitor *mon, =20 QEMU_CHECK_MONITOR(mon); =20 - if (!(*info =3D virHashNew(g_free))) + if (!(hash =3D virHashNew(g_free))) return -1; =20 - if ((ret =3D qemuMonitorJSONGetMemoryDeviceInfo(mon, *info)) < 0) { - virHashFree(*info); - *info =3D NULL; + if ((ret =3D qemuMonitorJSONGetMemoryDeviceInfo(mon, hash)) < 0) { + virHashFree(hash); } =20 + *info =3D hash; return ret; } =20 --=20 2.31.1