From: Claudio Fontana <cfontana@suse.de>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
Roman Bolshakov <r.bolshakov@yadro.com>,
Claudio Fontana <cfontana@suse.de>,
qemu-devel@nongnu.org
Subject: [PATCH v25 20/20] i386: make cpu_load_efer sysemu-only
Date: Fri, 26 Feb 2021 18:51:43 +0100 [thread overview]
Message-ID: <20210226175143.22388-21-cfontana@suse.de> (raw)
In-Reply-To: <20210226175143.22388-1-cfontana@suse.de>
cpu_load_efer is now used only for sysemu code.
Therefore, move this function implementation to
sysemu-only section of helper.c
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/cpu.h | 20 +++++---------------
target/i386/helper.c | 13 +++++++++++++
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 3797789dc2..a1268abe9f 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1957,6 +1957,11 @@ static inline AddressSpace *cpu_addressspace(CPUState *cs, MemTxAttrs attrs)
return cpu_get_address_space(cs, cpu_asidx_from_attrs(cs, attrs));
}
+/*
+ * load efer and update the corresponding hflags. XXX: do consistency
+ * checks with cpuid bits?
+ */
+void cpu_load_efer(CPUX86State *env, uint64_t val);
uint8_t x86_ldub_phys(CPUState *cs, hwaddr addr);
uint32_t x86_lduw_phys(CPUState *cs, hwaddr addr);
uint32_t x86_ldl_phys(CPUState *cs, hwaddr addr);
@@ -2053,21 +2058,6 @@ static inline uint32_t cpu_compute_eflags(CPUX86State *env)
return eflags;
}
-
-/* load efer and update the corresponding hflags. XXX: do consistency
- checks with cpuid bits? */
-static inline void cpu_load_efer(CPUX86State *env, uint64_t val)
-{
- env->efer = val;
- env->hflags &= ~(HF_LMA_MASK | HF_SVME_MASK);
- if (env->efer & MSR_EFER_LMA) {
- env->hflags |= HF_LMA_MASK;
- }
- if (env->efer & MSR_EFER_SVME) {
- env->hflags |= HF_SVME_MASK;
- }
-}
-
static inline MemTxAttrs cpu_get_mem_attrs(CPUX86State *env)
{
return ((MemTxAttrs) { .secure = (env->hflags & HF_SMM_MASK) != 0 });
diff --git a/target/i386/helper.c b/target/i386/helper.c
index 618ad1c409..7304721a94 100644
--- a/target/i386/helper.c
+++ b/target/i386/helper.c
@@ -574,6 +574,19 @@ void do_cpu_sipi(X86CPU *cpu)
#endif
#ifndef CONFIG_USER_ONLY
+
+void cpu_load_efer(CPUX86State *env, uint64_t val)
+{
+ env->efer = val;
+ env->hflags &= ~(HF_LMA_MASK | HF_SVME_MASK);
+ if (env->efer & MSR_EFER_LMA) {
+ env->hflags |= HF_LMA_MASK;
+ }
+ if (env->efer & MSR_EFER_SVME) {
+ env->hflags |= HF_SVME_MASK;
+ }
+}
+
uint8_t x86_ldub_phys(CPUState *cs, hwaddr addr)
{
X86CPU *cpu = X86_CPU(cs);
--
2.26.2
next prev parent reply other threads:[~2021-02-26 18:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 17:51 [PATCH v25 00/20] i386 cleanup PART 2 Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 01/20] target/i386: Rename helper_fldt, helper_fstt Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 02/20] target/i386: Split out do_fsave, do_frstor, do_fxsave, do_fxrstor Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 03/20] i386: split cpu accelerators from cpu.c, using AccelCPUClass Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 04/20] cpu: call AccelCPUClass::cpu_realizefn in cpu_exec_realizefn Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 05/20] accel: introduce new accessor functions Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 06/20] target/i386: fix host_cpu_adjust_phys_bits error handling Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 07/20] accel-cpu: make cpu_realizefn return a bool Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 08/20] meson: add target_user_arch Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 09/20] i386: split off sysemu-only functionality in tcg-cpu Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 10/20] i386: split smm helper (sysemu) Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 11/20] i386: split tcg excp_helper into sysemu and user parts Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 12/20] i386: move TCG bpt_helper into sysemu/ Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 13/20] i386: split misc helper user stubs and sysemu part Claudio Fontana
2021-02-26 18:33 ` Richard Henderson
2021-02-26 17:51 ` [PATCH v25 14/20] i386: separate fpu_helper into user and sysemu parts Claudio Fontana
2021-02-26 18:42 ` Richard Henderson
2021-03-01 8:41 ` Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 15/20] i386: split svm_helper into sysemu and stub-only user Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 16/20] i386: split seg_helper into user-only and sysemu parts Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 17/20] i386: split off sysemu part of cpu.c Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 18/20] target/i386: gdbstub: introduce aux functions to read/write CS64 regs Claudio Fontana
2021-02-26 17:51 ` [PATCH v25 19/20] target/i386: gdbstub: only write CR0/CR2/CR3/EFER for sysemu Claudio Fontana
2021-02-26 17:51 ` Claudio Fontana [this message]
2021-02-26 18:21 ` [PATCH v25 00/20] i386 cleanup PART 2 no-reply
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=20210226175143.22388-21-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=alex.bennee@linaro.org \
--cc=ehabkost@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).