From nobody Mon Feb 9 00:20:41 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=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