diff options
author | 2009-04-19 10:18:01 +0000 | |
---|---|---|
committer | 2009-04-19 10:18:01 +0000 | |
commit | 640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e (patch) | |
tree | 64bfaf3d5589c87ab9b35055a2ffa00f51d5b104 /cpu-exec.c | |
parent | Adds SM501 usb host emulation feature. (diff) | |
download | qemu-kvm-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.tar.gz qemu-kvm-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.tar.bz2 qemu-kvm-640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e.zip |
kqemu: merge CONFIG_KQEMU and USE_KQEMU
Basically a recursive ":%s/USE_KQEMU/CONFIG_KQEMU/g".
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7189 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'cpu-exec.c')
-rw-r--r-- | cpu-exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 611f1eab2..122bdd10b 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -314,7 +314,7 @@ int cpu_exec(CPUState *env1) } env->exception_index = -1; } -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (kqemu_is_ok(env) && env->interrupt_request == 0 && env->exit_request == 0) { int ret; env->eflags = env->eflags | helper_cc_compute_all(CC_OP) | (DF & DF_MASK); @@ -594,7 +594,7 @@ int cpu_exec(CPUState *env1) jump. */ { if (next_tb != 0 && -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU (env->kqemu_enabled != 2) && #endif tb->page_addr[1] == -1) { @@ -651,7 +651,7 @@ int cpu_exec(CPUState *env1) } /* reset soft MMU for next block (it can currently only be set by a memory fault) */ -#if defined(USE_KQEMU) +#if defined(CONFIG_KQEMU) #define MIN_CYCLE_BEFORE_SWITCH (100 * 1000) if (kqemu_is_ok(env) && (cpu_get_time_fast() - env->last_io_time) >= MIN_CYCLE_BEFORE_SWITCH) { |