From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"John Snow" <jsnow@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PULL 009/123] target/i386: Remove x86_cpu_dump_local_apic_state() dead stub
Date: Mon, 27 Feb 2023 13:36:53 +0100 [thread overview]
Message-ID: <20230227123847.27110-10-philmd@linaro.org> (raw)
In-Reply-To: <20230227123847.27110-1-philmd@linaro.org>
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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20221216220158.6317-5-philmd@linaro.org>
---
target/i386/cpu-dump.c | 5 +----
target/i386/cpu.h | 4 ++++
2 files changed, 5 insertions(+), 4 deletions(-)
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);
--
2.38.1
next prev parent reply other threads:[~2023-02-27 12:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 12:36 [PULL 000/123] Buildsys / QOM / QDev / UI patches for 2023-02-27 Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 001/123] cpu: Remove capstone meson dependency Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 002/123] cpu: Move breakpoint helpers to common code Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 003/123] cputlb: Restrict SavedIOTLB to system emulation Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 004/123] gdbstub: Use vaddr type for generic insert/remove_breakpoint() API Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 005/123] target/cpu: Restrict cpu_get_phys_page_debug() handlers to sysemu Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 006/123] target/cpu: Restrict do_transaction_failed() " Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 007/123] target/i386: Remove NEED_CPU_H guard from target-specific headers Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 008/123] target/i386/cpu: Remove dead helper_lock() declaration Philippe Mathieu-Daudé
2023-02-27 12:36 ` Philippe Mathieu-Daudé [this message]
2023-02-27 12:36 ` [PULL 010/123] target/hppa: Extract FPU helpers to fpu_helper.c Philippe Mathieu-Daudé
2023-02-27 12:36 ` [PULL 011/123] target/hppa: Extract system helpers to sys_helper.c Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230227123847.27110-10-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=jsnow@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).