From nobody Tue Feb 10 12:45:19 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=1612411100; cv=none; d=zohomail.com; s=zohoarc; b=LMWKoowievVB5OSTVIom2UjVlAmH8s0kcR/cnZlF3fhPIXZxRE8wUCC9Cp4vWSPgfijCG7Mo7vkjMwVJVcxB4cYB1WJZ5m4GlVAq4RO3LKJE9cl/mV5wfSCct7nRNPK+HxCjz9yN7ZiP88v4lrfQMiJuuU88/UC7DW7nMlNbI4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612411100; 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=5j1wMZtVAvMAxj+sp1UuR129x9UvJEOHifBZMCcS+xw=; b=EhJXhJZlejJD8Y4oMlm1DTI0F/Nl9XR6Hzjr5g6TIK0nkM4OSKofBPX7A1/pGd3styuhxs6/gSaaOz6sSDjbPzhw94jAnG9dNsoPIjgqn96CAeatwNSf02Pun2PRwoComtexb9ulz0iZxvWIHzhpt8EYLUwITeM+69AEKhkOwbI= 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) header.from= 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 1612411100118973.6411430262034; Wed, 3 Feb 2021 19:58:20 -0800 (PST) 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-533-x8Kd4f20ObqpJE4v273jXQ-1; Wed, 03 Feb 2021 22:58:16 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E01F2801964; Thu, 4 Feb 2021 03:58:09 +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 B57CF1A266; Thu, 4 Feb 2021 03:58:09 +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 8156F1809C8F; Thu, 4 Feb 2021 03:58:09 +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 1143w2rH003356 for ; Wed, 3 Feb 2021 22:58:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id B1D265B697; Thu, 4 Feb 2021 03:58:02 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-199.phx2.redhat.com [10.3.112.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C2305B695 for ; Thu, 4 Feb 2021 03:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612411099; 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=5j1wMZtVAvMAxj+sp1UuR129x9UvJEOHifBZMCcS+xw=; b=YgRErFey/X4gLMZl4M0XQoesnTkSFsVM+NZ6i4rhD5bcFbxRYsnSKVcLcb5TcIJZM6syBz eAjkltMBRoCmp4yso+ujctNG6+4/n1RxWzw7Pcwpyv9sdC6m7pzyJwWWopCXh3vuEVGI0n EVKBS6zhISavC8VKOUYiDBOf89KPO/Y= X-MC-Unique: x8Kd4f20ObqpJE4v273jXQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH v2 05/24] qemu: replace VIR_FREE with g_free in all vir*Free() functions Date: Wed, 3 Feb 2021 22:57:32 -0500 Message-Id: <20210204035751.164765-6-laine@redhat.com> In-Reply-To: <20210204035751.164765-1-laine@redhat.com> References: <20210204035751.164765-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump --- src/qemu/qemu_block.c | 36 ++++++++++++------------ src/qemu/qemu_capabilities.c | 8 +++--- src/qemu/qemu_cgroup.c | 4 +-- src/qemu/qemu_conf.c | 6 ++-- src/qemu/qemu_domain.c | 14 +++++----- src/qemu/qemu_firmware.c | 10 +++---- src/qemu/qemu_migration_params.c | 4 +-- src/qemu/qemu_monitor.c | 48 ++++++++++++++++---------------- src/qemu/qemu_monitor_json.c | 22 +++++++-------- src/qemu/qemu_process.c | 24 ++++++++-------- src/qemu/qemu_saveimage.c | 6 ++-- src/qemu/qemu_slirp.c | 2 +- src/qemu/qemu_vhost_user.c | 8 +++--- 13 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 0b8ca2a3f5..3d88e701b2 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -77,17 +77,17 @@ qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeName= BackingChainDataPtr data) if (!data) return; =20 - VIR_FREE(data->nodeformat); - VIR_FREE(data->nodestorage); + g_free(data->nodeformat); + g_free(data->nodestorage); =20 - VIR_FREE(data->qemufilename); + g_free(data->qemufilename); =20 - VIR_FREE(data->drvformat); - VIR_FREE(data->drvstorage); + g_free(data->drvformat); + g_free(data->drvstorage); =20 qemuBlockNodeNameBackingChainDataFree(data->backing); =20 - VIR_FREE(data); + g_free(data); } =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData, @@ -1635,16 +1635,16 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStora= geSourceAttachDataPtr data) virJSONValueFree(data->encryptsecretProps); virJSONValueFree(data->tlsProps); virJSONValueFree(data->tlsKeySecretProps); - VIR_FREE(data->tlsAlias); - VIR_FREE(data->tlsKeySecretAlias); - VIR_FREE(data->authsecretAlias); - VIR_FREE(data->encryptsecretAlias); - VIR_FREE(data->httpcookiesecretAlias); - VIR_FREE(data->driveCmd); - VIR_FREE(data->driveAlias); - VIR_FREE(data->chardevAlias); - VIR_FREE(data->chardevCmd); - VIR_FREE(data); + g_free(data->tlsAlias); + g_free(data->tlsKeySecretAlias); + g_free(data->authsecretAlias); + g_free(data->encryptsecretAlias); + g_free(data->httpcookiesecretAlias); + g_free(data->driveCmd); + g_free(data->driveAlias); + g_free(data->chardevAlias); + g_free(data->chardevCmd); + g_free(data); } =20 =20 @@ -1960,8 +1960,8 @@ qemuBlockStorageSourceChainDataFree(qemuBlockStorageS= ourceChainDataPtr data) for (i =3D 0; i < data->nsrcdata; i++) qemuBlockStorageSourceAttachDataFree(data->srcdata[i]); =20 - VIR_FREE(data->srcdata); - VIR_FREE(data); + g_free(data->srcdata); + g_free(data); } =20 =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 109a7ed9de..c57864f602 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4112,10 +4112,10 @@ virQEMUCapsCachePrivFree(void *privData) { virQEMUCapsCachePrivPtr priv =3D privData; =20 - VIR_FREE(priv->libDir); - VIR_FREE(priv->kernelVersion); - VIR_FREE(priv->hostCPUSignature); - VIR_FREE(priv); + g_free(priv->libDir); + g_free(priv->kernelVersion); + g_free(priv->hostCPUSignature); + g_free(priv); } =20 =20 diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index cb8112ea90..39c83d1478 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1215,8 +1215,8 @@ qemuCgroupEmulatorAllNodesDataFree(qemuCgroupEmulator= AllNodesDataPtr data) return; =20 virCgroupFree(data->emulatorCgroup); - VIR_FREE(data->emulatorMemMask); - VIR_FREE(data); + g_free(data->emulatorMemMask); + g_free(data); } =20 =20 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 151bea01eb..eae94bb5a2 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1579,9 +1579,9 @@ qemuSharedDeviceEntryFree(void *payload) return; =20 for (i =3D 0; i < entry->ref; i++) - VIR_FREE(entry->domains[i]); - VIR_FREE(entry->domains); - VIR_FREE(entry); + g_free(entry->domains[i]); + g_free(entry->domains); + g_free(entry); } =20 =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a970de619e..6ab8a94b73 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1803,8 +1803,8 @@ qemuDomainObjPrivateFree(void *data) =20 virObjectUnref(priv->monConfig); qemuDomainObjClearJob(&priv->job); - VIR_FREE(priv->lockState); - VIR_FREE(priv->origname); + g_free(priv->lockState); + g_free(priv->origname); =20 virChrdevFree(priv->devs); =20 @@ -1817,7 +1817,7 @@ qemuDomainObjPrivateFree(void *data) VIR_ERROR(_("Unexpected QEMU agent still active during domain dele= tion")); qemuAgentClose(priv->agent); } - VIR_FREE(priv->cleanupCallbacks); + g_free(priv->cleanupCallbacks); =20 g_clear_pointer(&priv->migSecinfo, qemuDomainSecretInfoFree); qemuDomainMasterKeyFree(priv); @@ -1830,7 +1830,7 @@ qemuDomainObjPrivateFree(void *data) g_object_unref(priv->eventThread); } =20 - VIR_FREE(priv); + g_free(priv); } =20 =20 @@ -3238,7 +3238,7 @@ qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def) virStringListFreeCount(def->capsadd, def->ncapsadd); virStringListFreeCount(def->capsdel, def->ncapsdel); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -10845,7 +10845,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_BLOCK_JOB: case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: - VIR_FREE(event->data); + g_free(event->data); break; case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE: virObjectUnref(event->data); @@ -10854,7 +10854,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_LAST: break; } - VIR_FREE(event); + g_free(event); } =20 =20 diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 639cff7459..fe30db4f79 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -180,7 +180,7 @@ struct _qemuFirmware { static void qemuFirmwareOSInterfaceFree(qemuFirmwareOSInterface *interfaces) { - VIR_FREE(interfaces); + g_free(interfaces); } =20 =20 @@ -245,7 +245,7 @@ qemuFirmwareTargetFree(qemuFirmwareTargetPtr target) =20 virStringListFreeCount(target->machines, target->nmachines); =20 - VIR_FREE(target); + g_free(target); } =20 =20 @@ -255,7 +255,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareTarget, qemuF= irmwareTargetFree); static void qemuFirmwareFeatureFree(qemuFirmwareFeature *features) { - VIR_FREE(features); + g_free(features); } =20 =20 @@ -274,10 +274,10 @@ qemuFirmwareFree(qemuFirmwarePtr fw) qemuFirmwareMappingFree(fw->mapping); for (i =3D 0; i < fw->ntargets; i++) qemuFirmwareTargetFree(fw->targets[i]); - VIR_FREE(fw->targets); + g_free(fw->targets); qemuFirmwareFeatureFree(fw->features); =20 - VIR_FREE(fw); + g_free(fw); } =20 =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 8c019bf2ce..510dad783a 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -261,11 +261,11 @@ qemuMigrationParamsFree(qemuMigrationParamsPtr migPar= ams) =20 for (i =3D 0; i < QEMU_MIGRATION_PARAM_LAST; i++) { if (qemuMigrationParamTypes[i] =3D=3D QEMU_MIGRATION_PARAM_TYPE_ST= RING) - VIR_FREE(migParams->params[i].value.s); + g_free(migParams->params[i].value.s); } =20 virBitmapFree(migParams->caps); - VIR_FREE(migParams); + g_free(migParams); } =20 =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 990519252e..2d9c9754d1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1674,7 +1674,7 @@ qemuMonitorCPUInfoFree(qemuMonitorCPUInfoPtr cpus, =20 qemuMonitorCPUInfoClear(cpus, ncpus); =20 - VIR_FREE(cpus); + g_free(cpus); } =20 void @@ -1687,9 +1687,9 @@ qemuMonitorQueryCpusFree(struct qemuMonitorQueryCpusE= ntry *entries, return; =20 for (i =3D 0; i < nentries; i++) - VIR_FREE(entries[i].qom_path); + g_free(entries[i].qom_path); =20 - VIR_FREE(entries); + g_free(entries); } =20 =20 @@ -2085,8 +2085,8 @@ qemuDomainDiskInfoFree(void *value) { struct qemuDomainDiskInfo *info =3D value; =20 - VIR_FREE(info->nodename); - VIR_FREE(info); + g_free(info->nodename); + g_free(info); } =20 =20 @@ -2871,8 +2871,8 @@ qemuMonitorChardevInfoFree(void *data) { qemuMonitorChardevInfoPtr info =3D data; =20 - VIR_FREE(info->ptyPath); - VIR_FREE(info); + g_free(info->ptyPath); + g_free(info); } =20 =20 @@ -3603,11 +3603,11 @@ qemuMonitorMachineInfoFree(qemuMonitorMachineInfoPt= r machine) { if (!machine) return; - VIR_FREE(machine->name); - VIR_FREE(machine->alias); - VIR_FREE(machine->defaultCPU); - VIR_FREE(machine->defaultRAMid); - VIR_FREE(machine); + g_free(machine->name); + g_free(machine->alias); + g_free(machine->defaultCPU); + g_free(machine->defaultRAMid); + g_free(machine); } =20 =20 @@ -3735,14 +3735,14 @@ qemuMonitorCPUModelInfoFree(qemuMonitorCPUModelInfo= Ptr model_info) return; =20 for (i =3D 0; i < model_info->nprops; i++) { - VIR_FREE(model_info->props[i].name); + g_free(model_info->props[i].name); if (model_info->props[i].type =3D=3D QEMU_MONITOR_CPU_PROPERTY_STR= ING) - VIR_FREE(model_info->props[i].value.string); + g_free(model_info->props[i].value.string); } =20 - VIR_FREE(model_info->props); - VIR_FREE(model_info->name); - VIR_FREE(model_info); + g_free(model_info->props); + g_free(model_info->name); + g_free(model_info); } =20 =20 @@ -4378,7 +4378,7 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicIn= foPtr info) =20 switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - VIR_FREE(info->data.s390.reason); + g_free(info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: @@ -4386,7 +4386,7 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicIn= foPtr info) break; } =20 - VIR_FREE(info); + g_free(info); } =20 =20 @@ -4396,8 +4396,8 @@ qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidS= tatusPtr info) if (!info) return; =20 - VIR_FREE(info->netdev); - VIR_FREE(info); + g_free(info->netdev); + g_free(info); } =20 =20 @@ -4588,9 +4588,9 @@ qemuMonitorJobInfoFree(qemuMonitorJobInfoPtr job) if (!job) return; =20 - VIR_FREE(job->id); - VIR_FREE(job->error); - VIR_FREE(job); + g_free(job->id); + g_free(job->error); + g_free(job); } =20 =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 97c5e5b36c..a02d29d52a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -591,11 +591,11 @@ qemuMonitorJSONParseKeywordsFree(int nkeywords, { size_t i; for (i =3D 0; i < nkeywords; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); + g_free(keywords[i]); + g_free(values[i]); } - VIR_FREE(keywords); - VIR_FREE(values); + g_free(keywords); + g_free(values); } =20 =20 @@ -6561,9 +6561,9 @@ void qemuMonitorJSONListPathFree(qemuMonitorJSONListP= athPtr paths) { if (!paths) return; - VIR_FREE(paths->name); - VIR_FREE(paths->type); - VIR_FREE(paths); + g_free(paths->name); + g_free(paths->type); + g_free(paths); } =20 =20 @@ -8573,13 +8573,13 @@ qemuMonitorQueryHotpluggableCpusFree(struct qemuMon= itorQueryHotpluggableCpusEntr for (i =3D 0; i < nentries; i++) { entry =3D entries + i; =20 - VIR_FREE(entry->type); - VIR_FREE(entry->qom_path); - VIR_FREE(entry->alias); + g_free(entry->type); + g_free(entry->qom_path); + g_free(entry->alias); virJSONValueFree(entry->props); } =20 - VIR_FREE(entries); + g_free(entries); } =20 =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f87a3c0f60..30cfa4d485 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4604,10 +4604,10 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDefPt= r inc) if (!inc) return; =20 - VIR_FREE(inc->address); - VIR_FREE(inc->launchURI); - VIR_FREE(inc->deferredURI); - VIR_FREE(inc); + g_free(inc->address); + g_free(inc->launchURI); + g_free(inc->deferredURI); + g_free(inc); } =20 =20 @@ -8713,14 +8713,14 @@ qemuProcessQMPFree(qemuProcessQMPPtr proc) =20 g_object_unref(proc->eventThread); =20 - VIR_FREE(proc->binary); - VIR_FREE(proc->libDir); - VIR_FREE(proc->uniqDir); - VIR_FREE(proc->monpath); - VIR_FREE(proc->monarg); - VIR_FREE(proc->pidfile); - VIR_FREE(proc->stdErr); - VIR_FREE(proc); + g_free(proc->binary); + g_free(proc->libDir); + g_free(proc->uniqDir); + g_free(proc->monpath); + g_free(proc->monarg); + g_free(proc->pidfile); + g_free(proc->stdErr); + g_free(proc); } =20 =20 diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 0e588d463d..de2d63dd9a 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -83,9 +83,9 @@ virQEMUSaveDataFree(virQEMUSaveDataPtr data) if (!data) return; =20 - VIR_FREE(data->xml); - VIR_FREE(data->cookie); - VIR_FREE(data); + g_free(data->xml); + g_free(data->cookie); + g_free(data); } =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUSaveData, virQEMUSaveDataFree); diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 4c4949f88b..62a6665679 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -58,7 +58,7 @@ qemuSlirpFree(qemuSlirpPtr slirp) VIR_FORCE_CLOSE(slirp->fd[0]); VIR_FORCE_CLOSE(slirp->fd[1]); virBitmapFree(slirp->features); - VIR_FREE(slirp); + g_free(slirp); } =20 =20 diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 0a69d690ca..5ceefbe456 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -113,7 +113,7 @@ struct _qemuVhostUser { static void qemuVhostUserGPUFeatureFree(qemuVhostUserGPUFeature *features) { - VIR_FREE(features); + g_free(features); } =20 =20 @@ -127,11 +127,11 @@ qemuVhostUserFree(qemuVhostUserPtr vu) return; =20 if (vu->type =3D=3D QEMU_VHOST_USER_TYPE_GPU) - VIR_FREE(vu->capabilities.gpu.features); + g_free(vu->capabilities.gpu.features); =20 - VIR_FREE(vu->binary); + g_free(vu->binary); =20 - VIR_FREE(vu); + g_free(vu); } =20 =20 --=20 2.29.2