From nobody Fri May 17 20:47:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614988463; cv=none; d=zohomail.com; s=zohoarc; b=JLJkv8IIbwTRg0ZOnoUkW4hSAFyJjUjLGohYnjpqGS7fAiVMFR4kCv8nkDKW3Lt6c9Abs8rd9/BydF+2WR+yWQlUw8RhHp5A0jmVyq8z+pWqVeDA0km+LhgvD2OzfVdP3wNV4agEY6UrffM/kpLdok1U+bAckNY96agcqNNu72o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614988463; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2yJZvfO9sIo/QVUNGf9LQHlm++XZyAwu6lIoAPys+a8=; b=VvS50eVPewnSDLEyV/11sf9EQWP6aT+oIZfTDXZfcC8Q6eH6OCDsC42ujWB/KNjlScslPBcN77MXhkidAFU4JlXNFYCvUWZgnN8dgsGQgjWbiASe+IoFu1IzA8aoyMckhu1O/QzL3HaQ0RDexmGkaKvbK+2rdEbmRpKgqfoI7zA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1614988463201747.3789200140538; Fri, 5 Mar 2021 15:54:23 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id 7so3953709wrz.0 for ; Fri, 05 Mar 2021 15:54:22 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id f7sm4213490wmq.11.2021.03.05.15.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 15:54:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2yJZvfO9sIo/QVUNGf9LQHlm++XZyAwu6lIoAPys+a8=; b=c7JTH2M0QrgF1ryBnhZU1bGyWEgtPFb2Wtjc3j4QrehofcbNpv//vK2VZHo0mSH77x 4CfNuI/scI0fSwOszQ6Ix38FlFBswcBnOtz3ORd1y37duCRlHwgLx2uAjjJUIbt+idDP IYtGJxxj8XZeHpDzmKjKARfBoa0NKDaNPZfrUr5djr2Oob0bJ6PcefhIk9cUilVT4dKh ErWKtYDgkv33HuXaiwtUem9wyDUelkKND+U7gvLtTG1oviMD2Xx9YJXqLPWathv+S/az XCt5mh/KTfbiEDcAFU+onCpNp6wFH+S4OIfIpYvHA6eFHWOSf7de/NZgYqndCTsxGoHK vC2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2yJZvfO9sIo/QVUNGf9LQHlm++XZyAwu6lIoAPys+a8=; b=JFA7mb1v5KpzJqQlASlyUtTQLV8VW6/BBzWduErTTbXu9fE2DUWQucIH800nHkQIaA LygLV+r5NKSUFEUXHG3tlp1/lhT+qYA0cD0JrIDQx36zgIaFLz0P2KCvJNIZCHqR0ajH UAZpAjpK76+gJhzbMTCWhmzsYiX3eyz6oE2c/Y1sXQ2oNJecvpWOsjPswTtFhkZl0CnP VshVEwS52O90oRI3QJP2ZChmOJHiR6WbcjrH0qyPNPElthCnYmbon0fLG8FPnXARf6Oc D/2kE5tpOGO9NgYblpPG18x15nERExlwRrM4ZhTDvOn0ULanaAlLVWrBYpSbrDLtmK7Q SStw== X-Gm-Message-State: AOAM532H82xco5rZZZZhPPsQe6sIWW8v8gYBuVtWT45UQGt3aC/q/aDd j1m8YSUO82mqDjYXRQ2Fhp0= X-Google-Smtp-Source: ABdhPJwf3mfNiMWi1Foi5fJPVGyL6v24fJPprwDvfmTyKXZV481NaShjzeyYL5GQpRizIna2UlHGbw== X-Received: by 2002:adf:e482:: with SMTP id i2mr11695759wrm.392.1614988461560; Fri, 05 Mar 2021 15:54:21 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] memory: Better name 'offset' argument in mtree_print_mr() Date: Sat, 6 Mar 2021 00:54:12 +0100 Message-Id: <20210305235414.2358144-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210305235414.2358144-1-f4bug@amsat.org> References: <20210305235414.2358144-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The 'base' argument of mtree_print_mr() actually represents an offset, not a base address. Rename it as such. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index 874a8fccdee..e4d93b2fd6f 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2925,7 +2925,7 @@ static void mtree_print_mr_owner(const MemoryRegion *= mr) } =20 static void mtree_print_mr(const MemoryRegion *mr, unsigned int level, - hwaddr base, + hwaddr offset, MemoryRegionListHead *alias_print_queue, bool owner, bool display_disabled) { @@ -2939,7 +2939,7 @@ static void mtree_print_mr(const MemoryRegion *mr, un= signed int level, return; } =20 - cur_start =3D base + mr->addr; + cur_start =3D offset + mr->addr; cur_end =3D cur_start + MR_SIZE(mr->size); =20 /* @@ -2947,7 +2947,7 @@ static void mtree_print_mr(const MemoryRegion *mr, un= signed int level, * happen normally. When it happens, we dump something to warn the * user who is observing this. */ - if (cur_start < base || cur_end < cur_start) { + if (cur_start < offset || cur_end < cur_start) { qemu_printf("[DETECTED OVERFLOW!] "); } =20 --=20 2.26.2 From nobody Fri May 17 20:47:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614988469; cv=none; d=zohomail.com; s=zohoarc; b=cFCj9F/p/U2tLHbKwYNxAvwrW1fRdx6hLcKbmhcgF37AggzWRpeXT3wPr7y1UKwrob0hQjvjlikBL6QfQXwlnBNQViKZfSK+UeKqgIBiyCHBWvVTv75SJJOSHXE7VFZRbISvNPR63povNGHmud4Keq9swGPW/7TX84/6iAYLE4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614988469; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4mjb5oVPdSX2n3hHdEG4YVcAQRM4J7GHgoGoVwiwxxY=; b=QtpeLwmHv2rdxjkH/TBOo4xPxgFN36KovqXQQ3JH605ydZBGmwcAKV8zoveY6nUq8d/nW6k+JZH5wmc9bQ4q7BQkSuXzBKQWq9MhVPl+wMH9wZMhl8VJWk5mHgyrcBrWDXcNeOtdJ1bzX05xhut/LEs6G/vfpMGQlky/uDHOjN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1614988469283322.80339954965234; Fri, 5 Mar 2021 15:54:29 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id a25-20020a1cf0190000b029010b1cbe2dd0so245271wmb.2 for ; Fri, 05 Mar 2021 15:54:27 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id i1sm5838120wmq.12.2021.03.05.15.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 15:54:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4mjb5oVPdSX2n3hHdEG4YVcAQRM4J7GHgoGoVwiwxxY=; b=p3f0iUM22NybklUFvcTtr8DEnIqpWNXAkBCqsdRqJGcr4KGhXSDDu2wL/7Ymh7ZR0o j598skSGoULelCvC9081zlt6KQKxa4IXKf7iiZu8AQWbJ5BGvVKhA6CHBeIv/lkjtCa+ 8YV6i4gSZtAfogvUEYV0oDYZhWaGdyLxynm8T/XOKo4LHUcQkMUrTLojU87paguLLWdt D95LTC30Z2lbQtKKJOwEwbpCHF6+9tQT25Ld2+H8qr0BOz9sqzOjpygZD26Rcoc/REtl ymEeNMZWdoKZ90vN80cWGYlwne3KwuYuDI8+h23VAQNIwFJrTqyyzCCRQrPsD4G2JNXh aF/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4mjb5oVPdSX2n3hHdEG4YVcAQRM4J7GHgoGoVwiwxxY=; b=ZIWh2Ws6P/iY+p6D0waxnLAv7J4L5+s22eGGWHv/rYXIvTZ8MDIx0FnSHTK+jN5hmB 4RvXRK10OnPijDOLGfw/44zE4M65P6HEIr/6UCdtOKkC999V8m6bQZorFDlDRBznmPDk G7N2zqp3N0ZhC8Te4bXjA8WGWmTTI9uZNxGj8bMQ9Pfha1Pb5wOIFrzOFn6MYyZ5TfgP YtMeLzJxjFQdLx9qNjOivOkkZYE/J9OPQJZGPMaCUsAyaw2DzYVVAebnNicSHmxKLjnu 8aMAsqvGISDFB+7oh2uHif7qerCgATUFKf6t0T/fl2ziMgs6evb+Z02OHDiJbKBuKk48 JN6g== X-Gm-Message-State: AOAM531ITQkaAvfUbSKwpTig58ercvjO/7gH/wC3YLgm7LtPhwNzIBLI O/tQWBYw7Gtq6l9Ji5uorTxdPF5WVHE= X-Google-Smtp-Source: ABdhPJxWzUtM3XKLlU5e5xBvTkeYnxwlSnB+TVgA73Y7Z2RHEHRhWo5z74Bi27ojf/d6Pz9uqO/AHA== X-Received: by 2002:a1c:a5cb:: with SMTP id o194mr10910575wme.129.1614988466419; Fri, 05 Mar 2021 15:54:26 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] memory: Provide 'base address' argument to mtree_print_mr() Date: Sat, 6 Mar 2021 00:54:13 +0100 Message-Id: <20210305235414.2358144-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210305235414.2358144-1-f4bug@amsat.org> References: <20210305235414.2358144-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Currently AdressSpace are display in 'info mtree' based on the physical address of their first MemoryRegion. This is rather confusing. Provide a 'base' address argument to mtree_print_mr() and use it in mtree_info() to display AdressSpace always based at address 0. Display behavior of MemoryRegions and FlatViews is not modified. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/memory.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index e4d93b2fd6f..991d9227a88 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2925,7 +2925,7 @@ static void mtree_print_mr_owner(const MemoryRegion *= mr) } =20 static void mtree_print_mr(const MemoryRegion *mr, unsigned int level, - hwaddr offset, + hwaddr offset, hwaddr base, MemoryRegionListHead *alias_print_queue, bool owner, bool display_disabled) { @@ -2974,7 +2974,7 @@ static void mtree_print_mr(const MemoryRegion *mr, un= signed int level, qemu_printf(TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s%s): alias %s @%s " TARGET_FMT_plx "-" TARGET_FMT_plx "%s", - cur_start, cur_end, + cur_start - base, cur_end - base, mr->priority, mr->nonvolatile ? "nv-" : "", memory_region_type((MemoryRegion *)mr), @@ -2995,7 +2995,7 @@ static void mtree_print_mr(const MemoryRegion *mr, un= signed int level, } qemu_printf(TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s%s): %s%s", - cur_start, cur_end, + cur_start - base, cur_end - base, mr->priority, mr->nonvolatile ? "nv-" : "", memory_region_type((MemoryRegion *)mr), @@ -3028,7 +3028,7 @@ static void mtree_print_mr(const MemoryRegion *mr, un= signed int level, } =20 QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) { - mtree_print_mr(ml->mr, level + 1, cur_start, + mtree_print_mr(ml->mr, level + 1, cur_start, base, alias_print_queue, owner, display_disabled); } =20 @@ -3188,14 +3188,15 @@ void mtree_info(bool flatview, bool dispatch_tree, = bool owner, bool disabled) =20 QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) { qemu_printf("address-space: %s\n", as->name); - mtree_print_mr(as->root, 1, 0, &ml_head, owner, disabled); + mtree_print_mr(as->root, 1, 0, as->root->addr, + &ml_head, owner, disabled); qemu_printf("\n"); } =20 /* print aliased regions */ QTAILQ_FOREACH(ml, &ml_head, mrqueue) { qemu_printf("memory-region: %s\n", memory_region_name(ml->mr)); - mtree_print_mr(ml->mr, 1, 0, &ml_head, owner, disabled); + mtree_print_mr(ml->mr, 1, 0, 0, &ml_head, owner, disabled); qemu_printf("\n"); } =20 --=20 2.26.2 From nobody Fri May 17 20:47:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614988472; cv=none; d=zohomail.com; s=zohoarc; b=PrdBU4HTV1qAl3EHz0XBeJcY/C0V3z+RYUehrjEV8v3Oy1gO5Ydwb+vWUKB1C3elRlYvRLY0qILmJ1M1DNaBsQt85lvJxasFAZL3BxiSLgSqg1MmubIklDZZcqb2+Irzy1+Hnvzxj72Yz5HAoTZOA+Zi7tfA3S4svwoGgxRoE2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614988472; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0wsEumeFIlRACswExG1nCE5Q11cdVztT7j+RbemABes=; b=LkXyba0qYhNHZ9IEWSIBQMDRqW1uWkD3X9O/cvTwDRKkKW0ylAZ1I3nd8o6yg8IyZJq81twc21RZhW7M0sMgsFJW9ZEhw5qs6RUwM6Ff06LGXABQQ0dDCVWTYQx2kCmeC7d5cfFb8ZtGbxtcM+jHo1lOCHQW2CY5pGnLZgDE8Mg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1614988472726671.4026947301481; Fri, 5 Mar 2021 15:54:32 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so244718wmi.3 for ; Fri, 05 Mar 2021 15:54:32 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z7sm6416121wrt.70.2021.03.05.15.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 15:54:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0wsEumeFIlRACswExG1nCE5Q11cdVztT7j+RbemABes=; b=o9Kz8pwKG0IfBq/GluT9CyQyCr/qVTZuluBmaluNTDSVp1mESiADbji5RyWQG7JsvB CHQerRUjXSKtEzxFtxxL4r9M9KYBT+B750tqchK0Gw2lyOqKSuddpSoAyGpR3glCD9PW QZqp9FgCIRnaaYw57BSqeQ5bG6IfaF2r7WLBzSMlFFNGYi5EmHGL0tzCFp9ZShN2Gkg5 79En88od6mtMWM0FIGCsGxw1uW8EFjJHRtDRfCZ00k1cvds9bEGqflDhgnQ5iIrGDxMN Yd3kR/H3J20n2exR83n11Z7E0L93Oq7ZJLbGDiWIXCC9Nn1ABsqustE7MVun+kUkLG60 K1Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0wsEumeFIlRACswExG1nCE5Q11cdVztT7j+RbemABes=; b=QSvWQhcHhJ26ty1bQEtnUy2kjaPU6hlRDBv2P9sNn4RXJwhPzpkJh+Umr3gai6ukJj irN/SsjB5UIX3d3S0JzSE4UBcuO85rCoNmLgCluecaHSdCniz1oNLcQNhecM1UWGwCkL jDaPnh7cbmCILzrG9Ra1kwe1tKmZJnjNlnu0IZKgN+eDE+n1YoqlenOTyPHQfN5LFMVR WLFzirXcnTva5JJg/f/6fobmcPjzwz/jwgkBAvLGFdWRlexsQOXZQO547PAWwpB3UfQo 6Yh+KA0684xzF/sSRULaJyjMBaqx8heCJoKOPaGgi9ShoyJzY4XGkxXuknnKzTz0Axho 3PCQ== X-Gm-Message-State: AOAM532jwYoKTfvTZY1uw+eec4hEKbjJA5qBgH8i2cuUUJmPUyKbrKfW vdMwxIdfSBfPWnVrRJ4E9Qs= X-Google-Smtp-Source: ABdhPJzlmQhxZPK1jzNuuzqCqA32JU0expmki8lu3ONtbZ3VmdH1d2QM5e8aUCko1+YROC7gA2QV4Q== X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr2827163wml.147.1614988471063; Fri, 05 Mar 2021 15:54:31 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] memory: Make memory_region_to_absolute_addr() take a const MemoryRegion Date: Sat, 6 Mar 2021 00:54:14 +0100 Message-Id: <20210305235414.2358144-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210305235414.2358144-1-f4bug@amsat.org> References: <20210305235414.2358144-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) There is no reason to not have memory_region_to_absolute_addr() work with a const MemoryRegion. Else we get: softmmu/memory.c: error: passing argument 1 of =E2=80=98memory_region_to_ab= solute_addr=E2=80=99 discards =E2=80=98const=E2=80=99 qualifier from pointe= r target type [-Werror=3Ddiscarded-qualifiers] 6666 | myaddr =3D memory_region_to_absolute_addr(constmr, addr); | ^~ softmmu/memory.c:410:60: note: expected =E2=80=98MemoryRegion *=E2=80=99 bu= t argument is of type =E2=80=98const MemoryRegion *=E2=80=99 410 | static hwaddr memory_region_to_absolute_addr(MemoryRegion *mr, hwad= dr offset) | ~~~~~~~~~~~~~~^~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/memory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index 991d9227a88..6d1e96ba37d 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -407,9 +407,10 @@ static inline uint64_t memory_region_shift_write_acces= s(uint64_t *value, return tmp; } =20 -static hwaddr memory_region_to_absolute_addr(MemoryRegion *mr, hwaddr offs= et) +static hwaddr memory_region_to_absolute_addr(const MemoryRegion *mr, + hwaddr offset) { - MemoryRegion *root; + const MemoryRegion *root; hwaddr abs_addr =3D offset; =20 abs_addr +=3D mr->addr; --=20 2.26.2