diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-07-12 18:01:47 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-07-12 18:01:47 +0300 |
| commit | 18b29b17a8a6d681f1a29abba0706d0dbec51e33 (patch) | |
| tree | 33a583b38a415fedf23680178381cc8a32089f22 /cpu-all.h | |
| parent | Merge commit '94c5495dd16ca3311cbc95705e58d28a45899d1d' into upstream-merge (diff) | |
| parent | QEMU: MCE: Add MCE simulation to qemu/tcg (diff) | |
| download | qemu-kvm-18b29b17a8a6d681f1a29abba0706d0dbec51e33.tar.gz qemu-kvm-18b29b17a8a6d681f1a29abba0706d0dbec51e33.tar.bz2 qemu-kvm-18b29b17a8a6d681f1a29abba0706d0dbec51e33.zip | |
Merge commit '79c4f6b08009a1d23177c2be8bd003253cf3686a' into upstream-merge
* commit '79c4f6b08009a1d23177c2be8bd003253cf3686a':
QEMU: MCE: Add MCE simulation to qemu/tcg
getrlimit conversion mix-up
wrap path for access syscall
64-bit clean socketcall syscall
pipe argument should not be signed
configure: remove bogus linux-user check
linux-user/syscall.c: remove warning: ‘array’ may be used uninitialized in this function
linux-user: check some parameters for some socket syscalls.
linux-user: increment MAX_ARG_PAGES
Conflicts:
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
| -rw-r--r-- | cpu-all.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -770,6 +770,7 @@ extern int use_icount; #define CPU_INTERRUPT_NMI 0x200 /* NMI pending. */ #define CPU_INTERRUPT_INIT 0x400 /* INIT pending. */ #define CPU_INTERRUPT_SIPI 0x800 /* SIPI pending. */ +#define CPU_INTERRUPT_MCE 0x1000 /* (x86 only) MCE pending. */ void cpu_interrupt(CPUState *s, int mask); void cpu_reset_interrupt(CPUState *env, int mask); @@ -1072,4 +1073,7 @@ extern int64_t kqemu_ret_excp_count; extern int64_t kqemu_ret_intr_count; #endif +void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, + uint64_t mcg_status, uint64_t addr, uint64_t misc); + #endif /* CPU_ALL_H */ |