From fa8ce012a328701054f0cbd191f792589793ea13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Sun, 5 Sep 2021 21:25:07 +0200 Subject: [PATCH] libxl: use g_auto in libxlDomainGetEmulatorType MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ján Tomko Reviewed-by: Jim Fehlig --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index ef77bec7a0..a516910215 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -715,13 +715,13 @@ int libxlDomainGetEmulatorType(const virDomainDef *def) { int ret = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - virCommand *cmd = NULL; + g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (def->emulator) { if (!virFileExists(def->emulator)) - goto cleanup; + return ret; cmd = virCommandNew(def->emulator); @@ -729,14 +729,12 @@ libxlDomainGetEmulatorType(const virDomainDef *def) virCommandSetOutputBuffer(cmd, &output); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return ret; if (strstr(output, LIBXL_QEMU_DM_STR)) ret = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } } - cleanup: - virCommandFree(cmd); return ret; } -- 2.47.2