From nobody Sun Sep 29 02:22:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1614251396; cv=none; d=zohomail.com; s=zohoarc; b=CRTv6hnNX7ckdzCajLtQgLfqsaV5wXVfp1lxJXDoHkzVCf9j2anSWhK2nfMRfzD+n31GFA8A/tEU5Y4fIlRoCSfk9HgMObKeg+H3F4BlC8mtbu76ZmbwH0+ECE27Gn0XQXi1wxew2CyS6ZWIbJsqWDCqOim9qM55yp+cpK5WPfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614251396; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MwMUfnwRr3RB9WQnv4VNX5kJYp15O3RLeFvuWU5PL1I=; b=Jokrnftyg9tUmvjd639U9BCTxWAv86zT21RZ0zLym2UoCBPTSuZ9uwxZEsGx2ACb8i3M5YjjxEO9Z+R3Mh30CWEzpPCIXpFqW7oitr8hzqctvju/KNaxoNLK1ireXQsbtE6fB5eltT/nZFnz0sjebqq42RHfb1WtgTXcBqBjeJI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614251396832901.4486738295295; Thu, 25 Feb 2021 03:09:56 -0800 (PST) Received: from localhost ([::1]:55302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFEWq-0004uJ-3c for importer@patchew.org; Thu, 25 Feb 2021 06:09:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFEDl-0002c8-DR for qemu-devel@nongnu.org; Thu, 25 Feb 2021 05:50:14 -0500 Received: from mx2.suse.de ([195.135.220.15]:40966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFEDe-0003Pv-RA for qemu-devel@nongnu.org; Thu, 25 Feb 2021 05:50:13 -0500 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 49F37AD57; Thu, 25 Feb 2021 10:49:54 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v23 17/17] i386: make cpu_load_efer sysemu-only Date: Thu, 25 Feb 2021 11:49:41 +0100 Message-Id: <20210225104941.15688-18-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210225104941.15688-1-cfontana@suse.de> References: <20210225104941.15688-1-cfontana@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Roman Bolshakov , Claudio Fontana , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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(CPUStat= e *cs, MemTxAttrs attrs) return cpu_get_address_space(cs, cpu_asidx_from_attrs(cs, attrs)); } =20 +/* + * 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(CPUX86Stat= e *env) return eflags; } =20 - -/* 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 =3D val; - env->hflags &=3D ~(HF_LMA_MASK | HF_SVME_MASK); - if (env->efer & MSR_EFER_LMA) { - env->hflags |=3D HF_LMA_MASK; - } - if (env->efer & MSR_EFER_SVME) { - env->hflags |=3D HF_SVME_MASK; - } -} - static inline MemTxAttrs cpu_get_mem_attrs(CPUX86State *env) { return ((MemTxAttrs) { .secure =3D (env->hflags & HF_SMM_MASK) !=3D 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 =20 #ifndef CONFIG_USER_ONLY + +void cpu_load_efer(CPUX86State *env, uint64_t val) +{ + env->efer =3D val; + env->hflags &=3D ~(HF_LMA_MASK | HF_SVME_MASK); + if (env->efer & MSR_EFER_LMA) { + env->hflags |=3D HF_LMA_MASK; + } + if (env->efer & MSR_EFER_SVME) { + env->hflags |=3D HF_SVME_MASK; + } +} + uint8_t x86_ldub_phys(CPUState *cs, hwaddr addr) { X86CPU *cpu =3D X86_CPU(cs); --=20 2.26.2