diff options
author | David 'Digit' Turner <digit@android.com> | 2011-05-10 17:31:15 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:18 +0200 |
commit | 95a83ce7ee413954ba6325584ea659c6685edfd5 (patch) | |
tree | 9d3a33d309a435361b855c9f09eb4629a3b5b2a9 /monitor.c | |
parent | 986acc9eba2cf7c9b468c2f84764fa478907ac66 (diff) | |
download | external_qemu-95a83ce7ee413954ba6325584ea659c6685edfd5.zip external_qemu-95a83ce7ee413954ba6325584ea659c6685edfd5.tar.gz external_qemu-95a83ce7ee413954ba6325584ea659c6685edfd5.tar.bz2 |
savevm: Remove OutputBuffer hack.
It's easier to provide a fake Monitor object instead.
Change-Id: Ia45267061d489b147497add6120d3caa9234ac11
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -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) |