Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging

[mirror_qemu.git] / balloon.c

diff --git a/balloon.c b/balloon.c
index 5f5202c25e1e8f2edf40c1a39a6e76873ba604ae..6bf0a968137728b89259932d6efa44f8ef50daf9 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -24,17 +24,30 @@
  * THE SOFTWARE.
  */
 
-#include "monitor/monitor.h"
+#include "qemu/osdep.h"
+#include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "sysemu/kvm.h"
 #include "sysemu/balloon.h"
-#include "trace.h"
-#include "qmp-commands.h"
-#include "qapi/qmp/qjson.h"
+#include "trace-root.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc.h"
+#include "qapi/qmp/qerror.h"
 
 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)
 {