diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-07-29 10:44:41 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-07-29 10:44:41 +0300 |
| commit | e8a1bd02da183143c796d7cae59a481f14edf0b6 (patch) | |
| tree | f3b71b56a8681bd659861de31bd421b6b72140f7 /cpu-exec.c | |
| parent | Merge commit '8fde6546fbe5a63df584819b1279086030e410a9' into upstream-merge (diff) | |
| parent | change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION} (diff) | |
| download | qemu-kvm-e8a1bd02da183143c796d7cae59a481f14edf0b6.tar.gz qemu-kvm-e8a1bd02da183143c796d7cae59a481f14edf0b6.tar.bz2 qemu-kvm-e8a1bd02da183143c796d7cae59a481f14edf0b6.zip | |
Merge commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c' into upstream-merge
* commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c':
change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}
Enable USE_DIRECT_JUMP on Win32.
Remove special Win32 code in vl.c that's no longer needed.
Remove setvbuf(<handle>, NULL, _IOLBF, 0) calls for Win32
Conflicts:
cpu-exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index e6709dc3a..1bc367396 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -42,7 +42,7 @@ #include "qemu-kvm.h" -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) // Work around ugly bugs in glibc that mangle global register contents #undef env #define env cpu_single_env @@ -263,7 +263,7 @@ int cpu_exec(CPUState *env1) /* prepare setjmp context for exception handling */ for(;;) { if (setjmp(env->jmp_env) == 0) { -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) #undef env env = cpu_single_env; #define env cpu_single_env @@ -421,7 +421,7 @@ int cpu_exec(CPUState *env1) env->interrupt_request &= ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_VIRQ); intno = cpu_get_pic_interrupt(env); qemu_log_mask(CPU_LOG_TB_IN_ASM, "Servicing hardware INT=0x%02x\n", intno); -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) #undef env env = cpu_single_env; #define env cpu_single_env @@ -651,7 +651,7 @@ int cpu_exec(CPUState *env1) while (env->current_tb) { tc_ptr = tb->tc_ptr; /* execute the generated code */ -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) #undef env env = cpu_single_env; #define env cpu_single_env @@ -1443,7 +1443,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, siginfo_t *info = pinfo; int is_write; uint32_t insn; -#if !defined(__arch64__) || defined(HOST_SOLARIS) +#if !defined(__arch64__) || defined(CONFIG_SOLARIS) uint32_t *regs = (uint32_t *)(info + 1); void *sigmask = (regs + 20); /* XXX: is there a standard glibc define ? */ |