diff options
| author | Alexander Graf <agraf@suse.de> | 2009-07-17 13:51:46 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-22 10:58:46 -0500 |
| commit | 16415335bea79c0226f92aec82197ab07b55ba65 (patch) | |
| tree | 8a7ee3ecf070d0143c45d3b2aeec57704028a332 /target-ppc | |
| parent | b80a55e67b90a87646c44474822a40c00b821d37 (diff) | |
| download | qemu-16415335bea79c0226f92aec82197ab07b55ba65.tar.gz qemu-16415335bea79c0226f92aec82197ab07b55ba65.tar.bz2 qemu-16415335bea79c0226f92aec82197ab07b55ba65.zip | |
Use correct input constant
440 and desktop codes use different input constants for interrupt indication.
Let's use the respective ones for KVM.
Signed-off-by: Alexander Graf <agraf@suse.de>
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 04bb305a37..b53d6e99ae 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -124,6 +124,14 @@ int kvm_arch_get_registers(CPUState *env) return 0; } +#if defined(TARGET_PPCEMB) +#define PPC_INPUT_INT PPC40x_INPUT_INT +#elif defined(TARGET_PPC64) +#define PPC_INPUT_INT PPC970_INPUT_INT +#else +#define PPC_INPUT_INT PPC6xx_INPUT_INT +#endif + int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) { int r; @@ -133,7 +141,7 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) * interrupt, reset, etc) in PPC-specific env->irq_input_state. */ if (run->ready_for_interrupt_injection && (env->interrupt_request & CPU_INTERRUPT_HARD) && - (env->irq_input_state & (1<<PPC40x_INPUT_INT))) + (env->irq_input_state & (1<<PPC_INPUT_INT))) { /* For now KVM disregards the 'irq' argument. However, in the * future KVM could cache it in-kernel to avoid a heavyweight exit |