diff options
| author | Anthony Liguori | 2011-02-16 15:47:07 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2011-02-16 15:47:07 +0100 |
| commit | c5d69e6bbf37bf5e3882060764b15e018e6a5321 (patch) | |
| tree | e246e96bdfffbc5e07682c5a39ea7a65482a5935 /target-ppc | |
| parent | Handle icount for powerpc tbl/tbu/decr load and store. (diff) | |
| parent | kvm: x86: Introduce kvmclock device to save/restore its state (diff) | |
| download | qemu-c5d69e6bbf37bf5e3882060764b15e018e6a5321.tar.gz qemu-c5d69e6bbf37bf5e3882060764b15e018e6a5321.tar.xz qemu-c5d69e6bbf37bf5e3882060764b15e018e6a5321.zip | |
Merge remote branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/kvm.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 710eca1dca..bd4012a4ec 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -256,14 +256,12 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) return 0; } -int kvm_arch_post_run(CPUState *env, struct kvm_run *run) +void kvm_arch_post_run(CPUState *env, struct kvm_run *run) { - return 0; } -int kvm_arch_process_irqchip_events(CPUState *env) +void kvm_arch_process_irqchip_events(CPUState *env) { - return 0; } static int kvmppc_handle_halt(CPUState *env) @@ -404,3 +402,13 @@ bool kvm_arch_stop_on_emulation_error(CPUState *env) { return true; } + +int kvm_arch_on_sigbus_vcpu(CPUState *env, int code, void *addr) +{ + return 1; +} + +int kvm_arch_on_sigbus(int code, void *addr) +{ + return 1; +} |