From: Ján Tomko <jtomko@redhat.com>
Date: Sun, 5 Sep 2021 19:25:07 +0000 (+0200)
Subject: libxl: use g_auto in libxlDomainGetEmulatorType
X-Git-Tag: v7.8.0-rc1~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8ce012a328701054f0cbd191f792589793ea13;p=thirdparty%2Flibvirt.git

libxl: use g_auto in libxlDomainGetEmulatorType

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
---

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index ef77bec7a0..a516910215 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -715,13 +715,13 @@ int
 libxlDomainGetEmulatorType(const virDomainDef *def)
 {
     int ret = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN;
-    virCommand *cmd = NULL;
+    g_autoptr(virCommand) cmd = NULL;
     g_autofree char *output = NULL;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
         if (def->emulator) {
             if (!virFileExists(def->emulator))
-                goto cleanup;
+                return ret;
 
             cmd = virCommandNew(def->emulator);
 
@@ -729,14 +729,12 @@ libxlDomainGetEmulatorType(const virDomainDef *def)
             virCommandSetOutputBuffer(cmd, &output);
 
             if (virCommandRun(cmd, NULL) < 0)
-                goto cleanup;
+                return ret;
 
             if (strstr(output, LIBXL_QEMU_DM_STR))
                 ret = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
         }
     }
 
- cleanup:
-    virCommandFree(cmd);
     return ret;
 }