From nobody Mon Mar 2 10:50:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772143466; cv=none; d=zohomail.com; s=zohoarc; b=NMQPIAFJdYkOWpuNe69boSKFg16Sgx94wO9ljhPNFlgngNQTPwzwTgaez6WAN1jSQTvTQWbjMW4BwCnqGw59Blnq1JEtpfXNAHjQ7czH+r+t4i5MNBQfVRxKC8Uv8FWShpMItJ8TOT+hRSQtTiOmzlT1SMSPL9WkI2GNqaa+u80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772143466; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Hbzn5vHgMdXp7p0dhzileZ9MCb8UEIgfWGmULUXbwAo=; b=VPoY5XUSkXN/QC6hqIodcF2kpxH6/n44nBjkfxwzzXV7B30Utk1iLkCQzRfOwR+v667zqQV65K9JACtlrAbFDo9FmOLpZGIg8IGwR3znr7lDrAla23dp5Ftz7NWatoQoxZ6DG32yXshUYFhj9HNtQjlWTKNH5qWiMgHanO9LCcU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1772143466703436.1656492348204; Thu, 26 Feb 2026 14:04:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvjSz-0003hU-JB; Thu, 26 Feb 2026 17:04:18 -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 1vvjSF-0002gO-Bm for qemu-devel@nongnu.org; Thu, 26 Feb 2026 17:03:32 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvjS9-0001vJ-Ka for qemu-devel@nongnu.org; Thu, 26 Feb 2026 17:03:28 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-437711e9195so991447f8f.1 for ; Thu, 26 Feb 2026 14:03:20 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4399c76b40esm1838119f8f.36.2026.02.26.14.03.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 26 Feb 2026 14:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772143399; x=1772748199; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hbzn5vHgMdXp7p0dhzileZ9MCb8UEIgfWGmULUXbwAo=; b=OlM4xEeNzJsLYitiemx8oGObTEMPV5FERDflDi74fHJON+QxZ5Z2pPjZZnygaGd1t/ 5BJGpaP+p5+2ho6Jr9lnFMHXYWYqGscuBDyFXJGhZAT8Z44GeXAeY8KYRUbExL3C7Vda 5BYVKQO1k4z/Xzyx5fjPn7A+yluIMtUu/0niTT3xP9NsIWX9sukfljVSg3z6fv/mRog7 L0rDIRnxBRnDFV6CuGellV7G6Fsdp//h6e5WfIsIk0K9/xlEnVx5lI6yFkahzu3OB08u MwgXcsPgpONlHI/KR5p9B72tP5g9qVZp41m59C5XFxONl+V3Huq+H+SBuWghjbf2utmz esLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772143399; x=1772748199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Hbzn5vHgMdXp7p0dhzileZ9MCb8UEIgfWGmULUXbwAo=; b=qp14njOeqWm4zQ8TqWirxFx/zYXWtNsTgPQF1DVr5r0+OB4kFKfWFlXpWwKtQtr/2A 4TnIU4iGYCbO1jwuwd7XMGoG8GSKbL6FiislJzlwrrv7BQ5gll3S6byUj22iNmSQqxHE WvfyiLOxYThWOHBQfM2spZpFlpPIK/K1NVdT3bxzHSlpYu4IRGaAwwBBPeb9zcpbN/4f 6RSZDFj8quV6wkFQdSxIO+tfozKnKsJyzv1S65ENSbXT9/rMOV8x4G3MxRXw/4hLsrHZ F63kYHKb7MvA3fsjOXzZhIvyOTiBy3x50zN2X1fChET0TsCUvVCflMsbLMpWSIY7M8N8 675w== X-Gm-Message-State: AOJu0Yy9Ah/dIyZ3CSAcKiI0VlaxWDB8s8iaKpeEdC3l4ejhT17L7i6x 8hRJtZtN2P/mFON+X/5/vy9etC+EQTfrjsdwSD+wr9PBK7H8a5k1d9eRAukW1Ayh+RSMrgOzLP9 AeJN0Vp0= X-Gm-Gg: ATEYQzy9HohlkKfsNsNsaEGhcbTrJvIZ/KqzdW0RY1balaWhYpUXlpYN4odQKiAjCbM 0BtfG/e4kjOz+GuF6XAhMl8WmQnThLyeBG0Ke05ne/00SR9EMjdZsFXSRCqjoBSfh6a9+R6qh/X n79MCBab1DDDbi7sRRgFH5nYkswtqXUAWS7P3OOAXLW2aYXXz9xzEPS8PVAijK1kMDNJ1ESTX5t qC1elMI/+Y4aehj1EkCOcHmkQR+wIvv3XYkkkFYgYUnfJJxjv7fGZH9jvZoekpyegtdP0nxR0pw eCuEEjQcvdSBIc0WseNP8/ehxeCWYxtR5akNXDNzC2tBz3wGDCez8Eh+UfStTVP5QoBFDVBK3pZ a2E95SSBxir+aPc43uGKv4AXu6Q0IQy7YGdwy7zbZ5cvJfoss6GvAnA9YmcgWDLEbtWo2YnexZP l0Xpota/WrIDa/Ofxacs9RCEFtC7WTLUA1V9mQk6B9LPZ6cR1lM00rpYpCZ9IjdqR51uNHcBTBR hzSJ0PChkY= X-Received: by 2002:a05:6000:2901:b0:439:5c09:4854 with SMTP id ffacd0b85a97d-4399de2fcd2mr690489f8f.41.1772143398974; Thu, 26 Feb 2026 14:03:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Mark Cave-Ayland , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Akihiko Odaki Subject: [PATCH 7/7] system/memory: Have 'info mtree' display addresses nicely Date: Thu, 26 Feb 2026 23:02:25 +0100 Message-ID: <20260226220226.20164-8-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260226220226.20164-1-philmd@linaro.org> References: <20260226220226.20164-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772143468318158500 Use the size of a MR / AS to decide how many address chars need to be used. For example, using 'qemu-system-x86_64 -M q35 -S -monitor stdio' to run 'info mtree' displays before: address-space: I/O 0000000000000000-000000000000ffff (prio 0, i/o): io 0000000000000000-0000000000000003 (prio 0, i/o): acpi-evt 0000000000000004-0000000000000005 (prio 0, i/o): acpi-cnt 0000000000000008-000000000000000b (prio 0, i/o): acpi-tmr 0000000000000020-000000000000002f (prio 0, i/o): acpi-gpe0 0000000000000030-0000000000000037 (prio 0, i/o): acpi-smi 0000000000000060-000000000000007f (prio 0, i/o): sm-tco 0000000000000000-0000000000000007 (prio 0, i/o): dma-chan 0000000000000008-000000000000000f (prio 0, i/o): dma-cont 0000000000000020-0000000000000021 (prio 0, i/o): pic 0000000000000040-0000000000000043 (prio 0, i/o): pit ... memory-region: pc.ram 0000000000000000-0000000007ffffff (prio 0, ram): pc.ram memory-region: pc.bios 00000000fffc0000-00000000ffffffff (prio 0, rom): pc.bios memory-region: pci 0000000000000000-ffffffffffffffff (prio -1, i/o): pci 00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem 00000000000c0000-00000000000dffff (prio 1, rom): pc.rom 00000000000e0000-00000000000fffff (prio 1, rom): alias isa-bios @pc.b= ios 0000000000020000-000000000003ffff 00000000fffc0000-00000000ffffffff (prio 0, rom): pc.bios ... and after: address-space: I/O 0000-ffff (prio 0, container): io 0000-0003 (prio 0, i/o): acpi-evt 0004-0005 (prio 0, i/o): acpi-cnt 0008-000b (prio 0, i/o): acpi-tmr 0020-002f (prio 0, i/o): acpi-gpe0 0030-0037 (prio 0, i/o): acpi-smi 0060-007f (prio 0, i/o): sm-tco 0000-0007 (prio 0, i/o): dma-chan 0008-000f (prio 0, i/o): dma-cont 0020-0021 (prio 0, i/o): pic 0040-0043 (prio 0, i/o): pit ... memory-region: pc.ram 00000000-07ffffff (prio 0, ram): pc.ram memory-region: pc.bios fffc0000-ffffffff (prio 0, rom): pc.bios memory-region: pci 0000000000000000-ffffffffffffffff (prio -1, i/o): pci 00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem 00000000000c0000-00000000000dffff (prio 1, rom): pc.rom 00000000000e0000-00000000000fffff (prio 1, rom): alias isa-bios @pc.b= ios 0000000000020000-000000000003ffff 00000000fffc0000-00000000ffffffff (prio 0, rom): pc.bios ... Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- system/memory.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4d276307da5..abcbdaadcd7 100644 --- a/system/memory.c +++ b/system/memory.c @@ -3321,7 +3321,26 @@ typedef QTAILQ_HEAD(, MemoryRegionList) MemoryRegion= ListHead; =20 #define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \ int128_sub((size), int128_one())) : 0) -#define MR_ADDR_WIDTH 16 + +static unsigned mr_addr_fmt_width(const MemoryRegion *mr) +{ + const unsigned int bits =3D 127 - clz128(mr->size); + unsigned int width; + + if (bits <=3D 8) { + width =3D 2; + } else if (bits <=3D 16) { + width =3D 4; + } else if (bits <=3D 32) { + width =3D 8; + } else if (bits <=3D 64) { + width =3D 16; + } else { + width =3D 20; + } + return width; +} + #define MTREE_INDENT " " =20 static void mtree_expand_owner(const char *label, Object *obj) @@ -3513,7 +3532,7 @@ static void mtree_print_flatview(gpointer key, gpoint= er value, return; } =20 - width =3D MR_ADDR_WIDTH; + width =3D mr_addr_fmt_width(view->root); while (n--) { const MemoryRegion *mr =3D range->mr; =20 @@ -3643,7 +3662,7 @@ static void mtree_print_as(gpointer key, gpointer val= ue, gpointer user_data) MemoryRegion *mr =3D key; GSList *as_same_root_mr_list =3D value; struct AddressSpaceInfo *asi =3D user_data; - const unsigned int width =3D MR_ADDR_WIDTH; + const unsigned int width =3D mr_addr_fmt_width(mr); =20 g_slist_foreach(as_same_root_mr_list, mtree_print_as_name, NULL); mtree_print_mr(mr, 1, width, -mr->addr, false, @@ -3692,7 +3711,7 @@ static void mtree_info_as(bool dispatch_tree, bool ow= ner, bool disabled) /* print aliased regions */ QTAILQ_FOREACH(ml, &ml_head, mrqueue) { const MemoryRegion *mr =3D ml->mr; - const unsigned int width =3D MR_ADDR_WIDTH; + const unsigned int width =3D mr_addr_fmt_width(mr); =20 qemu_printf("memory-region: %s\n", memory_region_name(mr)); mtree_print_mr(mr, 1, width, 0, false, &ml_head, owner, disabled); --=20 2.52.0