From patchwork Fri Aug 10 16:14:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10685 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 990A423E29 for ; Fri, 10 Aug 2012 16:14:10 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 615F8A187E6 for ; Fri, 10 Aug 2012 16:14:10 +0000 (UTC) Received: by ghbg10 with SMTP id g10so1763178ghb.11 for ; Fri, 10 Aug 2012 09:14:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=XK1rieNlFlMKW8fqXNWnZpeQI2hv2i+ZVbvtW72BtMo=; b=mqbyOrbgcTQ52D3Ei125X/FsNKqk2RKpnLoKtNL2TZA2PC115isKzECZA67TbvaFwH CWhXZzTfLtoVt7x9EZa5kTLDDfi5+jqqQwIvvIubgSOPTNJT9LdvGBkDV9x3q3OTaHLK f7smgEUe4Cn6EPKIiO/Vw0VNP867dYqVOm0solLnV/3KJZi4h2MamoUmLXAtw4YyMme+ DogODGHlgTDfD+8G98dSy5Z+r0hT11qomioQJHvyolNCszSEYW85+Wk4h2RO1344xHpd IlWpHGpAZUwZzYwJqHlrghBuU+jyJISFD8btSB8iWUEbwlSFu+r/2DC9QEEjy4n2QacH kC0w== Received: by 10.50.170.3 with SMTP id ai3mr169759igc.9.1344615249769; Fri, 10 Aug 2012 09:14:09 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp69161igc; Fri, 10 Aug 2012 09:14:09 -0700 (PDT) Received: by 10.14.0.198 with SMTP id 46mr3816261eeb.30.1344615248721; Fri, 10 Aug 2012 09:14:08 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id c5si3096032eep.140.2012.08.10.09.14.07 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Aug 2012 09:14:08 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Szrqf-0006Wz-Vr; Fri, 10 Aug 2012 17:14:05 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org Subject: [PATCH] cputlb.c: Fix out of date comment Date: Fri, 10 Aug 2012 17:14:05 +0100 Message-Id: <1344615245-25080-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQlICJztnuw1NQww9xDGXvYTURRSSKW9V8XKnnuhQIAjUnKfPS/8QGwhU04i8eQRD4eCRxT1 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 --- 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;