From: Matt Coleman <mcoleman@datto.com>
Date: Thu, 21 Jan 2021 18:51:03 +0000 (-0500)
Subject: hyperv: use g_autoptr for Win32_ComputerSystemProduct in hypervLookupHostSystemBiosUuid
X-Git-Tag: v7.1.0-rc1~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e58cb122a53937757191cfe83e856164bed26d;p=thirdparty%2Flibvirt.git

hyperv: use g_autoptr for Win32_ComputerSystemProduct in hypervLookupHostSystemBiosUuid

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index ef3ae54f7d..3c4ef5f33f 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -237,25 +237,20 @@ hypervParseVersionString(const char *str, unsigned int *major,
 static int
 hypervLookupHostSystemBiosUuid(hypervPrivate *priv, unsigned char *uuid)
 {
-    Win32_ComputerSystemProduct *computerSystem = NULL;
+    g_autoptr(Win32_ComputerSystemProduct) computerSystem = NULL;
     g_auto(virBuffer) query = { g_string_new(WIN32_COMPUTERSYSTEMPRODUCT_WQL_SELECT), 0 };
-    int result = -1;
 
     if (hypervGetWmiClass(Win32_ComputerSystemProduct, &computerSystem) < 0)
-        goto cleanup;
+        return -1;
 
     if (virUUIDParse(computerSystem->data->UUID, uuid) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Could not parse UUID from string '%s'"),
                        computerSystem->data->UUID);
-        goto cleanup;
+        return -1;
     }
-    result = 0;
 
- cleanup:
-    hypervFreeObject((hypervObject *)computerSystem);
-
-    return result;
+    return 0;
 }