Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20160927' into staging

[qemu.git] / balloon.c

diff --git a/balloon.c b/balloon.c
index 5d69e8a00b4873b416868d271b45f4e6a39af42e..f2ef50cf77cb0d59e6902b3f77869eb5f5cfd3df 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "sysemu/kvm.h"
@@ -36,6 +37,17 @@
 static QEMUBalloonEvent *balloon_event_fn;
 static QEMUBalloonStatus *balloon_stat_fn;
 static void *balloon_opaque;
+static bool balloon_inhibited;
+
+bool qemu_balloon_is_inhibited(void)
+{
+    return balloon_inhibited;
+}
+
+void qemu_balloon_inhibit(bool state)
+{
+    balloon_inhibited = state;
+}
 
 static bool have_balloon(Error **errp)
 {