From c9f47bfc7abd2162460801b41251a7802beea964 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 20 May 2020 11:32:14 +0200 Subject: [PATCH] qemuBuildNumaCommandLine: Move vars into loops There are two variables that are used only in a single loop. Move their definitions into their respective blocks. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 48df8818a6..247ac86e33 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7290,11 +7290,9 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, size_t i, j; virQEMUCaps *qemuCaps = priv->qemuCaps; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - char *next = NULL; virBuffer *nodeBackends = NULL; bool needBackend = false; bool hmat = false; - int rc; int ret = -1; size_t ncells = virDomainNumaGetNodeCount(def->numa); ssize_t masterInitiator = -1; @@ -7319,6 +7317,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) || virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) { + int rc; for (i = 0; i < ncells; i++) { if ((rc = qemuBuildMemoryCellBackendStr(def, cfg, i, priv, @@ -7361,6 +7360,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, if (cpumask) { g_autofree char *cpumaskStr = NULL; + char *next = NULL; char *tmpmask; if (!(cpumaskStr = virBitmapFormat(cpumask)))