From nobody Fri May 3 05:43:35 2024 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=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155084332955816.44162952230738; Fri, 22 Feb 2019 05:48:49 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDDD530B6F68; Fri, 22 Feb 2019 13:48:47 +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 C6C61611D1; Fri, 22 Feb 2019 13:48:47 +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 8AEA2181A13B; Fri, 22 Feb 2019 13:48:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1K8pP12024127 for ; Wed, 20 Feb 2019 03:51:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2A1AB5C1B2; Wed, 20 Feb 2019 08:51:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 220CB61D15 for ; Wed, 20 Feb 2019 08:51:21 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0EB5C058CAF for ; Wed, 20 Feb 2019 08:51:19 +0000 (UTC) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1K8n4uU101351 for ; Wed, 20 Feb 2019 03:51:18 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qs18mxcxs-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Feb 2019 03:51:18 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Feb 2019 08:51:15 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 20 Feb 2019 08:51:13 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1K8pCeE61604028 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 20 Feb 2019 08:51:12 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 57F414203F for ; Wed, 20 Feb 2019 08:51:12 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A48742049 for ; Wed, 20 Feb 2019 08:51:12 +0000 (GMT) Received: from marc-ibm.boeblingen.de.ibm.com (unknown [9.152.224.80]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Wed, 20 Feb 2019 08:51:12 +0000 (GMT) From: Marc Hartmayer To: Date: Wed, 20 Feb 2019 09:51:06 +0100 In-Reply-To: <20190220085107.20345-1-mhartmay@linux.ibm.com> References: <20190220085107.20345-1-mhartmay@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19022008-0028-0000-0000-0000034AB91E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19022008-0029-0000-0000-00002408F811 Message-Id: <20190220085107.20345-2-mhartmay@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-02-20_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=661 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902200065 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 20 Feb 2019 08:51:20 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 20 Feb 2019 08:51:20 +0000 (UTC) for IP:'148.163.156.1' DOMAIN:'mx0a-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'mhartmay@linux.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, SPF_PASS) 148.163.156.1 mx0a-001b2d01.pphosted.com 148.163.156.1 mx0a-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] qemu: Use refcounting for priv->monConfig 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: , MIME-Version: 1.0 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 22 Feb 2019 13:48:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use refcounting for priv->monConfig instead of asymmetric freeing. Signed-off-by: Marc Hartmayer Reviewed-by: Boris Fiuczynski Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 5 +---- src/qemu/qemu_process.c | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fe1b7801e9fc..010d7e285384 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17026,21 +17026,18 @@ static virDomainPtr qemuDomainQemuAttach(virConne= ctPtr conn, =20 if (qemuProcessAttach(conn, driver, vm, pid, pidfile, monConfig, monJSON) < 0) { - monConfig =3D NULL; qemuDomainRemoveInactive(driver, vm); qemuDomainObjEndJob(driver, vm); goto cleanup; } =20 - monConfig =3D NULL; - dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 qemuDomainObjEndJob(driver, vm); =20 cleanup: virDomainDefFree(def); - virDomainChrSourceDefFree(monConfig); + virObjectUnref(monConfig); virDomainObjEndAPI(&vm); VIR_FREE(pidfile); virObjectUnref(caps); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 85952b997566..f06fe62f9931 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7528,8 +7528,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UN= USED, goto error; =20 VIR_DEBUG("Preparing monitor state"); - priv->monConfig =3D monConfig; - monConfig =3D NULL; + priv->monConfig =3D virObjectRef(monConfig); priv->monJSON =3D monJSON; =20 /* Attaching to running QEMU so we need to detect whether it was start= ed @@ -7648,7 +7647,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UN= USED, VIR_FREE(sec_managers); if (seclabelgen) virSecurityLabelDefFree(seclabeldef); - virDomainChrSourceDefFree(monConfig); + virObjectUnref(priv->monConfig); + priv->monConfig =3D NULL; virObjectUnref(cfg); virObjectUnref(caps); return -1; --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 05:43:35 2024 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=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550652691506790.2950565996732; Wed, 20 Feb 2019 00:51:31 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 6FDE580472; Wed, 20 Feb 2019 08:51:28 +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 41CEA60F94; Wed, 20 Feb 2019 08:51:27 +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 A2ABD181A00B; Wed, 20 Feb 2019 08:51:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1K8pK7g024106 for ; Wed, 20 Feb 2019 03:51:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id ABB2C5D717; Wed, 20 Feb 2019 08:51:20 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A0D8A5D70E for ; Wed, 20 Feb 2019 08:51:20 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78550C0467E4 for ; Wed, 20 Feb 2019 08:51:19 +0000 (UTC) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1K8n513094474 for ; Wed, 20 Feb 2019 03:51:19 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qs25wv33a-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Feb 2019 03:51:18 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Feb 2019 08:51:16 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 20 Feb 2019 08:51:14 -0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1K8pDwv22151302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 20 Feb 2019 08:51:13 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 78C4F42041 for ; Wed, 20 Feb 2019 08:51:13 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 64B4E42045 for ; Wed, 20 Feb 2019 08:51:13 +0000 (GMT) Received: from marc-ibm.boeblingen.de.ibm.com (unknown [9.152.224.80]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Wed, 20 Feb 2019 08:51:13 +0000 (GMT) From: Marc Hartmayer To: Date: Wed, 20 Feb 2019 09:51:07 +0100 In-Reply-To: <20190220085107.20345-1-mhartmay@linux.ibm.com> References: <20190220085107.20345-1-mhartmay@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19022008-0020-0000-0000-00000318F476 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19022008-0021-0000-0000-0000216A3E75 Message-Id: <20190220085107.20345-3-mhartmay@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-02-20_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=4 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=980 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902200065 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 20 Feb 2019 08:51:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 20 Feb 2019 08:51:19 +0000 (UTC) for IP:'148.163.156.1' DOMAIN:'mx0a-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'mhartmay@linux.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, SPF_PASS) 148.163.156.1 mx0a-001b2d01.pphosted.com 148.163.156.1 mx0a-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: Replace virDomainChrSourceDefFree with virObjectUnref 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: , MIME-Version: 1.0 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 20 Feb 2019 08:51:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Replace virDomainChrSourceDefFree with virObjectUnref. Signed-off-by: Marc Hartmayer Reviewed-by: Boris Fiuczynski Reviewed-by: J=C3=A1n Tomko --- cfg.mk | 1 - src/conf/domain_conf.c | 17 +++++------------ src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_parse_command.c | 4 ++-- src/qemu/qemu_process.c | 5 ++--- 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/cfg.mk b/cfg.mk index c2524de5fc6b..7762422da764 100644 --- a/cfg.mk +++ b/cfg.mk @@ -120,7 +120,6 @@ useless_free_options =3D \ --name=3DvirConfFreeValue \ --name=3DvirDomainActualNetDefFree \ --name=3DvirDomainChrDefFree \ - --name=3DvirDomainChrSourceDefFree \ --name=3DvirDomainControllerDefFree \ --name=3DvirDomainDefFree \ --name=3DvirDomainDeviceDefFree \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 56c437ca0a34..5b61656d89b9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2194,7 +2194,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) =20 switch (def->type) { case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - virDomainChrSourceDefFree(def->data.vhostuser); + virObjectUnref(def->data.vhostuser); def->data.vhostuser =3D NULL; break; =20 @@ -2433,13 +2433,6 @@ virDomainChrSourceDefDispose(void *obj) } =20 =20 -void -virDomainChrSourceDefFree(virDomainChrSourceDefPtr def) -{ - virObjectUnref(def); -} - - /* virDomainChrSourceDefIsEqual: * @src: Source * @tgt: Target @@ -2530,7 +2523,7 @@ void virDomainChrDefFree(virDomainChrDefPtr def) break; } =20 - virDomainChrSourceDefFree(def->source); + virObjectUnref(def->source); virDomainDeviceInfoClear(&def->info); =20 VIR_FREE(def); @@ -2553,7 +2546,7 @@ void virDomainSmartcardDefFree(virDomainSmartcardDefP= tr def) break; =20 case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: - virDomainChrSourceDefFree(def->data.passthru); + virObjectUnref(def->data.passthru); break; =20 default: @@ -2812,7 +2805,7 @@ void virDomainRedirdevDefFree(virDomainRedirdevDefPtr= def) if (!def) return; =20 - virDomainChrSourceDefFree(def->source); + virObjectUnref(def->source); virDomainDeviceInfoClear(&def->info); =20 VIR_FREE(def); @@ -26562,7 +26555,7 @@ virDomainRNGDefFree(virDomainRNGDefPtr def) VIR_FREE(def->source.file); break; case VIR_DOMAIN_RNG_BACKEND_EGD: - virDomainChrSourceDefFree(def->source.chardev); + virObjectUnref(def->source.chardev); break; case VIR_DOMAIN_RNG_BACKEND_LAST: break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9bccd8bcd15c..f205fc872328 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2911,7 +2911,6 @@ void virDomainNetDefClear(virDomainNetDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); -void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def); int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, virDomainChrSourceDefPtr src); void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b720acdc939d..e5c9ccdbe497 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -221,7 +221,6 @@ virDomainChrSerialTargetTypeFromString; virDomainChrSerialTargetTypeToString; virDomainChrSourceDefClear; virDomainChrSourceDefCopy; -virDomainChrSourceDefFree; virDomainChrSourceDefGetPath; virDomainChrSourceDefNew; virDomainChrSpicevmcTypeFromString; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bbd4a5efe8d8..9996098494d7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2063,7 +2063,7 @@ qemuDomainObjPrivateFree(void *data) =20 qemuDomainObjPrivateDataClear(priv); =20 - virDomainChrSourceDefFree(priv->monConfig); + virObjectUnref(priv->monConfig); qemuDomainObjFreeJob(priv); VIR_FREE(priv->lockState); VIR_FREE(priv->origname); @@ -3084,7 +3084,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, VIR_FREE(tmp); virBitmapFree(priv->namespaces); priv->namespaces =3D NULL; - virDomainChrSourceDefFree(priv->monConfig); + virObjectUnref(priv->monConfig); priv->monConfig =3D NULL; virStringListFree(priv->qemuDevices); priv->qemuDevices =3D NULL; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 81691cb85ee1..49b34b1c178e 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2495,7 +2495,7 @@ qemuParseCommandLine(virFileCachePtr capsCache, goto error; =20 if (qemuParseCommandLineChr(chr, val) < 0) { - virDomainChrSourceDefFree(chr); + virObjectUnref(chr); goto error; } =20 @@ -2732,7 +2732,7 @@ qemuParseCommandLine(virFileCachePtr capsCache, virStringListFree(list); VIR_FREE(nics); if (monConfig) { - virDomainChrSourceDefFree(*monConfig); + virObjectUnref(*monConfig); *monConfig =3D NULL; } if (pidfile) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f06fe62f9931..68c670d3f2e5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1887,8 +1887,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomain= ObjPtr vm, int asyncJob, virObjectRef(vm); =20 ignore_value(virTimeMillisNow(&priv->monStart)); - monConfig =3D priv->monConfig; - virObjectRef(monConfig); + monConfig =3D virObjectRef(priv->monConfig); virObjectUnlock(vm); =20 mon =3D qemuMonitorOpen(vm, @@ -7184,7 +7183,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, if (priv->monConfig) { if (priv->monConfig->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX) unlink(priv->monConfig->data.nix.path); - virDomainChrSourceDefFree(priv->monConfig); + virObjectUnref(priv->monConfig); priv->monConfig =3D NULL; } =20 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list