[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] cpu-exec: Move halt handling out of cpu_exec()
From: |
Sergey Fedorov |
Subject: |
[Qemu-devel] [PATCH 1/5] cpu-exec: Move halt handling out of cpu_exec() |
Date: |
Wed, 11 May 2016 13:21:47 +0300 |
From: Sergey Fedorov <address@hidden>
Simplify cpu_exec() by extracting CPU halt state handling code out of
cpu_exec() into a new static inline function cpu_handle_halt().
Signed-off-by: Sergey Fedorov <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
Changes in v2:
* Declare x86_cpu variable in the inner-most block
cpu-exec.c | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index d55faa5114c7..1fcdc3fabb39 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -352,6 +352,29 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu,
return tb;
}
+static inline bool cpu_handle_halt(CPUState *cpu)
+{
+ if (cpu->halted) {
+#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
+
+ if ((cpu->interrupt_request & CPU_INTERRUPT_POLL)
+ && replay_interrupt()) {
+ X86CPU *x86_cpu = X86_CPU(cpu);
+ apic_poll_irq(x86_cpu->apic_state);
+ cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
+ }
+#endif
+ if (!cpu_has_work(cpu)) {
+ current_cpu = NULL;
+ return true;
+ }
+
+ cpu->halted = 0;
+ }
+
+ return false;
+}
+
static void cpu_handle_debug_exception(CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
@@ -383,20 +406,8 @@ int cpu_exec(CPUState *cpu)
/* replay_interrupt may need current_cpu */
current_cpu = cpu;
- if (cpu->halted) {
-#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
- if ((cpu->interrupt_request & CPU_INTERRUPT_POLL)
- && replay_interrupt()) {
- apic_poll_irq(x86_cpu->apic_state);
- cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
- }
-#endif
- if (!cpu_has_work(cpu)) {
- current_cpu = NULL;
- return EXCP_HALTED;
- }
-
- cpu->halted = 0;
+ if (cpu_handle_halt(cpu)) {
+ return EXCP_HALTED;
}
atomic_mb_set(&tcg_current_cpu, cpu);
--
1.9.1
- [Qemu-devel] [PATCH 4/5] cpu-exec: Move TB execution stuff out of cpu_exec(), (continued)
- [Qemu-devel] [PATCH 4/5] cpu-exec: Move TB execution stuff out of cpu_exec(), Sergey Fedorov, 2016/05/10
- [Qemu-devel] [PATCH 5/5] cpu-exec: Remove unused 'x86_cpu' and 'env' from cpu_exec(), Sergey Fedorov, 2016/05/10
- [Qemu-devel] [PATCH 3/5] cpu-exec: Move interrupt handling out of cpu_exec(), Sergey Fedorov, 2016/05/10
- Re: [Qemu-devel] [PATCH 0/5] cpu-exec: Restructure cpu_exec(), Sergey Fedorov, 2016/05/10
- [Qemu-devel] [PATCH 0/5] cpu-exec: Restructure cpu_exec(), Sergey Fedorov, 2016/05/11
- [Qemu-devel] [PATCH 2/5] cpu-exec: Move exception handling out of cpu_exec(), Sergey Fedorov, 2016/05/11
- [Qemu-devel] [PATCH 1/5] cpu-exec: Move halt handling out of cpu_exec(),
Sergey Fedorov <=
- [Qemu-devel] [PATCH 4/5] cpu-exec: Move TB execution stuff out of cpu_exec(), Sergey Fedorov, 2016/05/11
- [Qemu-devel] [PATCH 3/5] cpu-exec: Move interrupt handling out of cpu_exec(), Sergey Fedorov, 2016/05/11
- [Qemu-devel] [PATCH 5/5] cpu-exec: Remove unused 'x86_cpu' and 'env' from cpu_exec(), Sergey Fedorov, 2016/05/11
- Re: [Qemu-devel] [PATCH 0/5] cpu-exec: Restructure cpu_exec(), Richard Henderson, 2016/05/11