From nobody Sun Feb 8 12:42:45 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=1639404000; cv=none; d=zohomail.com; s=zohoarc; b=GW6AVXeJHR9X4WpG46lAvK6XD+xRaj1jRt2mJjcbzE0/2rJV8fQF/OjLRFsYEbeJQg5oXVgedF8yKtwKdDSmTtyM9TuOgxO2UnLPLagsNZwcehrq/WDv7ULmKLRAh/i5Ix7lcOsQDbGhvMzZNh8WMVddMTVsSXcgBwOgiwGQmdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639404000; 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=RrBt4B5L1JgKCMNiwx6BclNR0bClNlRaz04p43pnC+o=; b=Wj1s0Ci1Q16JNbx+aCCWXtX9Q9XIdOmusb/UgDzOsYSPTMWrNxvptLy2KMJSbMqsHEheK3IFPHRkOomP9rcixtvxdwJEzfUdtXHBx8RJ6s99mYT/8AAHh2YZ/0VQ0F4sYcHmRCkitCNI7s53DURh9m4qK+M0nt9ZCttRk83HcWs= 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 1639404000453920.8629261080714; Mon, 13 Dec 2021 06:00:00 -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-150-Le0NDl1nP5SGZ5GV6BzRug-1; Mon, 13 Dec 2021 08:59:55 -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 6D1C919253E8; Mon, 13 Dec 2021 13:59:51 +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 4A40316A31; Mon, 13 Dec 2021 13:59:51 +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 E7BEF4A7C9; Mon, 13 Dec 2021 13:59:50 +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 1BDDxlhq002510 for ; Mon, 13 Dec 2021 08:59:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7934522DFE; Mon, 13 Dec 2021 13:59:47 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00A1016A32 for ; Mon, 13 Dec 2021 13:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639403999; 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=RrBt4B5L1JgKCMNiwx6BclNR0bClNlRaz04p43pnC+o=; b=NYG4ncptcREDa3qah5p4YE2s5+IL2AOLGy7TvZzXr7WFDDmtB7b8c+8vmH5wOh3Q9t43Pu t32QsFutaW2RhSndA2PnlzeuVGP23SudBwJJddiNoCYHEtWwHGhTaxUwFKy/rHmHjG6bCF YUE/3V4zPYdxYIf1RSW48f22cbZfjjk= X-MC-Unique: Le0NDl1nP5SGZ5GV6BzRug-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 02/14] bhyve: refactor bhyveProbeCapsDeviceHelper Date: Mon, 13 Dec 2021 14:59:31 +0100 Message-Id: <3a92c405672a077a6df7db753256ecde3e9543f7.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: 1639404002283100006 Use g_auto and remove the 'ret' variable, as well as the cleanup label. Signed-off-by: J=C3=A1n Tomko --- src/bhyve/bhyve_capabilities.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index ed0df35518..421d0622cd 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -199,24 +199,20 @@ bhyveProbeCapsDeviceHelper(unsigned int *caps, const char *errormsg, unsigned int flag) { - char *error; - virCommand *cmd =3D NULL; - int ret =3D -1, exit; + g_autofree char *error =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; + int exit; =20 cmd =3D virCommandNew(binary); virCommandAddArgList(cmd, bus, device, NULL); virCommandSetErrorBuffer(cmd, &error); if (virCommandRun(cmd, &exit) < 0) - goto cleanup; + return -1; =20 if (strstr(error, errormsg) =3D=3D NULL) *caps |=3D flag; =20 - ret =3D 0; - cleanup: - VIR_FREE(error); - virCommandFree(cmd); - return ret; + return 0; } =20 static int --=20 2.31.1