X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=balloon.c;h=f104b42961b08dc5c4407178ea20f5cc382fcc51;hb=9c353b2fc9210e2a891442af98f476ee81901be8;hp=70c00f5f840b8f3c3a7f99f8112a7d541d17f6f4;hpb=b8a173b25c887a606681fc35a46702c164d5b2d0;p=thirdparty%2Fqemu.git

diff --git a/balloon.c b/balloon.c
index 70c00f5f840..f104b42961b 100644
--- a/balloon.c
+++ b/balloon.c
@@ -24,17 +24,35 @@
  * THE SOFTWARE.
  */
 
-#include "monitor/monitor.h"
-#include "exec/cpu-common.h"
+#include "qemu/osdep.h"
+#include "qemu/atomic.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 int balloon_inhibit_count;
+
+bool qemu_balloon_is_inhibited(void)
+{
+    return atomic_read(&balloon_inhibit_count) > 0;
+}
+
+void qemu_balloon_inhibit(bool state)
+{
+    if (state) {
+        atomic_inc(&balloon_inhibit_count);
+    } else {
+        atomic_dec(&balloon_inhibit_count);
+    }
+
+    assert(atomic_read(&balloon_inhibit_count) >= 0);
+}
 
 static bool have_balloon(Error **errp)
 {
@@ -58,7 +76,6 @@ int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
         /* We're already registered one balloon handler.  How many can
          * a guest really have?
          */
-        error_report("Another balloon device already registered");
         return -1;
     }
     balloon_event_fn = event_func;
@@ -97,7 +114,7 @@ void qmp_balloon(int64_t target, Error **errp)
     }
 
     if (target <= 0) {
-        error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
         return;
     }