From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmTL-0003hg-DI for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzmTK-0004Sj-7m for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:03 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34885) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzmTK-0004S3-1F for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:02 -0400 Received: by mail-wm0-x22c.google.com with SMTP id e69so41516353wmg.0 for ; Thu, 27 Oct 2016 08:20:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Thu, 27 Oct 2016 16:10:27 +0100 Message-Id: <20161027151030.20863-31-alex.bennee@linaro.org> In-Reply-To: <20161027151030.20863-1-alex.bennee@linaro.org> References: <20161027151030.20863-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 30/33] target-arm/cpu: don't reset TLB structures, use cputlb to do it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com Cc: qemu-devel@nongnu.org, mttcg@listserver.greensocs.com, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, bobby.prani@gmail.com, nikunj@linux.vnet.ibm.com, mark.burton@greensocs.com, jan.kiszka@siemens.com, serge.fdrv@gmail.com, rth@twiddle.net, peter.maydell@linaro.org, claudio.fontana@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , "open list:ARM" cputlb owns the TLB entries and knows how to safely update them in MTTCG. Signed-off-by: Alex Bennée --- target-arm/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 1b9540e..ff8c594 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -121,7 +121,13 @@ static void arm_cpu_reset(CPUState *s) acc->parent_reset(s); +#ifdef CONFIG_SOFTMMU + memset(env, 0, offsetof(CPUARMState, tlb_table)); + tlb_flush(s, 0); +#else memset(env, 0, offsetof(CPUARMState, features)); +#endif + g_hash_table_foreach(cpu->cp_regs, cp_reg_reset, cpu); g_hash_table_foreach(cpu->cp_regs, cp_reg_check_reset, cpu); -- 2.10.1