From 5d233742fe4494c4bca1fd0813da56965c22fa23 Mon Sep 17 00:00:00 2001
Message-Id: <5d233742fe4494c4bca1fd0813da56965c22fa23.1386932211.git.jdenemar@redhat.com>
From: Martin Kletzander <mkletzan@redhat.com>
Date: Tue, 10 Dec 2013 10:03:56 +0100
Subject: [PATCH] qemu: Report VIR_DOMAIN_MEMORY_PARAM_UNLIMITED properly

https://bugzilla.redhat.com/show_bug.cgi?id=1024272

For dead domains that have no memtune limits, we return 0 instead of
"unlimited", this patch fixes it to return PARAM_UNLIMITED.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit 0c2fdd7b14cbfc6ced77ed2a24f01f07a8a2f657)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_driver.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4466489..939c8a0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8315,29 +8315,30 @@ qemuDomainGetMemoryParameters(virDomainPtr dom,
     if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
         for (i = 0; i < *nparams && i < QEMU_NB_MEM_PARAM; i++) {
             virMemoryParameterPtr param = &params[i];
+            unsigned long long value;
 
             switch (i) {
             case 0: /* fill memory hard limit here */
-                if (virTypedParameterAssign(param,
-                                            VIR_DOMAIN_MEMORY_HARD_LIMIT,
-                                            VIR_TYPED_PARAM_ULLONG,
-                                            persistentDef->mem.hard_limit) < 0)
+                value = persistentDef->mem.hard_limit;
+                value = value ? value : VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
+                if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_HARD_LIMIT,
+                                            VIR_TYPED_PARAM_ULLONG, value) < 0)
                     goto cleanup;
                 break;
 
             case 1: /* fill memory soft limit here */
-                if (virTypedParameterAssign(param,
-                                            VIR_DOMAIN_MEMORY_SOFT_LIMIT,
-                                            VIR_TYPED_PARAM_ULLONG,
-                                            persistentDef->mem.soft_limit) < 0)
+                value = persistentDef->mem.soft_limit;
+                value = value ? value : VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
+                if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_SOFT_LIMIT,
+                                            VIR_TYPED_PARAM_ULLONG, value) < 0)
                     goto cleanup;
                 break;
 
             case 2: /* fill swap hard limit here */
-                if (virTypedParameterAssign(param,
-                                            VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT,
-                                            VIR_TYPED_PARAM_ULLONG,
-                                            persistentDef->mem.swap_hard_limit) < 0)
+                value = persistentDef->mem.swap_hard_limit;
+                value = value ? value : VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
+                if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT,
+                                            VIR_TYPED_PARAM_ULLONG, value) < 0)
                     goto cleanup;
                 break;
 
-- 
1.8.5.1