[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/17] target/i386/helper: Shuffle do_cpu_init()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 08/17] target/i386/helper: Shuffle do_cpu_init() |
Date: |
Tue, 13 Jun 2023 11:38:13 +0200 |
Move the #ifdef'ry inside do_cpu_init() instead of
declaring an empty stub for user emulation.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230602224628.59546-3-philmd@linaro.org>
---
target/i386/helper.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/target/i386/helper.c b/target/i386/helper.c
index 792c8eb45e..89aa696c6d 100644
--- a/target/i386/helper.c
+++ b/target/i386/helper.c
@@ -580,9 +580,9 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int
selector,
return 1;
}
-#if !defined(CONFIG_USER_ONLY)
void do_cpu_init(X86CPU *cpu)
{
+#if !defined(CONFIG_USER_ONLY)
CPUState *cs = CPU(cpu);
CPUX86State *env = &cpu->env;
CPUX86State *save = g_new(CPUX86State, 1);
@@ -601,19 +601,15 @@ void do_cpu_init(X86CPU *cpu)
kvm_arch_do_init_vcpu(cpu);
}
apic_init_reset(cpu->apic_state);
+#endif /* CONFIG_USER_ONLY */
}
+#ifndef CONFIG_USER_ONLY
+
void do_cpu_sipi(X86CPU *cpu)
{
apic_sipi(cpu->apic_state);
}
-#else
-void do_cpu_init(X86CPU *cpu)
-{
-}
-#endif
-
-#ifndef CONFIG_USER_ONLY
void cpu_load_efer(CPUX86State *env, uint64_t val)
{
--
2.38.1
- [PULL 00/17] Misc patches for 2023-06-13, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 01/17] linux-user, bsd-user: Preserve incoming order of environment variables in the target, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 02/17] cocoa: Fix warnings about invalid prototype declarations, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 03/17] util/cacheflush: Use declarations from <OSCacheControl.h> on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 05/17] accel/hvf: Report HV_DENIED error, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 04/17] util/cacheflush: Avoid possible redundant dcache flush on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 06/17] target/hppa/meson: Only build int_helper.o with system emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 07/17] target/i386/helper: Remove do_cpu_sipi() stub for user-mode emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 08/17] target/i386/helper: Shuffle do_cpu_init(),
Philippe Mathieu-Daudé <=
- [PULL 09/17] target/i386: Rename helper template headers as '.h.inc', Philippe Mathieu-Daudé, 2023/06/13
- [PULL 10/17] hw/i2c: Enable an id for the pca954x devices, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 12/17] hw/scsi/megasas: Silent GCC duplicated-cond warning, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 11/17] hw/ide/ahci: Remove stray backslash, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 13/17] hw/char/parallel: Export struct ParallelState, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 15/17] exec/ram_addr: Return number of dirty pages in cpu_physical_memory_set_dirty_lebitmap(), Philippe Mathieu-Daudé, 2023/06/13
- [PULL 16/17] hw/vfio: Add number of dirty pages to vfio_get_dirty_bitmap tracepoint, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 17/17] exec/memory: Introduce RAM_NAMED_FILE flag, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 14/17] hw/char/parallel-isa: Export struct ISAParallelState, Philippe Mathieu-Daudé, 2023/06/13
- Re: [PULL 00/17] Misc patches for 2023-06-13, Richard Henderson, 2023/06/14