commit 088edf82b3d34409ed9d9fd09ec1f7e9b933304f
author David 'Digit' Turner <digit@android.com> Mon May 09 15:59:28 2011 +0200
committer David 'Digit' Turner <digit@android.com> Wed Jun 01 17:08:17 2011 +0200
tree b5515cf92d243d3453062a5bc975a494142442d3
parent 795bb19daea966401df15bbf23c57b98848eec23

os-posix.c + os-win32.c and dependencies

+ Generate qemu-options.def instead of qemu-options.h

Change-Id: I043e6b0c1c58e5cc2e96d05465f39b42f9054b5a

vl-android.c

diff --git a/vl-android.c b/vl-android.c
index c446e21..b21600d 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -2312,7 +2312,8 @@
 
 static QEMUResetEntry *first_reset_entry;
 static int reset_requested;
-static int shutdown_requested;
+static int shutdown_requested, shutdown_signal = -1;
+static pid_t shutdown_pid;
 static int powerdown_requested;
 static int debug_requested;
 static int vmstop_requested;
@@ -2398,6 +2399,13 @@
     qemu_notify_event();
 }
 
+void qemu_system_killed(int signal, pid_t pid)
+{
+    shutdown_signal = signal;
+    shutdown_pid = pid;
+    qemu_system_shutdown_request();
+}
+
 void qemu_system_shutdown_request(void)
 {
     shutdown_requested = 1;
@@ -3204,7 +3212,7 @@
 #define DEF(option, opt_arg, opt_enum, opt_help)        \
            opt_help
 #define DEFHEADING(text) stringify(text) "\n"
-#include "qemu-options.h"
+#include "qemu-options.def"
 #undef DEF
 #undef DEFHEADING
 #undef GEN_DOCS
@@ -3233,7 +3241,7 @@
 #define DEF(option, opt_arg, opt_enum, opt_help)        \
     opt_enum,
 #define DEFHEADING(text)
-#include "qemu-options.h"
+#include "qemu-options.def"
 #undef DEF
 #undef DEFHEADING
 #undef GEN_DOCS
@@ -3250,7 +3258,7 @@
 #define DEF(option, opt_arg, opt_enum, opt_help)        \
     { option, opt_arg, opt_enum },
 #define DEFHEADING(text)
-#include "qemu-options.h"
+#include "qemu-options.def"
 #undef DEF
 #undef DEFHEADING
 #undef GEN_DOCS