diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-07-29 10:48:07 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-07-29 10:48:07 +0300 |
| commit | 1e3fecb259b740c40ece94c6b458e712d513f6be (patch) | |
| tree | 4bb77aa3bde1669adb05336cf50010800314020f /cpu-exec.c | |
| parent | Merge commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c' into upstream-merge (diff) | |
| parent | simplify brlapi selection (diff) | |
| download | qemu-kvm-1e3fecb259b740c40ece94c6b458e712d513f6be.tar.gz qemu-kvm-1e3fecb259b740c40ece94c6b458e712d513f6be.tar.bz2 qemu-kvm-1e3fecb259b740c40ece94c6b458e712d513f6be.zip | |
Merge commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3' into upstream-merge
* commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3': (38 commits)
simplify brlapi selection
simplify curses library selection
Define and use xen libs in a single place
indent with 2 spaces sdl tests
remove sdl_static. Just do the right thing if static is yes
target_softmmu is undefined at that point
instead of setup sdl_x11 just add -lX11 to sdl_libs
Calculate sdl_libs and sdl_flags and use them everywhere
sdl_config value was always sdl-config
the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes
Use CONFIG_POSIX to simplify Makefile
Add CONFIG_POSIX
rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN
rename DEBUG_EXEC to CONFIG_DEBUG_EXEC
rename DEBUG_TCG to CONFIG_DEBUG_TCG
rename HAVE_BYTESWAP_H to CONFIG_BYTESWAP_H
rename HAVE_GPROF to TARGET_GPROF
rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H
rename HAVE_FNMATCH_H to CONFIG_FNMATCH
rename HAVE_IOVEC to CONFIG_IOVEC
...
Conflicts:
configure
Signed-off-by: Avi Kivity <avi@redhat.com>
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 1bc367396..8f3f84c12 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -50,7 +50,7 @@ int tb_invalidated_flag; -//#define DEBUG_EXEC +//#define CONFIG_DEBUG_EXEC //#define DEBUG_SIGNAL int qemu_cpu_has_work(CPUState *env) @@ -575,7 +575,7 @@ int cpu_exec(CPUState *env1) env->exception_index = EXCP_INTERRUPT; cpu_loop_exit(); } -#ifdef DEBUG_EXEC +#ifdef CONFIG_DEBUG_EXEC if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { /* restore flags in standard format */ regs_to_env(); @@ -621,7 +621,7 @@ int cpu_exec(CPUState *env1) next_tb = 0; tb_invalidated_flag = 0; } -#ifdef DEBUG_EXEC +#ifdef CONFIG_DEBUG_EXEC qemu_log_mask(CPU_LOG_EXEC, "Trace 0x%08lx [" TARGET_FMT_lx "] %s\n", (long)tb->tc_ptr, tb->pc, lookup_symbol(tb->pc)); |