From 16415335bea79c0226f92aec82197ab07b55ba65 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 17 Jul 2009 13:51:46 +0200 Subject: [PATCH 1/1] 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 Signed-off-by: Anthony Liguori --- target-ppc/kvm.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 04bb305..b53d6e9 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<irq_input_state & (1<