From patchwork Wed Sep 4 09:05:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 272533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3535C2C0085 for ; Wed, 4 Sep 2013 19:29:58 +1000 (EST) Received: from localhost ([::1]:51393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH9PQ-00068G-A3 for incoming@patchwork.ozlabs.org; Wed, 04 Sep 2013 05:29:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH92H-0004eT-Ej for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:06:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VH925-0007z6-6G for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:06:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45473 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH924-0007yq-Qn for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:05:49 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 64456A5526 for ; Wed, 4 Sep 2013 11:05:48 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2013 11:05:12 +0200 Message-Id: <1378285521-3230-33-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1378285521-3230-1-git-send-email-afaerber@suse.de> References: <1378285521-3230-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC qom-cpu 32/41] cputlb: Change tlb_set_page() argument to CPUState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It no longer needs CPUArchState since moving tlb_flush_* to CPUState. Signed-off-by: Andreas Färber --- cputlb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cputlb.c b/cputlb.c index e5b6145..ddcd2cd 100644 --- a/cputlb.c +++ b/cputlb.c @@ -212,10 +212,9 @@ void tlb_set_dirty(CPUArchState *env, target_ulong vaddr) /* Our TLB does not support large pages, so remember the area covered by large pages and trigger a full TLB flush if these are invalidated. */ -static void tlb_add_large_page(CPUArchState *env, target_ulong vaddr, +static void tlb_add_large_page(CPUState *cpu, target_ulong vaddr, target_ulong size) { - CPUState *cpu = ENV_GET_CPU(env); target_ulong mask = ~(size - 1); if ((target_ulong)cpu->tlb_flush_addr == (target_ulong)-1) { @@ -252,7 +251,7 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, assert(size >= TARGET_PAGE_SIZE); if (size != TARGET_PAGE_SIZE) { - tlb_add_large_page(env, vaddr, size); + tlb_add_large_page(cpu, vaddr, size); } sz = size;