| Message ID | 20221216220158.6317-5-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/i386: Header cleanups around "cpu.h" | expand |
On 12/16/22 14:01, Philippe Mathieu-Daudé wrote: > x86_cpu_dump_local_apic_state() is called from monitor.c which > is only compiled for system emulation since commit bf95728400 > ("monitor: remove target-specific code from monitor.c"). > > Interestingly this stub was added few weeks later in commit > 1f871d49e3 ("hmp: added local apic dump state") and was not > necessary by that time. Crossed in-flight, presumably. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index 08ac957e99..40697064d9 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -335,10 +335,7 @@ void x86_cpu_dump_local_apic_state(CPUState *cs, int flags) } qemu_printf(" PPR 0x%02x\n", apic_get_ppr(s)); } -#else -void x86_cpu_dump_local_apic_state(CPUState *cs, int flags) -{ -} + #endif /* !CONFIG_USER_ONLY */ #define DUMP_CODE_BYTES_TOTAL 50 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 9824b7f8f2..32d048f326 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2355,12 +2355,16 @@ typedef int X86CPUVersion; */ void x86_cpu_set_default_version(X86CPUVersion version); +#ifndef CONFIG_USER_ONLY + #define APIC_DEFAULT_ADDRESS 0xfee00000 #define APIC_SPACE_SIZE 0x100000 /* cpu-dump.c */ void x86_cpu_dump_local_apic_state(CPUState *cs, int flags); +#endif + /* cpu.c */ bool cpu_is_bsp(X86CPU *cpu);
x86_cpu_dump_local_apic_state() is called from monitor.c which is only compiled for system emulation since commit bf95728400 ("monitor: remove target-specific code from monitor.c"). Interestingly this stub was added few weeks later in commit 1f871d49e3 ("hmp: added local apic dump state") and was not necessary by that time. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/i386/cpu-dump.c | 5 +---- target/i386/cpu.h | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-)