[libvirt PATCH 3/9] ch: use g_auto in virCHMonitorBuildMemoryJson

Ján Tomko jtomko at redhat.com
Wed Sep 22 20:55:29 UTC 2021


Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/ch/ch_monitor.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
index d241d30b10..9c562fdd0f 100644
--- a/src/ch/ch_monitor.c
+++ b/src/ch/ch_monitor.c
@@ -149,22 +149,18 @@ virCHMonitorBuildKernelRelatedJson(virJSONValue *content, virDomainDef *vmdef)
 static int
 virCHMonitorBuildMemoryJson(virJSONValue *content, virDomainDef *vmdef)
 {
-    virJSONValue *memory;
+    g_autoptr(virJSONValue) memory = NULL;
     unsigned long long total_memory = virDomainDefGetMemoryInitial(vmdef) * 1024;
 
     if (total_memory != 0) {
         memory = virJSONValueNewObject();
         if (virJSONValueObjectAppendNumberUlong(memory, "size", total_memory) < 0)
-            goto cleanup;
+            return -1;
         if (virJSONValueObjectAppend(content, "memory", &memory) < 0)
-            goto cleanup;
+            return -1;
     }
 
     return 0;
-
- cleanup:
-    virJSONValueFree(memory);
-    return -1;
 }
 
 static int
-- 
2.31.1




More information about the libvir-list mailing list