| commit | c859bf47e565062b7801a18966913142cf59eda8 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 7 Dec 2009 09:11:03 +0000 (7 11:11 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 7 Dec 2009 09:11:03 +0000 (7 11:11 +0200) | ||
| tree | 45b0d133200af9e62d052d7145a604e7d3d23cc0 | treesnapshot (tar.gz zip) |
| parent | 149d76049af52aa76f4665b6bc9bdbd5904a8588 | commitdiff |
| parent | a0fb002c6462d21ceb9eac8c5772e469ec189374 | commitdiff |
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>
* 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>