From e97be65e654b4df1ad64cd4da1017b907167559e Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 1 Nov 2021 12:58:27 +0100
Subject: [PATCH] qemu: Use g_autoptr(qemuMonitorCPUModelInfo)
There are two instances of an explicit call to
qemuMonitorCPUModelInfoFree() which in fact can be turned into
g_auto().
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
---
src/qemu/qemu_driver.c | 3 +--
tests/qemumonitorjsontest.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c022bf9448..bf3b528c5f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12396,7 +12396,7 @@ static int
qemuConnectStealCPUModelFromInfo(virCPUDef *dst,
qemuMonitorCPUModelInfo **src)
{
- qemuMonitorCPUModelInfo *info;
+ g_autoptr(qemuMonitorCPUModelInfo) info = NULL;
size_t i;
int ret = -1;
@@ -12419,7 +12419,6 @@ qemuConnectStealCPUModelFromInfo(virCPUDef *dst,
ret = 0;
cleanup:
- qemuMonitorCPUModelInfoFree(info);
return ret;
}
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 40eb2b8358..0ec8aec940 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2838,7 +2838,7 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelBaseline(const void *opaque)
g_autoptr(qemuMonitorTest) test = NULL;
g_autoptr(virCPUDef) cpu_a = virCPUDefNew();
g_autoptr(virCPUDef) cpu_b = virCPUDefNew();
- qemuMonitorCPUModelInfo *baseline = NULL;
+ g_autoptr(qemuMonitorCPUModelInfo) baseline = NULL;
int ret = -1;
if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema)))
@@ -2897,7 +2897,6 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelBaseline(const void *opaque)
ret = 0;
cleanup:
- qemuMonitorCPUModelInfoFree(baseline);
return ret;
}