From 2956f62bbcb686ea6486aefdff9aff768111120e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 12 Sep 2016 06:08:59 +0200
Subject: [PATCH] qmemman: fix meminfo handling

This fixes "a2d9b15 qmemman: support simple VM meminfo format"
---
 qubes/qmemman/algo.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qubes/qmemman/algo.py b/qubes/qmemman/algo.py
index 1552eb04..534f24cf 100644
--- a/qubes/qmemman/algo.py
+++ b/qubes/qmemman/algo.py
@@ -60,9 +60,9 @@ def sanitize_and_parse_meminfo(untrusted_meminfo):
                 untrusted_words[1]
 
     # sanitize start
-    if not is_meminfo_suspicious(untrusted_meminfo):
+    if not is_meminfo_suspicious(untrusted_dict):
         # sanitize end
-        meminfo = untrusted_meminfo
+        meminfo = untrusted_dict
         return meminfo['MemTotal'] - \
             meminfo['MemFree'] - meminfo['Cached'] - meminfo['Buffers'] + \
             meminfo['SwapTotal'] - meminfo['SwapFree']
@@ -131,7 +131,7 @@ def balloon(memsize, domain_dictionary):
     request = list()
     available = 0
     for i in domain_dictionary.keys():
-        if domain_dictionary[i].meminfo is None:
+        if domain_dictionary[i].mem_used is None:
             continue
         if domain_dictionary[i].no_progress:
             continue