| commit | f2604887b74feb9907d7b7b3237561bbde6736c8 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jun 2011 12:02:16 +0000 (28 15:02 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jun 2011 12:02:16 +0000 (28 15:02 +0300) | ||
| tree | 02392b28737bfde92a039ce83606ea8aa31c7518 | treesnapshot (tar.gz zip) |
| parent | bcd4f22796ebda2934a980060ea704ebedb46173 | commitdiff |
| parent | 3c688828bcb3afa2744e1f1729a40eef4a575b56 | commitdiff |
Merge commit '3c688828bcb3afa2744e1f1729a40eef4a575b56' into upstream-merge
* commit '3c688828bcb3afa2744e1f1729a40eef4a575b56':
m68k: use caller supplied CPUState for interrupt related stuff
x86: use caller supplied CPUState for interrupt related stuff
sparc: move do_interrupt to helper.c
sparc: fix coding style of the area to be moved
cpu_loop_exit: avoid using AREG0
Sparc32: dummy implementation of MXCC MMU breakpoint registers
Fix fallouts from Linux header inclusion
coreaudio: Fix OSStatus format specifier
coreaudio: Avoid formatting UInt32 type
Conflicts:
cpu-exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '3c688828bcb3afa2744e1f1729a40eef4a575b56':
m68k: use caller supplied CPUState for interrupt related stuff
x86: use caller supplied CPUState for interrupt related stuff
sparc: move do_interrupt to helper.c
sparc: fix coding style of the area to be moved
cpu_loop_exit: avoid using AREG0
Sparc32: dummy implementation of MXCC MMU breakpoint registers
Fix fallouts from Linux header inclusion
coreaudio: Fix OSStatus format specifier
coreaudio: Avoid formatting UInt32 type
Conflicts:
cpu-exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile.target | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |
| cpu-exec.c | diff1 | diff2 | blobhistory |
| target-i386/cpu.h | diff1 | diff2 | blobhistory |