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-ppc | |
| parent | 9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (diff) | |
| parent | c5999bfcfdf66390c98115044cb6fd174fbcf36d (diff) | |
| download | qemu-b3a98367eec7b2d87acca54ef5e4de3b0e0a7ed5.zip qemu-b3a98367eec7b2d87acca54ef5e4de3b0e0a7ed5.tar.gz qemu-b3a98367eec7b2d87acca54ef5e4de3b0e0a7ed5.tar.bz2 | |
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-ppc')
| -rw-r--r-- | target-ppc/kvm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 5caa07c..710eca1 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -37,6 +37,10 @@ do { } while (0) #endif +const KVMCapabilityInfo kvm_arch_required_capabilities[] = { + KVM_CAP_LAST_INFO +}; + static int cap_interrupt_unset = false; static int cap_interrupt_level = false; @@ -56,7 +60,7 @@ static void kvm_kick_env(void *env) qemu_cpu_kick(env); } -int kvm_arch_init(KVMState *s, int smp_cpus) +int kvm_arch_init(KVMState *s) { #ifdef KVM_CAP_PPC_UNSET_IRQ cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ); @@ -307,6 +311,10 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) dprintf("handle halt\n"); ret = kvmppc_handle_halt(env); break; + default: + fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); + ret = -1; + break; } return ret; |