diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-14 08:48:43 -0300 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-14 08:48:43 -0300 |
commit | 184b194ef1a8b8ce035d48c3fbdd72e3b4732869 (patch) | |
tree | a4e50b03279f2a140a99aca8689973090afa151d /cpu-defs.h | |
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 'cpu-defs.h')
-rw-r--r-- | cpu-defs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index b7a6d8cb2..1f482678d 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -29,7 +29,7 @@ #include <signal.h> #include <pthread.h> #include "osdep.h" -#include "sys-queue.h" +#include "qemu-queue.h" #include "targphys.h" #ifndef TARGET_LONG_BITS @@ -125,14 +125,14 @@ struct KVMState; typedef struct CPUBreakpoint { target_ulong pc; int flags; /* BP_* */ - TAILQ_ENTRY(CPUBreakpoint) entry; + QTAILQ_ENTRY(CPUBreakpoint) entry; } CPUBreakpoint; typedef struct CPUWatchpoint { target_ulong vaddr; target_ulong len_mask; int flags; /* BP_* */ - TAILQ_ENTRY(CPUWatchpoint) entry; + QTAILQ_ENTRY(CPUWatchpoint) entry; } CPUWatchpoint; /* forward decleration */ @@ -179,10 +179,10 @@ struct KVMCPUState { \ /* from this point: preserved by CPU reset */ \ /* ice debug support */ \ - TAILQ_HEAD(breakpoints_head, CPUBreakpoint) breakpoints; \ + QTAILQ_HEAD(breakpoints_head, CPUBreakpoint) breakpoints; \ int singlestep_enabled; \ \ - TAILQ_HEAD(watchpoints_head, CPUWatchpoint) watchpoints; \ + QTAILQ_HEAD(watchpoints_head, CPUWatchpoint) watchpoints; \ CPUWatchpoint *watchpoint_hit; \ \ struct GDBRegisterState *gdb_regs; \ |