Merge "upstream integration"

9 files changed, 43 insertions, 35 deletions

diff --git a/android/config/darwin-x86/config-host.h b/android/config/darwin-x86/config-host.h
index 93efda6..0395918 100644
--- a/android/config/darwin-x86/config-host.h
+++ b/android/config/darwin-x86/config-host.h
@@ -16,3 +16,5 @@
 #define O_LARGEFILE      0
 #define MAP_ANONYMOUS    MAP_ANON
 #define CONFIG_ANDROID       1
+#define CONFIG_POSIX 1
+#define CONFIG_MADVISE 1
diff --git a/android/config/freebsd-x86/config-host.h b/android/config/freebsd-x86/config-host.h
index 5518924..2e44a83 100644
--- a/android/config/freebsd-x86/config-host.h
+++ b/android/config/freebsd-x86/config-host.h
@@ -14,3 +14,5 @@
 #define CONFIG_UNAME_RELEASE ""
 #define CONFIG_SKINS 1
 #define CONFIG_ANDROID 1
+#define CONFIG_POSIX 1
+#define CONFIG_MADVISE 1
diff --git a/android/config/linux-ppc/config-host.h b/android/config/linux-ppc/config-host.h
index 5f7a94f..9faf170 100644
--- a/android/config/linux-ppc/config-host.h
+++ b/android/config/linux-ppc/config-host.h
@@ -15,4 +15,6 @@
 #define HOST_WORDS_BIGENDIAN 1
 #define CONFIG_IOVEC 1
 #define CONFIG_LINUX   1
+#define CONFIG_POSIX 1
 #define CONFIG_ANDROID       1
+#define CONFIG_MADVISE 1
diff --git a/android/config/linux-x86/config-host.h b/android/config/linux-x86/config-host.h
index 8cc2487..70a0eed 100644
--- a/android/config/linux-x86/config-host.h
+++ b/android/config/linux-x86/config-host.h
@@ -15,4 +15,6 @@
 #define CONFIG_KVM_GS_RESTORE   1
 #define CONFIG_IOVEC 1
 #define CONFIG_LINUX   1
+#define CONFIG_POSIX 1
 #define CONFIG_ANDROID       1
+#define CONFIG_MADVISE 1
diff --git a/android/console.c b/android/console.c
index daae2d7..f4273f4 100644
--- a/android/console.c
+++ b/android/console.c
@@ -2058,33 +2058,33 @@ static const CommandDefRec  event_commands[] =
 /********************************************************************************************/
 
 static int
-control_write_out_cb(void* opaque, const char* fmt, va_list ap)
+control_write_out_cb(void* opaque, const char* str, int strsize)
 {
     ControlClient client = opaque;
-    int ret = control_vwrite(client, fmt, ap);
-    return ret;
+    control_control_write(client, str, strsize);
+    return strsize;
 }
 
 static int
-control_write_err_cb(void* opaque, const char* fmt, va_list ap)
+control_write_err_cb(void* opaque, const char* str, int strsize)
 {
     int ret = 0;
     ControlClient client = opaque;
     ret += control_write(client, "KO: ");
-    ret += control_vwrite(client, fmt, ap);
-    return ret;
+    control_control_write(client, str, strsize);
+    return ret + strsize;
 }
 
 static int
 do_snapshot_list( ControlClient  client, char*  args )
 {
-    int ret;
-    OutputChannel *out = output_channel_alloc(client, control_write_out_cb);
-    OutputChannel *err = output_channel_alloc(client, control_write_err_cb);
-    do_info_snapshots_oc(out, err);
-    ret = output_channel_written(err);
-    output_channel_free(out);
-    output_channel_free(err);
+    int64_t ret;
+    Monitor *out = monitor_fake_new(client, control_write_out_cb);
+    Monitor *err = monitor_fake_new(client, control_write_err_cb);
+    do_info_snapshots(out, err);
+    ret = monitor_fake_get_bytes(err);
+    monitor_fake_free(err);
+    monitor_fake_free(out);
 
     return ret > 0;
 }
@@ -2092,17 +2092,17 @@ do_snapshot_list( ControlClient  client, char*  args )
 static int
 do_snapshot_save( ControlClient  client, char*  args )
 {
-    int ret;
+    int64_t ret;
 
     if (args == NULL) {
         control_write(client, "KO: argument missing, try 'avd snapshot save <name>'\r\n");
         return -1;
     }
 
-    OutputChannel *err = output_channel_alloc(client, control_write_err_cb);
-    do_savevm_oc(err, args);
-    ret = output_channel_written(err);
-    output_channel_free(err);
+    Monitor *err = monitor_fake_new(client, control_write_err_cb);
+    do_savevm(err, args);
+    ret = monitor_fake_get_bytes(err);
+    monitor_fake_free(err);
 
     return ret > 0; // no output on error channel indicates success
 }
