diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-03-02 08:56:04 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-15 01:19:04 -0300 |
| commit | bdcbd3e2fb98407e6b0928a17d1ed61786cb6389 (patch) | |
| tree | 5828dfd693c856812392fe49e59a98d2f3aa4ac1 /target-ppc | |
| parent | cc015e9a5dde2f03f123357fa060acbdfcd570a4 (diff) | |
| download | qemu-bdcbd3e2fb98407e6b0928a17d1ed61786cb6389.tar.gz qemu-bdcbd3e2fb98407e6b0928a17d1ed61786cb6389.tar.bz2 qemu-bdcbd3e2fb98407e6b0928a17d1ed61786cb6389.zip | |
kvm: ppc: Fix breakage of kvm_arch_pre_run/process_irqchip_events
Commit 7a39fe5882 failed to convert the right arch function.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/kvm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index bd4012a4ec..3924f4bed4 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -222,7 +222,7 @@ int kvmppc_set_interrupt(CPUState *env, int irq, int level) #define PPC_INPUT_INT PPC6xx_INPUT_INT #endif -int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) +void kvm_arch_pre_run(CPUState *env, struct kvm_run *run) { int r; unsigned irq; @@ -253,15 +253,15 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) /* We don't know if there are more interrupts pending after this. However, * the guest will return to userspace in the course of handling this one * anyways, so we will get a chance to deliver the rest. */ - return 0; } void kvm_arch_post_run(CPUState *env, struct kvm_run *run) { } -void kvm_arch_process_irqchip_events(CPUState *env) +int kvm_arch_process_irqchip_events(CPUState *env) { + return 0; } static int kvmppc_handle_halt(CPUState *env) |