From nobody Mon Feb 9 09:52:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1709825891; cv=none; d=zohomail.com; s=zohoarc; b=jvMJP358RF9kLJJ58CugG2VNgyJ61twGq7C6PKQ27VEFLUJNa9zxyUiBUzBxfle6fBxY+zt1bWoqs4nkDuuC+tGb7CrfvrOZVA9lM7KqSKfV6ZmpqJVd5ICNTaBgU96eiVpomrP/nlS3oDOahC3Wetxjl+gye2uQSlLZRphaRrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709825891; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=rWH+VJW3a9xVsxDPS7LJdecBUU39mrq3FlPrjkkG5/o=; b=LuUsqHn+ySMySizXORgnEJ/F/2wR32L3wdORac8vukMCdi5P3EtBfG6SJdmEZ6A4i0X4iqL01uPWA0u7Mab7/k/lemxkkgHyHKmDO+eugP4jaRMyblNyruAT0TS8h8WYwelVoUDdfqcW04NU5a0dWXhgOwAlRXl9H3NjfABqj14= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709825891378523.416069308156; Thu, 7 Mar 2024 07:38:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riFon-0001xK-QJ; Thu, 07 Mar 2024 10:38:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riFok-0001tL-0c for qemu-devel@nongnu.org; Thu, 07 Mar 2024 10:37:59 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riFoT-0001Xh-45 for qemu-devel@nongnu.org; Thu, 07 Mar 2024 10:37:56 -0500 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4TrCxw6qWMz6K7GH; Thu, 7 Mar 2024 23:33:40 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 31A0A140B18; Thu, 7 Mar 2024 23:37:39 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 7 Mar 2024 15:37:38 +0000 To: Paolo Bonzini , Peter Xu , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , CC: Subject: [PATCH v2 1/4] physmem: Rename addr1 to more informative mr_addr in flatview_read/write() and similar Date: Thu, 7 Mar 2024 15:37:07 +0000 Message-ID: <20240307153710.30907-2-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307153710.30907-1-Jonathan.Cameron@huawei.com> References: <20240307153710.30907-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml500001.china.huawei.com (7.191.163.213) To lhrpeml500005.china.huawei.com (7.191.163.240) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1709825893173100005 Content-Type: text/plain; charset="utf-8" The calls to flatview_read/write[_continue]() have parameters addr and addr1 but the names give no indication of what they are addresses of. Rename addr1 to mr_addr to reflect that it is the translated address offset within the MemoryRegion returned by flatview_translate(). Similarly rename the parameter in address_space_read/write_cached_slow() Suggested-by: Peter Xu Signed-off-by: Jonathan Cameron Reviewed-by: David Hildenbrand --- v2: New patch. - I have kept the renames to only the code I'm touching later in this series, but they could be applied much more widely. --- system/physmem.c | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 05997a7ca7..2704b780f6 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2685,7 +2685,7 @@ static bool flatview_access_allowed(MemoryRegion *mr,= MemTxAttrs attrs, static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, const void *ptr, - hwaddr len, hwaddr addr1, + hwaddr len, hwaddr mr_addr, hwaddr l, MemoryRegion *mr) { uint8_t *ram_ptr; @@ -2695,12 +2695,12 @@ static MemTxResult flatview_write_continue(FlatView= *fv, hwaddr addr, const uint8_t *buf =3D ptr; =20 for (;;) { - if (!flatview_access_allowed(mr, attrs, addr1, l)) { + if (!flatview_access_allowed(mr, attrs, mr_addr, l)) { result |=3D MEMTX_ACCESS_ERROR; /* Keep going. */ } else if (!memory_access_is_direct(mr, true)) { release_lock |=3D prepare_mmio_access(mr); - l =3D memory_access_size(mr, l, addr1); + l =3D memory_access_size(mr, l, mr_addr); /* XXX: could force current_cpu to NULL to avoid potential bugs */ =20 @@ -2715,13 +2715,13 @@ static MemTxResult flatview_write_continue(FlatView= *fv, hwaddr addr, (l =3D=3D 8 && len >=3D 8)); #endif val =3D ldn_he_p(buf, l); - result |=3D memory_region_dispatch_write(mr, addr1, val, + result |=3D memory_region_dispatch_write(mr, mr_addr, val, size_memop(l), attrs); } else { /* RAM case */ - ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, &l, fals= e); + ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, mr_addr, &l, fa= lse); memmove(ram_ptr, buf, l); - invalidate_and_set_dirty(mr, addr1, l); + invalidate_and_set_dirty(mr, mr_addr, l); } =20 if (release_lock) { @@ -2738,7 +2738,7 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, } =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, true, attrs); + mr =3D flatview_translate(fv, addr, &mr_addr, &l, true, attrs); } =20 return result; @@ -2749,22 +2749,22 @@ static MemTxResult flatview_write(FlatView *fv, hwa= ddr addr, MemTxAttrs attrs, const void *buf, hwaddr len) { hwaddr l; - hwaddr addr1; + hwaddr mr_addr; MemoryRegion *mr; =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, true, attrs); + mr =3D flatview_translate(fv, addr, &mr_addr, &l, true, attrs); if (!flatview_access_allowed(mr, attrs, addr, len)) { return MEMTX_ACCESS_ERROR; } return flatview_write_continue(fv, addr, attrs, buf, len, - addr1, l, mr); + mr_addr, l, mr); } =20 /* Called within RCU critical section. */ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, void *ptr, - hwaddr len, hwaddr addr1, hwaddr l, + hwaddr len, hwaddr mr_addr, hwaddr l, MemoryRegion *mr) { uint8_t *ram_ptr; @@ -2775,14 +2775,14 @@ MemTxResult flatview_read_continue(FlatView *fv, hw= addr addr, =20 fuzz_dma_read_cb(addr, len, mr); for (;;) { - if (!flatview_access_allowed(mr, attrs, addr1, l)) { + if (!flatview_access_allowed(mr, attrs, mr_addr, l)) { result |=3D MEMTX_ACCESS_ERROR; /* Keep going. */ } else if (!memory_access_is_direct(mr, false)) { /* I/O case */ release_lock |=3D prepare_mmio_access(mr); - l =3D memory_access_size(mr, l, addr1); - result |=3D memory_region_dispatch_read(mr, addr1, &val, + l =3D memory_access_size(mr, l, mr_addr); + result |=3D memory_region_dispatch_read(mr, mr_addr, &val, size_memop(l), attrs); =20 /* @@ -2798,7 +2798,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, stn_he_p(buf, l, val); } else { /* RAM case */ - ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, &l, fals= e); + ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, mr_addr, &l, fa= lse); memcpy(buf, ram_ptr, l); } =20 @@ -2816,7 +2816,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, } =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, false, attrs); + mr =3D flatview_translate(fv, addr, &mr_addr, &l, false, attrs); } =20 return result; @@ -2827,16 +2827,16 @@ static MemTxResult flatview_read(FlatView *fv, hwad= dr addr, MemTxAttrs attrs, void *buf, hwaddr len) { hwaddr l; - hwaddr addr1; + hwaddr mr_addr; MemoryRegion *mr; =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, false, attrs); + mr =3D flatview_translate(fv, addr, &mr_addr, &l, false, attrs); if (!flatview_access_allowed(mr, attrs, addr, len)) { return MEMTX_ACCESS_ERROR; } return flatview_read_continue(fv, addr, attrs, buf, len, - addr1, l, mr); + mr_addr, l, mr); } =20 MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr, @@ -3359,15 +3359,15 @@ MemTxResult address_space_read_cached_slow(MemoryRegionCache *cache, hwaddr addr, void *buf, hwaddr len) { - hwaddr addr1, l; + hwaddr mr_addr, l; MemoryRegion *mr; =20 l =3D len; - mr =3D address_space_translate_cached(cache, addr, &addr1, &l, false, + mr =3D address_space_translate_cached(cache, addr, &mr_addr, &l, false, MEMTXATTRS_UNSPECIFIED); return flatview_read_continue(cache->fv, addr, MEMTXATTRS_UNSPECIFIED, buf, len, - addr1, l, mr); + mr_addr, l, mr); } =20 /* Called from RCU critical section. address_space_write_cached uses this @@ -3377,15 +3377,15 @@ MemTxResult address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr, const void *buf, hwaddr len) { - hwaddr addr1, l; + hwaddr mr_addr, l; MemoryRegion *mr; =20 l =3D len; - mr =3D address_space_translate_cached(cache, addr, &addr1, &l, true, + mr =3D address_space_translate_cached(cache, addr, &mr_addr, &l, true, MEMTXATTRS_UNSPECIFIED); return flatview_write_continue(cache->fv, addr, MEMTXATTRS_UNSPECIFIED, buf, len, - addr1, l, mr); + mr_addr, l, mr); } =20 #define ARG1_DECL MemoryRegionCache *cache --=20 2.39.2