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 /kvm/user/iotable.c | |
| parent | Merge commit '40ff6d7e8dceca227e7f8a3e8e0d58b2c66d19b4' into upstream-merge (diff) | |
| parent | kvm: x86: Add support for VCPU event states (diff) | |
| download | qemu-kvm-c859bf47e565062b7801a18966913142cf59eda8.tar.gz qemu-kvm-c859bf47e565062b7801a18966913142cf59eda8.tar.bz2 qemu-kvm-c859bf47e565062b7801a18966913142cf59eda8.zip | |
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 'kvm/user/iotable.c')
0 files changed, 0 insertions, 0 deletions