gwj / at91sam9263 · Commits

Commit 59faf6d6a6a239fcd1fa283ef8b558299fb37325

Authored by bellard
1 parent 725af7d4

compile fixes 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@279 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
linux-user/main.c
  View file @59faf6d
... ... @@ -26,8 +26,6 @@
26 26  
27 27 #include "qemu.h"
28 28  
29   -#include "cpu-i386.h"
30   -
31 29 #define DEBUG_LOGFILE "/tmp/qemu.log"
32 30  
33 31 FILE *logfile = NULL;
... ... @@ -322,6 +320,9 @@ void usage(void)
322 320  
323 321 /* XXX: currently only used for async signals (see signal.c) */
324 322 CPUState *global_env;
  323 +/* used only if single thread */
  324 +CPUState *cpu_single_env = NULL;
  325 +
325 326 /* used to free thread contexts */
326 327 TaskState *first_task_state;
327 328  
... ... @@ -428,6 +429,7 @@ int main(int argc, char **argv)
428 429 memset(ts, 0, sizeof(TaskState));
429 430 env->opaque = ts;
430 431 ts->used = 1;
  432 + env->user_mode_only = 1;
431 433  
432 434 #if defined(TARGET_I386)
433 435 /* linux register setup */
... ... @@ -481,7 +483,6 @@ int main(int argc, char **argv)
481 483 cpu_x86_load_seg(env, R_SS, __USER_DS);
482 484 cpu_x86_load_seg(env, R_FS, __USER_DS);
483 485 cpu_x86_load_seg(env, R_GS, __USER_DS);
484   - env->user_mode_only = 1;
485 486  
486 487 #elif defined(TARGET_ARM)
487 488 {
... ...