From nobody Sun Feb 8 15:42:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639404043; cv=none; d=zohomail.com; s=zohoarc; b=f2GiE/qXeNp6mS72Wo9MEYH7rcdZpnVLXEFTQnzrTDTsd0tvM0NelMLw8ig79YU7W5Zgv9ZIOZZ/hQ/lI39Q+RosT7HimA3muBwq38CarIT8kBMrMPDo8uXYGJzAejFcWBVUkp7vPKAX/v/qCYTVdOmpemvTSSAuStDcN3WNfx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639404043; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Aey/HxWnO/59mmajPlBH7knrgUhlHw5bI87fZqkqDeA=; b=MoQgY3MXtvHMhFp/rwlmu4ldBAOKj27QLvTM5ct2bVCCYwyshtQsMbVJs4c9LXwwfO89/R0wL+sc8QWzrUnpVKBe5L9v2G/zQBj+0Fz9foc1ZiS++bcpL7GFW2T5NtrnMOQx2FZWuTKGbi/uUynPLIIfuZL2P4/OMdpJb57BYNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 16394040432341003.4380217135513; Mon, 13 Dec 2021 06:00:43 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-560-MSllikTwOyGOxWm4nL7rog-1; Mon, 13 Dec 2021 09:00:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F732344BC; Mon, 13 Dec 2021 14:00:04 +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 E466016A32; Mon, 13 Dec 2021 14:00:03 +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 81ACE4A706; Mon, 13 Dec 2021 14:00:03 +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 1BDDxnNm002530 for ; Mon, 13 Dec 2021 08:59:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id EC2A916A33; Mon, 13 Dec 2021 13:59:49 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 738B416A32 for ; Mon, 13 Dec 2021 13:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639404042; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Aey/HxWnO/59mmajPlBH7knrgUhlHw5bI87fZqkqDeA=; b=gPMCJKQ5E0t9Ai5+aYVm2WqBKJo9q7t6QXm0tD1QdGp733SOLf7+a83xqpbuUiWhRyMb74 syV5LqbkcRTUY+JFjsXAvcfvrgt0bVVfl1HWnJ/CN+M8Afob4fZQkIwbiPNvsinUnhmyX9 s90MFCgDXoFVKPuOz1dprlrDOyRXSCI= X-MC-Unique: MSllikTwOyGOxWm4nL7rog-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/14] bhyve: use g_auto in virBhyveProcessStartImpl Date: Mon, 13 Dec 2021 14:59:34 +0100 Message-Id: <888d38580225d411db494e5bf161346f46af4532.1639403837.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639404053826100003 Use g_auto and VIR_AUTOCLOSE where possible. Signed-off-by: J=C3=A1n Tomko --- src/bhyve/bhyve_process.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 8de5fe4838..ead6b0e522 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -116,12 +116,12 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, virDomainObj *vm, virDomainRunningReason reason) { - char *devmap_file =3D NULL; - char *devicemap =3D NULL; - char *logfile =3D NULL; - int logfd =3D -1; - virCommand *cmd =3D NULL; - virCommand *load_cmd =3D NULL; + g_autofree char *devmap_file =3D NULL; + g_autofree char *devicemap =3D NULL; + g_autofree char *logfile =3D NULL; + VIR_AUTOCLOSE logfd =3D -1; + g_autoptr(virCommand) cmd =3D NULL; + g_autoptr(virCommand) load_cmd =3D NULL; bhyveDomainObjPrivate *priv =3D vm->privateData; int ret =3D -1, rc; =20 @@ -227,28 +227,21 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (rc < 0 && errno !=3D ENOENT) virReportSystemError(errno, _("cannot unlink file '%s'"), devmap_file); - VIR_FREE(devicemap); } - VIR_FREE(devmap_file); =20 if (ret < 0) { int exitstatus; /* Needed to avoid logging non-zero status */ - virCommand *destroy_cmd; + g_autoptr(virCommand) destroy_cmd =3D NULL; if ((destroy_cmd =3D virBhyveProcessBuildDestroyCmd(driver, vm->def)) !=3D N= ULL) { virCommandSetOutputFD(load_cmd, &logfd); virCommandSetErrorFD(load_cmd, &logfd); ignore_value(virCommandRun(destroy_cmd, &exitstatus)); - virCommandFree(destroy_cmd); } =20 bhyveNetCleanup(vm); } =20 - virCommandFree(load_cmd); - virCommandFree(cmd); - VIR_FREE(logfile); - VIR_FORCE_CLOSE(logfd); return ret; } =20 --=20 2.31.1