From 2ba777f5e3df288af008bb39320fc894bd5d3083 Mon Sep 17 00:00:00 2001 From: William Douglas Date: Fri, 1 Oct 2021 11:12:35 -0700 Subject: [PATCH] ch: use g_auto in virCHMonitorBuildMemoryJson Signed-off-by: William Douglas Reviewed-by: Laine Stump --- src/ch/ch_monitor.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 0ceb711f05..841a2b6c8e 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -154,22 +154,19 @@ virCHMonitorBuildKernelRelatedJson(virJSONValue *content, virDomainDef *vmdef) static int virCHMonitorBuildMemoryJson(virJSONValue *content, virDomainDef *vmdef) { - virJSONValue *memory; unsigned long long total_memory = virDomainDefGetMemoryInitial(vmdef) * 1024; if (total_memory != 0) { - memory = virJSONValueNewObject(); + g_autoptr(virJSONValue) 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.47.2