From ebe9c31f417b2d0305163b76fcc0bb1e24600b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 24 Jan 2020 19:32:21 +0100 Subject: [PATCH] qemu: use g_auto in qemuExtTPMStartEmulator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the g_auto macros wherever possible to eliminate the cleanup section. Signed-off-by: Ján Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) 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: