From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 23 Mar 2015 13:17:42 +0000 (+0100)
Subject: qemu: Don't return memory device config on error in qemuBuildMemoryBackendStr
X-Git-Tag: v1.2.14-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=104011ea8b49dd8a0eea6bc88de90ef76c6d8273;p=thirdparty%2Flibvirt.git

qemu: Don't return memory device config on error in qemuBuildMemoryBackendStr

In the last section if the function determines that the config is
invalid when QEMU doesn't support the memory device the JSON config
object would be returned even if it doesn't make sense.

Assign the object to be returned only on success.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 63d43d41af..04e7bcc85f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4750,9 +4750,6 @@ qemuBuildMemoryBackendStr(unsigned long long size,
             goto cleanup;
     }
 
-    *backendProps = props;
-    props = NULL;
-
     if (!hugepage) {
         bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, guestNode);
 
@@ -4767,11 +4764,15 @@ qemuBuildMemoryBackendStr(unsigned long long size,
         /* report back that using the new backend is not necessary to achieve
          * the desired configuration */
         if (!userNodeset && !nodeSpecified) {
+            *backendProps = props;
+            props = NULL;
             ret = 1;
             goto cleanup;
         }
     }
 
+    *backendProps = props;
+    props = NULL;
     ret = 0;
 
  cleanup: