From nobody Sun Mar 22 14:10:07 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=1774025485; cv=none; d=zohomail.com; s=zohoarc; b=jWIZZaR4aQ33Kz3iMD5q7pa7r0Oq58YHdiNY0QbV1bo2MqnlAXcJ236QoxZz3+u5J+tFDwLxgXG5Gb6VlWF0mttGQJXvIm0QCNvBwPzZbTYqiPnqNs6UNSElXry/S/cAjq4hCm5OHkIZi1W4xCFLF3GOA8Cq33uQGTBFIo2GmGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025485; 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=LpNfpAudaHSn6E46oY3mv5zJptnJn91JySmHe16VZmw=; b=n19Lb2P7Da5xnGgqhYrDoY6C3MzQkwJSWr54wJZFycEBRV7pOhhfIMj40m4GhKQcsUSy3d3qBgQTfYUN1XYz20hRD1OepMCUNe9OUW5nQu4QXEK0MKBfcYC0sY0+4xB04ZU7d6OAYCshwDDYBGTupEaYM1nWeCUni+aarBT81Ek= 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 1774025485095758.4349753521275; Fri, 20 Mar 2026 09:51:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d3W-0005nt-Ch; Fri, 20 Mar 2026 12:50:38 -0400 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 1w3d3T-0005nK-0H for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:35 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d3R-0001N8-3q for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:34 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-439fe4985efso669071f8f.3 for ; Fri, 20 Mar 2026 09:50:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644acb52sm8330572f8f.7.2026.03.20.09.50.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025431; x=1774630231; 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=LpNfpAudaHSn6E46oY3mv5zJptnJn91JySmHe16VZmw=; b=VSg4dt+AYIJIDw/Y2m8aWC7unkX8pTGtT7rnateDl8lkNxHywCLS9eJNYVARQ6uDsK jo9KoBiykD5Ir/2bJ0gnnCFs4l3pHHcgwuawKQiXuIYtnwUwwtN5ERGfk5DCrbkDiJyT /Y13WQm7etUNMn9m1FdbCyZmHWho7cBZ0QBngMdYRjSXlfzjl/rvpWPW1UVvvN6Xuu3Z VFhKTGzjxQWLnFMpCOxfP0KENJXFNND7tBRfCeP/ZJZXgWlhiR5mL7t0PV32/8iMeve5 5UmIVBFKIYcanCeonT030KmTKZqSblUk8S6HA6MHY9pIHtwr783y7okXvy3t0cxkJijL HgwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025431; x=1774630231; 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=LpNfpAudaHSn6E46oY3mv5zJptnJn91JySmHe16VZmw=; b=NpcQoX6waKT1vL2fhKhrSo0X2L3X+Kpj0vhgeM8HNJUWx7CucoePjMp9YKRaYjiyIz 1R260+RXHUA5KB969gNlbc0Ikdd+HhZbM0y2ctXJpRSwHMZeRzdtyeynv+an2mquBrIU j+2ZO4ZLxZXVDZBwPhMXThWSYiGYNBFRy9OogaTN4jQ9LRe60hpwMc7Qki10upa7hi42 MxHU3rz8p75R3/z9ccGFfQu/bGI1J7XCLo+dPZ1VHyeU8r5YiH3fBEIyiICF9i2BbKDM /CNOAjSTxMMKn49JWFyv7jj9jiFLnfZCh6ikujCEt50B4yP8r7iyLlIV4ksGpTKBwEL3 IiFA== X-Gm-Message-State: AOJu0Yw0iWZJ+CTgzUAzIiXcv2fGc+TN6C623aip8p++lmwwrqORogtJ OUdu9Ds2LrNM/8CLTK4QKXPN0NNBwa554Di/JUT5RJ8lvL/cUl8TTBAX+z69kfgb0CUwJXxnmWt 5MUY4ovk= X-Gm-Gg: ATEYQzwA+bx+BtzqDxITc046Bq1PMOXMxrGcU9a5AN6aRmyefiQlehxFJdS/M8kIogg ATdGvkZSvPmPm60BZ2ywdBpGsChl0fesgskqx1Uev2gI42Crga3N6j8ZlLS81kU2VrROiRVrARC I6vIPwy/DNUMzHoaW4iMTOSeF1AZmfqsH8ogdzqBNwpoUzUhoamectO4p8jln7Q+rv3bHvdcc8b VYExlAEMXHOBpys4oA2fG340LDDo579w/r99MWiRHP54RZulrgi0GICveJ/WjEclkxaT44MrSM5 Oqb7RXw3YpblOSmoxHiskqDegVs5tvh6/hM6RzdU4o/mzcj00jqz0NSwx+YFd7ecRVhSEoDRv4V Z0WTpRjAZrIJ2RGvbZDzYwNcdEq7wYCQZ4gIF570VSPgod+610zcmGuEK7zNRr2qtJaO7k6y/lQ 7C/q19oriGSaFXa5D5W/5e+7nC2Bq0LBnhnIolA7FQKYbnNUpcLuVBIduK/XZpYPHlTa4RtI+PS qvHNq7Q0jI= X-Received: by 2002:a05:6000:430e:b0:43b:5356:a7fb with SMTP id ffacd0b85a97d-43b6427d152mr6207010f8f.49.1774025430704; Fri, 20 Mar 2026 09:50:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 1/7] target/m68k: Have 'info tlb' dump MMU information on monitor Date: Fri, 20 Mar 2026 17:50:14 +0100 Message-ID: <20260320165021.39521-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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=unavailable 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: 1774025486137154100 Currently 'info tlb' dumps the MMU information on stdout. Propagate the @Monitor argument and replace qemu_printf() by monitor_printf() -- or monitor_puts when no formatting -- to dump information over the monitor (which is not always stdout). Fixes: 2097dca6d3a ("target/m68k: add HMP command "info tlb"") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/m68k/cpu.h | 2 +- target/m68k/helper.c | 116 +++++++++++++++++++++--------------------- target/m68k/monitor.c | 2 +- 3 files changed, 61 insertions(+), 59 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index d7f508a9e80..84ffebe3890 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -606,6 +606,6 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr p= hysaddr, vaddr addr, #define TB_FLAGS_TRACE 16 #define TB_FLAGS_TRACE_BIT (1 << TB_FLAGS_TRACE) =20 -void dump_mmu(CPUM68KState *env); +void dump_mmu(Monitor *mon, CPUM68KState *env); =20 #endif diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 9bab1843892..2208b9a2ab9 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -28,7 +28,7 @@ #include "system/memory.h" #include "gdbstub/helpers.h" #include "fpu/softfloat.h" -#include "qemu/qemu-print.h" +#include "monitor/monitor.h" =20 #define SIGNBIT (1u << 31) =20 @@ -459,28 +459,30 @@ void m68k_switch_sp(CPUM68KState *env) #if !defined(CONFIG_USER_ONLY) /* MMU: 68040 only */ =20 -static void print_address_zone(uint32_t logical, uint32_t physical, +static void print_address_zone(Monitor *mon, + uint32_t logical, uint32_t physical, uint32_t size, int attr) { - qemu_printf("%08x - %08x -> %08x - %08x %c ", + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", logical, logical + size - 1, physical, physical + size - 1, attr & 4 ? 'W' : '-'); size >>=3D 10; if (size < 1024) { - qemu_printf("(%d KiB)\n", size); + monitor_printf(mon, "(%d KiB)\n", size); } else { size >>=3D 10; if (size < 1024) { - qemu_printf("(%d MiB)\n", size); + monitor_printf(mon, "(%d MiB)\n", size); } else { size >>=3D 10; - qemu_printf("(%d GiB)\n", size); + monitor_printf(mon, "(%d GiB)\n", size); } } } =20 -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) +static void dump_address_map(Monitor *mon, CPUM68KState *env, + uint32_t root_pointer) { int tic_size, tic_shift; uint32_t tib_mask; @@ -548,7 +550,7 @@ static void dump_address_map(CPUM68KState *env, uint32_= t root_pointer) if (first_logical !=3D 0xffffffff) { size =3D last_logical + (1 << tic_shift) - first_logical; - print_address_zone(first_logical, + print_address_zone(mon, first_logical, first_physical, size, last_attr= ); } first_logical =3D logical; @@ -559,125 +561,125 @@ static void dump_address_map(CPUM68KState *env, uin= t32_t root_pointer) } if (first_logical !=3D logical || (attr & 4) !=3D (last_attr & 4)) { size =3D logical + (1 << tic_shift) - first_logical; - print_address_zone(first_logical, first_physical, size, last_attr); + print_address_zone(mon, first_logical, first_physical, size, last_= attr); } } =20 #define DUMP_CACHEFLAGS(a) \ switch (a & M68K_DESC_CACHEMODE) { \ case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ - qemu_printf("T"); \ + monitor_puts(mon, "T"); \ break; \ case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ - qemu_printf("C"); \ + monitor_puts(mon, "C"); \ break; \ case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ - qemu_printf("S"); \ + monitor_puts(mon, "S"); \ break; \ case M68K_DESC_CM_NCACHE: /* noncachable */ \ - qemu_printf("N"); \ + monitor_puts(mon, "N"); \ break; \ } =20 -static void dump_ttr(uint32_t ttr) +static void dump_ttr(Monitor *mon, uint32_t ttr) { if ((ttr & M68K_TTR_ENABLED) =3D=3D 0) { - qemu_printf("disabled\n"); + monitor_puts(mon, "disabled\n"); return; } - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", ttr & M68K_TTR_ADDR_BASE, (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); switch (ttr & M68K_TTR_SFIELD) { case M68K_TTR_SFIELD_USER: - qemu_printf("U"); + monitor_puts(mon, "U"); break; case M68K_TTR_SFIELD_SUPER: - qemu_printf("S"); + monitor_puts(mon, "S"); break; default: - qemu_printf("*"); + monitor_puts(mon, "*"); break; } DUMP_CACHEFLAGS(ttr); if (ttr & M68K_DESC_WRITEPROT) { - qemu_printf("R"); + monitor_puts(mon, "R"); } else { - qemu_printf("W"); + monitor_puts(mon, "W"); } - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> M68K_DESC_USERATTR_SHIFT); } =20 -void dump_mmu(CPUM68KState *env) +void dump_mmu(Monitor *mon, CPUM68KState *env) { if ((env->mmu.tcr & M68K_TCR_ENABLED) =3D=3D 0) { - qemu_printf("Translation disabled\n"); + monitor_puts(mon, "Translation disabled\n"); return; } - qemu_printf("Page Size: "); + monitor_puts(mon, "Page Size: "); if (env->mmu.tcr & M68K_TCR_PAGE_8K) { - qemu_printf("8kB\n"); + monitor_puts(mon, "8kB\n"); } else { - qemu_printf("4kB\n"); + monitor_puts(mon, "4kB\n"); } =20 - qemu_printf("MMUSR: "); + monitor_puts(mon, "MMUSR: "); if (env->mmu.mmusr & M68K_MMU_B_040) { - qemu_printf("BUS ERROR\n"); + monitor_puts(mon, "BUS ERROR\n"); } else { - qemu_printf("Phy=3D%08x Flags: ", env->mmu.mmusr & 0xfffff000); + monitor_printf(mon, "Phy=3D%08x Flags: ", env->mmu.mmusr & 0xfffff= 000); /* flags found on the page descriptor */ if (env->mmu.mmusr & M68K_MMU_G_040) { - qemu_printf("G"); /* Global */ + monitor_puts(mon, "G"); /* Global */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_S_040) { - qemu_printf("S"); /* Supervisor */ + monitor_puts(mon, "S"); /* Supervisor */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_M_040) { - qemu_printf("M"); /* Modified */ + monitor_puts(mon, "M"); /* Modified */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_WP_040) { - qemu_printf("W"); /* Write protect */ + monitor_puts(mon, "W"); /* Write protect */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_T_040) { - qemu_printf("T"); /* Transparent */ + monitor_puts(mon, "T"); /* Transparent */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_R_040) { - qemu_printf("R"); /* Resident */ + monitor_puts(mon, "R"); /* Resident */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } - qemu_printf(" Cache: "); + monitor_puts(mon, " Cache: "); DUMP_CACHEFLAGS(env->mmu.mmusr); - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); - qemu_printf("\n"); + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); + monitor_puts(mon, "\n"); } =20 - qemu_printf("ITTR0: "); - dump_ttr(env->mmu.ttr[M68K_ITTR0]); - qemu_printf("ITTR1: "); - dump_ttr(env->mmu.ttr[M68K_ITTR1]); - qemu_printf("DTTR0: "); - dump_ttr(env->mmu.ttr[M68K_DTTR0]); - qemu_printf("DTTR1: "); - dump_ttr(env->mmu.ttr[M68K_DTTR1]); + monitor_puts(mon, "ITTR0: "); + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); + monitor_puts(mon, "ITTR1: "); + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); + monitor_puts(mon, "DTTR0: "); + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); + monitor_puts(mon, "DTTR1: "); + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); =20 - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); - dump_address_map(env, env->mmu.srp); + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); + dump_address_map(mon, env, env->mmu.srp); =20 - qemu_printf("URP: 0x%08x\n", env->mmu.urp); - dump_address_map(env, env->mmu.urp); + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); + dump_address_map(mon, env, env->mmu.urp); } =20 static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index be7411edca6..38f925e5b16 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -19,7 +19,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) return; } =20 - dump_mmu(env1); + dump_mmu(mon, env1); } =20 static const MonitorDef monitor_defs[] =3D { --=20 2.53.0 From nobody Sun Mar 22 14:10:07 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=1774025465; cv=none; d=zohomail.com; s=zohoarc; b=ZxUWOBtO8ydNHszfQH8jrboKyG0uPEAtqrWM60ebTu+iDr4TvuVyTU6CXVlcpFo8BDgHftX9fAD47i1gjS37WQZiJBih2mJyY58ARY45oe3QAC7L3EGvkYquAMFQFycjiqx2tYb/erOO+lRaJeMk9r1hSjP6wmjSIpj943lkPLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025465; 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=GmYiHLEMM3CrVk1bORwLOsj5HzlZX67DWgkYEyGciJg=; b=ai641hy8uOKdW/qiayrONXEwsyNsyN/TYhCyKk7xDVTVhYjr3XrqbkNDl3oN8Lv1t8hRy73BPHk+YJbrs3QgGkTbgNqaqtr+C7G7WSyQOrHWKRVOP0wCmlLhz0yKHKtbNZVxDBjaymPHdxYCg9Dmf+trk1qM4MSseSl3vYmBIGY= 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 1774025465614692.3251421647403; Fri, 20 Mar 2026 09:51:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d3m-0005qA-Oi; Fri, 20 Mar 2026 12:50:56 -0400 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 1w3d3a-0005pF-8E for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:42 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d3X-0001Ps-R8 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:41 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-439b7c2788dso527356f8f.1 for ; Fri, 20 Mar 2026 09:50:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b6470380asm7218075f8f.24.2026.03.20.09.50.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025438; x=1774630238; 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=GmYiHLEMM3CrVk1bORwLOsj5HzlZX67DWgkYEyGciJg=; b=Ju6+uv7F10ilhtrjW6zlb0f6zEGTkMZBD2MoBec6fyVYqxPTtcV0DgxlS/ytoARgMr u3qYGqFlQH9b70FVc7oPRlbClLAMImB8U7uRkM4UL5runmb02VTuHe3Zz6XJ3IVPsxef oT18SBxxyIem2fGAkXoov3HvDbPTCu+LOBFMVp6kBaKKDVIOGPO5MgK3kn8/OCXY5jzz DCaAsH37sNMIfoj5ajH6J0+gqnG4k0qTzlm2rfZ2XZLk23A03uhXotoBWSz2lNMeOJkL 0pvkGv12gKR39jTljrHVVFbEP4CySUHMYrl/ZlZbMahs6VVfEHwOINbwuk2FF7tUb9P1 zokg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025438; x=1774630238; 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=GmYiHLEMM3CrVk1bORwLOsj5HzlZX67DWgkYEyGciJg=; b=nrnnnrqvzvjQWFkoemSCctVKsDhfr1FfZLsUnZpE37xdGXnBxRe5E+k/fPKQefSqbO cZR0GM42Y+ohYWNhYLTxE0WG9tqRcBDv7wycZnTJzOXxEdfwSOFxlwVLppx3boxrDWE6 G96AyaulcKFd9yuAztiUwD0Php2dc8SbVvcWEYjZKR5IiWbGlVesMiY1QeOMIKraNHDP ep6oAsDi+BsT3bPsVWv9ig/PDliLbV/z+q6TzJ7zX6uIAnoBQTfpitGFO7ElEqkQGUHH T2+SfuH7rGKdno8HwvoqJJVuV+khvckHOZ9U/SU53QV3Z8NPJb78VoHJhPychqUPO4v0 Zqqg== X-Gm-Message-State: AOJu0Yya3f8MCmQ36Zx860zVZrNFg6RN5n/SULrlQ/eJu9pvLzW2mJTb 18MlyPgntVas/H6+lodK4Ob9iaarTsOe5bmW/LXPPm8tG/y7KzMxFKRlO1VuzsiGjGPNcBg8ogD KIumzNA8= X-Gm-Gg: ATEYQzwErZxRjsMtbggbeApa8+Mg0xeSjQXwf3ORwQM1Jq1mXscDial9+CGBySpdxcr ea/KPKE04XAzjPcNpL9hSOyB4Y+j9j39n9ewUtW8MpPeURLQnlPCvRYZPzjTCin/f2T6rU9n1PU W/zIFIJYzxvWVr6Z/28VZYPqnBXJKuIJJPJ8pR8gVWmr7UQgTdh417iCKciugCWaRFHFVMyr3dk UUfrt0a5/TnXPT5PdBFisGSvkiT5wa4fky29zdljRCiK0TFBJg4cHdsTfU0xccjYai1kTUFIlg+ XpRN5JsElhh0kLGMbUDJsFM+Ir45j5Br8djOfx+A4OhtTJ1Boq0NJLXrOAM6Zy7KNmB5br39nNq 50aMpVG5Zh2TtwODlO9CQdERmtoUMDz54/UUZzxx4Tl29AtmwlzU/A3yAs8qQpERthdnRqy8W4B M3eq3llJv9MGm9aw+jMOviH1wRRIsYcKT02hEesRPqGfxeSXDBTSAOKzZ8DF5/HFc7BFx+ds9r X-Received: by 2002:a05:6000:a8e:b0:43b:3cdc:9429 with SMTP id ffacd0b85a97d-43b64243307mr5583136f8f.1.1774025437686; Fri, 20 Mar 2026 09:50:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 2/7] target/ppc: Have 'info tlb' dump MMU information on monitor Date: Fri, 20 Mar 2026 17:50:15 +0100 Message-ID: <20260320165021.39521-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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=unavailable 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: 1774025468474158500 Currently 'info tlb' dumps the MMU information on stdout. Propagate the @Monitor argument and replace qemu_printf() by monitor_printf() -- or monitor_puts when no formatting -- to dump information over the monitor (which is not always stdout). Fixes: bebabbc7aa7 ("ppc: booke206: add "info tlb" support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu.h | 2 +- target/ppc/mmu-hash64.h | 2 +- target/ppc/mmu-hash64.c | 10 +++---- target/ppc/mmu_common.c | 66 ++++++++++++++++++++--------------------- target/ppc/monitor.c | 2 +- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 296e7604077..ba17ea83fa2 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -3082,7 +3082,7 @@ static inline bool ppc_interrupts_little_endian(Power= PCCPU *cpu, bool hv) } #endif =20 -void dump_mmu(CPUPPCState *env); +void dump_mmu(Monitor *mon, CPUPPCState *env); =20 void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len); void ppc_store_vscr(CPUPPCState *env, uint32_t vscr); diff --git a/target/ppc/mmu-hash64.h b/target/ppc/mmu-hash64.h index ae8d4b37aed..9ce6939191a 100644 --- a/target/ppc/mmu-hash64.h +++ b/target/ppc/mmu-hash64.h @@ -4,7 +4,7 @@ #ifndef CONFIG_USER_ONLY =20 #ifdef TARGET_PPC64 -void dump_slb(PowerPCCPU *cpu); +void dump_slb(Monitor *mon, PowerPCCPU *cpu); int ppc_store_slb(PowerPCCPU *cpu, target_ulong slot, target_ulong esid, target_ulong vsid); bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_t= ype, diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index 2c33d98001d..356aee0c92c 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -23,7 +23,6 @@ #include "exec/page-protection.h" #include "exec/target_page.h" #include "qemu/error-report.h" -#include "qemu/qemu-print.h" #include "system/hw_accel.h" #include "system/memory.h" #include "kvm_ppc.h" @@ -34,6 +33,7 @@ #include "mmu-book3s-v3.h" #include "mmu-books.h" #include "helper_regs.h" +#include "monitor/monitor.h" =20 #ifdef CONFIG_TCG #include "exec/helper-proto.h" @@ -83,7 +83,7 @@ static ppc_slb_t *slb_lookup(PowerPCCPU *cpu, target_ulon= g eaddr) return NULL; } =20 -void dump_slb(PowerPCCPU *cpu) +void dump_slb(Monitor *mon, PowerPCCPU *cpu) { CPUPPCState *env =3D &cpu->env; int i; @@ -91,15 +91,15 @@ void dump_slb(PowerPCCPU *cpu) =20 cpu_synchronize_state(CPU(cpu)); =20 - qemu_printf("SLB\tESID\t\t\tVSID\n"); + monitor_puts(mon, "SLB\tESID\t\t\tVSID\n"); for (i =3D 0; i < cpu->hash64_opts->slb_size; i++) { slbe =3D env->slb[i].esid; slbv =3D env->slb[i].vsid; if (slbe =3D=3D 0 && slbv =3D=3D 0) { continue; } - qemu_printf("%d\t0x%016" PRIx64 "\t0x%016" PRIx64 "\n", - i, slbe, slbv); + monitor_printf(mon, "%d\t0x%016" PRIx64 "\t0x%016" PRIx64 "\n", + i, slbe, slbv); } } =20 diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 52d48615ac2..5ea9b6d6773 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -29,11 +29,11 @@ #include "exec/log.h" #include "helper_regs.h" #include "qemu/error-report.h" -#include "qemu/qemu-print.h" #include "internal.h" #include "mmu-book3s-v3.h" #include "mmu-radix64.h" #include "mmu-booke.h" +#include "monitor/monitor.h" =20 /* #define DUMP_PAGE_TABLES */ =20 @@ -349,20 +349,20 @@ static const char *book3e_tsize_to_str[32] =3D { "1T", "2T" }; =20 -static void mmubooke_dump_mmu(CPUPPCState *env) +static void mmubooke_dump_mmu(Monitor *mon, CPUPPCState *env) { ppcemb_tlb_t *entry; int i; =20 #ifdef CONFIG_KVM if (kvm_enabled() && !env->kvm_sw_tlb) { - qemu_printf("Cannot access KVM TLB\n"); + monitor_puts(mon, "Cannot access KVM TLB\n"); return; } #endif =20 - qemu_printf("\nTLB:\n"); - qemu_printf("Effective Physical Size PID Prot = " + monitor_puts(mon, "\nTLB:\n"); + monitor_puts(mon, "Effective Physical Size PID Pr= ot " "Attr\n"); =20 entry =3D &env->tlb.tlbe[0]; @@ -387,21 +387,21 @@ static void mmubooke_dump_mmu(CPUPPCState *env) } else { snprintf(size_buf, sizeof(size_buf), "%3" PRId64 "k", size / K= iB); } - qemu_printf("0x%016" PRIx64 " 0x%016" PRIx64 " %s %-5u %08x %08x\n= ", + monitor_printf(mon, "0x%016" PRIx64 " 0x%016" PRIx64 " %s %-5u %08= x %08x\n", (uint64_t)ea, (uint64_t)pa, size_buf, (uint32_t)entry-= >PID, entry->prot, entry->attr); } =20 } =20 -static void mmubooke206_dump_one_tlb(CPUPPCState *env, int tlbn, int offse= t, - int tlbsize) +static void mmubooke206_dump_one_tlb(Monitor *mon, CPUPPCState *env, + int tlbn, int offset, int tlbsize) { ppcmas_tlb_t *entry; int i; =20 - qemu_printf("\nTLB%d:\n", tlbn); - qemu_printf("Effective Physical Size TID TS SRWX" + monitor_printf(mon, "\nTLB%d:\n", tlbn); + monitor_puts(mon, "Effective Physical Size TID TS= SRWX" " URWX WIMGE U0123\n"); =20 entry =3D &env->tlb.tlbm[offset]; @@ -418,7 +418,7 @@ static void mmubooke206_dump_one_tlb(CPUPPCState *env, = int tlbn, int offset, ea =3D entry->mas2 & ~(size - 1); pa =3D entry->mas7_3 & ~(size - 1); =20 - qemu_printf("0x%016" PRIx64 " 0x%016" PRIx64 " %4s %-5u %1u S%c%c= %c" + monitor_printf(mon, "0x%016" PRIx64 " 0x%016" PRIx64 " %4s %-5u %1= u S%c%c%c" " U%c%c%c %c%c%c%c%c U%c%c%c%c\n", (uint64_t)ea, (uint64_t)pa, book3e_tsize_to_str[tsize], @@ -442,14 +442,14 @@ static void mmubooke206_dump_one_tlb(CPUPPCState *env= , int tlbn, int offset, } } =20 -static void mmubooke206_dump_mmu(CPUPPCState *env) +static void mmubooke206_dump_mmu(Monitor *mon, CPUPPCState *env) { int offset =3D 0; int i; =20 #ifdef CONFIG_KVM if (kvm_enabled() && !env->kvm_sw_tlb) { - qemu_printf("Cannot access KVM TLB\n"); + monitor_puts(mon, "Cannot access KVM TLB\n"); return; } #endif @@ -461,12 +461,12 @@ static void mmubooke206_dump_mmu(CPUPPCState *env) continue; } =20 - mmubooke206_dump_one_tlb(env, i, offset, size); + mmubooke206_dump_one_tlb(mon, env, i, offset, size); offset +=3D size; } } =20 -static void mmu6xx_dump_BATs(CPUPPCState *env, int type) +static void mmu6xx_dump_BATs(Monitor *mon, CPUPPCState *env, int type) { target_ulong *BATlt, *BATut, *BATu, *BATl; target_ulong BEPIl, BEPIu, bl; @@ -489,7 +489,7 @@ static void mmu6xx_dump_BATs(CPUPPCState *env, int type) BEPIu =3D *BATu & BATU32_BEPIU; BEPIl =3D *BATu & BATU32_BEPIL; bl =3D (*BATu & BATU32_BL) << 15; - qemu_printf("%s BAT%d BATu " TARGET_FMT_lx + monitor_printf(mon, "%s BAT%d BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n\t" TARGET_FMT_lx " " TARGET_FMT_lx " " TARGET_FMT_lx "\n", type =3D=3D ACCESS_CODE ? "code" : "data", i, @@ -497,38 +497,38 @@ static void mmu6xx_dump_BATs(CPUPPCState *env, int ty= pe) } } =20 -static void mmu6xx_dump_mmu(CPUPPCState *env) +static void mmu6xx_dump_mmu(Monitor *mon, CPUPPCState *env) { PowerPCCPU *cpu =3D env_archcpu(env); ppc6xx_tlb_t *tlb; target_ulong sr; int type, way, entry, i; =20 - qemu_printf("HTAB base =3D 0x%"HWADDR_PRIx"\n", ppc_hash32_hpt_base(cp= u)); - qemu_printf("HTAB mask =3D 0x%"HWADDR_PRIx"\n", ppc_hash32_hpt_mask(cp= u)); + monitor_printf(mon, "HTAB base =3D 0x%"HWADDR_PRIx"\n", ppc_hash32_hpt= _base(cpu)); + monitor_printf(mon, "HTAB mask =3D 0x%"HWADDR_PRIx"\n", ppc_hash32_hpt= _mask(cpu)); =20 - qemu_printf("\nSegment registers:\n"); + monitor_puts(mon, "\nSegment registers:\n"); for (i =3D 0; i < 32; i++) { sr =3D env->sr[i]; if (sr & 0x80000000) { - qemu_printf("%02d T=3D%d Ks=3D%d Kp=3D%d BUID=3D0x%03x " + monitor_printf(mon, "%02d T=3D%d Ks=3D%d Kp=3D%d BUID=3D0x%03x= " "CNTLR_SPEC=3D0x%05x\n", i, sr & 0x80000000 ? 1 : 0, sr & 0x40000000 ? 1 : 0, sr & 0x20000000 ? 1 : 0, (uint32_t)((sr >> 20) & 0= x1FF), (uint32_t)(sr & 0xFFFFF)); } else { - qemu_printf("%02d T=3D%d Ks=3D%d Kp=3D%d N=3D%d VSID=3D0x%06x\= n", i, + monitor_printf(mon, "%02d T=3D%d Ks=3D%d Kp=3D%d N=3D%d VSID= =3D0x%06x\n", i, sr & 0x80000000 ? 1 : 0, sr & 0x40000000 ? 1 : 0, sr & 0x20000000 ? 1 : 0, sr & 0x10000000 ? 1 : 0, (uint32_t)(sr & 0x00FFFFFF)); } } =20 - qemu_printf("\nBATs:\n"); - mmu6xx_dump_BATs(env, ACCESS_INT); - mmu6xx_dump_BATs(env, ACCESS_CODE); + monitor_puts(mon, "\nBATs:\n"); + mmu6xx_dump_BATs(mon, env, ACCESS_INT); + mmu6xx_dump_BATs(mon, env, ACCESS_CODE); =20 - qemu_printf("\nTLBs [EPN EPN + SIZE]\n"); + monitor_puts(mon, "\nTLBs [EPN EPN + SIZE]\n"= ); for (type =3D 0; type < 2; type++) { for (way =3D 0; way < env->nb_ways; way++) { for (entry =3D env->nb_tlb * type + env->tlb_per_way * way; @@ -536,7 +536,7 @@ static void mmu6xx_dump_mmu(CPUPPCState *env) entry++) { =20 tlb =3D &env->tlb.tlb6[entry]; - qemu_printf("%s TLB %02d/%02d way:%d %s [" + monitor_printf(mon, "%s TLB %02d/%02d way:%d %s [" TARGET_FMT_lx " " TARGET_FMT_lx "]\n", type ? "code" : "data", entry % env->nb_tlb, env->nb_tlb, way, @@ -547,31 +547,31 @@ static void mmu6xx_dump_mmu(CPUPPCState *env) } } =20 -void dump_mmu(CPUPPCState *env) +void dump_mmu(Monitor *mon, CPUPPCState *env) { switch (env->mmu_model) { case POWERPC_MMU_BOOKE: - mmubooke_dump_mmu(env); + mmubooke_dump_mmu(mon, env); break; case POWERPC_MMU_BOOKE206: - mmubooke206_dump_mmu(env); + mmubooke206_dump_mmu(mon, env); break; case POWERPC_MMU_SOFT_6xx: - mmu6xx_dump_mmu(env); + mmu6xx_dump_mmu(mon, env); break; #if defined(TARGET_PPC64) case POWERPC_MMU_64B: case POWERPC_MMU_2_03: case POWERPC_MMU_2_06: case POWERPC_MMU_2_07: - dump_slb(env_archcpu(env)); + dump_slb(mon, env_archcpu(env)); break; case POWERPC_MMU_3_00: if (ppc64_v3_radix(env_archcpu(env))) { qemu_log_mask(LOG_UNIMP, "%s: the PPC64 MMU is unsupported\n", __func__); } else { - dump_slb(env_archcpu(env)); + dump_slb(mon, env_archcpu(env)); } break; #endif diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index 7c88e0e2bda..41337d77a89 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -19,5 +19,5 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(env1); + dump_mmu(mon, env1); } --=20 2.53.0 From nobody Sun Mar 22 14:10:07 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=1774025510; cv=none; d=zohomail.com; s=zohoarc; b=IdK+GxG8u47wAuoTAhyoOGLjh4iUdD+y7vQnxX2II3zMg/6XVL/qPznKUm9Wt2wvgEVM9vZvE4dZvbTtLlzUgNR7gqcS2m3rE4LyZc3DPCR0JGpkn5iEI/mc4nea/qY0YRKh0XiktgCi946m2GWtiiTke6E4iQTxyrU8edKlGHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025510; 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=UMP6P39GtUY9QKw5KFD9byXsM6LV5ZDKVvl9cJpnkZg=; b=bzuWLSfUNMAqcLXgKM1tRaZi24RdIL1B3OEGnOLhd+D+/MwTVe0mL/nDiteU+oSDLc3sygl+tnxv1ODy7fFu74e69PEReGSdBy+CREWmkKc/EUHUOIwkDSa0OV5ead8bWnZ75m/yLyNixUVHFiOvQCCvorykZDEqPpH0GTLMuD0= 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 17740255109701020.072340019294; Fri, 20 Mar 2026 09:51:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d3w-0005yJ-4y; Fri, 20 Mar 2026 12:51:04 -0400 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 1w3d3l-0005qf-0B for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:54 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d3g-0001Ul-8s for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:51 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-43b467dcf0bso2120963f8f.0 for ; Fri, 20 Mar 2026 09:50:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe7e3a94sm82408645e9.7.2026.03.20.09.50.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025445; x=1774630245; 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=UMP6P39GtUY9QKw5KFD9byXsM6LV5ZDKVvl9cJpnkZg=; b=sYL7udV+fTuMGZR1NhWyvryAd+WAPT5s/GZySbbHYPHtVe/bseRJVdp5Ho8WrQqqba UPNeQne/ylpHHAc6FzChrgXd5zzqdp2ezMkLjP1dc22DBUJr9yrqRkbw15k9Jv2ZEwh8 i7zu+ASnODBLykMw+8/85LuvyE7d+tt/cYh1k0lI2fEkuMk3wA1HXY3WWM2uG9GErPZr 99oXLlFhp0MfEYhcao/kfsTsNDwMtH+dusA5CwpxCkzeGE7Q47vSYsVgB9jTwmsqZQp0 yVC6lF3dwr0PoUuNBJlr/5tRDQEgEPgToUV0qH/aVq4+BPgGXIf2OprqO6fr/eacm/yt OtYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025445; x=1774630245; 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=UMP6P39GtUY9QKw5KFD9byXsM6LV5ZDKVvl9cJpnkZg=; b=FdX13prvfNJ4Uv72UIbb+wq6dvLRANVtxBRk1Skl20f5g2EJy0snc3xpKNZ4jo3GaV wvoexqSzRlp9bcfklEIbs3U1Df+AQIYGSa9XiVSrKL2a/tsBI1D8I2m524Q4wZMme+bo vDu5p1S7cf3oEM6Pbg/B4wsQonVUzlZRPyVUkdEFmRHjawIPAYOPYQKu8Wpt7PJH/pd+ UFttLWCOeZl5OotQPvEhDyD9uyuPujHtQhkmBvOERPI70dV7Z1vdmE/K2LDwF8Y+rmiF Ro8tNg6p6LLAD/3OcLey2X2R+gISQV1XUTQiih6Ly0xLO/22lkToByj+0CKR5bTcfl2C 8LqA== X-Gm-Message-State: AOJu0Yz7xMd41n6P8+Ck4P2VJb2dl0FN94Uk0sJWV3Ok9sm9TLIpw64+ vU7aW636TJ36FWRo0rhEhbHaRgUMEqnaH42TeUuZXDki2q2BeWu7u7A7t6G1NIgkm3RxZV3POb9 Oi0QjV2E= X-Gm-Gg: ATEYQzxksGIBex/kKvPh1K4bRcCqKx/vr1AdsxdMiLFrn/vfmynHMl1Fn5Shc+9o0le ieaT63MzOqVw6zbibx+9HToFk/yvZ1ULkNeMslVOfFa7iYtYcToWJBh7uI9Udg903tRezuRjhAm 28KL7s6bv7O5xvWhWfa+iridjVWl76nMhlNaRJuT0YaAdeFuUO5wjH1QZBG5bO23yEiP9WUmSGx PCdyKbpNUBwUnNHbpnvIiBXetW8TRxcqNdReKLT4Iz+pDIThowXCw0tVpncOMPjSqpsYz4WNhq8 r9KLnRrt90OvA9TRK/u88UM+uu2d/Izcd5kiftVxsiHQ2lvQncNulKg4TN4tGjpqrLCRxNGXcim hYwfipigaoQwHbEvzc13IvB2uBH/lV+TdeVyTmvRCiPJRsfpCsS5Cg9+gUseEcYIqNURGyoBMQC NplC4FGf7ZoJv8uTt3t7KWepFMW5PgUj+0E5qDBu6o2y+Hp8ns/3Pkr3MTlaCahmegN9SqfZ0y X-Received: by 2002:a05:600c:1383:b0:486:fbc4:8fe2 with SMTP id 5b1f17b1804b1-486fe8fb2b2mr63111185e9.15.1774025444675; Fri, 20 Mar 2026 09:50:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 3/7] target/xtensa: Have 'info tlb' dump MMU information on monitor Date: Fri, 20 Mar 2026 17:50:16 +0100 Message-ID: <20260320165021.39521-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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=unavailable 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: 1774025512539154100 Currently 'info tlb' dumps the MMU information on stdout. Propagate the @Monitor argument and replace qemu_printf() by monitor_printf() -- or monitor_puts when no formatting -- to dump information over the monitor (which is not always stdout). Fixes: d41160a3e64 ("Sparc: implement monitor command 'info tlb'") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/xtensa/cpu.h | 2 +- target/xtensa/mmu_helper.c | 44 +++++++++++++++++++------------------- target/xtensa/monitor.c | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index dfd2ceab7cf..caec22bb742 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -693,7 +693,7 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool = update_tlb, uint32_t vaddr, int is_write, int mmu_idx, uint32_t *paddr, uint32_t *page_size, unsigned *access); void reset_mmu(CPUXtensaState *env); -void dump_mmu(CPUXtensaState *env); +void dump_mmu(Monitor *mon, CPUXtensaState *env); =20 static inline MemoryRegion *xtensa_get_er_region(CPUXtensaState *env) { diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 71330fc84b9..9dbf671228b 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -27,7 +27,6 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu/qemu-print.h" #include "qemu/units.h" #include "cpu.h" #include "exec/helper-proto.h" @@ -38,6 +37,7 @@ #include "exec/page-protection.h" #include "exec/target_page.h" #include "system/memory.h" +#include "monitor/monitor.h" =20 #define XTENSA_MPU_SEGMENT_MASK 0x0000001f #define XTENSA_MPU_ACC_RIGHTS_MASK 0x00000f00 @@ -1082,7 +1082,7 @@ int xtensa_get_physical_addr(CPUXtensaState *env, boo= l update_tlb, } } =20 -static void dump_tlb(CPUXtensaState *env, bool dtlb) +static void dump_tlb(Monitor *mon, CPUXtensaState *env, bool dtlb) { unsigned wi, ei; const xtensa_tlb *conf =3D @@ -1121,11 +1121,11 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb) =20 if (print_header) { print_header =3D false; - qemu_printf("Way %u (%d %s)\n", wi, sz, sz_text); - qemu_printf("\tVaddr Paddr ASID Attr RWX = Cache\n" + monitor_printf(mon, "Way %u (%d %s)\n", wi, sz, sz_tex= t); + monitor_puts(mon, "\tVaddr Paddr ASID Att= r RWX Cache\n" "\t---------- ---------- ---- ---- --- = -------\n"); } - qemu_printf("\t0x%08x 0x%08x 0x%02x 0x%02x %c%c%c %s\n", + monitor_printf(mon, "\t0x%08x 0x%08x 0x%02x 0x%02x %c%c= %c %s\n", entry->vaddr, entry->paddr, entry->asid, @@ -1140,12 +1140,12 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb) } } =20 -static void dump_mpu(CPUXtensaState *env, +static void dump_mpu(Monitor *mon, CPUXtensaState *env, const xtensa_mpu_entry *entry, unsigned n) { unsigned i; =20 - qemu_printf("\t%s Vaddr Attr Ring0 Ring1 System Type = CPU cache\n" + monitor_printf(mon, "\t%s Vaddr Attr Ring0 Ring1 Syste= m Type CPU cache\n" "\t%s ---------- ---------- ----- ----- -------------= ---------\n", env ? "En" : " ", env ? "--" : " "); @@ -1157,7 +1157,7 @@ static void dump_mpu(CPUXtensaState *env, unsigned type =3D mpu_attr_to_type(attr); char cpu_cache =3D (type & XTENSA_MPU_TYPE_CPU_CACHE) ? '-' : ' '; =20 - qemu_printf("\t %c 0x%08x 0x%08x %c%c%c %c%c%c ", + monitor_printf(mon, "\t %c 0x%08x 0x%08x %c%c%c %c%c%c ", env ? ((env->sregs[MPUENB] & (1u << i)) ? '+' : '-') : ' ', entry[i].vaddr, attr, @@ -1170,19 +1170,19 @@ static void dump_mpu(CPUXtensaState *env, =20 switch (type & XTENSA_MPU_SYSTEM_TYPE_MASK) { case XTENSA_MPU_SYSTEM_TYPE_DEVICE: - qemu_printf("Device %cB %3s\n", + monitor_printf(mon, "Device %cB %3s\n", (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', (type & XTENSA_MPU_TYPE_INT) ? "int" : ""); break; case XTENSA_MPU_SYSTEM_TYPE_NC: - qemu_printf("Sys NC %cB %c%c%c\n", + monitor_printf(mon, "Sys NC %cB %c%c%c\n", (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', (type & XTENSA_MPU_TYPE_CPU_R) ? 'r' : cpu_cache, (type & XTENSA_MPU_TYPE_CPU_W) ? 'w' : cpu_cache, (type & XTENSA_MPU_TYPE_CPU_C) ? 'c' : cpu_cache); break; case XTENSA_MPU_SYSTEM_TYPE_C: - qemu_printf("Sys C %c%c%c %c%c%c\n", + monitor_printf(mon, "Sys C %c%c%c %c%c%c\n", (type & XTENSA_MPU_TYPE_SYS_R) ? 'R' : '-', (type & XTENSA_MPU_TYPE_SYS_W) ? 'W' : '-', (type & XTENSA_MPU_TYPE_SYS_C) ? 'C' : '-', @@ -1191,29 +1191,29 @@ static void dump_mpu(CPUXtensaState *env, (type & XTENSA_MPU_TYPE_CPU_C) ? 'c' : cpu_cache); break; default: - qemu_printf("Unknown\n"); + monitor_puts(mon, "Unknown\n"); break; } } } =20 -void dump_mmu(CPUXtensaState *env) +void dump_mmu(Monitor *mon, CPUXtensaState *env) { if (xtensa_option_bits_enabled(env->config, XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_PROTECTION) | XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_TRANSLATION) | XTENSA_OPTION_BIT(XTENSA_OPTION_MMU))) { =20 - qemu_printf("ITLB:\n"); - dump_tlb(env, false); - qemu_printf("\nDTLB:\n"); - dump_tlb(env, true); + monitor_puts(mon, "ITLB:\n"); + dump_tlb(mon, env, false); + monitor_puts(mon, "\nDTLB:\n"); + dump_tlb(mon, env, true); } else if (xtensa_option_enabled(env->config, XTENSA_OPTION_MPU)) { - qemu_printf("Foreground map:\n"); - dump_mpu(env, env->mpu_fg, env->config->n_mpu_fg_segments); - qemu_printf("\nBackground map:\n"); - dump_mpu(NULL, env->config->mpu_bg, env->config->n_mpu_bg_segments= ); + monitor_puts(mon, "Foreground map:\n"); + dump_mpu(mon, env, env->mpu_fg, env->config->n_mpu_fg_segments); + monitor_puts(mon, "\nBackground map:\n"); + dump_mpu(mon, NULL, env->config->mpu_bg, env->config->n_mpu_bg_seg= ments); } else { - qemu_printf("No TLB for this CPU core\n"); + monitor_puts(mon, "No TLB for this CPU core\n"); } } diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index 2af84934f83..2761735f112 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -34,5 +34,5 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(env1); + dump_mmu(mon, env1); } --=20 2.53.0 From nobody Sun Mar 22 14:10:07 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=1774025543; cv=none; d=zohomail.com; s=zohoarc; b=I1TuuaPgxYPfCmV1bnUFfZvPtVH6RjGwAIoF/i1VbPMIdKdY8n9rvTLqs02PM7UPfOx3TR+SgC8XAhk59alcfK7AKLcXec+Mx+xzyizz7MlyAGi5PVGbcMYGNDHC2pAdzsRae5WY+kupXbKOy5EJjYyRja19QAal/xxoqgptSZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025543; 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=Ko/NuQ8s3llnSfwWg8qZEUB+hUDbScGaC6K4YYh0HTI=; b=ZePbgPhvcg7uqbF+XgvK6jUD4yJZhsA5lZUOGdgU3prVqXwrpXkLh8YV6ph1PUBu8Tq7xxO7enfp8Po2QJVz8113Ct4HLpofw/6p2l/IdRbcxv9vx2uALK8zsfsC+B9AH+l9K8EiAx3MH6QLakjl3sLNKJ+0AUk+rRhByiZIhvU= 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 1774025543520921.1130398599148; Fri, 20 Mar 2026 09:52:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d3w-00060N-Iz; Fri, 20 Mar 2026 12:51:04 -0400 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 1w3d3p-0005v7-Uc for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:58 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d3m-0001gL-KS for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:50:57 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-43b467dcf0bso2121031f8f.0 for ; Fri, 20 Mar 2026 09:50:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b6471a27csm8215511f8f.36.2026.03.20.09.50.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025452; x=1774630252; 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=Ko/NuQ8s3llnSfwWg8qZEUB+hUDbScGaC6K4YYh0HTI=; b=u/E3LWG6w2XxFIA6o4gDIhrwMPuXR4hrbExH1tqNiTsjvr7XJMYF3Oy345Xwmn5TgH zTRBdcsuRX9uL+V4vjs1Mqamgz94qkYaWfPL/BSpHHp8JuHEG63SJb3ZqHUynL5AO9dv Vk1ul6ygdpEhUzVZXdklcT2lGtGLLcGMlLUHUEq4bao+mqef1p8+SohSTY5sr4g7DoT9 nCuP40XHWIUwfk5wbafxfWxHLvg3BD+7TDeZxLiZRz/JPeusuWgUixeIuAnmSre1VvwU /LRiznvZTrlDnZeqRg7sMc1IGvY0j7LE/1nX25KHujcXRDzU0X3mGppuwFuszIygQTf4 Rp0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025452; x=1774630252; 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=Ko/NuQ8s3llnSfwWg8qZEUB+hUDbScGaC6K4YYh0HTI=; b=YxCuQQGjoYNfYypXQ69ek4puoRp69v28LkCkGAq26xwAmTvkl5cClkSkXAMI53D7yk pCPb0yU2Dc3N6PS6F8wztQjNHbXIdx6kLCCjA30NSRMSQuLc50rnKJld8Nhkqgq9ME5k TkYz/PENwOVqZXjZxW+iHxsT9q4ZwwLskQqkTIRdd8VJHqbyyr/WOYh81WIAVuDfSN3c iSB2yNRp9cL5C7aE17gCviIeobhswVEonrOmDfNYTKraBjjczBq8auHTMsE0FLKVlvKO phn1roZu6kBs18uRjip3V6W0cQSB6K02PBMUUjCxquWiX8wW4V+qBsaSow8zF9qEfM5a rF1w== X-Gm-Message-State: AOJu0YygwpzMbkYKLBirLXCbB4eOXzoVbnvWMq+Wz30KwOxXbxLq+mos y7WEuLmT8CydfLCOEXhqk7nfDc4gOyFFpltG8GxFevDz4eaFGXdt3KULOXdCjkx98ql5MRgdh9d 3X4iOBfM= X-Gm-Gg: ATEYQzxfHP1WcEskMl3RiEiemkhQrplqgoVOVY798VPZibTKm5nTrE7U/UBL9VgDiXO ojiHM4HyCHsK6lpNnKGz3FBScMsVnuN09m+nq6q5+ED0h8oXAxFavr6yoC5HU3oDo4MnX8J9xxf 33PZoZISSp+3dXsY9QNFdWOKijb9MF/Blk082wvEfYtLrVeXOMZaD2aF1bIMdQiGPMPkiivYKZ/ WsbZb9uunPzbIX7fcrqP5LEzAC3thFKTkubtPgHrJPqU2WdZRrQLuf1atcBb3Bg8hBMAxjmS0aR oTaQR/W1JlafB+tV0+BPvRnhBgfcEkCm2W61UgBOqs7OWFuD3tvzrtx71eFz9XG32db32bDcNwJ SNWGY5pHpTdkQXSB7yRwTWzxl46E1IEj5od1xDhHBDQJITFxnc88fWnfMG7I4SX/sQkJGJRW02I qJGynyBQqPl3YLJndoymvIoqzoQZUxlh5nj8YqAQnvM/0ijUzHvtsAPyeyLfIMrf3z00yJQdJv X-Received: by 2002:a05:6000:26cb:b0:439:bb42:dbde with SMTP id ffacd0b85a97d-43b6427daf9mr6982391f8f.23.1774025451578; Fri, 20 Mar 2026 09:50:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 4/7] target/xtensa: Display [ID]TLB header within dump_tlb() Date: Fri, 20 Mar 2026 17:50:17 +0100 Message-ID: <20260320165021.39521-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1774025543984158500 Move common code from caller to callee. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Max Filippov --- target/xtensa/mmu_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 9dbf671228b..48e1d64a3d7 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -1091,6 +1091,7 @@ static void dump_tlb(Monitor *mon, CPUXtensaState *en= v, bool dtlb) xtensa_option_enabled(env->config, XTENSA_OPTION_MMU) ? mmu_attr_to_access : region_attr_to_access; =20 + monitor_printf(mon, "\n%cTLB:\n", dtlb ? 'D' : 'I'); for (wi =3D 0; wi < conf->nways; ++wi) { uint32_t sz =3D ~xtensa_tlb_get_addr_mask(env, dtlb, wi) + 1; const char *sz_text; @@ -1203,10 +1204,7 @@ void dump_mmu(Monitor *mon, CPUXtensaState *env) XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_PROTECTION) | XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_TRANSLATION) | XTENSA_OPTION_BIT(XTENSA_OPTION_MMU))) { - - monitor_puts(mon, "ITLB:\n"); dump_tlb(mon, env, false); - monitor_puts(mon, "\nDTLB:\n"); dump_tlb(mon, env, true); } else if (xtensa_option_enabled(env->config, XTENSA_OPTION_MPU)) { monitor_puts(mon, "Foreground map:\n"); --=20 2.53.0 From nobody Sun Mar 22 14:10:07 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=1774025547; cv=none; d=zohomail.com; s=zohoarc; b=M5x1kIZw6JBEglI2m0zL9OwWuc2Mf8wfHrfICjiyuleztHIBdNji+mWg0adPiwORg1riSBL+t9L/ZRFBx9pEWcCw4FmWg1py4stI0qhTJ4uuHwhjru5QeUo12WfmqwaKK7CD9cebGbAmM5bk4H4RL1QUV75vbqhONuQQbjr5cqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025547; 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=VSEEhKxsgd12wtFnDcnrYqYBfTtK/Gi6UjxPHhN76lI=; b=abSAr6czrNkDCTza9zFtteXfCRkDZ9aahqE7r2nS0qX2gyod0ZB+iURdrBOGi6Um1klvZ0RjElBcYfYIx2s/WvwftTe8fEySxigwe+2sqfkFezo5bUCn79rVlnV9Q9syMFUR5Xm4Hi4erhsUWr5ZrAWg5cfuNdPgxXER49GhGoQ= 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 1774025547415671.8177453221095; Fri, 20 Mar 2026 09:52:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d3y-000661-1X; Fri, 20 Mar 2026 12:51:06 -0400 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 1w3d3u-0005xt-EG for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:51:03 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d3s-0001pc-HR for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:51:01 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48374014a77so20327755e9.3 for ; Fri, 20 Mar 2026 09:51:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-487004e7bc4sm22884685e9.2.2026.03.20.09.50.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025459; x=1774630259; 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=VSEEhKxsgd12wtFnDcnrYqYBfTtK/Gi6UjxPHhN76lI=; b=u2gBms1MDycOyibk/jzpaYy0eU40CqIcrp5tBYjxH3D2Y69T+bCN5R/IM57BUbgMGv 9M5ct+euRdzOb0VTVQ63pjx8wR5ki9WS9PVAuvDAMDa4/yyHGnedTkI7dJ604vnAWZUP mMUoUdOlKs4e0a+bjoWzH6oqoVtx1ZcB1XZ3RErMfSDc5iNlsGTf1+POLvtH0il8Qm1y iFCNlw/zcpeWbV0JFeCnSHqosT9u+uUAeG2f4pA8Wb40FKWRcvIbIQ+FSUNenXEDJg83 xIrFt+w7J4B4N0Qvh3tUX7XMTD00AJJ3VihqWZWXwhZBryBqfwu55pPs8+J8ebLbXP+k zWnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025459; x=1774630259; 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=VSEEhKxsgd12wtFnDcnrYqYBfTtK/Gi6UjxPHhN76lI=; b=Pudos3H6Fgk7o7pfyOqWpzlVIqtsL0JA/UJjKjcEd4IiHbF0TMnXQuY0FaQlwbhAWi G8zgOYQtyv+KhEUBtoT2uLfE1JHwbtr697la3LA33NsklZUDFNzSnR7/23AAwONRV9IT TTKILU7ekyNq5M7wtrC92DJsyoEnEWv72NQQXhtaWH4fnk9886ObBLHUPtgv10nbYq2T Nro9fGcdOzNYid05nr8pLw9fcXSnuqfhKBHCVffs0n+un92hif+ZnWP+gAKcVduiNGGg 7jPQoz3He43dKYPvSkOyffmHWVnRM1sJmcs7woyIi730G9bkYWMZEyByEzehD8zP8i5s sPog== X-Gm-Message-State: AOJu0YycdoecD8fOiPcJgFCRyw6NR2Ezs+/PCptkgHoltF9VNv3szT34 dVAYybvmrquSiujCeDHi7BW7/dG7/aQafMM9Oo6ALGcVUAdW+LgXS351EyQ9EJxFiUyeq/zcLZ5 pxp9U8ys= X-Gm-Gg: ATEYQzxdmmK8LEkAC5FyEHb5qjIxWTzqNGMuziqC9sZpC20R3XoALerMzqzCjOy3PP+ OAs/ABoa5sDVVif6GzShFuRvx4/Po+aroxH+BJK67FrrBgaJ2pE5y2AKRQM+0oVu4Lb1TVnT2yH M7aJQ+8tnDf+PlIQiWK4p6wvIRVns1t/8vhtEBRZ6qsn35WaDyrIZKPKezhqQfs/aWHqJeZzybd f1qsryYoaseVWixkuQvhRTzYJEK8cAYXcjr5yS6xXhEmpaemQpQJp6X93/GGjnzjnjekMkZGzuZ c2Nm0eHSlLClv7QwzhI61csJPmQi0VajOaA0DMyznLjd10ED899O8w6zajWSuKQpzrsZQPLWKVw TfOJV2qK9n344k9owr1M6QzP8LLr6Ms7LAGvTF38ASj8x1hJQ4oWBxjwptKxJdwqa2RF/EerZsm rgF/y3IWozhUMCupLtwq1PZMwuXOEujSftKlf3o3tzVl3iEz6K9gw8bdbxnmYSNwIZGH6ose2A X-Received: by 2002:a05:600c:4705:b0:486:d76c:fa57 with SMTP id 5b1f17b1804b1-486fee0983dmr57740125e9.17.1774025458618; Fri, 20 Mar 2026 09:50:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 5/7] target/m68k: Rename dump_mmu() -> m68k_monitor_dump_mmu() Date: Fri, 20 Mar 2026 17:50:18 +0100 Message-ID: <20260320165021.39521-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=unavailable 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: 1774025548067158500 Rename dump_mmu() to avoid a name clash with other targets: $ git grep -w dump_mmu master | fgrep .h target/m68k/cpu.h:610:void dump_mmu(CPUM68KState *env); target/ppc/cpu.h:3083:void dump_mmu(CPUPPCState *env); target/sparc/cpu.h:603:void dump_mmu(CPUSPARCState *env); target/xtensa/cpu.h:697:void dump_mmu(CPUXtensaState *env); Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/m68k/cpu.h | 2 +- target/m68k/helper.c | 2 +- target/m68k/monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 84ffebe3890..5c45597375c 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -606,6 +606,6 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr p= hysaddr, vaddr addr, #define TB_FLAGS_TRACE 16 #define TB_FLAGS_TRACE_BIT (1 << TB_FLAGS_TRACE) =20 -void dump_mmu(Monitor *mon, CPUM68KState *env); +void m68k_monitor_dump_mmu(Monitor *mon, CPUM68KState *env); =20 #endif diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 2208b9a2ab9..7cdea555061 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -611,7 +611,7 @@ static void dump_ttr(Monitor *mon, uint32_t ttr) M68K_DESC_USERATTR_SHIFT); } =20 -void dump_mmu(Monitor *mon, CPUM68KState *env) +void m68k_monitor_dump_mmu(Monitor *mon, CPUM68KState *env) { if ((env->mmu.tcr & M68K_TCR_ENABLED) =3D=3D 0) { monitor_puts(mon, "Translation disabled\n"); diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 38f925e5b16..eea5ae16a90 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -19,7 +19,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) return; } =20 - dump_mmu(mon, env1); + m68k_monitor_dump_mmu(mon, env1); } =20 static const MonitorDef monitor_defs[] =3D { --=20 2.53.0 From nobody Sun Mar 22 14:10:07 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=1774025481; cv=none; d=zohomail.com; s=zohoarc; b=ZRYT3LPFvZNBCKT4Nyrc78YOK+brsS55uvxm8SXt2/vlhJnfI/m+U2ycSnd30iS707/eBdirzV6sA9iVLmzHYnVI4fnYJVPyrsH9x+H+VZ6sRyYULARS6GHEyb4L1YxhuWmcFaRPzuKXSgUi0yXV/tPgNmgaC1B5B0WP+Fhy5mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025481; 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=PmtnWJ5PFHdyhRwq5dv+ae8r7zuhkOnXX82QXiYgiuw=; b=afvFF1QUBjm/VohpIjn/sQ+/v7V9wwRmJmKHK1Jc11vS7O3deLe/WnU3Lb2qXwfdHU1laAFnAPmVzbhiOuwmL+Ibqq2X2Y7kDoC76IYwnePPXy8z/ReBeqitXfWAkvWeEsn0xFLLyb/oya5J9iMP9g2EwvO8/1/PxiJ8Sx7rZbQ= 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 1774025481797596.9930128994486; Fri, 20 Mar 2026 09:51:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d43-0006GJ-V8; Fri, 20 Mar 2026 12:51:11 -0400 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 1w3d42-0006FU-11 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:51:10 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d40-0001rz-Ik for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:51:09 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-486fd27754bso13297055e9.3 for ; Fri, 20 Mar 2026 09:51:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486ff1ce0b9sm28082815e9.6.2026.03.20.09.51.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025466; x=1774630266; 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=PmtnWJ5PFHdyhRwq5dv+ae8r7zuhkOnXX82QXiYgiuw=; b=WXU00+xkx2xnE+6+7E7zspkRC8dUO/pTM93tczTAts3KRBhr0aBL4eZRniZifKkzV2 9aJV/HoNLuKoxSaTVv8zvSYqjoc+fk5fD0oUbq/0skxqk6hWfCZv4qKZ2nr5Uz3HaeeK WNo9e0T1IflQQY+S5AD0usbiqFlf21AKbI0swyYSiYz2kQzZ7nLMLSiZip6vM2DuFkjU leGKNjMtdfZXyYWG/ipF7cYviMYsScE9gHRRgjG5PPts+D6+2ngR2bpEqh6eSeUm7lfq LXGboRAmWGiDVPhYmSQNwor4H/lfh+fi67bi5+T3Yvg0FpXH4sJAAZeuAp2i+OMxzoBF Jl2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025466; x=1774630266; 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=PmtnWJ5PFHdyhRwq5dv+ae8r7zuhkOnXX82QXiYgiuw=; b=O1Ol/qLQN0fds8wKL+QzLx9yQIt5kOcYE1H3tU1zfNlky86labZ2UY2v4UJOfpmsOu ArW/W+USjnIDVZXSORSq8EjbMUGQpDzTqa7zcZwrixwS4ZWVhBbvs4uvSsLG50l0/XdY s+n78j1NFqO6Luhl5HffIpG2mRwSGNYMwQNZltqQuqSUDVpNk7KVOcytcjgx3M4ai8LY lFD41Y62pq3vajSqHIgZodXrm/pjHbl0ZmLd7e2IUwEO0BG8kbrFMPddKtnIFtn7JQN8 AhI0gHy0glqnZ8KbrgjdxHX2V0IAkO72VsccvnvybJrA/90GwtDmN30fWqMoY11ZgdcW gpGA== X-Gm-Message-State: AOJu0Yw7zwFqs2BqCWh7hbKVF9eM68KTUO5w1zKLmX77aIBRHVj+ZFcp qskCRCYzyiDF6xfDFcX38kc+DCQdc9EWmgv93NgLuZIQOl1PGPJS3TBmwXIyLoZFoKxpWM0my5I O3atvLzM= X-Gm-Gg: ATEYQzxAY46Sn3Z9F/XF0wIhsbNurGjbWVfVidFBu4YzkczJgtEGl4q7i8ivHmPUqvs SegonO7O0WN9cGENd5scXal78edWfEUJ6nd7rTNl/1Vh6J9jCwEXZreCNTzGjgkDd+oQUa9ibxu dySFlflIV5dH6xvh4oXE3b2ItgLWOIHGuNuXDi77I2N43AC//jPNTdNoC5sYzAElFVQx5QCk45h hqkbZALLnYS2venPKqPutHIuooiz/3K0oFekl5w4Co+2zo6EVRxoR+yGqh/K1pHiOVNGmAXNvXV abqgFwNKbEAs94vQ1FVS07fpHOE46k/H3D8u8xyw6F5CGjihw8tbR9J6drDDr0QZhTCeTh8520z aMJvlDHj3wAY2FVbgGwuWMLA3SpuZl6QsZm4DhGmEmMEbvKaJ9US+c6rr7ixeDD8kofTAYy2tON +Gyv4i7IV0DwxSY45zDQOtz14/PTz1GD/Cg7iZouXy2AGkVWij4DWh1o4bLQ4BBSEmde9jslQj1 nhERh1RQxU= X-Received: by 2002:a05:600c:8b66:b0:486:f9d0:aac8 with SMTP id 5b1f17b1804b1-486fee0f835mr53412435e9.18.1774025466464; Fri, 20 Mar 2026 09:51:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 6/7] target/ppc: Rename dump_mmu() -> ppc_monitor_dump_mmu() Date: Fri, 20 Mar 2026 17:50:19 +0100 Message-ID: <20260320165021.39521-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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=unavailable 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: 1774025483725158500 Rename dump_mmu() to avoid a name clash with other targets: $ git grep -w dump_mmu master | fgrep .h target/m68k/cpu.h:610:void dump_mmu(CPUM68KState *env); target/ppc/cpu.h:3083:void dump_mmu(CPUPPCState *env); target/sparc/cpu.h:603:void dump_mmu(CPUSPARCState *env); target/xtensa/cpu.h:697:void dump_mmu(CPUXtensaState *env); Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu.h | 2 +- target/ppc/mmu_common.c | 2 +- target/ppc/monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index ba17ea83fa2..7fcafd590d4 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -3082,7 +3082,7 @@ static inline bool ppc_interrupts_little_endian(Power= PCCPU *cpu, bool hv) } #endif =20 -void dump_mmu(Monitor *mon, CPUPPCState *env); +void ppc_monitor_dump_mmu(Monitor *mon, CPUPPCState *env); =20 void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len); void ppc_store_vscr(CPUPPCState *env, uint32_t vscr); diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 5ea9b6d6773..00923c0b96e 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -547,7 +547,7 @@ static void mmu6xx_dump_mmu(Monitor *mon, CPUPPCState *= env) } } =20 -void dump_mmu(Monitor *mon, CPUPPCState *env) +void ppc_monitor_dump_mmu(Monitor *mon, CPUPPCState *env) { switch (env->mmu_model) { case POWERPC_MMU_BOOKE: diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index 41337d77a89..f95b1b44c2c 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -19,5 +19,5 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(mon, env1); + ppc_monitor_dump_mmu(mon, env1); } --=20 2.53.0 From nobody Sun Mar 22 14:10:07 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=1774025532; cv=none; d=zohomail.com; s=zohoarc; b=BU/fm1aSVxAKBLjV4/6d/X7gZZtkAaH7YacEAeza9hsPzNZng1uK32N8gDp3swdW4Py4ZtD6o/RncY5a6rd1YRDBqS0jFpzNCN4gQJFypTwlGFjehdgYwkLWghDBz2a+bsPSg+o9ZvS6sra8suSWodxLzXHYfbKaeeuNDWtRU/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774025532; 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=e6sBzq3DUz6gocrIces2uqDUPmvpHqt0ZePVNRFGs/E=; b=ai/0QwJbQM3h11u04X/NHhh05xZd8vGd3AdNHvmrz3ZHHqxKiDOgcaGnz7Wkp+NbmCpfq5Juc6tSaQ1EEVWZK4+G2ROEC29meC5y0lrZXro/PG3btb+SKgxlfEpwyc/Bp8EcFe/wCo3JLxvnSCDOF6MS0v3z6Ari9oBnv9f35RM= 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 1774025532481279.52528897533205; Fri, 20 Mar 2026 09:52:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3d4B-0006KT-Gh; Fri, 20 Mar 2026 12:51:19 -0400 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 1w3d49-0006JM-Sl for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:51:17 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3d48-0001sj-3A for qemu-devel@nongnu.org; Fri, 20 Mar 2026 12:51:17 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48558d6ef83so7709025e9.3 for ; Fri, 20 Mar 2026 09:51:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe8ceebdsm30580915e9.4.2026.03.20.09.51.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Mar 2026 09:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774025474; x=1774630274; 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=e6sBzq3DUz6gocrIces2uqDUPmvpHqt0ZePVNRFGs/E=; b=UZrp0hcjJ4S+7aLXKfIdecAYwBfX0Y2O5VYqyuqrS9nAIy6UeC63PnLE5ApB9VVbkA BsDjdHxc6QPXVP/IMowVl3sWqLZPgYXOJSZONfg6wHZ1f35+aF9mvxymkzEWKcSanRoU qM0q3b3DVouf7iSaFkP7lAlrpHiyxWOAznLNHn+KRedzNtn57uXVPX1TYL2jQWsFyOue n6CBuEA59RP2S4cXhnFfXVgF7jKVnwpXXLkLu1tYVRyryA/hgGYChZEgjRvuhZxqUihq SM9eLSYJ5zi0zCyVHcrXD3tHXYs336p0jDsh9Gfqlg2xeub6dPfnSlgIlE9pQNCKeMXb ydcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025474; x=1774630274; 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=e6sBzq3DUz6gocrIces2uqDUPmvpHqt0ZePVNRFGs/E=; b=MJwp+uSMy2dihvLxW0RN9UjIF1nHB/uPG9V4xS8EANTnezDWCqEOetea4UPR/MyN+z Ce9SdkLymUSaYVcc+EumkH0j7oACmLidZoR9yJGo0jBDB4DNbIMG4xFClTmOr6AYKF0d y2JbhitmGgQ1Xwv8cNytcp5AqVHzt3MP7AxiA7F12dc77Hz+sp1Cng4CtsXmQl7sC3EP Pw42tE1uvBufNcsjLx0YJJ0vc0Y91EHLwTuEFoGdAn9fDRLboeto+7NRyEUOsf8S6I+M vYnMdkN3bh56P7iJbp5pdiF1gPfHYBXVMOCmyYS0boqWNzkSbMWIET/M6X5IlIgaUT/J sWoQ== X-Gm-Message-State: AOJu0YyotcIIpIYvMRMSxDgORR/YJVgyrQ02Iail/Wpz+kwsvPaHmCek ZDkz3DWusDm1Gf6ZZXV5av8kEd2zfPQh+NbkRfoBwD8cVBy6md0SX+IdEXU4MVO36mqeN/Dmfxj z3V3bL4s= X-Gm-Gg: ATEYQzySufC84OOH9eeMDsfjMHe2nHK2HSs+glBOdj//nHD1MmI4KVIWixtGv6JvY4Y XS96ARoe1xXymZ3iP/trhivZ6wSXimIPKthmKEUczkuDMatY8MUQUrQs05mOWw7emX/7YUgSWwy YwSyvcyB6iSOZZUWzAwEzcIZAD99WE3wUyGJIdvGJ3yUF7i69iPcr8LX/d3xQUAE1y9E45nu3Cg ivyxxdMUMLie5o6dLCmfDe0HnkNrjfOBkUqfK/AeoMvcRnRUmD3gn0oEu/+xPH3l7MTqVWuk2pn rlIn0aGSNYS34Eort2IcV8amWymOiXUW9UONuJEjuSHbTqYNmWHUZQRdLSLQOtLWtfDHtnT3IuU LgnwzU3XN4eL4CWxaTnbuV1gwRpiD+LenTgb0bEgXtQxIduQ0B/7OCYtDtyJaz5ZF04AWe+ZB+/ lgNAv1Zq4r1K5JZmTSQANx25wX/n6r7X85vm1xEgeAvDhDjiEGua/RP6TeA9vksXlQGMZRJQDl X-Received: by 2002:a05:600c:8b32:b0:485:4394:b0e with SMTP id 5b1f17b1804b1-486fedbad16mr51693335e9.12.1774025474277; Fri, 20 Mar 2026 09:51:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Anton Johansson , Glenn Miles , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, Max Filippov , Pierrick Bouvier , Chinmay Rath , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 v2 7/7] target/xtensa: Rename dump_mmu() -> xtensa_monitor_dump_mmu() Date: Fri, 20 Mar 2026 17:50:20 +0100 Message-ID: <20260320165021.39521-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165021.39521-1-philmd@linaro.org> References: <20260320165021.39521-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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=unavailable 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: 1774025534063158500 Rename dump_mmu() to avoid a name clash with other targets: $ git grep -w dump_mmu master | fgrep .h target/m68k/cpu.h:610:void dump_mmu(CPUM68KState *env); target/ppc/cpu.h:3083:void dump_mmu(CPUPPCState *env); target/sparc/cpu.h:603:void dump_mmu(CPUSPARCState *env); target/xtensa/cpu.h:697:void dump_mmu(CPUXtensaState *env); Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Max Filippov --- target/xtensa/cpu.h | 2 +- target/xtensa/mmu_helper.c | 2 +- target/xtensa/monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index caec22bb742..095b4ced45f 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -693,7 +693,7 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool = update_tlb, uint32_t vaddr, int is_write, int mmu_idx, uint32_t *paddr, uint32_t *page_size, unsigned *access); void reset_mmu(CPUXtensaState *env); -void dump_mmu(Monitor *mon, CPUXtensaState *env); +void xtensa_monitor_dump_mmu(Monitor *mon, CPUXtensaState *env); =20 static inline MemoryRegion *xtensa_get_er_region(CPUXtensaState *env) { diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 48e1d64a3d7..766fe60e2eb 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -1198,7 +1198,7 @@ static void dump_mpu(Monitor *mon, CPUXtensaState *en= v, } } =20 -void dump_mmu(Monitor *mon, CPUXtensaState *env) +void xtensa_monitor_dump_mmu(Monitor *mon, CPUXtensaState *env) { if (xtensa_option_bits_enabled(env->config, XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_PROTECTION) | diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index 2761735f112..80ebba5acbd 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -34,5 +34,5 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(mon, env1); + xtensa_monitor_dump_mmu(mon, env1); } --=20 2.53.0