@@ -2110,17 +2110,17 @@ do_snapshot_save( ControlClient  client, char*  args )
 static int
 do_snapshot_load( ControlClient  client, char*  args )
 {
-    int ret;
+    int64_t ret;
 
     if (args == NULL) {
         control_write(client, "KO: argument missing, try 'avd snapshot load <name>'\r\n");
         return -1;
     }
 
-    OutputChannel *err = output_channel_alloc(client, control_write_err_cb);
-    do_loadvm_oc(err, args);
-    ret = output_channel_written(err);
-    output_channel_free(err);
+    Monitor *err = monitor_fake_new(client, control_write_err_cb);
+    do_loadvm(err, args);
+    ret = monitor_fake_get_bytes(err);
+    monitor_fake_free(err);
 
     return ret > 0;
 }
@@ -2128,17 +2128,17 @@ do_snapshot_load( ControlClient  client, char*  args )
 static int
 do_snapshot_del( ControlClient  client, char*  args )
 {
-    int ret;
+    int64_t ret;
 
     if (args == NULL) {
         control_write(client, "KO: argument missing, try 'avd snapshot del <name>'\r\n");
         return -1;
     }
 
-    OutputChannel *err = output_channel_alloc(client, control_write_err_cb);
-    do_delvm_oc(err, args);
-    ret = output_channel_written(err);
-    output_channel_free(err);
+    Monitor *err = monitor_fake_new(client, control_write_err_cb);
+    do_delvm(err, args);
+    ret = monitor_fake_get_bytes(err);
+    monitor_fake_free(err);
 
     return ret > 0;
 }
diff --git a/android/hw-sensors.c b/android/hw-sensors.c
index c3ab12f..69447a2 100644
--- a/android/hw-sensors.c
+++ b/android/hw-sensors.c
@@ -212,7 +212,7 @@ _hwSensorClient_new( HwSensors*  sensors )
     cl->sensors     = sensors;
     cl->enabledMask = 0;
     cl->delay_ms    = 800;
-    cl->timer       = qemu_new_timer(vm_clock, _hwSensorClient_tick, cl);
+    cl->timer       = qemu_new_timer_ns(vm_clock, _hwSensorClient_tick, cl);
 
     cl->next         = sensors->clients;
     sensors->clients = cl;
@@ -316,7 +316,7 @@ _hwSensorClient_tick( void*  opaque )
         _hwSensorClient_send(cl, (uint8_t*) buffer, strlen(buffer));
     }
 
-    now_ns = qemu_get_clock(vm_clock);
+    now_ns = qemu_get_clock_ns(vm_clock);
 
     snprintf(buffer, sizeof buffer, "sync:%lld", now_ns/1000);
     _hwSensorClient_send(cl, (uint8_t*)buffer, strlen(buffer));
diff --git a/android/looper-qemu.c b/android/looper-qemu.c
index 5526f5b..714b48d 100644
--- a/android/looper-qemu.c
+++ b/android/looper-qemu.c
@@ -36,7 +36,7 @@ qlooptimer_startRelative(void* impl, Duration timeout_ms)
     if (timeout_ms == DURATION_INFINITE)
         qemu_del_timer(tt);
     else
-        qemu_mod_timer(tt, qemu_get_clock_ns(host_clock) + timeout_ms*1000000);
+        qemu_mod_timer(tt, qemu_get_clock_ms(host_clock) + timeout_ms);
 }
 
 static void
@@ -85,7 +85,7 @@ qlooper_timer_init(Looper*        looper,
                    void*          opaque)
 {
     timer->clazz = (LoopTimerClass*) &qlooptimer_class;
-    timer->impl  = qemu_new_timer(host_clock, callback, opaque);
+    timer->impl  = qemu_new_timer_ms(host_clock, callback, opaque);
 }
 
 /**********************************************************************
@@ -370,7 +370,7 @@ qlooper_handle_io_bh(void* opaque)
 static Duration
 qlooper_now(Looper* ll)
 {
-    return qemu_get_clock_ns(host_clock)/1000000;
+    return qemu_get_clock_ms(host_clock);
 }
 
 extern void qemu_system_shutdown_request(void);
diff --git a/android/protocol/core-commands-impl.c b/android/protocol/core-commands-impl.c
index 4366529..bf6da15 100644
--- a/android/protocol/core-commands-impl.c
+++ b/android/protocol/core-commands-impl.c
@@ -19,7 +19,7 @@
 #include "android/android.h"
 #include "android/globals.h"
 #include "telephony/modem_driver.h"
-#include "trace.h"
+#include "android-trace.h"
 #include "android/looper.h"
 #include "android/async-utils.h"
 #include "android/sync-utils.h"
diff --git a/android/protocol/core-commands-qemu.c b/android/protocol/core-commands-qemu.c
index 03fef64..76b3abb 100644
--- a/android/protocol/core-commands-qemu.c
+++ b/android/protocol/core-commands-qemu.c
@@ -19,7 +19,7 @@
 #include "android/globals.h"
 #include "android/hw-sensors.h"
 #include "telephony/modem_driver.h"
-#include "trace.h"
+#include "android-trace.h"
 #include "audio/audio.h"
 #include "android/protocol/core-commands-api.h"