From patchwork Wed Aug 15 15:08:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 177702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C6A6C2C009B for ; Thu, 16 Aug 2012 01:10:30 +1000 (EST) Received: from localhost ([::1]:36705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1fEq-0007lF-Q9 for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 11:10:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1fDl-0005Ow-9B for qemu-devel@nongnu.org; Wed, 15 Aug 2012 11:09:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1fDj-0001Es-Mx for qemu-devel@nongnu.org; Wed, 15 Aug 2012 11:09:21 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:47506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1fDj-0001EC-Dp for qemu-devel@nongnu.org; Wed, 15 Aug 2012 11:09:19 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Aug 2012 16:09:18 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 15 Aug 2012 16:09:16 +0100 Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7FF99r110354760 for ; Wed, 15 Aug 2012 15:09:09 GMT Received: from d06av12.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7FF9FWd030939 for ; Wed, 15 Aug 2012 09:09:15 -0600 Received: from localhost (sig-9-145-129-230.de.ibm.com [9.145.129.230]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7FF9FV6030914; Wed, 15 Aug 2012 09:09:15 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Wed, 15 Aug 2012 16:08:58 +0100 Message-Id: <1345043344-3978-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1345043344-3978-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1345043344-3978-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12081515-1948-0000-0000-000002ADF502 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.110 Cc: Peter Maydell , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 3/9] cputlb.c: Fix out of date comment 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 From: Peter Maydell The comment about the return address from get_page_addr_code() was well out of date as phys_ram_base has not existed for some time. Signed-off-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- cputlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cputlb.c b/cputlb.c index 0d1e252..d3e7b25 100644 --- a/cputlb.c +++ b/cputlb.c @@ -312,7 +312,9 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, /* NOTE: this function can trigger an exception */ /* NOTE2: the returned address is not exactly the physical address: it - is the offset relative to phys_ram_base */ + * is actually a ram_addr_t (in system mode; the user mode emulation + * version of this function returns a guest virtual address). + */ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) { int mmu_idx, page_index, pd;