From cd20f59c0bd39aa7133b5bcdb9c1e3c1da653159 Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Thu, 21 Jan 2021 13:50:53 -0500 Subject: [PATCH] hyperv: use g_autoptr for Msvm_ComputerSystem in hypervConnectListDomains Signed-off-by: Matt Coleman Reviewed-by: Laine Stump --- src/hyperv/hyperv_driver.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index efafe9ece2..45463d120d 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -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; } -- 2.47.2