From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 26 Aug 2019 20:37:41 +0000 (+0200)
Subject: qemuBuildMemoryBackendProps: use 'rc' instead of ret.
X-Git-Tag: v5.8.0-rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfe0ce93f29fc4470dff72ca5438034ccf741e5f;p=thirdparty%2Flibvirt.git

qemuBuildMemoryBackendProps: use 'rc' instead of ret.

Do not overwrite the 'ret' value more than once.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c5ef79653b..df499f75e3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3333,7 +3333,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
     VIR_AUTOFREE(char *) memPath = NULL;
     bool prealloc = false;
     virBitmapPtr nodemask = NULL;
-    int ret = -1;
+    int rc;
     VIR_AUTOPTR(virJSONValue) props = NULL;
     bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, mem->targetNode);
     unsigned long long pagesize = mem->pagesize;
@@ -3547,7 +3547,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
         !force) {
         /* report back that using the new backend is not necessary
          * to achieve the desired configuration */
-        ret = 1;
+        rc = 1;
     } else {
         /* otherwise check the required capability */
         if (STREQ(backendType, "memory-backend-file") &&
@@ -3570,14 +3570,14 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
             return -1;
         }
 
-        ret = 0;
+        rc = 0;
     }
 
     if (!(*backendProps = qemuMonitorCreateObjectPropsWrap(backendType, alias,
                                                            &props)))
-        ret = -1;
+        return -1;
 
-    return ret;
+    return rc;
 }