From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 10 Dec 2021 16:39:57 +0000 (+0100)
Subject: bhyve: refactor virBhyveProbeGrubCaps
X-Git-Tag: v8.0.0-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0729b3fb1666bf838b9135139143c804f085e740;p=thirdparty%2Flibvirt.git

bhyve: refactor virBhyveProbeGrubCaps

Use g_auto and remove the 'ret' variable, as well as the cleanup label.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

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 = NULL;
+    g_autofree char *help = NULL;
+    g_autoptr(virCommand) cmd = NULL;
+    int exit;
 
-    ret = 0;
     *caps = 0;
-    cmd = NULL;
-    help = NULL;
 
     binary = virFindFileInPath("grub-bhyve");
-    if (binary == NULL)
-        goto out;
+    if (!binary)
+        return 0;
 
     cmd = virCommandNew(binary);
     virCommandAddArg(cmd, "--help");
     virCommandSetOutputBuffer(cmd, &help);
-    if (virCommandRun(cmd, &exit) < 0) {
-        ret = -1;
-        goto out;
-    }
+    if (virCommandRun(cmd, &exit) < 0)
+        return -1;
 
     if (strstr(help, "--cons-dev") != NULL)
         *caps |= BHYVE_GRUB_CAP_CONSDEV;
 
- out:
-    VIR_FREE(help);
-    virCommandFree(cmd);
-    VIR_FREE(binary);
-    return ret;
+    return 0;
 }
 
 static int