Merge remote branch 'qemu-kvm/uq/stable-0.12' into stable-0.12

[qemu.git] / monitor.h

diff --git a/monitor.h b/monitor.h
index d06e2d8bbaad0a0b0eb39d7f2c1fa5ed589f8235..6ed117a920a2eefe7cf8b648117b7323da957da2 100644 (file)
--- a/monitor.h
+++ b/monitor.h
@@ -3,19 +3,38 @@
 
 #include "qemu-common.h"
 #include "qemu-char.h"
+#include "qdict.h"
 #include "block.h"
 
 extern Monitor *cur_mon;
 
-void monitor_init(CharDriverState *chr, int show_banner);
+/* flags for monitor_init */
+#define MONITOR_IS_DEFAULT    0x01
+#define MONITOR_USE_READLINE  0x02
+#define MONITOR_USE_CONTROL   0x04
 
-void monitor_suspend(Monitor *mon);
+/* QMP events */
+typedef enum MonitorEvent {
+    QEVENT_DEBUG,
+    QEVENT_SHUTDOWN,
+    QEVENT_RESET,
+    QEVENT_POWERDOWN,
+    QEVENT_STOP,
+    QEVENT_MAX,
+} MonitorEvent;
+
+void monitor_protocol_event(MonitorEvent event, QObject *data);
+void monitor_init(CharDriverState *chr, int flags);
+
+int monitor_suspend(Monitor *mon);
 void monitor_resume(Monitor *mon);
 
 void monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
                                  BlockDriverCompletionFunc *completion_cb,
                                  void *opaque);
 
+int monitor_get_fd(Monitor *mon, const char *fdname);
+
 void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap);
 void monitor_printf(Monitor *mon, const char *fmt, ...)
     __attribute__ ((__format__ (__printf__, 2, 3)));