diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:23:24 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:32:18 -0600 |
| commit | b3a98367eec7b2d87acca54ef5e4de3b0e0a7ed5 (patch) | |
| tree | 22b6121e6f81c09c7dd780ed211afef7b9ebb92d /target-i386/kvm_x86.h | |
| parent | 9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (diff) | |
| parent | c5999bfcfdf66390c98115044cb6fd174fbcf36d (diff) | |
Merge remote branch 'qemu-kvm/uq/master' into staging
aliguori: fix build with !defined(KVM_CAP_ASYNC_PF)
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386/kvm_x86.h')
| -rw-r--r-- | target-i386/kvm_x86.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target-i386/kvm_x86.h b/target-i386/kvm_x86.h index 04932cf4c8..9d7b584267 100644 --- a/target-i386/kvm_x86.h +++ b/target-i386/kvm_x86.h @@ -15,8 +15,11 @@ #ifndef __KVM_X86_H__ #define __KVM_X86_H__ +#define ABORT_ON_ERROR 0x01 +#define MCE_BROADCAST 0x02 + void kvm_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, uint64_t mcg_status, uint64_t addr, uint64_t misc, - int abort_on_error); + int flag); #endif |