MAINTAINERS: Add Samuel Thibault as slirp maintainer

[qemu.git] / balloon.c

diff --git a/balloon.c b/balloon.c
index aa354f75546122df10b4a9cba27e5725d8099c35..f2ef50cf77cb0d59e6902b3f77869eb5f5cfd3df 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -24,16 +24,45 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

-#include "monitor.h"
-#include "cpu-common.h"
-#include "kvm.h"
-#include "balloon.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 "trace.h"
 #include "qmp-commands.h"

+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qjson.h"

 
 static QEMUBalloonEvent *balloon_event_fn;
 static QEMUBalloonStatus *balloon_stat_fn;
 static void *balloon_opaque;
 
 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)
+{
+    if (kvm_enabled() && !kvm_has_sync_mmu()) {
+        error_set(errp, ERROR_CLASS_KVM_MISSING_CAP,
+                  "Using KVM without synchronous MMU, balloon unavailable");
+        return false;
+    }
+    if (!balloon_event_fn) {
+        error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,
+                  "No balloon device has been activated");
+        return false;
+    }
+    return true;
+}

 
 int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
                              QEMUBalloonStatus *stat_func, void *opaque)
 
 int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
                              QEMUBalloonStatus *stat_func, void *opaque)


@@ -42,7 +71,6 @@ int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
         /* We're already registered one balloon handler.  How many can
          * a guest really have?
          */
         /* 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;
         return -1;
     }
     balloon_event_fn = event_func;


@@ -61,58 +89,30 @@ void qemu_remove_balloon_handler(void *opaque)
     balloon_opaque = NULL;
 }
 
     balloon_opaque = NULL;
 }
 

-static int qemu_balloon(ram_addr_t target)
-{
-    if (!balloon_event_fn) {
-        return 0;
-    }
-    trace_balloon_event(balloon_opaque, target);
-    balloon_event_fn(balloon_opaque, target);
-    return 1;
-}
-
-static int qemu_balloon_status(BalloonInfo *info)
-{
-    if (!balloon_stat_fn) {
-        return 0;
-    }
-    balloon_stat_fn(balloon_opaque, info);
-    return 1;
-}
-

 BalloonInfo *qmp_query_balloon(Error **errp)
 {
     BalloonInfo *info;
 
 BalloonInfo *qmp_query_balloon(Error **errp)
 {
     BalloonInfo *info;
 

-    if (kvm_enabled() && !kvm_has_sync_mmu()) {
-        error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
+    if (!have_balloon(errp)) {

         return NULL;
     }
 
     info = g_malloc0(sizeof(*info));
         return NULL;
     }
 
     info = g_malloc0(sizeof(*info));

-
-    if (qemu_balloon_status(info) == 0) {
-        error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
-        qapi_free_BalloonInfo(info);
-        return NULL;
-    }
-
+    balloon_stat_fn(balloon_opaque, info);

     return info;
 }
 
     return info;
 }
 

-void qmp_balloon(int64_t value, Error **errp)
+void qmp_balloon(int64_t target, Error **errp)

 {
 {

-    if (kvm_enabled() && !kvm_has_sync_mmu()) {
-        error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
+    if (!have_balloon(errp)) {

         return;
     }
 
         return;
     }
 

-    if (value <= 0) {
-        error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
+    if (target <= 0) {
+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");

         return;
     }
         return;
     }

-    
-    if (qemu_balloon(value) == 0) {
-        error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
-    }
+
+    trace_balloon_event(balloon_opaque, target);
+    balloon_event_fn(balloon_opaque, target);

 }
 }