Re: [PATCH 3/5] qemuBuildNumaCommandLine: Move vars into loops

[Peter Krempa]

On Tue, Sep 21, 2021 at 16:50:29 +0200, Michal Privoznik wrote:
> There are two variables that are used only in a single
> loop. Move their definitions into their respective blocks.
> 
> Signed-off-by: Michal Privoznik 
> ---
>  src/qemu/qemu_command.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Peter Krempa 

[PATCH 3/5] qemuBuildNumaCommandLine: Move vars into loops

[Michal Privoznik]

There are two variables that are used only in a single
loop. Move their definitions into their respective blocks.

Signed-off-by: Michal Privoznik 
---
 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 3de37aa5c5..020cbfa214 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7416,11 +7416,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;
@@ -7445,6 +7443,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,
@@ -7487,6 +7486,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg,
 
 if (cpumask) {
 g_autofree char *cpumaskStr = NULL;
+char *next = NULL;
 char *tmpmask;
 
 if (!(cpumaskStr = virBitmapFormat(cpumask)))
-- 
2.32.0