From 95a83ce7ee413954ba6325584ea659c6685edfd5 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Tue, 10 May 2011 17:31:15 +0200
Subject: savevm: Remove OutputBuffer hack.

It's easier to provide a fake Monitor object instead.

Change-Id: Ia45267061d489b147497add6120d3caa9234ac11
---
 monitor.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'monitor.c')

diff --git a/monitor.c b/monitor.c
index 3c9d512..cf8bb42 100644
--- a/monitor.c
+++ b/monitor.c
@@ -86,8 +86,18 @@ struct Monitor {
     void *password_opaque;
     QLIST_ENTRY(Monitor) entry;
     int has_quit;
+#ifdef CONFIG_ANDROID
+    void*            fake_opaque;
+    MonitorFakeFunc  fake_func;
+    int64_t          fake_count;
+
+#endif
 };
 
+#ifdef CONFIG_ANDROID
+#include "monitor-android.h"
+#endif
+
 static QLIST_HEAD(mon_list, Monitor) mon_list;
 
 #if defined(TARGET_I386)
@@ -158,6 +168,7 @@ static int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
     }
 }
 
+#ifndef CONFIG_ANDROID /* See monitor-android.h */
 void monitor_flush(Monitor *mon)
 {
     if (mon && mon->outbuf_index != 0 && !mon->mux_out) {
@@ -165,6 +176,7 @@ void monitor_flush(Monitor *mon)
         mon->outbuf_index = 0;
     }
 }
+#endif
 
 /* flush at every end of line or if the buffer is full */
 static void monitor_puts(Monitor *mon, const char *str)
-- 
cgit v1.1