diff options
| author | Avi Kivity <avi@redhat.com> | 2009-12-07 11:11:03 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-07 11:11:03 +0200 |
| commit | c859bf47e565062b7801a18966913142cf59eda8 (patch) | |
| tree | 45b0d133200af9e62d052d7145a604e7d3d23cc0 /qemu-kvm.h | |
| parent | 149d76049af52aa76f4665b6bc9bdbd5904a8588 (diff) | |
| parent | a0fb002c6462d21ceb9eac8c5772e469ec189374 (diff) | |
Merge commit 'a0fb002c6462d21ceb9eac8c5772e469ec189374' into upstream-merge
* commit 'a0fb002c6462d21ceb9eac8c5772e469ec189374':
kvm: x86: Add support for VCPU event states
kvm: x86: Fix merge artifact of f8d926e9 about mp_state
targe-ppc: Sync CPU state for KVM
target-ppc: Get MMU state on register sync
qemu: cleanup unused macros in cirrus
qemu: make cirrus init value pci spec compliant
Conflicts:
kvm-all.c
target-i386/kvm.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.h')
| -rw-r--r-- | qemu-kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-kvm.h b/qemu-kvm.h index f897c7c8d..74f374659 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -1145,6 +1145,7 @@ typedef struct KVMState { int coalesced_mmio; int broken_set_mem_region; int migration_log; + int vcpu_events; #ifdef KVM_CAP_SET_GUEST_DEBUG QTAILQ_HEAD(, kvm_sw_breakpoint) kvm_sw_breakpoints; #endif |