[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 1641533] Use correct input constant
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 1641533] Use correct input constant |
Date: |
Wed, 22 Jul 2009 16:26:27 -0000 |
From: Alexander Graf <address@hidden>
440 and desktop codes use different input constants for interrupt indication.
Let's use the respective ones for KVM.
Signed-off-by: Alexander Graf <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
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<<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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 1641533] Use correct input constant,
Anthony Liguori <=