summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-14 19:40:27 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-14 19:40:27 +0000
commit72d239ed26db3f288e73b68b70fcf1bb06f67900 (patch)
treea7a198fb8a8599857f31ea3f4c22797ccd4ec45a /cpu-exec.c
parentSuppress i386 warnings (diff)
downloadqemu-kvm-72d239ed26db3f288e73b68b70fcf1bb06f67900.tar.gz
qemu-kvm-72d239ed26db3f288e73b68b70fcf1bb06f67900.tar.bz2
qemu-kvm-72d239ed26db3f288e73b68b70fcf1bb06f67900.zip
Get rid of user_mode_only
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6305 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 07ddd0eda..b40e74a0c 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -263,7 +263,8 @@ int cpu_exec(CPUState *env1)
if (ret == EXCP_DEBUG)
cpu_handle_debug_exception(env);
break;
- } else if (env->user_mode_only) {
+ } else {
+#if defined(CONFIG_USER_ONLY)
/* if user mode only, we simulate a fake exception
which will be handled outside the cpu execution
loop */
@@ -277,7 +278,7 @@ int cpu_exec(CPUState *env1)
#endif
ret = env->exception_index;
break;
- } else {
+#else
#if defined(TARGET_I386)
/* simulate a real cpu exception. On i386, it can
trigger new exceptions, but we do not handle
@@ -305,6 +306,7 @@ int cpu_exec(CPUState *env1)
#elif defined(TARGET_M68K)
do_interrupt(0);
#endif
+#endif
}
env->exception_index = -1;
}