From nobody Thu May 15 02:24:30 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1517574050200630.0211109913935; Fri, 2 Feb 2018 04:20:50 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id E58C719CF78; Fri, 2 Feb 2018 12:20:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 508E37916A; Fri, 2 Feb 2018 12:20: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 ECC2E4EEEF; Fri, 2 Feb 2018 12:20:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w12CEK7A030867 for ; Fri, 2 Feb 2018 07:14:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id EE9FB63F9E; Fri, 2 Feb 2018 12:14:20 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E99D378E9C for ; Fri, 2 Feb 2018 12:14:19 +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 2BB2A50173 for ; Fri, 2 Feb 2018 12:14:18 +0000 (UTC) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w12C9mP2094357 for ; Fri, 2 Feb 2018 07:14:17 -0500 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fvmqmysb7-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 02 Feb 2018 07:14:17 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Feb 2018 12:14:14 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 2 Feb 2018 12:14:13 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w12CEDDG47448192 for ; Fri, 2 Feb 2018 12:14:13 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A6DA4C040 for ; Fri, 2 Feb 2018 12:08:08 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 708224C04A for ; Fri, 2 Feb 2018 12:08:08 +0000 (GMT) Received: from marc-ibm.boeblingen.de.ibm.com (unknown [9.152.224.131]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Fri, 2 Feb 2018 12:08:08 +0000 (GMT) From: Marc Hartmayer To: Date: Fri, 2 Feb 2018 13:13:46 +0100 In-Reply-To: <20180202121346.7991-1-mhartmay@linux.vnet.ibm.com> References: <20180202121346.7991-1-mhartmay@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18020212-0020-0000-0000-000003F1AADF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18020212-0021-0000-0000-0000428417B0 Message-Id: <20180202121346.7991-3-mhartmay@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-02-02_03:, , 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=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802020150 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 02 Feb 2018 12:14:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 02 Feb 2018 12:14:18 +0000 (UTC) for IP:'148.163.156.1' DOMAIN:'mx0a-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'mhartmay@linux.vnet.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2) 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.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: Add and use qemuProcessEventFree for freeing qemuProcessEvents 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 02 Feb 2018 12:20:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add and use qemuProcessEventFree for freeing qemuProcessEvents. This is less error-prone as the compiler can help us make sure that for every new enumeration value of qemuProcessEventType the qemuProcessEventFree function has to be adapted. All process*Event functions are *only* called by qemuProcessHandleEvent and this function does the freeing by itself with qemuProcessEventFree. This means that an explicit freeing of processEvent->data is no longer required in each process*Event handler. The effectiveness of this change is also demonstrated by the fact that it fixes a memory leak of the panic info data in qemuProcessHandleGuestPanic. Reported-by: Wang Dong Signed-off-by: Bjoern Walk Signed-off-by: Marc Hartmayer Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_domain.c | 23 +++++++++++++++++++++++ src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 12 ++---------- src/qemu/qemu_process.c | 22 +++++++--------------- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c8123ce59bc4..4472b00d6540 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10910,3 +10910,26 @@ qemuDomainPrepareDiskSource(virConnectPtr conn, =20 return 0; } + + +void +qemuProcessEventFree(struct qemuProcessEvent *event) +{ + if (!event) + return; + + switch (event->eventType) { + case QEMU_PROCESS_EVENT_GUESTPANIC: + qemuMonitorEventPanicInfoFree(event->data); + break; + case QEMU_PROCESS_EVENT_WATCHDOG: + case QEMU_PROCESS_EVENT_DEVICE_DELETED: + case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED: + case QEMU_PROCESS_EVENT_SERIAL_CHANGED: + case QEMU_PROCESS_EVENT_BLOCK_JOB: + case QEMU_PROCESS_EVENT_MONITOR_EOF: + case QEMU_PROCESS_EVENT_LAST: + VIR_FREE(event->data); + } + VIR_FREE(event); +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index ddfc46dcd0c1..7c9364f0bb69 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -445,6 +445,8 @@ struct qemuProcessEvent { void *data; }; =20 +void qemuProcessEventFree(struct qemuProcessEvent *event); + typedef struct _qemuDomainLogContext qemuDomainLogContext; typedef qemuDomainLogContext *qemuDomainLogContextPtr; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d64686df4c5f..d760b77c81e7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4183,7 +4183,6 @@ processWatchdogEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); =20 cleanup: - VIR_FREE(dumpfile); virObjectUnref(cfg); } =20 @@ -4309,7 +4308,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - qemuMonitorEventPanicInfoFree(info); virObjectUnref(cfg); } =20 @@ -4351,7 +4349,6 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(devAlias); virObjectUnref(cfg); } =20 @@ -4648,7 +4645,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - VIR_FREE(devAlias); virObjectUnref(cfg); } =20 @@ -4735,9 +4731,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(devAlias); virObjectUnref(cfg); - } =20 =20 @@ -4751,7 +4745,7 @@ processBlockJobEvent(virQEMUDriverPtr driver, virDomainDiskDefPtr disk; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4763,8 +4757,6 @@ processBlockJobEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - cleanup: - VIR_FREE(diskAlias); } =20 =20 @@ -4856,7 +4848,7 @@ static void qemuProcessEventHandler(void *data, void = *opaque) } =20 virDomainObjEndAPI(&vm); - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); } =20 =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c17a6e9abfc6..f9b608434f47 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -303,7 +303,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, =20 if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { ignore_value(virObjectUnref(vm)); - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); goto cleanup; } =20 @@ -917,7 +917,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) = < 0) { if (!virObjectUnref(vm)) vm =3D NULL; - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); } } } @@ -1048,9 +1048,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUT= E_UNUSED, virObjectUnlock(vm); return 0; error: - if (processEvent) - VIR_FREE(processEvent->data); - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); goto cleanup; } =20 @@ -1356,7 +1354,7 @@ qemuProcessHandleGuestPanic(qemuMonitorPtr mon ATTRIB= UTE_UNUSED, if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { if (!virObjectUnref(vm)) vm =3D NULL; - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); } =20 cleanup: @@ -1404,9 +1402,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, virObjectUnlock(vm); return 0; error: - if (processEvent) - VIR_FREE(processEvent->data); - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); goto cleanup; } =20 @@ -1552,9 +1548,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mo= n ATTRIBUTE_UNUSED, virObjectUnlock(vm); return 0; error: - if (processEvent) - VIR_FREE(processEvent->data); - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); goto cleanup; } =20 @@ -1594,9 +1588,7 @@ qemuProcessHandleSerialChanged(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, virObjectUnlock(vm); return 0; error: - if (processEvent) - VIR_FREE(processEvent->data); - VIR_FREE(processEvent); + qemuProcessEventFree(processEvent); goto cleanup; } =20 --=20 2.13.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list