[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] Use correct input constant
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 5/7] Use correct input constant |
Date: |
Fri, 17 Jul 2009 13:51:46 +0200 |
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>
---
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 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
--
1.6.0.2
- [Qemu-devel] [PATCH 0/4] Add preliminary KVM support for non-embedded PPC v3, Alexander Graf, 2009/07/17
- [Qemu-devel] [PATCH 1/7] Enable PPC KVM for non-embedded, Alexander Graf, 2009/07/17
- [Qemu-devel] [PATCH 2/7] Set PVR in sregs, Alexander Graf, 2009/07/17
- [Qemu-devel] [PATCH 3/7] Add mp_state to PPC CPU struct, Alexander Graf, 2009/07/17
- [Qemu-devel] [PATCH 4/7] Fix warning in kvm-all.c, Alexander Graf, 2009/07/17
- [Qemu-devel] [PATCH 5/7] Use correct input constant,
Alexander Graf <=
- [Qemu-devel] [PATCH 6/7] Set slots more carefully, Alexander Graf, 2009/07/17
- [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Alexander Graf, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Stefano Stabellini, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Alexander Graf, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Alexander Graf, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Stefano Stabellini, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Alexander Graf, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Stefano Stabellini, 2009/07/17
- Re: [Qemu-devel] [PATCH 7/7] Fake dirty loggin when it's not there, Alexander Graf, 2009/07/17
- [Qemu-devel] Re: [PATCH 7/7] Fake dirty loggin when it's not there, Jan Kiszka, 2009/07/17