]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Use g_autoptr(qemuMonitorCPUModelInfo)
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 1 Nov 2021 11:58:27 +0000 (12:58 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 11 Nov 2021 15:16:22 +0000 (16:16 +0100)
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
tests/qemumonitorjsontest.c

index c022bf9448a1f25cf83119b9b64ecc5c1b369bc2..bf3b528c5fa4d9910558cabf8dd49a3a025bc755 100644 (file)
@@ -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;
 }
 
index 40eb2b8358b4098eda63163fca58280fcce5fdad..0ec8aec940d739d6d8ee26c35fbd0bd1d575cf75 100644 (file)
@@ -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;
 }