aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-06-25 16:18:50 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-06-25 16:18:50 +0000
commit59faf6d6a6a239fcd1fa283ef8b558299fb37325 (patch)
tree083195b0109a4937b8f63396b9e2b84b2a3da6e7
parent725af7d46041eafd0b95a7550172dd39d39bb815 (diff)
compile fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@279 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--linux-user/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index a8ae9c75ac..56cba61898 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -26,8 +26,6 @@
#include "qemu.h"
-#include "cpu-i386.h"
-
#define DEBUG_LOGFILE "/tmp/qemu.log"
FILE *logfile = NULL;
@@ -322,6 +320,9 @@ void usage(void)
/* XXX: currently only used for async signals (see signal.c) */
CPUState *global_env;
+/* used only if single thread */
+CPUState *cpu_single_env = NULL;
+
/* used to free thread contexts */
TaskState *first_task_state;
@@ -428,6 +429,7 @@ int main(int argc, char **argv)
memset(ts, 0, sizeof(TaskState));
env->opaque = ts;
ts->used = 1;
+ env->user_mode_only = 1;
#if defined(TARGET_I386)
/* linux register setup */
@@ -481,7 +483,6 @@ int main(int argc, char **argv)
cpu_x86_load_seg(env, R_SS, __USER_DS);
cpu_x86_load_seg(env, R_FS, __USER_DS);
cpu_x86_load_seg(env, R_GS, __USER_DS);
- env->user_mode_only = 1;
#elif defined(TARGET_ARM)
{