From nobody Sun Feb 8 09:41:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=Hd9RB0KMXoP6L0dl98joTZA6bDi6y2x1l6Yq7NOzJNDM2ISVrAB2yVuWiQ38lHJYKSjcKCg+pwCrQbW7btMB/KqBH3tXvc0UanqTXAoesmQo7okmJRzd27v2uzbaZBOkiRWwlpoqm4gIft/6QiJ+ckS7D3UBFEkjC+E/Vs4K028= 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=ZTHa5J3lKZfAETvn55YIcDT0R0CdUo/hMJ9WL5JrU8I=; b=buBC/nVLqf2qsQRqB+OJEUk2EuBLT838G8tba2Y3+sK/mhXBHYCdpjhGRMgFRtLPVc4PCEdbA66sgN0pLxxeUj3QS7s9znTolK2BMFi+zF08GGcScYRye6SwiKWBFTtWO7vC4aKx7VeMX70EH6Hto5bdV08PjkcKniAQ0YxVUsM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1639404000112216.95446948838412; 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-527-RmzdKpfdOt2Og1clxRvVAA-1; Mon, 13 Dec 2021 08:59:56 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B9CC8015CD; Mon, 13 Dec 2021 13:59:50 +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 929825BE03; Mon, 13 Dec 2021 13:59:49 +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 AC7A04BB7C; Mon, 13 Dec 2021 13:59:47 +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 1BDDxkKk002503 for ; Mon, 13 Dec 2021 08:59:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id A5DD922E07; Mon, 13 Dec 2021 13:59:46 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CBFF16A31 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=1639403998; 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=ZTHa5J3lKZfAETvn55YIcDT0R0CdUo/hMJ9WL5JrU8I=; b=ZajMD4+zE2KL60sfL++zJ1zXkRRL6H7jmAoy8TB0g7JrpIZdWp/6/1l6gCUHTwOwo6du8x lCHowoZreMGLqNnbAoIlaU8p3LX7ykHYBaEE3hBf7wbL5TiOLrelsY/Yk5GaUvu4KyZCsJ LggJtTwBWs5XCJugKNxxkO+LaniNxfE= X-MC-Unique: RmzdKpfdOt2Og1clxRvVAA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 01/14] bhyve: refactor virBhyveProbeGrubCaps Date: Mon, 13 Dec 2021 14:59:30 +0100 Message-Id: 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.79 on 10.5.11.15 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: 1639404002130100004 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 | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 5a0c6c2b77..ed0df35518 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -168,35 +168,27 @@ virBhyveDomainCapsBuild(struct _bhyveConn *conn, int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) { - char *binary, *help; - virCommand *cmd; - int ret, exit; + g_autofree char *binary =3D NULL; + g_autofree char *help =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; + int exit; =20 - ret =3D 0; *caps =3D 0; - cmd =3D NULL; - help =3D NULL; =20 binary =3D virFindFileInPath("grub-bhyve"); - if (binary =3D=3D NULL) - goto out; + if (!binary) + return 0; =20 cmd =3D virCommandNew(binary); virCommandAddArg(cmd, "--help"); virCommandSetOutputBuffer(cmd, &help); - if (virCommandRun(cmd, &exit) < 0) { - ret =3D -1; - goto out; - } + if (virCommandRun(cmd, &exit) < 0) + return -1; =20 if (strstr(help, "--cons-dev") !=3D NULL) *caps |=3D BHYVE_GRUB_CAP_CONSDEV; =20 - out: - VIR_FREE(help); - virCommandFree(cmd); - VIR_FREE(binary); - return ret; + return 0; } =20 static int --=20 2.31.1