From nobody Fri May 3 04:26:06 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571259314; cv=none; d=zoho.com; s=zohoarc; b=e87FiQeKweAX1N1Z/2kImJH4O2vDl8N7XkPEhO1ru1aV6Lt+etlFy2BbOZdSAV3bXsT9Dy4QXv6cG51GAB7Gybbe8SoslldiWv0IHH6jGJ2pi+e9KZ26xkQDjjlKAuwzVFWfYDM0PH6BkxaJdG4xzbofAWZJ/7oD+ZJYKNZLdbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571259314; h=Content-Type:Content-Transfer-Encoding:Cc: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=7+zij4kkmVkdmuQIJEZYrKKaUimN7Pv5tVuCfTNWRYs=; b=T7AijeLeEXayPXkeWO7+R0i5nqUwHeFAcE0wlUOJ7lp/7QiXXm+elMyrHLbAyrGs/rF71vjVlKQyUxAJ0pPr0pfXaBP1HlsxrsMQkuWzRzCDouJz12uDwy2N8rsgwEAEmergM2bPGEvzCEfzXh/igWezbz7FXPHa9pZmu0EoWqM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 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 1571259314168284.30232881944676; Wed, 16 Oct 2019 13:55:14 -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 4B4A33082B40; Wed, 16 Oct 2019 20:55:12 +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 119FE60166; Wed, 16 Oct 2019 20:55:12 +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 A42074EBC0; Wed, 16 Oct 2019 20:55:11 +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 x9GKsnRu018395 for ; Wed, 16 Oct 2019 16:54:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id A5EC760166; Wed, 16 Oct 2019 20:54:49 +0000 (UTC) Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FE27600C4; Wed, 16 Oct 2019 20:54:47 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47CA23084288; Wed, 16 Oct 2019 20:54:46 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id o12so169668qtf.3; Wed, 16 Oct 2019 13:54:46 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id m125sm23965qkd.3.2019.10.16.13.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZKSiQK2hvFWP7o3RSnwTYhnq6xIoJmwxU9uo7vjo0FU=; b=SQaXoq4Fkxh/RDw+JM/tcvz/ArBZcSV79yBAb1gepDYtGjRstlL6ZfCUCGyQLryjdZ WZ+rqfYD+xcIinf6FlT9qQ5y0as/WfWz1NDDKy2UHJKWQRtNJGM8AjPVPkBDtFilnJ5U X+RXI8iKjB3m3UL/pVKFZVFwCPV0j/kl/AtmbpfFLrgOCPMIfePuCqsdsL19Kn87CgY0 Z3Bc8D4+nBLX7jOb4ln1Tv8VJm4Ke5hmwKJaOQU0pCK1EjE+93d+hFP3zehwJoznyz6U gC4dQsrP61tXidiiNJNv0KFc186eDK2JDZqeKX2M/A2Q4z+4boZw3WC5guKU90ZvuH9+ cArw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZKSiQK2hvFWP7o3RSnwTYhnq6xIoJmwxU9uo7vjo0FU=; b=U/vrUuP73Pe66zUZudtjgGREHAFt48FRsAtvNEu4ZQdFJ360PBnBdUncNJNgONGSDL VHRIDtFgEJNrBuq+3CT1TRgAQVlTd2nTcqmj/r2mHiuS/oqU3ST+mksBDkxtMvxfnjA4 tPUypRF+GS9sBzSYVbasVlrCR9qHjX58/S/j8N+x8vpGiSXX6bGKweae4l4lz5hEhucQ FeRDK4iapqffqSm1eqFOk4KXGArlOzXeAsK1NSbvJ2s92KfA9ash6pynDIvXFtmz6iku pk5wbZQbApQwZ+bN60L7zYen089Qvv6qnoY/0/lcIjDt7J2bgGQXxFwnuojlETFTMM0W 5EtQ== X-Gm-Message-State: APjAAAWcKaoNCOPFEEa/y7++V+NQaurn/TwmOBO9UtrBwSha3ZZ3aykY VZDhmEqUeiIzHSwbWxulBh9nz8iJ X-Google-Smtp-Source: APXvYqzCxE9ukK4/AbFjfqx97VKNrqWfeXcHYvXndZ9MjUwC+ZMlDe5rgpnD949GlPfR8dGwvJUm9w== X-Received: by 2002:a05:6214:841:: with SMTP id dg1mr27488qvb.55.1571259285327; Wed, 16 Oct 2019 13:54:45 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 16 Oct 2019 17:54:29 -0300 Message-Id: <20191016205433.18341-2-danielhb413@gmail.com> In-Reply-To: <20191016205433.18341-1-danielhb413@gmail.com> References: <20191016205433.18341-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 16 Oct 2019 20:54:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 16 Oct 2019 20:54:46 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.40 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , jtomko@redhat.com, eskultet@redhat.com Subject: [libvirt] [PATCH v4 1/5] qemu_driver: use g_auto* in some functions 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.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 16 Oct 2019 20:55:12 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) This patch changes qemuDomainSnapshotLoad, qemuDomainCheckpointLoad and qemuStateInitialize to use g_autoptr() and g_autofree, cleaning up some virObjectUnref() and VIR_FREE() calls on each. The reason this is being sent separately is because these are not trivial search/replace cases. In all these functions some strings declarations are moved inside local loops, where they are in fact used, allowing us to erase VIR_FREE() calls that were made inside the loop and in 'cleanup' labels. Following patches with tackle more trivial cases of g_auto* usage in all qemu_driver.c file. Suggested-by: J=C3=A1n Tomko Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 51 +++++++++++++----------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86d7647628..3772c71a51 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -386,11 +386,9 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, void *data) { char *baseDir =3D (char *)data; - char *snapDir =3D NULL; + g_autofree char *snapDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; - char *xmlStr; - char *fullpath; virDomainSnapshotDefPtr def =3D NULL; virDomainMomentObjPtr snap =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -399,7 +397,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); int ret =3D -1; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -425,6 +423,9 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, goto cleanup; =20 while ((direrr =3D virDirRead(dir, &entry, NULL)) > 0) { + g_autofree char *xmlStr =3D NULL; + g_autofree char *fullpath =3D NULL; + /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ VIR_INFO("Loading snapshot file '%s'", entry->d_name); @@ -440,7 +441,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, virReportSystemError(errno, _("Failed to read snapshot file %s"), fullpath); - VIR_FREE(fullpath); continue; } =20 @@ -453,8 +453,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse snapshot XML from file '%s'"= ), fullpath); - VIR_FREE(fullpath); - VIR_FREE(xmlStr); continue; } =20 @@ -468,9 +466,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, vm->def->name); current =3D snap; } - - VIR_FREE(fullpath); - VIR_FREE(xmlStr); } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, @@ -497,8 +492,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, ret =3D 0; cleanup: VIR_DIR_CLOSE(dir); - VIR_FREE(snapDir); - virObjectUnref(caps); virObjectUnlock(vm); return ret; } @@ -509,17 +502,15 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, void *data) { char *baseDir =3D (char *)data; - char *chkDir =3D NULL; + g_autofree char *chkDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; - char *xmlStr; - char *fullpath; virDomainCheckpointDefPtr def =3D NULL; virDomainMomentObjPtr chk =3D NULL; virDomainMomentObjPtr current =3D NULL; unsigned int flags =3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; int ret =3D -1; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -544,6 +535,9 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, goto cleanup; =20 while ((direrr =3D virDirRead(dir, &entry, NULL)) > 0) { + g_autofree char *xmlStr =3D NULL; + g_autofree char *fullpath =3D NULL; + /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ VIR_INFO("Loading checkpoint file '%s'", entry->d_name); @@ -559,7 +553,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virReportSystemError(errno, _("Failed to read checkpoint file %s"), fullpath); - VIR_FREE(fullpath); continue; } =20 @@ -572,8 +565,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse checkpoint XML from file '%s= '"), fullpath); - VIR_FREE(fullpath); - VIR_FREE(xmlStr); virObjectUnref(def); continue; } @@ -581,9 +572,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, chk =3D virDomainCheckpointAssignDef(vm->checkpoints, def); if (chk =3D=3D NULL) virObjectUnref(def); - - VIR_FREE(fullpath); - VIR_FREE(xmlStr); } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, @@ -608,8 +596,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, ret =3D 0; cleanup: VIR_DIR_CLOSE(dir); - VIR_FREE(chkDir); - virObjectUnref(caps); virObjectUnlock(vm); return ret; } @@ -667,12 +653,11 @@ qemuStateInitialize(bool privileged, virStateInhibitCallback callback, void *opaque) { - char *driverConf =3D NULL; + g_autofree char *driverConf =3D NULL; virQEMUDriverConfigPtr cfg; uid_t run_uid =3D -1; gid_t run_gid =3D -1; - char *hugepagePath =3D NULL; - char *memoryBackingPath =3D NULL; + g_autofree char *memoryBackingPath =3D NULL; bool autostart =3D true; size_t i; =20 @@ -713,7 +698,6 @@ qemuStateInitialize(bool privileged, =20 if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) goto error; - VIR_FREE(driverConf); =20 if (virQEMUDriverConfigValidate(cfg) < 0) goto error; @@ -837,7 +821,7 @@ qemuStateInitialize(bool privileged, goto error; =20 if (privileged) { - char *channeldir; + g_autofree char *channeldir =3D NULL; =20 if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, @@ -890,10 +874,8 @@ qemuStateInitialize(bool privileged, _("unable to set ownership of '%s' to %d:= %d"), channeldir, (int)cfg->user, (int)cfg->group); - VIR_FREE(channeldir); goto error; } - VIR_FREE(channeldir); if (chown(cfg->channelTargetDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), @@ -944,6 +926,8 @@ qemuStateInitialize(bool privileged, * it, since we can't assume the root mount point has permissions that * will let our spawned QEMU instances use it. */ for (i =3D 0; i < cfg->nhugetlbfs; i++) { + g_autofree char *hugepagePath =3D NULL; + hugepagePath =3D qemuGetBaseHugepagePath(&cfg->hugetlbfs[i]); =20 if (!hugepagePath) @@ -959,7 +943,6 @@ qemuStateInitialize(bool privileged, virFileUpdatePerm(cfg->hugetlbfs[i].mnt_dir, 0, S_IXGRP | S_IXOTH) < 0) goto error; - VIR_FREE(hugepagePath); } =20 if (qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath) < 0) @@ -976,7 +959,6 @@ qemuStateInitialize(bool privileged, virFileUpdatePerm(memoryBackingPath, 0, S_IXGRP | S_IXOTH) < 0) goto error; - VIR_FREE(memoryBackingPath); =20 if (!(qemu_driver->closeCallbacks =3D virCloseCallbacksNew())) goto error; @@ -1045,9 +1027,6 @@ qemuStateInitialize(bool privileged, return VIR_DRV_STATE_INIT_COMPLETE; =20 error: - VIR_FREE(driverConf); - VIR_FREE(hugepagePath); - VIR_FREE(memoryBackingPath); qemuStateCleanup(); return VIR_DRV_STATE_INIT_ERROR; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 04:26:06 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571259301; cv=none; d=zoho.com; s=zohoarc; b=UjFqKQNJrzavpf8yLTOKSjC1wDM40HDxf7cImH57vYVE+uQJ3/EbvChWsEr1QlX2xBksY5HuY/rXdNrhiaDUyby3koadiwnq3YHEVunfdAhf+wjZRnlYfTWznWVyKIDp+T/i8I4+dSB1HzD4jvBPVXwbOMxNhXEg9sRGJD16SS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571259301; h=Content-Type:Content-Transfer-Encoding:Cc: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=yyelOaAi3BTAJlZaBCcVzfj+0CCc5o9nYGrOUZ6bAwI=; b=JuQgkRIjaUT8BZVLxhTgqPAIx9Z0jPp5IfhuHOwqd/Ps121vecpFqW27SDD63hBr1Y0EjRBCsrlDcCqrxSE0Fdyf6LEtoWdk4n4Li8LQDIrc4j8GveXOHzXbjE+Lp6oajdMIBBGCMXQNurCIYCFoxqlKaX9Rms6riX4K9IjUy5o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 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 1571259301232789.0890649555836; Wed, 16 Oct 2019 13:55:01 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 4E7E830821C2; Wed, 16 Oct 2019 20:54:59 +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 0359719C70; Wed, 16 Oct 2019 20:54:59 +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 756A31800535; Wed, 16 Oct 2019 20:54:58 +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 x9GKst48018424 for ; Wed, 16 Oct 2019 16:54:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id E49A95D71C; Wed, 16 Oct 2019 20:54:55 +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 254495D6A9; Wed, 16 Oct 2019 20:54:51 +0000 (UTC) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03FCF8667D; Wed, 16 Oct 2019 20:54:49 +0000 (UTC) Received: by mail-qt1-f178.google.com with SMTP id u40so96161qth.11; Wed, 16 Oct 2019 13:54:48 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id m125sm23965qkd.3.2019.10.16.13.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xHLsYdhtV4OoRwY5EDy9izS6DOuK9uAFGrLIwIZnRy4=; b=L3q7Ua9KsemqqMipkGxmT88fEHVylV6LFxO9zBS2REt/g+musvHso8ehM8NhmUIaNG sF+KBy88rkzchEygCkimo8P41zOOKR83YQm7ZvORQBShaX1yJAFUL80iU8wD+RiIoW8U XM/lHZrsxUTp5pFQ+l9HPzRY6s2M+jV8IYYPA5b7MdSUkmCo241T+6eWQ+I0Q6FzECLn Xx16GfDHII2x19DsKl8phScuU86zQsXVlP3FRzJRrxU1Qn598hUK9NvEspsl5og4wWC1 DFxtoOWt13zqsqf4nvQW0Lw7NsJAj/QG181U1xkyAdGOXMbP0tl9M666/K2fCYmShxOh nugA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xHLsYdhtV4OoRwY5EDy9izS6DOuK9uAFGrLIwIZnRy4=; b=RZiDl4++ho83yibnLehW//0w/+JCWixMOGohZKq/adfdT1QC7Y61T6g000T4IZsAKF DypjmjKd3E5OIp5A/IgVTs4yyAxDd8Pd3gXAc/QlK4zF+wt3EMx9nszHaclTAzr/Zy3L SoYne7P3pmm52nRKQjZfTcMcp1XBTK2hxjEuvpkx1MkFzFw8M0X+TZtcn8wYePnNazB7 A47buLh6IlMdZLXrTvoDA8LW9WrgOP3oOTAml+hU+2RL/gpA8nFZ9QfmSimBb7MW+sSo jXMLHy7tlmAEpWAaxm4RHlTXE79k/QjIcTz0hbeoxFUnkMmoT8SkOHvb86ata3DlSSXi P61g== X-Gm-Message-State: APjAAAVHI3KnBx6dXEBPt/23trYUPBmawCdc0wD/zorlJ+TN54M8M6IQ f9p8anijMTGsgD/nYwUL5tqnYPli X-Google-Smtp-Source: APXvYqyGDeib8zYG8DoSXH83nLJJs/0fWSgtL0xPu/8UFkMdRAVGwpzTcMNAZmBGxb0wQ0itaHv05g== X-Received: by 2002:ac8:b46:: with SMTP id m6mr39992qti.262.1571259287394; Wed, 16 Oct 2019 13:54:47 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 16 Oct 2019 17:54:30 -0300 Message-Id: <20191016205433.18341-3-danielhb413@gmail.com> In-Reply-To: <20191016205433.18341-1-danielhb413@gmail.com> References: <20191016205433.18341-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 16 Oct 2019 20:54:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 16 Oct 2019 20:54:49 +0000 (UTC) for IP:'209.85.160.178' DOMAIN:'mail-qt1-f178.google.com' HELO:'mail-qt1-f178.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.178 mail-qt1-f178.google.com 209.85.160.178 mail-qt1-f178.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , jtomko@redhat.com, eskultet@redhat.com Subject: [libvirt] [PATCH v4 2/5] qemu_driver: use g_autoptr() when possible 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-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 16 Oct 2019 20:54:59 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Several pointer types can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call. This patch uses g_autoptr() in the following pointer types inside qemu_driver.c, whenever possible: - qemuBlockJobDataPtr - virCapsPtr - virConnect - virDomainCapsPtr - virNetworkPtr - virQEMUDriverConfigPtr Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 271 +++++++++++++---------------------------- 1 file changed, 87 insertions(+), 184 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3772c71a51..dc342734b1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -202,7 +202,7 @@ qemuAutostartDomain(virDomainObjPtr vm, { virQEMUDriverPtr driver =3D opaque; int flags =3D 0; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 if (cfg->autoStartBypassCache) @@ -234,7 +234,6 @@ qemuAutostartDomain(virDomainObjPtr vm, ret =3D 0; cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -308,7 +307,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) char **names; virSecurityManagerPtr mgr =3D NULL; virSecurityManagerPtr stack =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int flags =3D 0; =20 if (cfg->securityDefaultConfined) @@ -368,7 +367,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) } =20 driver->securityManager =3D stack; - virObjectUnref(cfg); return 0; =20 error: @@ -376,7 +374,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) _("Failed to initialize security drivers")); virObjectUnref(stack); virObjectUnref(mgr); - virObjectUnref(cfg); return -1; } =20 @@ -1053,8 +1050,8 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, = int newVM, void *opaque) static int qemuStateReload(void) { - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (!qemu_driver) return 0; @@ -1069,8 +1066,6 @@ qemuStateReload(void) caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); cleanup: - virObjectUnref(cfg); - virObjectUnref(caps); return 0; } =20 @@ -1085,13 +1080,13 @@ static int qemuStateStop(void) { int ret =3D -1; - virConnectPtr conn; + g_autoptr(virConnect) conn =3D NULL; int numDomains =3D 0; size_t i; int state; virDomainPtr *domains =3D NULL; unsigned int *flags =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(qemu_driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(qemu_dri= ver); =20 if (!(conn =3D virConnectOpen(cfg->uri))) goto cleanup; @@ -1129,8 +1124,6 @@ qemuStateStop(void) VIR_FREE(domains); } VIR_FREE(flags); - virObjectUnref(conn); - virObjectUnref(cfg); =20 return ret; } @@ -1188,7 +1181,7 @@ qemuStateCleanup(void) static int qemuConnectURIProbe(char **uri) { - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int ret =3D -1; =20 if (qemu_driver =3D=3D NULL) @@ -1200,7 +1193,6 @@ qemuConnectURIProbe(char **uri) =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -1344,8 +1336,8 @@ qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUS= ED, const char *type) =20 static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - virCapsPtr caps =3D NULL; char *xml =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; @@ -1354,7 +1346,6 @@ static char *qemuConnectGetCapabilities(virConnectPtr= conn) { goto cleanup; =20 xml =3D virCapabilitiesFormatXML(caps); - virObjectUnref(caps); =20 cleanup: =20 @@ -1706,7 +1697,7 @@ static int qemuConnectGetVersion(virConnectPtr conn, = unsigned long *version) virQEMUDriverPtr driver =3D conn->privateData; int ret =3D -1; unsigned int qemuVersion =3D 0; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetVersionEnsureACL(conn) < 0) return -1; @@ -1723,7 +1714,6 @@ static int qemuConnectGetVersion(virConnectPtr conn, = unsigned long *version) ret =3D 0; =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -1777,7 +1767,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virObjectEventPtr event =3D NULL; virObjectEventPtr event2 =3D NULL; unsigned int start_flags =3D VIR_QEMU_PROCESS_START_COLD; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -1852,7 +1842,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return dom; } @@ -1866,7 +1855,7 @@ static int qemuDomainSuspend(virDomainPtr dom) qemuDomainObjPrivatePtr priv; virDomainPausedReason reason; int state; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1909,7 +1898,6 @@ static int qemuDomainSuspend(virDomainPtr dom) cleanup: virDomainObjEndAPI(&vm); =20 - virObjectUnref(cfg); return ret; } =20 @@ -1921,7 +1909,7 @@ static int qemuDomainResume(virDomainPtr dom) int ret =3D -1; int state; int reason; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1967,7 +1955,6 @@ static int qemuDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2348,7 +2335,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -2453,7 +2440,6 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2476,7 +2462,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2539,7 +2525,6 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -3052,14 +3037,12 @@ qemuOpenFile(virQEMUDriverPtr driver, bool *needUnlink) { int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t user =3D cfg->user; gid_t group =3D cfg->group; bool dynamicOwnership =3D cfg->dynamicOwnership; virSecurityLabelDefPtr seclabel; =20 - virObjectUnref(cfg); - /* TODO: Take imagelabel into account? */ if (vm && (seclabel =3D virDomainDefGetSecurityLabelDef(vm->def, "dac")) != =3D NULL && @@ -3236,7 +3219,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; @@ -3299,7 +3282,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) ret =3D -1; virFileWrapperFdFree(wrapperFd); - virObjectUnref(cfg); =20 if (ret < 0 && needUnlink) unlink(path); @@ -3323,7 +3305,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int ret =3D -1; virObjectEventPtr event =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps; + g_autoptr(virCaps) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -3438,7 +3420,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return ret; } =20 @@ -3527,7 +3508,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, char *compressedpath =3D NULL; int ret =3D -1; virDomainObjPtr vm =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | VIR_DOMAIN_SAVE_RUNNING | @@ -3554,7 +3535,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -3568,14 +3548,11 @@ static char * qemuDomainManagedSavePath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *ret; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 - if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) { - virObjectUnref(cfg); + if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) return NULL; - } =20 - virObjectUnref(cfg); return ret; } =20 @@ -3583,7 +3560,7 @@ static int qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int compressed; char *compressedpath =3D NULL; virDomainObjPtr vm; @@ -3629,7 +3606,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virDomainObjEndAPI(&vm); VIR_FREE(name); VIR_FREE(compressedpath); - virObjectUnref(cfg); =20 return ret; } @@ -3827,7 +3803,7 @@ doCoreDump(virQEMUDriverPtr driver, int directFlag =3D 0; unsigned int flags =3D VIR_FILE_WRAPPER_NON_BLOCKING; const char *memory_dump_format =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); char *compressedpath =3D NULL; =20 /* We reuse "save" flag for "dump" here. Then, we can support the same @@ -3909,7 +3885,6 @@ doCoreDump(virQEMUDriverPtr driver, if (ret !=3D 0) unlink(path); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -4041,7 +4016,7 @@ qemuDomainScreenshot(virDomainPtr dom, const char *videoAlias =3D NULL; char *ret =3D NULL; bool unlink_tmp =3D false; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -4133,7 +4108,6 @@ qemuDomainScreenshot(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -4146,7 +4120,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, char timestr[100]; struct tm time_info; time_t curtime =3D time(NULL); - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!domname) return NULL; @@ -4161,7 +4135,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - virObjectUnref(cfg); VIR_FREE(domname); return dumpfile; } @@ -4172,7 +4145,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, int action) { int ret; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); char *dumpfile =3D getAutoDumpPath(driver, vm); unsigned int flags =3D VIR_DUMP_MEMORY_ONLY; =20 @@ -4213,7 +4186,6 @@ processWatchdogEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); VIR_FREE(dumpfile); } =20 @@ -4223,7 +4195,7 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); char *dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) @@ -4236,7 +4208,6 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, "%s", _("Dump failed")); cleanup: VIR_FREE(dumpfile); - virObjectUnref(cfg); return ret; } =20 @@ -4265,13 +4236,13 @@ processGuestPanicEvent(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool removeInactive =3D false; unsigned long flags =3D VIR_DUMP_MEMORY_ONLY; =20 if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) <= 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Ignoring GUEST_PANICKED event from inactive domain %s", @@ -4338,9 +4309,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); if (removeInactive) qemuDomainRemoveInactiveJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4349,14 +4317,14 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDeviceDef dev; =20 VIR_DEBUG("Removing device %s from domain %p %s", devAlias, vm, vm->def->name); =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4379,9 +4347,6 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4586,7 +4551,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev; virDomainNetDefPtr def; @@ -4685,7 +4650,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } =20 =20 @@ -4695,7 +4659,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, const char *devAlias, bool connected) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainChrDeviceState newstate; virObjectEventPtr event =3D NULL; virDomainDeviceDef dev; @@ -4728,7 +4692,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, } =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4769,9 +4733,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -5044,7 +5005,7 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, virDomainDefPtr persistentDef, unsigned int nvcpus) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int topologycpus; int ret =3D -1; =20 @@ -5082,7 +5043,6 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -5248,7 +5208,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, int ret =3D -1; virBitmapPtr pcpumap =3D NULL; virDomainVcpuDefPtr vcpuinfo =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -5305,7 +5265,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); - virObjectUnref(cfg); return ret; } =20 @@ -5368,7 +5327,7 @@ qemuDomainPinEmulator(virDomainPtr dom, int ret =3D -1; qemuDomainObjPrivatePtr priv; virBitmapPtr pcpumap =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -5462,7 +5421,6 @@ qemuDomainPinEmulator(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -5833,7 +5791,7 @@ qemuDomainPinIOThread(virDomainPtr dom, { int ret =3D -1; virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainObjPtr vm; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -5957,7 +5915,6 @@ qemuDomainPinIOThread(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -6306,7 +6263,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, virDomainIOThreadAction action, unsigned int flags) { - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -6406,7 +6363,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6634,7 +6590,7 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, virQEMUDriverPtr driver =3D conn->privateData; char *p; int ret =3D 0; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 memset(secmodel, 0, sizeof(*secmodel)); =20 @@ -6670,7 +6626,6 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, strcpy(secmodel->doi, p); =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -6692,7 +6647,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virDomainDefPtr ret =3D NULL; virDomainDefPtr newdef_migr =3D NULL; virDomainDefPtr newdef =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -6730,7 +6685,6 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(caps); virDomainDefFree(newdef); virDomainDefFree(newdef_migr); =20 @@ -6770,7 +6724,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virQEMUSaveHeaderPtr header; virDomainDefPtr def =3D NULL; int oflags =3D open_write ? O_RDWR : O_RDONLY; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; size_t xml_len; size_t cookie_len; =20 @@ -6890,7 +6844,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_data =3D data; =20 cleanup: - virObjectUnref(caps); return fd; =20 error: @@ -6917,7 +6870,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; char *errbuf =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -7039,7 +6992,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); - virObjectUnref(cfg); return ret; } =20 @@ -7464,13 +7416,11 @@ static char *qemuConnectDomainXMLToNative(virConnec= tPtr conn, virCommandPtr cmd =3D NULL; char *ret =3D NULL; size_t i; - virQEMUDriverConfigPtr cfg; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virCaps) caps =3D NULL; =20 virCheckFlags(0, NULL); =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (virConnectDomainXMLToNativeEnsureACL(conn) < 0) goto cleanup; =20 @@ -7529,8 +7479,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, cleanup: virCommandFree(cmd); virObjectUnref(vm); - virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -7717,8 +7665,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7727,8 +7675,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; =20 @@ -7784,8 +7730,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); - virObjectUnref(cfg); return dom; } =20 @@ -7806,7 +7750,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, int ret =3D -1; int nsnapshots; int ncheckpoints; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; g_autofree char *nvram_path =3D NULL; =20 virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | @@ -7934,7 +7878,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -8754,11 +8697,11 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr= vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr vmdef =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -8839,8 +8782,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(cfg); - virObjectUnref(caps); =20 return ret; } @@ -8900,8 +8841,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D 0; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9000,8 +8941,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; } @@ -9013,8 +8952,8 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; virDomainDefPtr vmdef =3D NULL; @@ -9092,8 +9031,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, ret =3D 0; =20 cleanup: - virObjectUnref(caps); - virObjectUnref(cfg); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9109,8 +9046,8 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainDefPtr vmdef =3D NULL; @@ -9171,8 +9108,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(cfg); - virObjectUnref(caps); return ret; } =20 @@ -9280,7 +9215,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, virDomainObjPtr vm; char *configFile =3D NULL, *autostartLink =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -9345,7 +9280,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9592,7 +9526,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9792,7 +9726,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9904,7 +9837,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, bool set_swap_hard_limit =3D false; bool set_hard_limit =3D false; bool set_soft_limit =3D false; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int rc; int ret =3D -1; qemuDomainObjPrivatePtr priv; @@ -10029,7 +9962,6 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10194,7 +10126,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, virDomainDefPtr persistentDef; virDomainObjPtr vm =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virBitmapPtr nodeset =3D NULL; virDomainNumatuneMemMode config_mode; @@ -10306,7 +10238,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, cleanup: virBitmapFree(nodeset); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10411,7 +10342,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; size_t i; virDomainObjPtr vm =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -10503,7 +10434,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10690,8 +10620,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, long long value_l; int ret =3D -1; int rc; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -10983,8 +10913,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(caps); - virObjectUnref(cfg); return ret; } #undef SCHED_RANGE_CHECK @@ -11649,7 +11577,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, int ret =3D -1; virDomainNetDefPtr net =3D NULL, persistentNet =3D NULL; virNetDevBandwidthPtr bandwidth =3D NULL, newBandwidth =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; bool inboundSpecified =3D false, outboundSpecified =3D false; int actualType; bool qosSupported =3D true; @@ -11844,7 +11772,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(newBandwidth); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12106,7 +12033,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, char *tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_MEMORY_VIRTUAL | VIR_MEMORY_PHYSICAL, -1); =20 @@ -12177,7 +12104,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, unlink(tmp); VIR_FREE(tmp); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12394,7 +12320,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, virDomainObjPtr vm; int ret =3D -1; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuBlockStatsPtr entry =3D NULL; =20 virCheckFlags(0, -1); @@ -12483,7 +12409,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12955,7 +12880,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { virQEMUDriverPtr driver =3D dconn->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; @@ -13029,7 +12954,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, VIR_FREE(migrate_disks); VIR_FREE(origname); virDomainDefFree(def); - virObjectUnref(cfg); return ret; } =20 @@ -13601,7 +13525,7 @@ qemuConnectCompareCPU(virConnectPtr conn, { virQEMUDriverPtr driver =3D conn->privateData; int ret =3D VIR_CPU_COMPARE_ERROR; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool failIncompatible; =20 virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, @@ -13619,7 +13543,6 @@ qemuConnectCompareCPU(virConnectPtr conn, xmlDesc, failIncompatible); =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -13675,7 +13598,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virCPUDefPtr cpu =3D NULL; @@ -13729,7 +13652,6 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, =20 cleanup: virCPUDefFree(cpu); - virObjectUnref(qemuCaps); return ret; } =20 @@ -13889,7 +13811,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, virQEMUDriverPtr driver =3D conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virCPUDefPtr *cpus =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -13968,7 +13890,6 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, cleanup: virCPUDefListFree(cpus); virCPUDefFree(cpu); - virObjectUnref(qemuCaps); virStringListFree(features); =20 return cpustr; @@ -14753,7 +14674,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, virCommandPtr cmd =3D NULL; const char *qemuImgPath; virBitmapPtr created =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); @@ -14841,7 +14762,6 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, } } virBitmapFree(created); - virObjectUnref(cfg); =20 return ret; } @@ -15943,8 +15863,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; g_autoptr(virDomainSnapshotDef) def =3D NULL; @@ -16216,8 +16136,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(xml); - virObjectUnref(caps); - virObjectUnref(cfg); return snapshot; } =20 @@ -16627,8 +16545,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, int rc; virDomainDefPtr config =3D NULL; virDomainDefPtr inactiveConfig =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool was_stopped =3D false; qemuDomainSaveCookiePtr cookie; virCPUDefPtr origCPU =3D NULL; @@ -17045,8 +16963,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); - virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -17107,7 +17023,7 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, virQEMUMomentReparent rep; bool metadata_only =3D !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_= ONLY); int external =3D 0; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY | @@ -17199,7 +17115,6 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -17779,10 +17694,10 @@ qemuDomainBlockJobAbort(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); - qemuBlockJobDataPtr job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv =3D NULL; bool blockdev =3D false; @@ -17883,8 +17798,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(job); - virObjectUnref(cfg); virDomainObjEndAPI(&vm); return ret; } @@ -19144,7 +19057,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, bool supportMaxOptions =3D true; bool supportGroupNameOption =3D true; bool supportMaxLengthOptions =3D true; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; @@ -19465,7 +19378,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(cfg); return ret; } =20 @@ -19715,8 +19627,8 @@ qemuDomainSetMetadata(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -19750,8 +19662,6 @@ qemuDomainSetMetadata(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -20559,10 +20469,10 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, { char *ret =3D NULL; virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; - virDomainCapsPtr domCaps =3D NULL; + g_autoptr(virDomainCaps) domCaps =3D NULL; =20 virCheckFlags(0, ret); =20 @@ -20585,8 +20495,6 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, =20 ret =3D virDomainCapsFormat(domCaps); cleanup: - virObjectUnref(domCaps); - virObjectUnref(qemuCaps); return ret; } =20 @@ -21338,7 +21246,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashTablePtr nodestats =3D NULL; virJSONValuePtr nodedata =3D NULL; qemuDomainObjPrivatePtr priv =3D dom->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool fetchnodedata =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES)= && !blockdev; @@ -21396,7 +21304,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashFree(stats); virHashFree(nodestats); virJSONValueFree(nodedata); - virObjectUnref(cfg); return ret; } =20 @@ -21831,7 +21738,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, int n_leases =3D 0; size_t i, j; size_t ifaces_count =3D 0; - virNetworkPtr network =3D NULL; + g_autoptr(virNetwork) network =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainInterfacePtr iface =3D NULL; virNetworkDHCPLeasePtr *leases =3D NULL; @@ -21899,7 +21806,6 @@ qemuGetDHCPInterfaces(virDomainPtr dom, rv =3D ifaces_count; =20 cleanup: - virObjectUnref(network); if (leases) { for (i =3D 0; i < n_leases; i++) virNetworkDHCPLeaseFree(leases[i]); @@ -22035,7 +21941,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; @@ -22124,7 +22030,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm, VIR_FREE(new_dom_name); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); - virObjectUnref(cfg); return ret; =20 rollback: @@ -22587,7 +22492,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virDomainDefPtr def =3D NULL; @@ -22644,7 +22549,6 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -22696,8 +22600,8 @@ qemuNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemucaps =3D NULL; int ret =3D -1; + g_autoptr(virQEMUCaps) qemucaps =3D NULL; =20 if (virNodeGetSevInfoEnsureACL(conn) < 0) return ret; @@ -22719,7 +22623,6 @@ qemuNodeGetSEVInfo(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(qemucaps); =20 return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 04:26:06 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571259300; cv=none; d=zoho.com; s=zohoarc; b=BAgvwPz2sYxJx8uuDozC8qq1ZPJMDn7ofP2PLk9B6uOjD2OVkB4UJ71Ypn21Wmr6A77gyClkK6f6gOxlNuyjSlozrjp36Y8Ddyh7G8hZfnlp6s3Q/XQgGKSHSUIe4f7ifZeBB1E0+s/GoTbO9SMppJ1EfLQAcmG5g8EW3jYW7+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571259300; h=Content-Type:Content-Transfer-Encoding:Cc: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=yjyQRVSPtGlwRrcgc1ca7rfuTdu30GZQzNeyq//3IeQ=; b=hAKKAlpr6zxuQC6omPYTOWNFMyHw5T/08wZvsbrnqWQbqZaCbC8KHZIoYUpDUjBclFgLVzN5Jk1ngLBp3V2EY379aJM+tDM/AwqD/sIIf9YSy4t1vGVLfNd/9o0bDD2Tg0H0yuZNkRTRW/jAJ2GMA6zwE9z1qN2zIKx9bvLerik= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 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 1571259300876310.0599301603985; Wed, 16 Oct 2019 13:55:00 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DFD818CB90C; Wed, 16 Oct 2019 20:54:57 +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 3B3295C1D4; Wed, 16 Oct 2019 20:54:57 +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 336CB4E58B; Wed, 16 Oct 2019 20:54:56 +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 x9GKss6C018411 for ; Wed, 16 Oct 2019 16:54:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98E5B5C231; Wed, 16 Oct 2019 20:54:54 +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 661FE5C1D6; Wed, 16 Oct 2019 20:54:52 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AB2EC057F23; Wed, 16 Oct 2019 20:54:50 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id e66so3578039qkf.13; Wed, 16 Oct 2019 13:54:50 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id m125sm23965qkd.3.2019.10.16.13.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RwivzoJhwCOgH7GfX00bF40DZjEQ+NWlWp02aMqyQvs=; b=GybC3HSkOY1znCiWq/Wjd873p4yiWQrOuwOqoq7evJu433Ec9I/uv84rkp9NSgMxJQ 7S+xr/LAcowniCqjWvzUnNYjM3tvMdOw2n51zuP8ilUhK6vp3jYJywFP9kTZ/0i7Prcp QH2zwieB4bMVvJ2UahZ0RIzbI+fzBgA7c7zB73nfKmuZmebWNOIOcUAYwtb6Qrf+S41G 4YY5/XDq97BMob//9z4Vpazg468p+eoErcf4VjwpqcTvsWMTVT7lSsYyDgulWzuxCs2k E7p+kbYGYmYwdYrchRRbHYmNpzGa+rV0Q3sHFQ1N2TE3jxPF5tDIJanNnsrZOllzE1i1 Keuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RwivzoJhwCOgH7GfX00bF40DZjEQ+NWlWp02aMqyQvs=; b=QkVQ0weTC/4vnXUwGS85AmwJzPnSfDAiijWSsbW4bMA8AlZ97MR1P6ngytH0eLR3Dx fbea+1ap6JAyXlJH0xR+QWaqhvNlHLh6Sfj3YssIFhmoJXm6uYmA6++4CJiXP2htffO9 Mrw3+3YHuQ849cielSo3hz83Tdlw0SLUp3v2QA4M3unLVPgwGmPqjuAA4MFmx59R1jdH sRx2yuO4/wGSoWf56+/dF2yhD09Q7PWn+VZbSis+uBqyAybLKQ4kB1Vkd4NQg7Hr5dTO SiRJcAUjTokPpwvSEA+qrFrxq2ImOorp5ivDF+NlD7s9OGYt6wY4IapwFmdZtf65wHDr vDXQ== X-Gm-Message-State: APjAAAVWoo9Vqg5tZXIsY/bRAFlCkWtQoqB2zXd5vFZxQ1G1hIn9nR+T fnR+v2kdPV2lj1veDs6gPlosAKHW X-Google-Smtp-Source: APXvYqwNwWU+g44A/FhL0e4OCP0HYYj8grvF5gx2zArO2efh2MLo3KttM4qqhPVwOg4NJR7Q25LrGg== X-Received: by 2002:a37:9c14:: with SMTP id f20mr42894119qke.500.1571259289011; Wed, 16 Oct 2019 13:54:49 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 16 Oct 2019 17:54:31 -0300 Message-Id: <20191016205433.18341-4-danielhb413@gmail.com> In-Reply-To: <20191016205433.18341-1-danielhb413@gmail.com> References: <20191016205433.18341-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 16 Oct 2019 20:54:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 16 Oct 2019 20:54:50 +0000 (UTC) for IP:'209.85.222.195' DOMAIN:'mail-qk1-f195.google.com' HELO:'mail-qk1-f195.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.195 mail-qk1-f195.google.com 209.85.222.195 mail-qk1-f195.google.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 Cc: Daniel Henrique Barboza , jtomko@redhat.com, eskultet@redhat.com Subject: [libvirt] [PATCH v4 3/5] qemu_driver: use g_autofree when possible 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-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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Wed, 16 Oct 2019 20:54:59 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" String and other scalar pointers an be auto-unref, sparing us a VIR_FREE() call. This patch uses g_autofree whenever possible with strings and other scalar pointer types. Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 203 ++++++++++++++--------------------------- 1 file changed, 68 insertions(+), 135 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc342734b1..d824992c16 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1085,7 +1085,7 @@ qemuStateStop(void) size_t i; int state; virDomainPtr *domains =3D NULL; - unsigned int *flags =3D NULL; + g_autofree unsigned int *flags =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(qemu_dri= ver); =20 if (!(conn =3D virConnectOpen(cfg->uri))) @@ -1123,7 +1123,6 @@ qemuStateStop(void) virObjectUnref(domains[i]); VIR_FREE(domains); } - VIR_FREE(flags); =20 return ret; } @@ -1357,8 +1356,8 @@ static int qemuGetSchedInfo(unsigned long long *cpuWait, pid_t pid, pid_t tid) { - char *proc =3D NULL; - char *data =3D NULL; + g_autofree char *proc =3D NULL; + g_autofree char *data =3D NULL; char **lines =3D NULL; size_t i; int ret =3D -1; @@ -1422,8 +1421,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, ret =3D 0; =20 cleanup: - VIR_FREE(data); - VIR_FREE(proc); virStringListFree(lines); return ret; } @@ -1433,7 +1430,7 @@ static int qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, pid_t pid, int tid) { - char *proc; + g_autofree char *proc =3D NULL; FILE *pidinfo; unsigned long long usertime =3D 0, systime =3D 0; long rss =3D 0; @@ -1450,7 +1447,6 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *= lastCpu, long *vm_rss, return -1; =20 pidinfo =3D fopen(proc, "r"); - VIR_FREE(proc); =20 /* See 'man proc' for information about what all these fields are. We'= re * only interested in a very few of them */ @@ -2908,7 +2904,7 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, size_t cookie_len =3D 0; int ret =3D -1; size_t zerosLen =3D 0; - char *zeros =3D NULL; + g_autofree char *zeros =3D NULL; =20 xml_len =3D strlen(data->xml) + 1; if (data->cookie) @@ -2965,7 +2961,6 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, ret =3D 0; =20 cleanup: - VIR_FREE(zeros); return ret; } =20 @@ -3300,7 +3295,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int compressed, const char *compressedpath, const char *xmlin, unsigned int flags) { - char *xml =3D NULL; + g_autofree char *xml =3D NULL; bool was_running =3D false; int ret =3D -1; virObjectEventPtr event =3D NULL; @@ -3381,7 +3376,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, if (!(data =3D virQEMUSaveDataNew(xml, cookie, was_running, compressed, driver->xmlopt))) goto endjob; - xml =3D NULL; =20 ret =3D qemuDomainSaveMemory(driver, vm, path, data, compressedpath, flags, QEMU_ASYNC_JOB_SAVE); @@ -3417,7 +3411,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, =20 cleanup: virObjectUnref(cookie); - VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -3505,7 +3498,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, { virQEMUDriverPtr driver =3D dom->conn->privateData; int compressed; - char *compressedpath =3D NULL; + g_autofree char *compressedpath =3D NULL; int ret =3D -1; virDomainObjPtr vm =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; @@ -3534,7 +3527,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(compressedpath); return ret; } =20 @@ -3562,9 +3554,9 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virQEMUDriverPtr driver =3D dom->conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int compressed; - char *compressedpath =3D NULL; + g_autofree char *compressedpath =3D NULL; virDomainObjPtr vm; - char *name =3D NULL; + g_autofree char *name =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | @@ -3604,8 +3596,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(name); - VIR_FREE(compressedpath); =20 return ret; } @@ -3615,7 +3605,7 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - char *name; + g_autofree char *name =3D NULL; int ret =3D -1; =20 virObjectLock(vm); @@ -3628,7 +3618,6 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, ret =3D 0; cleanup: virObjectUnlock(vm); - VIR_FREE(name); return ret; } =20 @@ -3660,7 +3649,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; int ret =3D -1; - char *name =3D NULL; + g_autofree char *name =3D NULL; =20 virCheckFlags(0, -1); =20 @@ -3684,7 +3673,6 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) ret =3D 0; =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); return ret; } @@ -3804,7 +3792,7 @@ doCoreDump(virQEMUDriverPtr driver, unsigned int flags =3D VIR_FILE_WRAPPER_NON_BLOCKING; const char *memory_dump_format =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - char *compressedpath =3D NULL; + g_autofree char *compressedpath =3D NULL; =20 /* We reuse "save" flag for "dump" here. Then, we can support the same * format in "save" and "dump". This path doesn't need the compression @@ -3884,7 +3872,6 @@ doCoreDump(virQEMUDriverPtr driver, virFileWrapperFdFree(wrapperFd); if (ret !=3D 0) unlink(path); - VIR_FREE(compressedpath); return ret; } =20 @@ -4010,7 +3997,7 @@ qemuDomainScreenshot(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; int tmp_fd =3D -1; size_t i; const char *videoAlias =3D NULL; @@ -4102,7 +4089,6 @@ qemuDomainScreenshot(virDomainPtr dom, VIR_FORCE_CLOSE(tmp_fd); if (unlink_tmp) unlink(tmp); - VIR_FREE(tmp); =20 qemuDomainObjEndJob(driver, vm); =20 @@ -4116,7 +4102,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *dumpfile =3D NULL; - char *domname =3D virDomainDefGetShortName(vm->def); + g_autofree char *domname =3D virDomainDefGetShortName(vm->def); char timestr[100]; struct tm time_info; time_t curtime =3D time(NULL); @@ -4135,7 +4121,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - VIR_FREE(domname); return dumpfile; } =20 @@ -4146,11 +4131,11 @@ processWatchdogEvent(virQEMUDriverPtr driver, { int ret; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - char *dumpfile =3D getAutoDumpPath(driver, vm); + g_autofree char *dumpfile =3D getAutoDumpPath(driver, vm); unsigned int flags =3D VIR_DUMP_MEMORY_ONLY; =20 if (!dumpfile) - goto cleanup; + return; =20 switch (action) { case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: @@ -4158,7 +4143,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) { - goto cleanup; + return; } =20 if (virDomainObjCheckActive(vm) < 0) @@ -4179,14 +4164,11 @@ processWatchdogEvent(virQEMUDriverPtr driver, "%s", _("Resuming after dump failed")); break; default: - goto cleanup; + return; } =20 endjob: qemuDomainObjEndAsyncJob(driver, vm); - - cleanup: - VIR_FREE(dumpfile); } =20 static int @@ -4196,7 +4178,7 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, { int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - char *dumpfile =3D getAutoDumpPath(driver, vm); + g_autofree char *dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) goto cleanup; @@ -4207,7 +4189,6 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Dump failed")); cleanup: - VIR_FREE(dumpfile); return ret; } =20 @@ -4217,14 +4198,11 @@ qemuProcessGuestPanicEventInfo(virQEMUDriverPtr dri= ver, virDomainObjPtr vm, qemuMonitorEventPanicInfoPtr info) { - char *msg =3D qemuMonitorGuestPanicEventInfoFormatMsg(info); - char *timestamp =3D virTimeStringNow(); + g_autofree char *msg =3D qemuMonitorGuestPanicEventInfoFormatMsg(info); + g_autofree char *timestamp =3D virTimeStringNow(); =20 if (msg && timestamp) qemuDomainLogAppendMessage(driver, vm, "%s: panic %s\n", timestamp= , msg); - - VIR_FREE(timestamp); - VIR_FREE(msg); } =20 =20 @@ -5124,7 +5102,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virDomainVcpuDefPtr vcpuinfo; qemuDomainObjPrivatePtr priv =3D vm->privateData; virCgroupPtr cgroup_vcpu =3D NULL; - char *str =3D NULL; + g_autofree char *str =3D NULL; virObjectEventPtr event =3D NULL; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] =3D ""; virTypedParameterPtr eventParams =3D NULL; @@ -5188,7 +5166,6 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, cleanup: virBitmapFree(tmpmap); virCgroupFree(&cgroup_vcpu); - VIR_FREE(str); virObjectEventStateQueue(driver->domainEventState, event); return ret; } @@ -5329,7 +5306,7 @@ qemuDomainPinEmulator(virDomainPtr dom, virBitmapPtr pcpumap =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; - char *str =3D NULL; + g_autofree char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; int eventMaxparams =3D 0; @@ -5418,7 +5395,6 @@ qemuDomainPinEmulator(virDomainPtr dom, if (cgroup_emulator) virCgroupFree(&cgroup_emulator); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5800,7 +5776,7 @@ qemuDomainPinIOThread(virDomainPtr dom, virCgroupPtr cgroup_iothread =3D NULL; virObjectEventPtr event =3D NULL; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] =3D ""; - char *str =3D NULL; + g_autofree char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; int eventMaxparams =3D 0; @@ -5912,7 +5888,6 @@ qemuDomainPinIOThread(virDomainPtr dom, if (cgroup_iothread) virCgroupFree(&cgroup_iothread); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5924,7 +5899,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, unsigned int iothread_id) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *alias =3D NULL; + g_autofree char *alias =3D NULL; size_t idx; int ret =3D -1; unsigned int orig_niothreads =3D vm->def->niothreadids; @@ -6000,7 +5975,6 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", ret =3D=3D 0); - VIR_FREE(alias); virJSONValueFree(props); return ret; =20 @@ -6045,7 +6019,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; size_t idx; - char *alias =3D NULL; + g_autofree char *alias =3D NULL; int rc =3D -1; int ret =3D -1; unsigned int orig_niothreads =3D vm->def->niothreadids; @@ -6094,7 +6068,6 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", rc =3D=3D 0); - VIR_FREE(alias); return ret; =20 exit_monitor: @@ -6869,7 +6842,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virObjectEventPtr event; int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; - char *errbuf =3D NULL; + g_autofree char *errbuf =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; @@ -6989,7 +6962,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, cleanup: virObjectUnref(cookie); virCommandFree(cmd); - VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); return ret; @@ -7005,7 +6977,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, qemuDomainObjPrivatePtr priv =3D NULL; virDomainDefPtr def =3D NULL; virDomainObjPtr vm =3D NULL; - char *xmlout =3D NULL; + g_autofree char *xmlout =3D NULL; const char *newxml =3D dxml; int fd =3D -1; int ret =3D -1; @@ -7090,7 +7062,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret =3D -1; virFileWrapperFdFree(wrapperFd); virQEMUSaveDataFree(data); - VIR_FREE(xmlout); if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); @@ -7213,7 +7184,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *path =3D NULL; + g_autofree char *path =3D NULL; char *ret =3D NULL; virDomainDefPtr def =3D NULL; int fd =3D -1; @@ -7250,7 +7221,6 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7261,7 +7231,7 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, virQEMUDriverPtr driver =3D dom->conn->privateData; virConnectPtr conn =3D dom->conn; virDomainObjPtr vm; - char *path =3D NULL; + g_autofree char *path =3D NULL; int ret =3D -1; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) @@ -7283,7 +7253,6 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7302,7 +7271,7 @@ qemuDomainObjRestore(virConnectPtr conn, qemuDomainObjPrivatePtr priv =3D vm->privateData; int fd =3D -1; int ret =3D -1; - char *xmlout =3D NULL; + g_autofree char *xmlout =3D NULL; virQEMUSaveDataPtr data =3D NULL; virFileWrapperFdPtr wrapperFd =3D NULL; =20 @@ -7359,7 +7328,6 @@ qemuDomainObjRestore(virConnectPtr conn, =20 cleanup: virQEMUSaveDataFree(data); - VIR_FREE(xmlout); virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) @@ -7524,7 +7492,7 @@ qemuDomainObjStart(virConnectPtr conn, qemuDomainAsyncJob asyncJob) { int ret =3D -1; - char *managed_save; + g_autofree char *managed_save =3D NULL; bool start_paused =3D (flags & VIR_DOMAIN_START_PAUSED) !=3D 0; bool autodestroy =3D (flags & VIR_DOMAIN_START_AUTODESTROY) !=3D 0; bool bypass_cache =3D (flags & VIR_DOMAIN_START_BYPASS_CACHE) !=3D 0; @@ -7598,7 +7566,6 @@ qemuDomainObjStart(virConnectPtr conn, } =20 cleanup: - VIR_FREE(managed_save); return ret; } =20 @@ -7746,7 +7713,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; virObjectEventPtr event =3D NULL; - char *name =3D NULL; + g_autofree char *name =3D NULL; int ret =3D -1; int nsnapshots; int ncheckpoints; @@ -7875,7 +7842,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -9213,7 +9179,8 @@ static int qemuDomainSetAutostart(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *configFile =3D NULL, *autostartLink =3D NULL; + g_autofree char *configFile =3D NULL; + g_autofree char *autostartLink =3D NULL; int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 @@ -9277,8 +9244,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(configFile); - VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); return ret; } @@ -10058,7 +10023,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, { virCgroupPtr cgroup_temp =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *nodeset_str =3D NULL; + g_autofree char *nodeset_str =3D NULL; virDomainNumatuneMemMode mode; size_t i =3D 0; int ret =3D -1; @@ -10108,7 +10073,6 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(nodeset_str); virCgroupFree(&cgroup_temp); =20 return ret; @@ -10251,7 +10215,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, virDomainObjPtr vm =3D NULL; virDomainNumatuneMemMode tmpmode =3D VIR_DOMAIN_NUMATUNE_MEM_STRICT; qemuDomainObjPrivatePtr priv; - char *nodeset =3D NULL; + g_autofree char *nodeset =3D NULL; int ret =3D -1; virDomainDefPtr def =3D NULL; bool live =3D false; @@ -10315,7 +10279,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); virDomainObjEndAPI(&vm); return ret; } @@ -11182,7 +11145,7 @@ qemuDomainBlockResize(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; int ret =3D -1; - char *device =3D NULL; + g_autofree char *device =3D NULL; const char *nodename =3D NULL; virDomainDiskDefPtr disk =3D NULL; =20 @@ -11254,7 +11217,6 @@ qemuDomainBlockResize(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); return ret; } @@ -11963,7 +11925,7 @@ qemuDomainBlockPeek(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; virDomainObjPtr vm; - char *tmpbuf =3D NULL; + g_autofree char *tmpbuf =3D NULL; ssize_t nread; int ret =3D -1; =20 @@ -12018,7 +11980,6 @@ qemuDomainBlockPeek(virDomainPtr dom, if (disk) virStorageFileDeinit(disk->src); virDomainObjEndAPI(&vm); - VIR_FREE(tmpbuf); return ret; } =20 @@ -12030,7 +11991,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; @@ -12102,7 +12063,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, VIR_FORCE_CLOSE(fd); if (tmp) unlink(tmp); - VIR_FREE(tmp); virDomainObjEndAPI(&vm); return ret; } @@ -12268,7 +12228,7 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, int ret =3D -1; int fd =3D -1; struct stat sb; - char *buf =3D NULL; + g_autofree char *buf =3D NULL; ssize_t len; =20 if ((rc =3D qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb, @@ -12304,7 +12264,6 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, ret =3D 1; =20 cleanup: - VIR_FREE(buf); qemuDomainStorageCloseStat(src, &fd); return ret; } @@ -12525,7 +12484,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12560,7 +12519,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12582,7 +12540,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12627,7 +12585,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12828,7 +12785,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12863,7 +12820,6 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12889,7 +12845,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, int nbdPort =3D 0; int nmigrate_disks; const char **migrate_disks =3D NULL; - char *origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12952,7 +12908,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); VIR_FREE(migrate_disks); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12972,7 +12927,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -13001,7 +12956,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13021,7 +12975,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; - char *origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -13060,7 +13014,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13382,7 +13335,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; bool vfio =3D qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 @@ -13432,7 +13385,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13450,7 +13402,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13476,7 +13428,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13488,7 +13439,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13514,7 +13465,6 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -15355,7 +15305,6 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *backingStoreStr; virDomainDiskDefPtr persistdisk; g_autoptr(virStorageSource) terminator =3D NULL; bool supportsCreate; @@ -15401,13 +15350,13 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr= driver, * block commit still works */ if (reuse) { if (supportsBacking) { + g_autofree char *backingStoreStr =3D NULL; + if (virStorageFileGetBackingStoreStr(dd->src, &backingStor= eStr) < 0) return -1; if (backingStoreStr !=3D NULL) { if (virStorageIsRelative(backingStoreStr)) VIR_STEAL_PTR(dd->relPath, backingStoreStr); - else - VIR_FREE(backingStoreStr); } } } else { @@ -15854,7 +15803,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, { virQEMUDriverPtr driver =3D domain->conn->privateData; virDomainObjPtr vm =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; virDomainMomentObjPtr snap =3D NULL; virDomainSnapshotPtr snapshot =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -16135,7 +16084,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(xml); return snapshot; } =20 @@ -17922,7 +17870,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; virDomainObjPtr vm; - char *device =3D NULL; + g_autofree char *device =3D NULL; unsigned long long speed =3D bandwidth; =20 virCheckFlags(VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES, -1); @@ -17967,7 +17915,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); =20 return ret; @@ -19047,7 +18994,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo info; - char *drivealias =3D NULL; + g_autofree char *drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; size_t i; @@ -19374,7 +19321,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(info.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -19395,7 +19341,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo reply =3D {0}; - char *drivealias =3D NULL; + g_autofree char *drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; int maxparams; @@ -19532,7 +19478,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(reply.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); return ret; } @@ -20812,7 +20757,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, size_t i; int ret =3D -1; virVcpuInfoPtr cpuinfo =3D NULL; - unsigned long long *cpuwait =3D NULL; + g_autofree unsigned long long *cpuwait =3D NULL; =20 if (virTypedParamListAddUInt(params, virDomainDefGetVcpus(dom->def), "vcpu.current") < 0) @@ -20877,7 +20822,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, =20 cleanup: VIR_FREE(cpuinfo); - VIR_FREE(cpuwait); return ret; } =20 @@ -21159,7 +21103,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, bool blockdev) =20 { - char *alias =3D NULL; virStorageSourcePtr n; const char *frontendalias; const char *backendalias; @@ -21181,6 +21124,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, } =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { + g_autofree char *alias =3D NULL; + if (blockdev) { frontendalias =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; backendalias =3D n->nodeformat; @@ -21218,7 +21163,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, params) < 0) goto cleanup; =20 - VIR_FREE(alias); (*recordnr)++; =20 if (!visitBacking) @@ -21228,7 +21172,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, ret =3D 0; =20 cleanup: - VIR_FREE(alias); return ret; } =20 @@ -21945,12 +21888,12 @@ qemuDomainRenameCallback(virDomainObjPtr vm, virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; - char *new_dom_name =3D NULL; - char *old_dom_name =3D NULL; - char *new_dom_cfg_file =3D NULL; - char *old_dom_cfg_file =3D NULL; - char *new_dom_autostart_link =3D NULL; - char *old_dom_autostart_link =3D NULL; + g_autofree char *new_dom_name =3D NULL; + g_autofree char *old_dom_name =3D NULL; + g_autofree char *new_dom_cfg_file =3D NULL; + g_autofree char *old_dom_cfg_file =3D NULL; + g_autofree char *new_dom_autostart_link =3D NULL; + g_autofree char *old_dom_autostart_link =3D NULL; =20 virCheckFlags(0, ret); =20 @@ -22022,12 +21965,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret =3D 0; =20 cleanup: - VIR_FREE(old_dom_autostart_link); - VIR_FREE(new_dom_autostart_link); - VIR_FREE(old_dom_cfg_file); - VIR_FREE(new_dom_cfg_file); - VIR_FREE(old_dom_name); - VIR_FREE(new_dom_name); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); return ret; @@ -22132,7 +22069,7 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, virBitmapPtr vcpus =3D NULL; virBitmapPtr online =3D NULL; virBitmapPtr offlinable =3D NULL; - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; size_t i; int ret =3D -1; =20 @@ -22161,7 +22098,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, goto cleanup; \ if (virTypedParamsAddString(&par, &npar, &maxpar, #name, tmp) < 0) \ goto cleanup; \ - VIR_FREE(tmp) =20 ADD_BITMAP(vcpus); ADD_BITMAP(online); @@ -22175,7 +22111,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, ret =3D 0; =20 cleanup: - VIR_FREE(tmp); virBitmapFree(vcpus); virBitmapFree(online); virBitmapFree(offlinable); @@ -22403,7 +22338,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virStorageSourcePtr src; - char *nodename =3D NULL; + g_autofree char *nodename =3D NULL; int rc; int ret =3D -1; =20 @@ -22457,7 +22392,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(nodename); virDomainObjEndAPI(&vm); return ret; } @@ -22636,7 +22570,7 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - char *tmp =3D NULL; + g_autofree char *tmp =3D NULL; int maxpar =3D 0; =20 virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); @@ -22661,7 +22595,6 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, ret =3D 0; =20 endjob: - VIR_FREE(tmp); qemuDomainObjEndJob(driver, vm); return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 04:26:06 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571259318; cv=none; d=zoho.com; s=zohoarc; b=n/5B7jpPv2urjGQJPoxGsQTo9D2ocGv4KGr6SQOG9hNiKdYbiVkr2cUUvjmdFyrgCVF4QnDITY3FG47Go5WbdahoOE0GRmY5cRQKKPqk+tL6eq4Me4WWrf53dTDZJWr/2NAH5tHFbZMCwgY5x/FTIw4t7ct/0Q3X+etOeVHZBhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571259318; h=Content-Type:Content-Transfer-Encoding:Cc: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=RaswKDx5uJjEt785zQPl7+pz+CKTuZm3W5cKCdqO7U8=; b=TIDxFEXvM/W3wzn2tmY2GNezaqvAd4h3rc47IHsfpYcTqyrBpzOV6E5D3HbxfDWqimFP6oW1OV1g83srypEd91FyrEciEbU2d+f/DNw7ztr8lE5KgrGxgdRPIzrekQrs4L4gcXW3SlZyCJ8ubHCSbG6qTDFew9XW4gQuQoSbTa0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 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 1571259318020651.8397008881341; Wed, 16 Oct 2019 13:55:18 -0700 (PDT) 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 30C213078467; Wed, 16 Oct 2019 20:55:16 +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 F2FAA60C5D; Wed, 16 Oct 2019 20:55:15 +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 AF1E7180BA99; Wed, 16 Oct 2019 20:55:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9GKstwX018416 for ; Wed, 16 Oct 2019 16:54:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9249B3CC8; Wed, 16 Oct 2019 20:54:55 +0000 (UTC) Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13E94194B6; Wed, 16 Oct 2019 20:54:53 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABF4C3D965; Wed, 16 Oct 2019 20:54:51 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id w14so115330qto.9; Wed, 16 Oct 2019 13:54:51 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id m125sm23965qkd.3.2019.10.16.13.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CCd4JnkaeKb5rUGDb8xvKDKWsz6WZBehInjpsiGvhts=; b=DEqa9gxkiZn1X57Zmf0TMMZOTVFbAQznHjw57R2MHtEGpgWhVGmYPqGkZ840XNywF/ dX+BiAH1DKAfs4PrhnKVF+yll9bUL6tXuMVBmSS8Bu6q4M1mP5YwpR+cBBoA2TYeyejE hsBJj1iO59arUsnt3qIpA3ki6IhuQ2EP0V6nM8RP4+cgdXADcvs/rw/n3wzlqvLG0qjL Syg/qYbZQMG+V/VTFRbGAhrbl0eUxFXJsCYd5KhMCaT7pi0Qv3y4tpd3p8ulLe+w668q vXWilEjw0okO/oAUMDTuMu8GT8ZprVhTljRhJ1ec8QvgaJ7DSRQwtNFYLdTASQ4PiwHS kYnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CCd4JnkaeKb5rUGDb8xvKDKWsz6WZBehInjpsiGvhts=; b=Se7mDgnlBw8dyI4pJx2f6JB5gpG23Q6RHPBH8DN5ctOBUjF6uuCBmFtVBfI5zjydi6 W40erPW0JBVOjL8nC/e+CmgbMlIt1Crn2mhSjEFmJdzZVyRBhK4wxXRbWs2SxiRiYKIF iixMII7QmaFB9vYT2zo8p3/mo5ahhbo6PioxPaEvtPbuki7ZiFg4HnFxBQcSiW2Jgv+x 63634nED5w3ZJB41D2ydWiJ8/nR34NQiWVnXAUZkB7PNmkKC4dyy0otpIos3pkRT0uAF CJKIwBrwKv+A34bb1XwpPUgAnWuCoK8LyscLJ5aHlFv4N19nJnY8rXK6DWQUoZ1I/lux P/Hw== X-Gm-Message-State: APjAAAUaLxDt0lYayn9l3PaIgu0it3/OBLxMolcTUk7bHzXAj4fEeSyG MeNQBxFLFj2Q25SumKSVXDQ7p+nW X-Google-Smtp-Source: APXvYqzGmzH6p3NudR1fxC9gRXJCpU/QWAR8kGtbTkOF50DS6dMYluLOfV18SFsSqFoWCTl0iBEjuw== X-Received: by 2002:ac8:6f61:: with SMTP id u1mr15596qtv.79.1571259290581; Wed, 16 Oct 2019 13:54:50 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 16 Oct 2019 17:54:32 -0300 Message-Id: <20191016205433.18341-5-danielhb413@gmail.com> In-Reply-To: <20191016205433.18341-1-danielhb413@gmail.com> References: <20191016205433.18341-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 16 Oct 2019 20:54:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 16 Oct 2019 20:54:51 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.30 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , jtomko@redhat.com, eskultet@redhat.com Subject: [libvirt] [PATCH v4 4/5] qemu_driver: remove unused 'cleanup' labels after g_auto*() changes 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 16 Oct 2019 20:55:16 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) The g_auto*() changes made by the previous patches made a lot of 'cleanup' labels obsolete. Let's remove them. Suggested-by: J=C3=A1n Tomko Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 160 +++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 104 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d824992c16..a263393626 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1057,7 +1057,7 @@ qemuStateReload(void) return 0; =20 if (!(caps =3D virQEMUDriverGetCapabilities(qemu_driver, false))) - goto cleanup; + return 0; =20 cfg =3D virQEMUDriverGetConfig(qemu_driver); virDomainObjListLoadAllConfigs(qemu_driver->domains, @@ -1065,7 +1065,6 @@ qemuStateReload(void) cfg->autostartDir, false, caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); - cleanup: return 0; } =20 @@ -1181,18 +1180,15 @@ static int qemuConnectURIProbe(char **uri) { g_autoptr(virQEMUDriverConfig) cfg =3D NULL; - int ret =3D -1; =20 if (qemu_driver =3D=3D NULL) return 0; =20 cfg =3D virQEMUDriverGetConfig(qemu_driver); if (VIR_STRDUP(*uri, cfg->uri) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn, @@ -1335,20 +1331,15 @@ qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UN= USED, const char *type) =20 static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - char *xml =3D NULL; g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, true))) - goto cleanup; - - xml =3D virCapabilitiesFormatXML(caps); - - cleanup: + return NULL; =20 - return xml; + return virCapabilitiesFormatXML(caps); } =20 =20 @@ -1691,7 +1682,6 @@ static int qemuDomainIsUpdated(virDomainPtr dom) static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *versio= n) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; unsigned int qemuVersion =3D 0; g_autoptr(virCaps) caps =3D NULL; =20 @@ -1699,18 +1689,15 @@ static int qemuConnectGetVersion(virConnectPtr conn= , unsigned long *version) return -1; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return -1; =20 if (virQEMUCapsGetDefaultVersion(caps, driver->qemuCapsCache, &qemuVersion) < 0) - goto cleanup; + return -1; =20 *version =3D qemuVersion; - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2902,7 +2889,6 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, size_t len; size_t xml_len; size_t cookie_len =3D 0; - int ret =3D -1; size_t zerosLen =3D 0; g_autofree char *zeros =3D NULL; =20 @@ -2916,12 +2902,12 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, if (len > header->data_len) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("new xml too large to fit in file")); - goto cleanup; + return -1; } =20 zerosLen =3D header->data_len - len; if (VIR_ALLOC_N(zeros, zerosLen) < 0) - goto cleanup; + return -1; } else { header->data_len =3D len; } @@ -2933,14 +2919,14 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, virReportSystemError(errno, _("failed to write header to domain save file= '%s'"), path); - goto cleanup; + return -1; } =20 if (safewrite(fd, data->xml, xml_len) !=3D xml_len) { virReportSystemError(errno, _("failed to write domain xml to '%s'"), path); - goto cleanup; + return -1; } =20 if (data->cookie && @@ -2948,20 +2934,17 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, virReportSystemError(errno, _("failed to write cookie to '%s'"), path); - goto cleanup; + return -1; } =20 if (safewrite(fd, zeros, zerosLen) !=3D zerosLen) { virReportSystemError(errno, _("failed to write padding to '%s'"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3031,7 +3014,6 @@ qemuOpenFile(virQEMUDriverPtr driver, int oflags, bool *needUnlink) { - int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t user =3D cfg->user; gid_t group =3D cfg->group; @@ -3043,13 +3025,10 @@ qemuOpenFile(virQEMUDriverPtr driver, (seclabel =3D virDomainDefGetSecurityLabelDef(vm->def, "dac")) != =3D NULL && seclabel->label !=3D NULL && (virParseOwnershipIds(seclabel->label, &user, &group) < 0)) - goto cleanup; - - ret =3D qemuOpenFileAs(user, group, dynamicOwnership, - path, oflags, needUnlink); + return -1; =20 - cleanup: - return ret; + return qemuOpenFileAs(user, group, dynamicOwnership, + path, oflags, needUnlink); } =20 static int @@ -4181,14 +4160,13 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, g_autofree char *dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) - goto cleanup; + return -1; =20 flags |=3D cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0; if ((ret =3D doCoreDump(driver, vm, dumpfile, flags, VIR_DOMAIN_CORE_DUMP_FORMAT_RAW)) < 0) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Dump failed")); - cleanup: return ret; } =20 @@ -4985,19 +4963,18 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int topologycpus; - int ret =3D -1; =20 if (def) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("maximum vcpu count of a live domain can't be mod= ified")); - goto cleanup; + return -1; } =20 if (virDomainNumaGetCPUCountTotal(persistentDef->numa) > nvcpus) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Number of CPUs in exceeds the desired " "maximum vcpu count")); - goto cleanup; + return -1; } =20 if (virDomainDefGetVcpusTopology(persistentDef, &topologycpus) =3D=3D = 0 && @@ -5006,22 +4983,19 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, * setting may be corrected via this API */ virReportError(VIR_ERR_INVALID_ARG, "%s", _("CPU topology doesn't match the desired vcpu coun= t")); - goto cleanup; + return -1; } =20 /* ordering information may become invalid, thus clear it */ virDomainDefVcpuOrderClear(persistentDef); =20 if (virDomainDefSetVcpusMax(persistentDef, nvcpus, driver->xmlopt) < 0) - goto cleanup; + return -1; =20 if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) <= 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -6247,7 +6221,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, priv =3D vm->privateData; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; =20 if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) goto endjob; @@ -6335,7 +6309,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, endjob: qemuDomainObjEndJob(driver, vm); =20 - cleanup: return ret; } =20 @@ -6562,29 +6535,27 @@ static int qemuNodeGetSecurityModel(virConnectPtr c= onn, { virQEMUDriverPtr driver =3D conn->privateData; char *p; - int ret =3D 0; g_autoptr(virCaps) caps =3D NULL; =20 memset(secmodel, 0, sizeof(*secmodel)); =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return 0; =20 if (virNodeGetSecurityModelEnsureACL(conn) < 0) - goto cleanup; + return 0; =20 /* We treat no driver as success, but simply return no data in *secmod= el */ if (caps->host.nsecModels =3D=3D 0 || caps->host.secModels[0].model =3D=3D NULL) - goto cleanup; + return 0; =20 p =3D caps->host.secModels[0].model; if (strlen(p) >=3D VIR_SECURITY_MODEL_BUFLEN-1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - ret =3D -1; - goto cleanup; + return -1; } strcpy(secmodel->model, p); =20 @@ -6593,13 +6564,11 @@ static int qemuNodeGetSecurityModel(virConnectPtr c= onn, virReportError(VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - ret =3D -1; - goto cleanup; + return -1; } strcpy(secmodel->doi, p); =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -7510,7 +7479,7 @@ qemuDomainObjStart(virConnectPtr conn, managed_save =3D qemuDomainManagedSavePath(driver, vm); =20 if (!managed_save) - goto cleanup; + return ret; =20 if (virFileExists(managed_save)) { if (force_boot) { @@ -7518,7 +7487,7 @@ qemuDomainObjStart(virConnectPtr conn, virReportSystemError(errno, _("cannot remove managed save file %s= "), managed_save); - goto cleanup; + return ret; } vm->hasManagedSave =3D false; } else { @@ -7534,11 +7503,11 @@ qemuDomainObjStart(virConnectPtr conn, else vm->hasManagedSave =3D false; =20 - goto cleanup; + return ret; } else if (ret < 0) { VIR_WARN("Unable to restore from managed state %s. " "Maybe the file is corrupted?", managed_save); - goto cleanup; + return ret; } else { VIR_WARN("Ignoring incomplete managed state %s", managed_s= ave); priv->job.current->operation =3D op; @@ -7565,7 +7534,6 @@ qemuDomainObjStart(virConnectPtr conn, } } =20 - cleanup: return ret; } =20 @@ -13474,7 +13442,6 @@ qemuConnectCompareCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D VIR_CPU_COMPARE_ERROR; g_autoptr(virCaps) caps =3D NULL; bool failIncompatible; =20 @@ -13482,18 +13449,15 @@ qemuConnectCompareCPU(virConnectPtr conn, VIR_CPU_COMPARE_ERROR); =20 if (virConnectCompareCPUEnsureACL(conn) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 failIncompatible =3D !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATI= BLE); =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - - ret =3D virCPUCompareXML(caps->host.arch, caps->host.cpu, - xmlDesc, failIncompatible); + return VIR_CPU_COMPARE_ERROR; =20 - cleanup: - return ret; + return virCPUCompareXML(caps->host.arch, caps->host.cpu, + xmlDesc, failIncompatible); } =20 =20 @@ -20412,17 +20376,16 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, const char *virttype_str, unsigned int flags) { - char *ret =3D NULL; virQEMUDriverPtr driver =3D conn->privateData; g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; g_autoptr(virDomainCaps) domCaps =3D NULL; =20 - virCheckFlags(0, ret); + virCheckFlags(0, NULL); =20 if (virConnectGetDomainCapabilitiesEnsureACL(conn) < 0) - return ret; + return NULL; =20 qemuCaps =3D virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, emulatorbin, @@ -20431,16 +20394,14 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, machine, &arch, &virttype, &machine); if (!qemuCaps) - goto cleanup; + return NULL; =20 if (!(domCaps =3D virQEMUDriverGetDomainCapabilities(driver, qemuCaps, machine, arch, virttype))) - goto cleanup; + return NULL; =20 - ret =3D virDomainCapsFormat(domCaps); - cleanup: - return ret; + return virDomainCapsFormat(domCaps); } =20 =20 @@ -21107,7 +21068,6 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, const char *frontendalias; const char *backendalias; const char *backendstoragealias; - int ret =3D -1; =20 /* * This helps to keep logs clean from error messages on getting stats @@ -21134,7 +21094,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, /* alias may be NULL if the VM is not running */ if (disk->info.alias && !(alias =3D qemuDomainStorageAlias(disk->info.alias, n->id= ))) - goto cleanup; + return -1; =20 qemuDomainGetStatsOneBlockRefreshNamed(n, alias, stats, nodest= ats); =20 @@ -21144,24 +21104,24 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDe= fPtr disk, } =20 if (qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params= ) < 0) - goto cleanup; + return -1; =20 /* The following stats make sense only for the frontend device */ if (n =3D=3D disk->src) { if (qemuDomainGetStatsBlockExportFrontend(frontendalias, stats= , *recordnr, params) < 0) - goto cleanup; + return -1; } =20 if (qemuDomainGetStatsOneBlock(driver, cfg, dom, params, backendalias, n, *recordnr, stats) < 0) - goto cleanup; + return -1; =20 if (qemuDomainGetStatsBlockExportBackendStorage(backendstoragealia= s, stats, *recordnr, params) < 0) - goto cleanup; + return -1; =20 (*recordnr)++; =20 @@ -21169,10 +21129,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef= Ptr disk, break; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -22534,31 +22491,26 @@ qemuNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; g_autoptr(virQEMUCaps) qemucaps =3D NULL; =20 if (virNodeGetSevInfoEnsureACL(conn) < 0) - return ret; + return -1; =20 qemucaps =3D virQEMUCapsCacheLookupByArch(driver->qemuCapsCache, virArchFromHost()); if (!qemucaps) - goto cleanup; + return -1; =20 if (!virQEMUCapsGet(qemucaps, QEMU_CAPS_SEV_GUEST)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("QEMU does not support SEV guest")); - goto cleanup; + return -1; } =20 if (qemuGetSEVInfoToParams(qemucaps, params, nparams, flags) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: + return -1; =20 - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 04:26:06 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571259315; cv=none; d=zoho.com; s=zohoarc; b=d2qKBMSVZ9EoQOci3LoSQh9WRRWogzM2diSIfurUqYVCbsMsNcKSuOurw6eZeqptBJgEF5faGvJOu+Zii/WoWOvzn7jNLrEn22UnaEZLpFsDhkLee/e25/nbUvrpN9OUhMAWT4Xli3d5LseX1qRVf49N+XeruYeUlppPeQaSzXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571259315; h=Content-Type:Content-Transfer-Encoding:Cc: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=exp1vOYy7IExLGXrmlKmkIdchTWLFsKoKX8jr0vJLQs=; b=L74SGi+JKB5x4Ad+I/JSYH1MAQghEEbcZjDIGXjgk37LjmzHJ+AgDroBtSTmHIBp7ZCV9cFqOLlyGAi7sBUTj7h9xiG0yt/dOo+k3c9h83OslqUitQEW7IP9+UMic3tD/VcXvUDb5o6vRZIUIRss3l9gfXwqLOmbDt7IVVSGnlU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 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 1571259315476903.6057992288811; Wed, 16 Oct 2019 13:55:15 -0700 (PDT) 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 972EB307D88C; Wed, 16 Oct 2019 20:55:13 +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 6C54E60C5D; Wed, 16 Oct 2019 20:55:13 +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 15801180B761; Wed, 16 Oct 2019 20:55:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9GKsuN7018431 for ; Wed, 16 Oct 2019 16:54:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id C6E6C5DC18; Wed, 16 Oct 2019 20:54:56 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 439075DA8D; Wed, 16 Oct 2019 20:54:54 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2F3A734CC; Wed, 16 Oct 2019 20:54:53 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id u40so96421qth.11; Wed, 16 Oct 2019 13:54:53 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id m125sm23965qkd.3.2019.10.16.13.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nXChUnJX/8DAyu4dUOBZYvFbvdhtzbUGmzIdtFGwGmE=; b=qAnmXFJB9px55iLma1ndgpKHJXLDgV/B/YgQRGavSkyPvfdVd6NFMV2VXa67vLIYuW nG7+kWcyUBA230zave7p1i9agPrqvgObkkbL1KzF3A8dr+y6kHFWO2K/H+wLr2rAyymD mOlAcEayNQt5YjBx0kQoDglJknlBee3kPSG4k/LkBVqvl8wQQQIDgoR+GO1buaUPTijk HydSD+KVHellpLBpt73PobDmjAQ+ClLyBnrr/geBkVdcFhbgmw9FTVL82+gCOuE5Arin PVkHudAYuGd79DLyQtpn42Zqk5eca+nWBoSmBUs7/axAKyXQlLIS1POklXSmKLwqSxTA WpBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nXChUnJX/8DAyu4dUOBZYvFbvdhtzbUGmzIdtFGwGmE=; b=ENjfY6YRalPTUovQ5X9meLPXdxNwYV7KySle857b9oQQ+NqS9eglQFrNmaf1T6itjy 7jZZqellt2UhowAb1CcWpyLNmNd392aWcqQh27swCB9aMiKYShNgU2ul/DuKERjnxQCf 6WQMSWktCkIdBE8Ar5ksJ3L2Cp6ooR3ytVOoP5WUQli3Q+604BkOOFtpWy9NU4uUF8Vb ILG6Ziv9QW2EJ5uQColI1YGPzehcaxyB/LsvvZjHKR6QiLHQ0VSEFNhclX1v99Kb4Fwf qlmUME4s3bCK5odncSUyYK9Zq5eqedomqv+D8RYjYnZwuEzk4U5sKxqOduBgWD0NMk3C ku1w== X-Gm-Message-State: APjAAAVhjqfH4YHaUWP2PafHKHfK0JrJGN9vKNTAW0LzYoJ8OpHY/eHb MC/VCOkSn32eBgjcbj/F7OsIwXsh X-Google-Smtp-Source: APXvYqwzeUhhBZP7wvT+1r21TdYtIfRNeg7wVzo3wC5ZuSUofGhh7oqhSEvod38N84FGONOI65MGug== X-Received: by 2002:aed:3847:: with SMTP id j65mr57218qte.124.1571259292228; Wed, 16 Oct 2019 13:54:52 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 16 Oct 2019 17:54:33 -0300 Message-Id: <20191016205433.18341-6-danielhb413@gmail.com> In-Reply-To: <20191016205433.18341-1-danielhb413@gmail.com> References: <20191016205433.18341-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 16 Oct 2019 20:54:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 16 Oct 2019 20:54:53 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , jtomko@redhat.com, eskultet@redhat.com Subject: [libvirt] [PATCH v4 5/5] qemu_driver: use g_strdup_printf 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-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.48]); Wed, 16 Oct 2019 20:55:14 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch changes all virAsprintf calls to use the GLib API g_strdup_printf in qemu_driver.c Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a263393626..c9b3ed877f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -402,7 +402,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, =20 priv =3D vm->privateData; =20 - if (virAsprintf(&snapDir, "%s/%s", baseDir, vm->def->name) < 0) { + if (!(snapDir =3D g_strdup_printf("%s/%s", baseDir, vm->def->name))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to allocate memory for " "snapshot directory for domain %s"), @@ -427,7 +427,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, kill the whole process */ VIR_INFO("Loading snapshot file '%s'", entry->d_name); =20 - if (virAsprintf(&fullpath, "%s/%s", snapDir, entry->d_name) < 0) { + if (!(fullpath =3D g_strdup_printf("%s/%s", snapDir, entry->d_name= ))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to allocate memory for path")); continue; @@ -514,7 +514,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virObjectLock(vm); priv =3D vm->privateData; =20 - if (virAsprintf(&chkDir, "%s/%s", baseDir, vm->def->name) < 0) { + if (!(chkDir =3D g_strdup_printf("%s/%s", baseDir, vm->def->name))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to allocate memory for " "checkpoint directory for domain %s"), @@ -539,7 +539,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, kill the whole process */ VIR_INFO("Loading checkpoint file '%s'", entry->d_name); =20 - if (virAsprintf(&fullpath, "%s/%s", chkDir, entry->d_name) < 0) { + if (!(fullpath =3D g_strdup_printf("%s/%s", chkDir, entry->d_name)= )) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to allocate memory for path")); continue; @@ -690,7 +690,7 @@ qemuStateInitialize(bool privileged, if (!(qemu_driver->config =3D cfg =3D virQEMUDriverConfigNew(privilege= d))) goto error; =20 - if (virAsprintf(&driverConf, "%s/qemu.conf", cfg->configBaseDir) < 0) + if (!(driverConf =3D g_strdup_printf("%s/qemu.conf", cfg->configBaseDi= r))) goto error; =20 if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) @@ -1359,10 +1359,10 @@ qemuGetSchedInfo(unsigned long long *cpuWait, /* In general, we cannot assume pid_t fits in int; but /proc parsing * is specific to Linux where int works fine. */ if (tid) - ret =3D virAsprintf(&proc, "/proc/%d/task/%d/sched", (int)pid, (in= t)tid); + proc =3D g_strdup_printf("/proc/%d/task/%d/sched", (int)pid, (int)= tid); else - ret =3D virAsprintf(&proc, "/proc/%d/sched", (int)pid); - if (ret < 0) + proc =3D g_strdup_printf("/proc/%d/sched", (int)pid); + if (!proc) goto cleanup; ret =3D -1; =20 @@ -1426,15 +1426,14 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int= *lastCpu, long *vm_rss, unsigned long long usertime =3D 0, systime =3D 0; long rss =3D 0; int cpu =3D 0; - int ret; =20 /* In general, we cannot assume pid_t fits in int; but /proc parsing * is specific to Linux where int works fine. */ if (tid) - ret =3D virAsprintf(&proc, "/proc/%d/task/%d/stat", (int)pid, tid); + proc =3D g_strdup_printf("/proc/%d/task/%d/stat", (int)pid, tid); else - ret =3D virAsprintf(&proc, "/proc/%d/stat", (int)pid); - if (ret < 0) + proc =3D g_strdup_printf("/proc/%d/stat", (int)pid); + if (!proc) return -1; =20 pidinfo =3D fopen(proc, "r"); @@ -3521,7 +3520,7 @@ qemuDomainManagedSavePath(virQEMUDriverPtr driver, vi= rDomainObjPtr vm) char *ret; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 - if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) + if (!(ret =3D g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->nam= e))) return NULL; =20 return ret; @@ -4032,7 +4031,7 @@ qemuDomainScreenshot(virDomainPtr dom, } } =20 - if (virAsprintf(&tmp, "%s/qemu.screendump.XXXXXX", cfg->cacheDir) < 0) + if (!(tmp =3D g_strdup_printf("%s/qemu.screendump.XXXXXX", cfg->cacheD= ir))) goto endjob; =20 if ((tmp_fd =3D mkostemp(tmp, O_CLOEXEC)) =3D=3D -1) { @@ -4095,10 +4094,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, localtime_r(&curtime, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); =20 - ignore_value(virAsprintf(&dumpfile, "%s/%s-%s", - cfg->autoDumpPath, - domname, - timestr)); + dumpfile =3D g_strdup_printf("%s/%s-%s", cfg->autoDumpPath, domname, t= imestr); =20 return dumpfile; } @@ -5883,7 +5879,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, virDomainIOThreadIDDefPtr iothrid; virJSONValuePtr props =3D NULL; =20 - if (virAsprintf(&alias, "iothread%u", iothread_id) < 0) + if (!(alias =3D g_strdup_printf("iothread%u", iothread_id))) return -1; =20 if (qemuMonitorCreateObjectProps(&props, "iothread", alias, NULL) < 0) @@ -6001,7 +5997,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, int new_niothreads =3D 0; qemuMonitorIOThreadInfoPtr *new_iothreads =3D NULL; =20 - if (virAsprintf(&alias, "iothread%u", iothread_id) < 0) + if (!(alias =3D g_strdup_printf("iothread%u", iothread_id))) return -1; =20 qemuDomainObjEnterMonitor(driver, vm); @@ -11986,7 +11982,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; =20 - if (virAsprintf(&tmp, "%s/qemu.mem.XXXXXX", cfg->cacheDir) < 0) + if (!(tmp =3D g_strdup_printf("%s/qemu.mem.XXXXXX", cfg->cacheDir))) goto endjob; =20 /* Create a temporary filename. */ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list