[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] sun4u: Pass SPARCCPU to cpu_kick_irq()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 4/5] sun4u: Pass SPARCCPU to cpu_kick_irq() |
Date: |
Fri, 12 Oct 2012 04:23:07 +0200 |
Needed for changing qemu_cpu_kick() argument type to CPUState.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/sun4u.c | 10 ++++++----
1 Datei geändert, 6 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 4cea102..0453522 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -310,8 +310,10 @@ void cpu_check_irqs(CPUSPARCState *env)
}
}
-static void cpu_kick_irq(CPUSPARCState *env)
+static void cpu_kick_irq(SPARCCPU *cpu)
{
+ CPUSPARCState *env = &cpu->env;
+
env->halted = 0;
cpu_check_irqs(env);
qemu_cpu_kick(env);
@@ -431,7 +433,7 @@ static void tick_irq(void *opaque)
}
env->softint |= SOFTINT_TIMER;
- cpu_kick_irq(env);
+ cpu_kick_irq(cpu);
}
static void stick_irq(void *opaque)
@@ -449,7 +451,7 @@ static void stick_irq(void *opaque)
}
env->softint |= SOFTINT_STIMER;
- cpu_kick_irq(env);
+ cpu_kick_irq(cpu);
}
static void hstick_irq(void *opaque)
@@ -467,7 +469,7 @@ static void hstick_irq(void *opaque)
}
env->softint |= SOFTINT_STIMER;
- cpu_kick_irq(env);
+ cpu_kick_irq(cpu);
}
static int64_t cpu_to_timer_ticks(int64_t cpu_ticks, uint32_t frequency)
--
1.7.10.4
- [Qemu-devel] [PATCH v2 0/5] target-sparc: Preparations for CPUState part 4b series, Andreas Färber, 2012/10/11
- [Qemu-devel] [PATCH v2 1/5] sun4m: Pass SPARCCPU to cpu_set_irq(), Andreas Färber, 2012/10/11
- [Qemu-devel] [PATCH v2 2/5] sun4m: Pass SPARCCPU to cpu_kick_irq(), Andreas Färber, 2012/10/11
- [Qemu-devel] [PATCH v2 4/5] sun4u: Pass SPARCCPU to cpu_kick_irq(),
Andreas Färber <=
- [Qemu-devel] [PATCH v2 5/5] sun4u: Pass SPARCCPU to cpu_set_ivec_irq(), Andreas Färber, 2012/10/11
- [Qemu-devel] [PATCH v2 3/5] sun4u: Pass SPARCCPU to {, s, hs}tick_irq() and cpu_timer_create(), Andreas Färber, 2012/10/11
- Re: [Qemu-devel] [PATCH v2 0/5] target-sparc: Preparations for CPUState part 4b series, Blue Swirl, 2012/10/13