From nobody Tue Feb 10 06:27:31 2026 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=1613669185; cv=none; d=zohomail.com; s=zohoarc; b=YgOzYYqn6zj3XiKZsWwl0vNLezmJyaD4bQSw4qcv9gSVJFlQCkI3Ap3w6J7TOYk73UuQMalNim0U6Kriuzi2Uab9/W2gb3yhiMvmlfIs4wDe4x+V3oUzNVmTeVlIAYo4e39LNyCyS0fwR3IswUY8KOXrGwlV/Y7eB51eQho3mO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613669185; 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=b8sHCZ8lMyhmRidCMkX7fnbm5JHNpOKwhUkWTIUESRI=; b=Pg2LwrJcbucQ16WzFKlqF0jf3eX7Rv7NWZRsEf7O+WglZ37K9Zb+b0fFQt8bcDVyK7ib9JUIyk3l7DTxizhUSpy64Scy/j83A14O6ydhx+Him/xs7yKhZ+FoIZm4F0wZNqyL9OVp0BT+Wcf2AM8J301hf+AEl9z9dJ5apx5BpUc= 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 1613669185158525.8089955204056; Thu, 18 Feb 2021 09:26:25 -0800 (PST) Received: from localhost ([::1]:37620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCn4J-0001z8-S4 for importer@patchew.org; Thu, 18 Feb 2021 12:26:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCn0d-0007If-8D for qemu-devel@nongnu.org; Thu, 18 Feb 2021 12:22:35 -0500 Received: from mx2.suse.de ([195.135.220.15]:38938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCn0Z-0007RN-GA for qemu-devel@nongnu.org; Thu, 18 Feb 2021 12:22:34 -0500 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0D67EB03C; Thu, 18 Feb 2021 17:22:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Peter Maydell Subject: [PATCH v20 17/17] i386: move cpu_load_efer into SOFTMMU-only section of cpu.h Date: Thu, 18 Feb 2021 18:21:56 +0100 Message-Id: <20210218172156.25520-18-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210218172156.25520-1-cfontana@suse.de> References: <20210218172156.25520-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 softmmu code. Therefore, make this inline function not visible anymore in CONFIG_USER_ONLY builds. Signed-off-by: Claudio Fontana --- target/i386/cpu.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 1cab87e834..9b3703c492 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1953,6 +1953,22 @@ 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? + */ +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; + } +} + 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); @@ -2049,21 +2065,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 = }); --=20 2.26.2