From 25faf51e010e17f382920ebe291f61cdf1bfb865 Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Thu, 21 Jan 2021 13:51:00 -0500 Subject: [PATCH] hyperv: use g_autoptr for WMI classes in hypervDomainGetMaxMemory Signed-off-by: Matt Coleman Reviewed-by: Laine Stump --- src/hyperv/hyperv_driver.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 7da4c216b1..2ec0415f62 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1860,25 +1860,18 @@ hypervDomainGetMaxMemory(virDomainPtr domain) { char uuid_string[VIR_UUID_STRING_BUFLEN]; hypervPrivate *priv = domain->conn->privateData; - Msvm_VirtualSystemSettingData *vssd = NULL; - Msvm_MemorySettingData *mem_sd = NULL; - int maxMemoryBytes = 0; + g_autoptr(Msvm_VirtualSystemSettingData) vssd = NULL; + g_autoptr(Msvm_MemorySettingData) mem_sd = NULL; virUUIDFormat(domain->uuid, uuid_string); if (hypervGetMsvmVirtualSystemSettingDataFromUUID(priv, uuid_string, &vssd) < 0) - goto cleanup; + return 0; if (hypervGetMemorySD(priv, vssd->data->InstanceID, &mem_sd) < 0) - goto cleanup; + return 0; - maxMemoryBytes = mem_sd->data->Limit * 1024; - - cleanup: - hypervFreeObject((hypervObject *)vssd); - hypervFreeObject((hypervObject *)mem_sd); - - return maxMemoryBytes; + return mem_sd->data->Limit * 1024; }