From patchwork Thu Jan 12 15:47:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 91180 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1684593qgi; Thu, 12 Jan 2017 07:50:47 -0800 (PST) X-Received: by 10.55.78.73 with SMTP id c70mr14838918qkb.11.1484236247353; Thu, 12 Jan 2017 07:50:47 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 63si3932295qtc.303.2017.01.12.07.50.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 12 Jan 2017 07:50:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRheI-0006be-Uy for patch@linaro.org; Thu, 12 Jan 2017 10:50:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRhbR-0005KE-RK for qemu-devel@nongnu.org; Thu, 12 Jan 2017 10:47:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRhbN-00079H-3o for qemu-devel@nongnu.org; Thu, 12 Jan 2017 10:47:49 -0500 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cRhbM-00078m-Ss for qemu-devel@nongnu.org; Thu, 12 Jan 2017 10:47:45 -0500 Received: by mail-wm0-x22c.google.com with SMTP id r126so25171278wmr.0 for ; Thu, 12 Jan 2017 07:47:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6dcaiumeSM6CPRzp9WqpuR57ejJW7QIpagQyZ/PS37w=; b=e9wJTJGw5fG6UP+z+dO7DnqPcFaHmr8yrwnjppayX61AICfukKV65b1iDX//GKoY0e sqDhMK4hBdCHJk57MVJmM1Yc40YGmx8S5eRW7M4YWKDzmkvLjrm1TXdw1TX7gmyRs2Tk YjjpzPDy65upKHSRIIfYOfT6sl6kLP4Ch3IIc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6dcaiumeSM6CPRzp9WqpuR57ejJW7QIpagQyZ/PS37w=; b=VBLMpcx1gB5J6MFozB9w6v53HyY8SY4QInvPt/lfNNt5p57/OBRdyoSBZq2ahR4W63 +13/XQvQXEOeE6nb8bmmARcZuAKWqH94ZorIliLRQFp47PRDQv0ecM8IQKgOcJ1r2cFO NZeTQ582l7fSVgDYIJOrrpDGmS8SHrr2XA+p5okMHx/g4n557tAXXEC2BflWYaNp59EX +VV+N/Lmp8r2OE9ZwF3kuxtF2hgvdrnFB6KQdsHWgS1IagCBb2WAGbfXrJiUsyI2Dxus +l4KcSihF+sBtkW28Jhy0/1e6hlYm0tUV1S+U2DoKTrpmgRpfQ7Xgu+crXtB3t/20g+S jkLg== X-Gm-Message-State: AIkVDXLpScr295fne5nhtDoLCMiIR+UpspqJ6ZmrUpRYgDxmcJNpTqPbgUDaMvprFn8oFuU+ X-Received: by 10.223.160.213 with SMTP id n21mr8957419wrn.134.1484236063896; Thu, 12 Jan 2017 07:47:43 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w79sm3810817wmw.0.2017.01.12.07.47.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2017 07:47:41 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6A04F3E36FD; Thu, 12 Jan 2017 15:47:40 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: rth@twiddle.net Date: Thu, 12 Jan 2017 15:47:30 +0000 Message-Id: <20170112154731.1028-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170112154731.1028-1-alex.bennee@linaro.org> References: <20170112154731.1028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PATCH v3 2/3] cpu_common_reset: wrap TCG specific code in tcg_enabled() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , ehabkost@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Both the cpu->tb_jmp_cache and SoftMMU TLB structures are only used when running TCG code so we might as well skip them for anything else. Signed-off-by: Alex Bennée --- qom/cpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.11.0 Reviewed-by: Richard Henderson Reviewed-by: Eduardo Habkost diff --git a/qom/cpu.c b/qom/cpu.c index cc51de2a8c..61ee0cb88c 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -270,13 +270,15 @@ static void cpu_common_reset(CPUState *cpu) cpu->exception_index = -1; cpu->crash_occurred = false; - for (i = 0; i < TB_JMP_CACHE_SIZE; ++i) { - atomic_set(&cpu->tb_jmp_cache[i], NULL); - } + if (tcg_enabled()) { + for (i = 0; i < TB_JMP_CACHE_SIZE; ++i) { + atomic_set(&cpu->tb_jmp_cache[i], NULL); + } #ifdef CONFIG_SOFTMMU - tlb_flush(cpu, 0); + tlb_flush(cpu, 0); #endif + } } static bool cpu_common_has_work(CPUState *cs)