[qemu1] Route Ctrl-C event to EmulatorQtWindow::closeRequest.

Before this CL, Ctrl-C exit path was slightly different from user
pressing the [x] button on UI -- it would directly request qemu to quit,
instead of going via the UI exit code path.

The different led to subtle ordering problems in how threads were torn
down. This CL unifies the two paths, and fixes a bug in process. See
b.android.com/199844#c6 for gory details.

- While there, removed a no-op call inside ui_done -- this call was
  always made too late, after the Qt window had already been cleaned up.

BUG=b.android.com/199844

Change-Id: Ife263389b957005915d4e1f77f6b948eb5faf904

Author: pprabhu-oss

android/main-common-ui.c

@@ -662,6 +662,5 @@ void ui_done(void)
 {
     user_config_done();
     emulator_window_done(emulator_window_get());
-    skin_winsys_quit_request();
     skin_winsys_destroy();
 }

os-posix.c

@@ -39,6 +39,10 @@
 #include "net/net.h"
 #include "qemu-options.h"
 
+#ifdef CONFIG_ANDROID
+#include "android/skin/winsys.h"
+#endif
+
 #ifdef CONFIG_LINUX
 #include <sys/prctl.h>
 #include <sys/syscall.h>
@@ -64,7 +68,14 @@ void os_setup_early_signal_handling(void)
 
 static void termsig_handler(int signal)
 {
+#ifdef CONFIG_ANDROID
+    // In android, request closing the UI, instead of short-circuting down to
+    // qemu. This will eventually call qemu_system_shutdown_request via a skin
+    // event.
+    skin_winsys_quit_request();
+#else
     qemu_system_shutdown_request();
+#endif  //!CONFIG_ANDROID
 }
 
 #ifndef CONFIG_ANDROID

os-win32.c

@@ -32,6 +32,10 @@
 #include "sysemu/sysemu.h"
 #include "qemu-options.h"
 
+#ifdef CONFIG_ANDROID
+#include "android/skin/winsys.h"
+#endif
+
 /***********************************************************/
 /* Functions missing in mingw */
 
@@ -49,7 +53,19 @@ int setenv(const char *name, const char *value, int overwrite)
 
 static BOOL WINAPI qemu_ctrl_handler(DWORD type)
 {
+#ifdef CONFIG_ANDROID
+    // In android, request closing the UI, instead of short-circuting down to
+    // qemu. This will eventually call qemu_system_shutdown_request via a skin
+    // event.
+    skin_winsys_quit_request();
+    // Windows 7 kills application when the function returns.
+    // Sleep here to give QEMU a try for closing.
+    // Sleep period is 10000ms because Windows kills the program
+    // after 10 seconds anyway.
+    Sleep(10000);
+#else
     exit(STATUS_CONTROL_C_EXIT);
+#endif  // !CONFIG_ANDROID
     return TRUE;
 }