From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 24 Jan 2020 18:32:21 +0000 (+0100)
Subject: qemu: use g_auto in qemuExtTPMStartEmulator
X-Git-Tag: v6.1.0-rc1~382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebe9c31f417b2d0305163b76fcc0bb1e24600b03;p=thirdparty%2Flibvirt.git

qemu: use g_auto in qemuExtTPMStartEmulator

Use the g_auto macros wherever possible to eliminate the cleanup
section.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 262e6c4f07..c2132250eb 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -794,12 +794,12 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
                         bool incomingMigration)
 {
     int ret = -1;
-    virCommandPtr cmd = NULL;
+    g_autoptr(virCommand) cmd = NULL;
     int exitstatus = 0;
-    char *errbuf = NULL;
-    virQEMUDriverConfigPtr cfg;
+    g_autofree char *errbuf = NULL;
+    g_autoptr(virQEMUDriverConfig) cfg = NULL;
     virDomainTPMDefPtr tpm = vm->def->tpm;
-    char *shortName = virDomainDefGetShortName(vm->def);
+    g_autofree char *shortName = virDomainDefGetShortName(vm->def);
     int cmdret = 0, timeout, rc;
     pid_t pid;
 
@@ -855,12 +855,6 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
     ret = 0;
 
  cleanup:
-    VIR_FREE(shortName);
-    VIR_FREE(errbuf);
-    virCommandFree(cmd);
-
-    virObjectUnref(cfg);
-
     return ret;
 
  error: