From nobody Sun Feb 8 18:18:54 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566305981; cv=none; d=zoho.com; s=zohoarc; b=HZUHzckmzOQAhmHYJPOl+0wnFYAIEH4uBvd4OTwLlTNWbtXNwMCuIMj2AXCEXA7Yl26SWz/bdcTU/ypvSAAnOUgNM+I9Wm1ysz3WR6ozSiRA0c7Xs8VJNBg3wV1Z89V5SVPhoIdQr4F7/h7FNtxBbmyr53BendCvv7LeXnKGThQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566305981; 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:ARC-Authentication-Results; bh=ZH+puVGj/kqUtXJV1nzw/ERQMXUFAe2S0Yk38SAiMWs=; b=PNuFsHrDd3PoNEru/4OT1qcb0w4vNmHTNIIK6CtxuCScCowiacOx8IgeE0C/IpPDz4wzH1dT+4iZQu1c+cyke7okOQla+wJHdnk74K7WBFqtYs2Ce+s7a+8xRku1+1yYzJePYQtUQYPNGxlQCmQe4ZQM1IcFDHHG6wLJJs7kyYA= ARC-Authentication-Results: i=1; mx.zoho.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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566305981225474.01292873074124; Tue, 20 Aug 2019 05:59:41 -0700 (PDT) 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 D5D3E8D5BAE; Tue, 20 Aug 2019 12:59:39 +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 A8C0D4274; Tue, 20 Aug 2019 12:59:39 +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 64E8B180BA9F; Tue, 20 Aug 2019 12:59:39 +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 x7KCxVcm023191 for ; Tue, 20 Aug 2019 08:59:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F1AE18EEF; Tue, 20 Aug 2019 12:59:31 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 180EB13836 for ; Tue, 20 Aug 2019 12:59:29 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 20 Aug 2019 14:59:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/19] qemu_command: use VIR_AUTOPTR for virJSONValue 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: , Content-Type: text/plain; charset="utf-8" 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.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 20 Aug 2019 12:59:40 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 94a6ad546e..b5448a074f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -738,7 +738,7 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; @@ -752,7 +752,6 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virJSONValueFree(props); return ret; } =20 @@ -935,7 +934,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, certEncSecretAlias, qemuCaps, &props)= < 0) @@ -950,7 +949,6 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, ret =3D 0; =20 cleanup: - virJSONValueFree(props); return ret; } =20 @@ -1641,7 +1639,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, qemuDomainStorageSourcePrivatePtr srcpriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(disk->src); qemuDomainSecretInfoPtr secinfo =3D NULL; qemuDomainSecretInfoPtr encinfo =3D NULL; - virJSONValuePtr srcprops =3D NULL; + VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; char *source =3D NULL; bool rawluks =3D false; int ret =3D -1; @@ -1729,7 +1727,6 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, =20 cleanup: VIR_FREE(source); - virJSONValueFree(srcprops); return ret; } =20 @@ -3407,7 +3404,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, bool prealloc =3D false; virBitmapPtr nodemask =3D NULL; int ret =3D -1; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; bool nodeSpecified =3D virDomainNumatuneNodeSpecified(def->numa, mem->= targetNode); unsigned long long pagesize =3D mem->pagesize; bool needHugepage =3D !!pagesize; @@ -3651,7 +3648,6 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendP= rops, ret =3D -1; =20 cleanup: - virJSONValueFree(props); VIR_FREE(memPath); return ret; } @@ -3664,7 +3660,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, qemuDomainObjPrivatePtr priv, virBufferPtr buf) { - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; char *alias =3D NULL; int ret =3D -1; int rc; @@ -3690,7 +3686,6 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, =20 cleanup: VIR_FREE(alias); - virJSONValueFree(props); =20 return ret; } @@ -3703,7 +3698,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, virQEMUDriverConfigPtr cfg, qemuDomainObjPrivatePtr priv) { - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; char *alias =3D NULL; int ret =3D -1; =20 @@ -3727,7 +3722,6 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, =20 cleanup: VIR_FREE(alias); - virJSONValueFree(props); =20 return ret; } @@ -5050,7 +5044,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, char *ret =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *netsource =3D NULL; - virJSONValuePtr srcprops =3D NULL; + VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; qemuDomainStorageSourcePrivatePtr srcPriv =3D @@ -5079,7 +5073,6 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPt= r dev, =20 cleanup: VIR_FREE(netsource); - virJSONValueFree(srcprops); return ret; } =20 @@ -6080,7 +6073,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, size_t i; =20 for (i =3D 0; i < def->nrngs; i++) { - virJSONValuePtr props; + VIR_AUTOPTR(virJSONValue) props =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainRNGDefPtr rng =3D def->rngs[i]; char *tmp; @@ -6107,7 +6100,6 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, return -1; =20 rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, props); - virJSONValueFree(props); =20 if (rc < 0) return -1; @@ -9272,7 +9264,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, virQEMUCapsPtr qemuCaps, bool chardevStdioLogd) { - virJSONValuePtr memProps =3D NULL; + VIR_AUTOPTR(virJSONValue) memProps =3D NULL; VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *devstr =3D NULL; int rc; @@ -9317,7 +9309,6 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, return -1; =20 rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, memProps); - virJSONValueFree(memProps); =20 if (rc < 0) return -1; @@ -10294,7 +10285,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, qemuDomainObjPrivatePtr priv) { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virJSONValuePtr props =3D NULL; + VIR_AUTOPTR(virJSONValue) props =3D NULL; int ret =3D -1; =20 if (!virDomainDefHasManagedPR(def)) @@ -10311,7 +10302,6 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, =20 ret =3D 0; cleanup: - virJSONValueFree(props); return ret; } =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list