diff options
author | 2009-09-14 08:48:43 -0300 | |
---|---|---|
committer | 2009-09-14 08:48:43 -0300 | |
commit | 184b194ef1a8b8ce035d48c3fbdd72e3b4732869 (patch) | |
tree | a4e50b03279f2a140a99aca8689973090afa151d /target-ppc | |
parent | Merge commit '2637c754ccdb286890ed2a8d0d1da775dbd062af' into upstream-merge (diff) | |
parent | Fix sys-queue.h conflict for good (diff) | |
download | qemu-kvm-184b194ef1a8b8ce035d48c3fbdd72e3b4732869.tar.gz qemu-kvm-184b194ef1a8b8ce035d48c3fbdd72e3b4732869.tar.bz2 qemu-kvm-184b194ef1a8b8ce035d48c3fbdd72e3b4732869.zip |
Merge commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e' into upstream-merge
* commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e':
Fix sys-queue.h conflict for good
Try to fix BSD breakage by 806b60248218bd5f74a8b070f5a99a864e8e51c6
Include sys-queue.h early to override system queue definitions on BSD
Unbreak BSD: use qemu_fdatasync instead of fdatasync
Use proper format conversion specifier when printing size_t value
audio: remove lsbindex/popcount in favour of host-utils's ctz32
alsa: poll mode handling
oss: poll mode handling
audio: poll mode infrastructure
gus: Do not manually free the state, qdev does it for us
oss: Unbreak mmaping the ability to mmap oss fd on Linux
Conflicts:
exec.c
kvm.h
sysemu.h
vl.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-ppc')
-rw-r--r-- | target-ppc/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 1c54fa7d8..648bf9e18 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -9000,8 +9000,8 @@ static inline void gen_intermediate_code_internal(CPUState *env, gen_icount_start(); /* Set env in case of segfault during code fetch */ while (ctx.exception == POWERPC_EXCP_NONE && gen_opc_ptr < gen_opc_end) { - if (unlikely(!TAILQ_EMPTY(&env->breakpoints))) { - TAILQ_FOREACH(bp, &env->breakpoints, entry) { + if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { + QTAILQ_FOREACH(bp, &env->breakpoints, entry) { if (bp->pc == ctx.nip) { gen_debug_exception(ctxp); break; |