]> xenbits.xensource.com Git - libvirt.git/commitdiff
hyperv: use g_autoptr for Msvm_ComputerSystem in hypervConnectListDomains
authorMatt Coleman <mcoleman@datto.com>
Thu, 21 Jan 2021 18:50:53 +0000 (13:50 -0500)
committerLaine Stump <laine@redhat.com>
Fri, 22 Jan 2021 19:04:25 +0000 (14:04 -0500)
Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Laine Stump <laine@redhat.com>
src/hyperv/hyperv_driver.c

index efafe9ece2acd65914ede3231980ddbefda6b048..45463d120d7265188d726f3fa45cf4c898bf7bb6 100644 (file)
@@ -1606,9 +1606,8 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
 static int
 hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids)
 {
-    bool success = false;
     hypervPrivate *priv = conn->privateData;
-    Msvm_ComputerSystem *computerSystemList = NULL;
+    g_autoptr(Msvm_ComputerSystem) computerSystemList = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     int count = 0;
 
@@ -1616,7 +1615,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids)
         return 0;
 
     if (hypervGetActiveVirtualSystemList(priv, &computerSystemList) < 0)
-        goto cleanup;
+        return -1;
 
     for (computerSystem = computerSystemList; computerSystem != NULL;
          computerSystem = computerSystem->next) {
@@ -1626,12 +1625,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids)
             break;
     }
 
-    success = true;
-
- cleanup:
-    hypervFreeObject((hypervObject *)computerSystemList);
-
-    return success ? count : -1;
+    return count;
 }