From nobody Sat Feb 7 05:53:47 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=1766583684; cv=none; d=zohomail.com; s=zohoarc; b=Ln5K4dO1P+G5tWYAavv9vChRCr8pb/hezFyQ3zbGKKLsrBAzx5QMkIzmHH706ZOJbuPgK9O6XH2ktHuFUs9IZyrIOqIpNC3sU8ET9sa5pxAGTCRpqlugs9bpUKHUnGzTCTiMPQn5PXpMpNpZ2tsQ7ZZae9fgiq0LHectSO04OKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766583684; 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=npTLL+HNAjuRrR3R9RZSM7yLL2ZqtYn4UMz3SJMLrrI=; b=kmGLXgdmP9p2YtQbiEV5cZCbchNfLU7JD2KHZQu1EkrdbxuRyTyNRR6+tF7XVZUp56B0pmGUKqdt+0t5RDk6NgEPmYsebTbCIloXAeB73nZPJWBE3U9LbR/JQGP/EnZUwelLgrw7vH7A7q0IM9EK0VGy0M+IrisYRfGwUmKTpZE= 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 1766583684815618.6547807497896; Wed, 24 Dec 2025 05:41:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYP60-0002Pp-J1; Wed, 24 Dec 2025 08:40:08 -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 1vYP5w-0002Ng-Jj for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:04 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYP5v-0002LZ-2C for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:04 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4779cc419b2so47169805e9.3 for ; Wed, 24 Dec 2025 05:40:02 -0800 (PST) Received: from localhost.localdomain (218.170.88.92.rev.sfr.net. [92.88.170.218]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3aac6d9sm144306225e9.4.2025.12.24.05.39.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 05:40:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766583601; x=1767188401; 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=npTLL+HNAjuRrR3R9RZSM7yLL2ZqtYn4UMz3SJMLrrI=; b=nz4n3U8GEH0lmsQFY+CavQ+EVCUDLgvQKS3Y1pSAwWp+oKTiz3Rk1t5kB+Rbc8c38g ciFHFS1l57EMLhu2CsDotJeacdeQbpV+wqh9KrRr+5F8q1JbnribYaFqY7xrHZhaTgsO LCJZBEOte1LTVZvxbDrwDUs36is/JqOpvH1b64rq+OwEbD6ibr9jYhEk3LL/tDlUdHj0 8E0BVEkc1MUDgUsPEuYGxA8AQghLQxz254GP1sQrsYmChiZ9xsARjHLd8RX+0zZgzhLz HJDDx1xjSwBT5tC8IpduEQAvCHYNncJ9+ypaZvaMZ64zp361WbphwgMTKkl8pxg6SGUB egzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766583601; x=1767188401; 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=npTLL+HNAjuRrR3R9RZSM7yLL2ZqtYn4UMz3SJMLrrI=; b=Dm7vtObJyrndwq0cYwIgubn/U/p7RW6tTPXdpjyQqfcWw6HSIoaRK8NsSsiWn7L+QV Cs/Fm4rtMbhNQuT2UExICpAxaiyiLehJH1rSRHO7gJKxf3BMFWCdbiX6Z74Jplqb8ShG P0YJ5T+YorwYswJNjbMd4V6N475L22dwZRqSccEeI83YdUoMG7eBuzdKKlFaJlymq5h+ ZyNk7jZSMt4/E2vUb+83TSIc0NbLbOetTsvDzg7NqqE1wmRXb/Nuf29dxc6WhgTlEdpu tc4B/R4scePKCv0OiopFSiFizXveo6P+7tQJviK7lWXkGjFOIGKL2bi1jxfi3vcPb0AR dAmw== X-Gm-Message-State: AOJu0Yxac+CpDXbrZFqlFL872kiVW9CCWVgR+nNR6e0XXSGx3cKw/5yr HRN33AcWKjq8qT4GVlWY+c54uNw1IcXKHyh/f4KIrFeKL9ynvNJt0yJ0zqCZVlEVnn4FA5gRBY7 3UGua3tQ= X-Gm-Gg: AY/fxX5D1FCjtl2nKhdtLAt09Vb+nDY0tNJexUF8UWKforn8HcqQN2/fQmeWfwnBhMi USMj5T6wvcD02/hLYEN/1BD9hAf8DVhXpdVzl1iMBnUWS4u0AxQPxH4Yx3w7/LLwntUlGp3C9On kSeLh94kds00gD3+QR7kBdM18lbzcT+KSjvXuccKhKkGXnwlDjOeWFMdJvu8UzGban583rdr+Hf 7sW5XRadEsF2ke2ijtO/ZYFdItd4o00YzQbAi5ERtXvpmOxty/4jdbWq4zlroGOaea2+UIPwQAd KOtpwy1jOLv8T87RWsEvAWCMU12Q5WuoHrHUF5YDeaWK4Wib+LiuQdzKCeeGsZFjWJO+eTeg8ba CM9oFo3x6qmQE9YczjGTKc0YyityvATk5rEdJwICtOlAh3+RPTRRDNEWmmfBsP7hbbCJzwyP+iZ iA3Xn4hc7h130M4d0qBUIdTu90nA6ofV0aOiSfx0mLwRBV71SsVp06j2Wi937n X-Google-Smtp-Source: AGHT+IGDh5UlHu/Ogt4V7UIVyWzH8BgS4jMIYR7F99WKAJuofh9mtCpHdmJkC4l1sJn1r8Xt4RBBBQ== X-Received: by 2002:a05:600c:3b9d:b0:459:db7b:988e with SMTP id 5b1f17b1804b1-47d19555e07mr222050455e9.13.1766583601206; Wed, 24 Dec 2025 05:40:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , "Dr. David Alan Gilbert" , Pierrick Bouvier , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/6] monitor/hmp: Replace target_ulong -> vaddr in hmp_gva2gpa() Date: Wed, 24 Dec 2025 14:39:44 +0100 Message-ID: <20251224133949.85136-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224133949.85136-1-philmd@linaro.org> References: <20251224133949.85136-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 (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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 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: 1766583685802158500 cpu_get_phys_page_debug() takes a vaddr type since commit 00b941e581b ("cpu: Turn cpu_get_phys_page_debug() into a CPUClass hook"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Manos Pitsidianakis --- monitor/hmp-cmds-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index e9820611466..2976f986d35 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -301,7 +301,7 @@ void hmp_gpa2hva(Monitor *mon, const QDict *qdict) =20 void hmp_gva2gpa(Monitor *mon, const QDict *qdict) { - target_ulong addr =3D qdict_get_int(qdict, "addr"); + vaddr addr =3D qdict_get_int(qdict, "addr"); CPUState *cs =3D mon_get_cpu(mon); hwaddr gpa; =20 --=20 2.52.0 From nobody Sat Feb 7 05:53:47 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=1766583658; cv=none; d=zohomail.com; s=zohoarc; b=JnOdlZ7W7wCrX8BmSdiIr2U1joic1J9pmZOMD8s07kQ9laet69h+zQ/G7bX/TZcZ4lw8eCP001pkxkJN0Xqc5/NkcOn5LBeBi7kfihyTfiVWFcshWvJWbxHphFA3MPTRxRUeqarXj17hjoDYOxMquZXm/hpfIDgfqjoH/TcZyHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766583658; 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=lnHAAvQ7KeLMZzzpATHJdXiQ9iksZ8WqgrEdFTW4jwI=; b=d4e1uCLOwpJuJgk8a4uW45sXdxyCPTWTigPjpHub1wAO6TL7vKUmcDxLRz9i0CoR1JTZywzHvVn0TK8vMOwhK5hEJYvoipg0I0g7eHxnxQsryrXfzPazeRnsee9fhOQdzFL1ofutIncRhoyMBGQGrySTFGrgH4EBq+ALa8qu6yU= 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 1766583658445218.46260623746582; Wed, 24 Dec 2025 05:40:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYP6B-0002Qm-QN; Wed, 24 Dec 2025 08:40:19 -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 1vYP65-0002QZ-1z for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:13 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYP62-0002Yf-Nr for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:12 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47d3ffb0f44so1849185e9.3 for ; Wed, 24 Dec 2025 05:40:10 -0800 (PST) Received: from localhost.localdomain (218.170.88.92.rev.sfr.net. [92.88.170.218]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be272e46fsm341295395e9.4.2025.12.24.05.40.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 05:40:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766583609; x=1767188409; 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=lnHAAvQ7KeLMZzzpATHJdXiQ9iksZ8WqgrEdFTW4jwI=; b=TRWSQHUjnxdS3Zp7Q3v77XDkXBHJv4YUot5zS8Wv6x98HzeLKY2vFG0KiGfphlCPRW dcG6jTUREVd7Y9MllpKGoTtvri4kOiSVPjpMCr+yEchx3bc6KpqjyfgMPqVS1khRO6v7 0YBV/Px7IBGGojEkfy4fFCb0xOxFUXvokdq37Zlmuj3ts2/NHwSb0RUm5dbFzx10MJz2 TZa7ugrsQkYe6tgD8WORhBCM5r204NYY4ZDasHGmN2MLBI0fOr43/YWhj8zkH+bf/WIC 5BviSYM+P9jmbGdynfw6KtetfVUsOL1OnLlqY6W4YKAlJfrehUWNNc4bH6q8po/COtvz ae6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766583609; x=1767188409; 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=lnHAAvQ7KeLMZzzpATHJdXiQ9iksZ8WqgrEdFTW4jwI=; b=X7COg6gC9MbaqCoU6uXgWTyfwqe5lA0XcReOiAM5OTuoYM1+0Cf3qpp2HUzFcTpYf5 b5uB9n+UCm8BCu/efkWnH/2ITBbpMZafeik/MorvPqpfe+E1CAZcRaGy01TDdI+GQ6D9 ddgKQPXpl22k4AN5oQZkG5FaGRB+NOAtM9IufO1gGLY9RqwE8w+6s3eaysMluKR3DZoU 3WYxXtJ4dTg36uFPdl7VC+37ZmTSQy1+RWX/tsMdGyo9XW8VsfpuM4tD5buuCCSOdbNh EFg3f+Ow+0MeMdHxYXxHX6m8Kp+H+SHiWDnRjTvCFfihqLdtAf9KRMZdK0tuotdE/v4T exlw== X-Gm-Message-State: AOJu0YzHesAZCzV6uOEUGEp8c18flcUR3iR1uGa33r9ZtPzIgvIHyt7m Z61q/qEEsN+9493t9NUu+LMk/GasPxmwM3VlSL4NmHKEvTQk6bKf+JIsGEsTpssxFQnQcnFY+Pn bjs8R/wo= X-Gm-Gg: AY/fxX4Cq2pBDCH7wdnxXljGWwwtpnZuc0rYu8zJ4dclttdYn6jXGTC+gURVvQjbmpa lVuHpZkiCjTEOwTMPkPqF9tacQcp6IP4vYpzS8us5vNnMaRnEDdNGYSPcSvMcqf83D2782TnO/9 MGT1W3qOE2rlsg+TeppdT7dcVTFNsoRI/w8yt079KYa51CuirKEYlMF6OjDo/mURXMMQ+QZXzPd pIXmabf+1WEC6fLc9tOfXG8CR1gLLUZpfQIr6JlkZ4wR63Fi8neHIEzZb6+NVj3tiBG3WRUe09y Sn0SCFW9nryofGE5/vFNcmPgQ7zRrtzJaCR4ayZevz5dLAFZu33GXtx3kwB9B9BJRUxAzXKiSLQ DkfVIFavnrI/uuhA1ZWq7FPzjOQRE42B2qiOZOEl4UKUdYmUunmcugO4fhZbBlgXfxWhLoAd0Zw +8/goTwmA1GW9ePK5bUfNhutq5WhP1k9eoyrzW6lzEmULX8pjNOcu5LQeGx1yi X-Google-Smtp-Source: AGHT+IG052qBOgBfV5wXTnonMj1M1LJCqcGYuRPnLNrDG1lFtBJPw8NAXfxg/BejGnAxtGHD5+RuHQ== X-Received: by 2002:a05:600c:8216:b0:47d:403e:9cd5 with SMTP id 5b1f17b1804b1-47d403e9f61mr10353635e9.11.1766583608780; Wed, 24 Dec 2025 05:40:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , "Dr. David Alan Gilbert" , Pierrick Bouvier , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/6] monitor/hmp: Use plain uint64_t @addr argument in memory_dump() Date: Wed, 24 Dec 2025 14:39:45 +0100 Message-ID: <20251224133949.85136-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224133949.85136-1-philmd@linaro.org> References: <20251224133949.85136-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 (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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 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: 1766583659838158500 memory_dump() takes either hwaddr or vaddr type, depending on the @is_physical argument. Simply use uint64_t type which is common to both. Pad address using field width formatting, removing the need for the target_ulong type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Manos Pitsidianakis --- monitor/hmp-cmds-target.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index 2976f986d35..c00f75eab3c 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -122,12 +122,13 @@ void hmp_info_registers(Monitor *mon, const QDict *qd= ict) } =20 static void memory_dump(Monitor *mon, int count, int format, int wsize, - hwaddr addr, int is_physical) + uint64_t addr, int is_physical) { int l, line_size, i, max_digits, len; uint8_t buf[16]; uint64_t v; CPUState *cs =3D mon_get_cpu(mon); + const unsigned int addr_width =3D is_physical ? 8 : (target_long_bits(= ) * 2); =20 if (!cs && (format =3D=3D 'i' || !is_physical)) { monitor_printf(mon, "Can not dump without CPU\n"); @@ -165,11 +166,7 @@ static void memory_dump(Monitor *mon, int count, int f= ormat, int wsize, } =20 while (len > 0) { - if (is_physical) { - monitor_printf(mon, HWADDR_FMT_plx ":", addr); - } else { - monitor_printf(mon, TARGET_FMT_lx ":", (target_ulong)addr); - } + monitor_printf(mon, "%0*" PRIx64 ":", addr_width, addr); l =3D len; if (l > line_size) l =3D line_size; --=20 2.52.0 From nobody Sat Feb 7 05:53:47 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=1766583652; cv=none; d=zohomail.com; s=zohoarc; b=g5FBWoVJ92gMFkDet7a+zB4raWqJsW69t9c4Er8HCpSemUXczHXb6TuUcvIjaQFSv9HOsa7FmSFyPeR2e2sU5MLpQZpc7EE46S0znbvnba8n+MSMrVPjJqLbjGj6J+oQgHR943i+I7odzFcsBqBm4kVTll3FwmwHm2SAnVOUl6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766583652; 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=uWjac0+Kz5L48LnLkc+my141z9NWCQHb41+AY0m7S6g=; b=Rjho763G6KzgUuYmwyNHMb5PPydh791jrfv1G5zHEvDT5feymCU2GXhY4DHsyDKI7ksxA8tkanKt54ACVbKpxLK+MUSw7qy71rQ7D7YEMxVmlgWkrTr40EW8iJC8swglprCJQM4n6zuprs34E3uSkSovifhSg9FBqnZ3NAg0fyc= 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 1766583652090246.27003223928398; Wed, 24 Dec 2025 05:40:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYP6L-0002S4-3i; Wed, 24 Dec 2025 08:40:32 -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 1vYP6C-0002R4-Au for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:21 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYP6A-0002Z9-QJ for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:20 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4779adb38d3so39636945e9.2 for ; Wed, 24 Dec 2025 05:40:18 -0800 (PST) Received: from localhost.localdomain (218.170.88.92.rev.sfr.net. [92.88.170.218]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3af6dbdsm138952525e9.19.2025.12.24.05.40.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 05:40:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766583617; x=1767188417; 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=uWjac0+Kz5L48LnLkc+my141z9NWCQHb41+AY0m7S6g=; b=zuUjUtVLVOnkkelmiOGFNMihILMVRXmio0MJC3r4TOWCh6WZU6H+VGiKU5EjHwSf/b Xbt3mC+5ee4rbqCyW1E+hdUfgkPTFRWmDawqUYoFbkIKZ0tpQcbcmrYUwQrQhnFEbqIU TZZCMfMc0qwegkObiCBoYQKWyWU9IOSXSrkaJhg94QHOExUdPrrSyA7ooK6jWQ+lEkHE Xl77HhpkCGBGq7dbZXbZZP1t6Zhtkn41k+11ZHa5cKc1FM1Gj+odWfA2ZSIrRGjslpQN Li+z1HB00KWwasHmhez21nr+E1gA6oan+4BXwrVZLNUWB6NrENd6ODSCycX9Ure5mYBZ PmFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766583617; x=1767188417; 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=uWjac0+Kz5L48LnLkc+my141z9NWCQHb41+AY0m7S6g=; b=leQSBPf7iIFn/cZ70oO2PXXMmStE3aq+QNZcZ+9QXidHIvPgPRSzEACLrIN92fwwNj dI9mm/EHoyqsj4j18waVr3HB2o2ZXYuYwAzSQ1iNULDCbYeYJ/1XS91Or/MPpENn5Aob uANHEQ7XqYbP+f5cIW3mBKyhDpyJDvSZsrB38rJpQhRjZByoQOumhVIHG4gAAPehgR7A uv2QFA/fqjFe27Acy7aDpkCWb/P9HxxTouRcYgJNMvCxnezocSEJr6qKI+wIaF4H2PSG 6/YWNV5W/zn+oIHPFVWVQje5x3iLUpW/qRB0XSb8BLXDCSBEcqWkL9l3oEi01fZUkPxP jkAw== X-Gm-Message-State: AOJu0YwARlg2FwYWdw7tVxI3jOGmqMMcHIosRbeg4uHUjx5Snj/2DWpT 1qoUDsYAKNXYpZ1JhMtB3zZntFdXA+IYftOnLKNDumVXdN9nG0oZ8+8Zlb7C6gaaoFN7zNBaZTB Vkkpl1Js= X-Gm-Gg: AY/fxX6RBrQFCDE5qmYyQlqSUyZsg3kWFGnii1HvyV3bMY4pBIfo6Y6he4oyiyCZNba c50IKR3v+cFb9+mw5H/sLduitDcP3me4KwxsB2858Fhr6JcuYPUqlDtmdIJ+2TBat2TCCpqeuV1 Uux7pzjYVOCBZryQ2iF+kjpHm7iZILNPci9SQstWhrO8H1e0lUPfy9vD7YykhihK7zG3o99gvw2 5ILmnH64kG96pNYik2J/6k1qWG9rUuqVfj3WOWMBy0XnVQuKarQPbUvME6SRt+rYqaPEyjRa9UZ wG1iOL1c8lRb4xuGAW6jFoPMbjSr9kK3LYHaeXE7eqyTabZOrLoa+rmFtHZDUg31uULoWFCoHzR xZjX5oXp3xDYuGJyvA8X+m6uAmB1GtsqdBwRLgID9SNuDCTeiRJ95/93tQ6uifuiUu2iAjmYlON az4NgUym7LfZGspMsHyR9uro24SXO4V4H72QRT3914Z4yREC9x0L+KI1AkylEM X-Google-Smtp-Source: AGHT+IGMAwR0p5ixFj+lSIqKJsyeYsvaGgH76RxhEingeOrtWIx+E5OM0LqiuI6eNEgEE/2sRzsd9w== X-Received: by 2002:a05:600c:828d:b0:477:73cc:82c2 with SMTP id 5b1f17b1804b1-47d1954a14dmr177420215e9.9.1766583616984; Wed, 24 Dec 2025 05:40:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , "Dr. David Alan Gilbert" , Pierrick Bouvier , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/6] monitor/hmp: Remove target_long uses in memory_dump() Date: Wed, 24 Dec 2025 14:39:46 +0100 Message-ID: <20251224133949.85136-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224133949.85136-1-philmd@linaro.org> References: <20251224133949.85136-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 (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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 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: 1766583654267158500 Pass a plain vaddr type to express virtual address. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis --- monitor/hmp-cmds-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index c00f75eab3c..d2bdf44dafd 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -232,7 +232,7 @@ void hmp_memory_dump(Monitor *mon, const QDict *qdict) int count =3D qdict_get_int(qdict, "count"); int format =3D qdict_get_int(qdict, "format"); int size =3D qdict_get_int(qdict, "size"); - target_long addr =3D qdict_get_int(qdict, "addr"); + vaddr addr =3D qdict_get_int(qdict, "addr"); =20 memory_dump(mon, count, format, size, addr, 0); } --=20 2.52.0 From nobody Sat Feb 7 05:53:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766583662258149.83417713480378; Wed, 24 Dec 2025 05:41:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYP6Z-0002VN-9x; Wed, 24 Dec 2025 08:40:45 -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 1vYP6M-0002Sd-Fi for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:32 -0500 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 1vYP6K-0002aI-OP for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:30 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-477bf34f5f5so43010695e9.0 for ; Wed, 24 Dec 2025 05:40:27 -0800 (PST) Received: from localhost.localdomain (218.170.88.92.rev.sfr.net. [92.88.170.218]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be279c5f8sm332071485e9.9.2025.12.24.05.40.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 05:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766583625; x=1767188425; 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=S0MnkHx8beE0xTm3sEpW7oObMdRyrLSD6QHpxN3N5Dg=; b=oAL9MG6IFpiBbues8rSnBOOrimeEt6eHy+5g+PKhhSjXuNXIYNRcpI98V8Xi84h28a ncglN62IU3ZBhGJ0qOEqNiDIJ5QyiyOAj5zwn+2Sio9/YZcw7uyesFtOVhYsGFyk7J31 PWU5XaibftNsWaPM1+3OWi5MewMNrcAgAGmBYOIfINPkt9m8dcpBdZTX48ozblfQ/ibp y4M/kfg1DSZ1WjzhZzj5aVio0wBS4+Nl2S8W+AIvZwI55+KccxAREfP95Bm1DnFlOfoC b2/O4WnulrDkpKwiQ/Q1MyPueym8k2uGaw6JJVaR3u9tjWIrCjJaD5QO1UIY/5Vj73ou ESSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766583625; x=1767188425; 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=S0MnkHx8beE0xTm3sEpW7oObMdRyrLSD6QHpxN3N5Dg=; b=InMlOfOb0lpXyrNl5tQH2ArrrqhZugvYsiSPms7TRqzHrP2IRcaBXAPZToW/JPvGoy RTNHgUIG1w2oH8tGYsZsUVhxKuXFvu2zmzLF8DBxik65gfEKEML2m3k3J2HLh2TYG1Qc vsa61ci5ZVyWmdmIs9NBcs6VL00qj+QzbvCFy6vqy8T91i1ImOpaTcTEnxlIqkxRS6AG rlsaYgDyN8kqdvhrt9jibjKnfpWwZnzmWxMf8qNZ7oTgmo8uieOdtAondq1IwSbMzBU0 oL+8vAu/AAGOnk9s63KmyZDGPCccTGuBecznQunMf0MW+xFwO/WpMjzVButyyDPCYo6f chIg== X-Gm-Message-State: AOJu0YzxzOUnHGMEqL4ItF4K0WhuzNxsDnrXkYFw+BImjMxJSuGjS7jj OfnMc0bIPHtSgTkjYw6d2OmO7VDU5Nrhg0VPbc8w9eYCINpOw9kPvRgeyU6Ed5dhWhW9Q56JPLo batVIb5Y= X-Gm-Gg: AY/fxX7YZSBNeewKD6JKbz4gelP/vaCxqCdvHff0SCkLgtGQHEKIbCd8gGu/P2L/i62 9XjtgE9U/m7PGqmik1QnejfYvAvWsZywvqxUk+8XHYhTflG2480g3Q3wkVwLpDwivc87ADx6snV gCIiTk4FuNGWP7pV8Uko8vnV25wy/EGmaTZLdQWzHpRbtbXaxxWA2UHnPum8WbFlu9jl5H83p1I fVHsrHfrLfeoaey6eEXNTkVUJnYOMgS+qFdYHW0I7OJiLw344JcfC7jA+B54JNhGt2W7QAyzYTB prwJgXLy6MDAOQ5hqbW4s4w5S932SHsgVKjUJnfalRoF8A3DdLvktEb0PmPN9e5UYTCavWVd3ka UUEuqY10+noE1GHqm5/OrNVtclm/Z671AKTSet2pBJkoM9sOX6UlhT2/Iw8B4/lO6ecc0zl/edT BDn4uPRTXH9tJjPFyfkriTwxDZSOR2hcppK4fMV0C5vm1QUguvfsHdrkT4K3QW X-Google-Smtp-Source: AGHT+IEdYT7u7b8cciqbPQYRl7Pvbf8lH3Ft25qDVSG/0cY7KopTILu/l8qctsLtYzTnYXcZvVdxpg== X-Received: by 2002:a05:600c:64c5:b0:479:1348:c614 with SMTP id 5b1f17b1804b1-47d1959e2b3mr173182905e9.26.1766583625208; Wed, 24 Dec 2025 05:40:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , "Dr. David Alan Gilbert" , Pierrick Bouvier , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/6] monitor/hmp: Inline ld[uw, l, q]_p() calls in memory_dump() Date: Wed, 24 Dec 2025 14:39:47 +0100 Message-ID: <20251224133949.85136-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224133949.85136-1-philmd@linaro.org> References: <20251224133949.85136-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 (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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1766583663692158500 Remove the last target-specificity in this file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis --- monitor/hmp-cmds-target.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index d2bdf44dafd..efab133cf2f 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -129,6 +129,7 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, uint64_t v; CPUState *cs =3D mon_get_cpu(mon); const unsigned int addr_width =3D is_physical ? 8 : (target_long_bits(= ) * 2); + const bool big_endian =3D target_big_endian(); =20 if (!cs && (format =3D=3D 'i' || !is_physical)) { monitor_printf(mon, "Can not dump without CPU\n"); @@ -192,13 +193,13 @@ static void memory_dump(Monitor *mon, int count, int = format, int wsize, v =3D ldub_p(buf + i); break; case 2: - v =3D lduw_p(buf + i); + v =3D (big_endian ? lduw_be_p : lduw_le_p)(buf + i); break; case 4: - v =3D (uint32_t)ldl_p(buf + i); + v =3D (uint32_t)(big_endian ? ldl_be_p : ldl_le_p)(buf + i= ); break; case 8: - v =3D ldq_p(buf + i); + v =3D (big_endian ? ldq_be_p : ldq_le_p)(buf + i); break; } monitor_printf(mon, " "); --=20 2.52.0 From nobody Sat Feb 7 05:53:47 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=1766583698; cv=none; d=zohomail.com; s=zohoarc; b=mvmAIHCc1wezvd1cEaHv42XoNZy3jR51nwoZ57PkCHxJzaLl8GP4/SGbRWS1oND02+PE+ukVx59HQdSrSaxlcd7dZegxfs5ybnWYlQeEkgMq59B20cymRQNKlLrxgczr8dNWkH8c3sSWaTiqlZttMl0rHETOK7D+iavtHf/X0t4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766583698; 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=M6zHLozB015qWCpKDt4iTQiK5JyCqCHtIyYzoHPJGD0=; b=Kj9cs9d00tOr4GLbD5CoqhS41ITlaRR7YsP2XXGJFUVxuYgFW+/nEKtQMny4APc4iHe1QvBxwYqocfG99GAVoRba+2lmwn1uPqzEZXOmD1W7QgGObXWgcXvyIcILSLHRbNaf9UtNJ80myrYaeClQ2QY8IXWKpEO1zWIDUC9cEbI= 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 17665836989311005.3885483356119; Wed, 24 Dec 2025 05:41:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYP6v-0002ZN-Pj; Wed, 24 Dec 2025 08:41:07 -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 1vYP6V-0002VG-Ag for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:39 -0500 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 1vYP6R-0002aj-U3 for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:38 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-47d3ffa6720so3064335e9.0 for ; Wed, 24 Dec 2025 05:40:35 -0800 (PST) Received: from localhost.localdomain (218.170.88.92.rev.sfr.net. [92.88.170.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eaa08d9sm35065914f8f.30.2025.12.24.05.40.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 05:40:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766583634; x=1767188434; 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=M6zHLozB015qWCpKDt4iTQiK5JyCqCHtIyYzoHPJGD0=; b=LYbrWbJcwt3hkU1T6WN2U80p3CzQGGL+8cMLcPTL5G+TM2axW/a7m/6gLnc4LJHiFW u21QYZhOAf8+aKMWEa1SgMAS7GmO8l1yTnqPitiRQ+ePxAZDNQKkgehmc43fiqnNm7MO b0kYByekjFvClX53TFaglYEhb7KasKKPMULCANBNpO0jstAPBbgKPRwFCswUJIwS105f jr9cvWQexKedS39gL7oZMLLXv5/qLIHGU9MH/IpmRa/bvabfhzh507Pe4NJqCZbeB+GW P/9qnNzxv/qjxfctysTAviHO+epbEhSUYber6xbO1mk2TotJMAk+Y9N7owswjCrhsyfx 2ixA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766583634; x=1767188434; 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=M6zHLozB015qWCpKDt4iTQiK5JyCqCHtIyYzoHPJGD0=; b=ghZ6KgZpeR0bna/D7gA6efWpKHRDNizpu22tHCHf5H9BaqPuKVVNYYfMMAvZdfJuHP +lS3PE2EWsxJzxPzG4qw+7/KSxK1del32fjqLjZ+D2X7FgcGtkw8BxW0LJhcYoxwBJcg TC21yRrvaZw2DffC71Qia3qUC6yYCE4NPyH/rxSXvjFkPHPtITuPFl1+9RrqxaxCBzop EoaQ/x7tB+z3JfVQgULxA6euhKlNDX13hAfkx1Y6jiXBmBj2qWYgPn5znX0pZ4AAagc1 UaeEH4uLTGNCLa55xwnDh6DxoES7J1kDw9GtDhehfLPh3PFbId2MaNGfah9E+qc+tHis EQgQ== X-Gm-Message-State: AOJu0Yzp5fH/zuBy3k0q01ihQyU3uD/9a/gracrWlji5Eyb9Z5INQ4Ng Y3mm5J1pakGMBQcWY33diYHuxdh5Xyt625I66PJUvmN71bQwO6kjPHif7bwXn5ckEbXY3UDlFw9 Yl97jgm8= X-Gm-Gg: AY/fxX77nHhV3cU64gekSFERwSuCpwZxwgPMlylhk89HDORarpX2gw21TYDufXxdy/2 RijBrnMJcaLs55Oe6NiUdtp9+TuWppRdlW6+NHgjaZF8saXz7gYFLYzKlU01QvuclU5SEvUdzwx W1L+TJE72RQDafQEoJClHuUhH4WUrQCwC4ESu0M6rrF+9m4qs27a2W3OT05aBkRPpmNNXYcqzc4 reHLQ5tvcIhXhArlOMs1t39rbs1KT17E1pMy0QQQnUsaaHWXm0Mc/pewPDxaOfrCZM+Mf3cqbAH IXWpDJw0rKMWNFk1MPOgTpwv7MuQX7aCcR0DhxoQ9J4qe5qXFA4IsdL0uXDAZcVltsbKqCS72oO F1i7DGwyuHlpmr7+615mNMi1KfuQSxwaptXUk9kem0/SQNBNzYtM8zXhwjRqVnYKKEIUKl2k7rI Us2rDjsb9shnXlpVLFbbW1fisSb10FMU1HyKXJ3m400dVxr/zIaqPzuQGkw8wL X-Google-Smtp-Source: AGHT+IEm0qP8Fu+eaQwb3AQconnfsRzmoVoftrEIA8AU7B24/fMHfFXTG/DevCACOavSi91FPVqCDg== X-Received: by 2002:a05:600c:1d1d:b0:477:abea:9023 with SMTP id 5b1f17b1804b1-47d19577fb8mr176782435e9.9.1766583633617; Wed, 24 Dec 2025 05:40:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , "Dr. David Alan Gilbert" , Pierrick Bouvier , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/6] monitor/hmp: Fix coding style in hmp-cmds-target.c Date: Wed, 24 Dec 2025 14:39:48 +0100 Message-ID: <20251224133949.85136-6-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224133949.85136-1-philmd@linaro.org> References: <20251224133949.85136-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 (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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: 1766583699995158500 Previous to moving code contained in hmp-cmds-target.c, fix the coding style. Otherwise the checkpatch.pl script would report: ERROR: space required before the open parenthesis '(' #134: FILE: monitor/hmp-cmds-target.c:152: + switch(format) { ERROR: braces {} are necessary for all arms of this statement #154: FILE: monitor/hmp-cmds-target.c:172: + if (l > line_size) [...] ERROR: space required before the open parenthesis '(' #172: FILE: monitor/hmp-cmds-target.c:190: + switch(wsize) { ERROR: space required before the open parenthesis '(' #188: FILE: monitor/hmp-cmds-target.c:206: + switch(format) { ERROR: Don't use '#' flag of printf format ('%#') in format strings, use = '0x' prefix instead #190: FILE: monitor/hmp-cmds-target.c:208: + monitor_printf(mon, "%#*" PRIo64, max_digits, v); WARNING: line over 80 characters #240: FILE: monitor/hmp-cmds-target.c:258: + error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRI= x, addr); WARNING: line over 80 characters #245: FILE: monitor/hmp-cmds-target.c:263: + error_setg(errp, "Memory at address 0x%" HWADDR_PRIx " is not RA= M", addr); ERROR: Don't use '#' flag of printf format ('%#') in format strings, use = '0x' prefix instead #297: FILE: monitor/hmp-cmds-target.c:315: + monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n", WARNING: line over 80 characters #329: FILE: monitor/hmp-cmds-target.c:347: + ret =3D ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (page= size - 1)); Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Manos Pitsidianakis --- monitor/hmp-cmds-target.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index efab133cf2f..48c21559156 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -149,7 +149,7 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, } max_digits =3D 0; =20 - switch(format) { + switch (format) { case 'o': max_digits =3D DIV_ROUND_UP(wsize * 8, 3); break; @@ -169,8 +169,9 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, while (len > 0) { monitor_printf(mon, "%0*" PRIx64 ":", addr_width, addr); l =3D len; - if (l > line_size) + if (l > line_size) { l =3D line_size; + } if (is_physical) { AddressSpace *as =3D cs ? cs->as : &address_space_memory; MemTxResult r =3D address_space_read(as, addr, @@ -187,7 +188,7 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, } i =3D 0; while (i < l) { - switch(wsize) { + switch (wsize) { default: case 1: v =3D ldub_p(buf + i); @@ -203,9 +204,9 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, break; } monitor_printf(mon, " "); - switch(format) { + switch (format) { case 'o': - monitor_printf(mon, "%#*" PRIo64, max_digits, v); + monitor_printf(mon, "0%*" PRIo64, max_digits, v); break; case 'x': monitor_printf(mon, "0x%0*" PRIx64, max_digits, v); @@ -255,12 +256,14 @@ void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint6= 4_t size, Error **errp) addr, size); =20 if (!mrs.mr) { - error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRIx,= addr); + error_setg(errp, + "No memory is mapped at address 0x%" HWADDR_PRIx, addr); return NULL; } =20 if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) { - error_setg(errp, "Memory at address 0x%" HWADDR_PRIx " is not RAM"= , addr); + error_setg(errp, + "Memory at address 0x%" HWADDR_PRIx " is not RAM", addr= ); memory_region_unref(mrs.mr); return NULL; } @@ -312,7 +315,7 @@ void hmp_gva2gpa(Monitor *mon, const QDict *qdict) if (gpa =3D=3D -1) { monitor_printf(mon, "Unmapped\n"); } else { - monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n", + monitor_printf(mon, "gpa: 0x%" HWADDR_PRIx "\n", gpa + (addr & ~TARGET_PAGE_MASK)); } } @@ -344,7 +347,8 @@ static uint64_t vtop(void *ptr, Error **errp) error_setg(errp, "Page not present"); goto out; } - ret =3D ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (pagesi= ze - 1)); + ret =3D (pinfo & 0x007fffffffffffffull) * pagesize; + ret |=3D addr & (pagesize - 1); =20 out: close(fd); --=20 2.52.0 From nobody Sat Feb 7 05:53:47 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=1766583689; cv=none; d=zohomail.com; s=zohoarc; b=O8/Axv5i4rSqfaT/Vn4T+DwEGMUAvD6iB3j3x09DemEG0uadVLjaA8MeBdEH9Nv1hL0lb1xGeI1u6Y8tAtNnfIqaahRVu7cp6POehVKTXo7O43j3WPjqduQKtr/cZLHixMSwgAE3zqtYqxHBZxtu3wEVmS/lAn1Bv7Ve3R1YtEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766583689; 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=ddVLFkEtKuXhVUEos9VLXdCSTbwYv0ukc/ibv6naXCs=; b=UDihnpB87UyKdvhlYVLGSUyrRRNcaomvWeSTFmGetlmgfvPFGlG2AEY1VWv98H70IIbVKsH4alh3yoOC2NGHG2+xLnGFNorKKVeGUVpG4QwawGM0Wn2Iv7/FDhO4wVHRi9FulqFlHad0TknjC9JdlHIE/1nTHx9LsqPwyk8A2sg= 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 1766583689461849.8625387726827; Wed, 24 Dec 2025 05:41:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYP7F-0003Ei-FA; Wed, 24 Dec 2025 08:41:25 -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 1vYP6m-0002ZW-CR for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:41:00 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYP6e-0002bI-Ge for qemu-devel@nongnu.org; Wed, 24 Dec 2025 08:40:52 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-47774d3536dso46671365e9.0 for ; Wed, 24 Dec 2025 05:40:43 -0800 (PST) Received: from localhost.localdomain (218.170.88.92.rev.sfr.net. [92.88.170.218]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3a7b687sm145065705e9.6.2025.12.24.05.40.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 05:40:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766583642; x=1767188442; 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=ddVLFkEtKuXhVUEos9VLXdCSTbwYv0ukc/ibv6naXCs=; b=gHV37H9/PhWv+2vHfVe4nunwr4q3Oqr8NjRX/7BbNo/kVY+thC9PLpGKd2C4WGOUn+ XiiViBpcOLlhiE0DczytatGmUqAb3sglDt4YVFznGlKvP6YxyADlNtFMHBWaxzM8ylXx SsC2h87HCmr5faXV+vRzUDdLjCFDxKtNxmEYZzdjpfU9a0euDCFyWl7K1yUG5z8+PkmJ M0tFVeU0AhYPoelwxpDIl4x/U/qz/C1/FZ8F/nlLDP8h87ZVRPvgsyQjvSsCuw5urVnq ZFVMgOPfvN5r1XFx8UoL9G2B/0DBTf+SHP//AyzBcQZKOc4UOYikrmrmntCaOO0SLL1e tb+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766583642; x=1767188442; 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=ddVLFkEtKuXhVUEos9VLXdCSTbwYv0ukc/ibv6naXCs=; b=l6mNb179NvHw+YorHWdzEmk0M2yIHLaYWzVR9/rYuNDJz0GsYuIA7PHFuROOGE758J u6MFKD6MZriJ6krRjsKFAR1W10ioVOH6m/JdplsUMfFt9jaA2qGSvnP+DcPdvXx6RrHF xk4PX2NCcHAR24Kxdssrd8bYZO8hsmlrTs6CTW2FLnIu3KSxm7mrzCnetFslr+hp2pJz u7L7xx+MIFzMXyUv8UCxtnmKXncOuMb+LFb/PfcDsYSFr9QyZ39Cy+0+5tq6fLCX0+rw +kVhbl+p5C48ee70x/E5+Z68aGEtJ9kucgrwENIU6YD39LNYm+W8xilcEVt1IBEA6xR/ L3Hw== X-Gm-Message-State: AOJu0YzEDMIhX85cgycBVaOPFpXc8oni4u7LY5L7aOMhIDUPC/DZSXQ0 r8bD83BIV2jjH8Uq4rYjwB5+OqG5BXe+vGpCVn0+zs7z/aF8UJZqqE/kvdaH5Ac7yuhAmX9i4Lp 9Zs0GAnQ= X-Gm-Gg: AY/fxX4O5P0CJ76J39jqAymq6DdLErCZB/fmEIxXpCxx4zOMhDfjGREOWsphU92hdC5 3+17KTkNimt5ztwuXH4QDajAbU7I1fCCdgV86USSUZ0t8Q3FPn8cjvobUagOf0cwSfvasTdelUW 5kAZ2dy6e/moGGgIclmBi7pPdU3Hk4LV3sWThdp8MoIkl9IX3eozWW1DoTj4DqQXMaKsGB07OqW L009edidJnVOs8unwbLgHimzraol+dnYyKC+ACumQPcJETqXXXOlsOiXsHgB2wJ0rHYMO26nvYv 91vURqxF3JgszHnIS+IBQdGj8IP4toFv+k4cxcEDhCgKJPBxmtzaXaZw2YA3ovfg4zsHZh18X6h 8VDesirw6Fch0vBrYqFJtS5txr+4dbXtiuUFL+/81JEFdpq0j+LgyeERWeYC4WX1EdSZ7F1oSwV VqOg37ChGbbR54NcRO0O2miOhuAFFb0NoeBoRX/phj9tbIuuEhzGF3tdX3cjUr X-Google-Smtp-Source: AGHT+IEk996QAQvMRVa9vVByTMWG5m1ryWROIkXz5guGm96IBy+ccXChhQeNPs3XNdvSdM+qefMS5g== X-Received: by 2002:a05:600c:45c4:b0:47d:403a:277 with SMTP id 5b1f17b1804b1-47d403a0498mr12912595e9.4.1766583641490; Wed, 24 Dec 2025 05:40:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , "Dr. David Alan Gilbert" , Pierrick Bouvier , Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 6/6] monitor/hmp: Merge hmp-cmds-target.c within hmp-cmds.c Date: Wed, 24 Dec 2025 14:39:49 +0100 Message-ID: <20251224133949.85136-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224133949.85136-1-philmd@linaro.org> References: <20251224133949.85136-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 (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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: 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: 1766583692007158500 hmp-cmds-target.c is no more target specific, move its code in hmp-cmds.c, which is built once for all system binaries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis --- monitor/hmp-cmds-target.c | 383 -------------------------------------- monitor/hmp-cmds.c | 354 +++++++++++++++++++++++++++++++++++ monitor/meson.build | 2 +- 3 files changed, 355 insertions(+), 384 deletions(-) delete mode 100644 monitor/hmp-cmds-target.c diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c deleted file mode 100644 index 48c21559156..00000000000 --- a/monitor/hmp-cmds-target.c +++ /dev/null @@ -1,383 +0,0 @@ -/* - * Miscellaneous target-dependent HMP commands - * - * Copyright (c) 2003-2004 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "disas/disas.h" -#include "system/address-spaces.h" -#include "system/memory.h" -#include "monitor/hmp-target.h" -#include "monitor/monitor-internal.h" -#include "qapi/error.h" -#include "qobject/qdict.h" -#include "system/hw_accel.h" -#include "exec/target_page.h" - -/* Set the current CPU defined by the user. Callers must hold BQL. */ -int monitor_set_cpu(Monitor *mon, int cpu_index) -{ - CPUState *cpu; - - cpu =3D qemu_get_cpu(cpu_index); - if (cpu =3D=3D NULL) { - return -1; - } - g_free(mon->mon_cpu_path); - mon->mon_cpu_path =3D object_get_canonical_path(OBJECT(cpu)); - return 0; -} - -/* Callers must hold BQL. */ -static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize) -{ - CPUState *cpu =3D NULL; - - if (mon->mon_cpu_path) { - cpu =3D (CPUState *) object_resolve_path_type(mon->mon_cpu_path, - TYPE_CPU, NULL); - if (!cpu) { - g_free(mon->mon_cpu_path); - mon->mon_cpu_path =3D NULL; - } - } - if (!mon->mon_cpu_path) { - if (!first_cpu) { - return NULL; - } - monitor_set_cpu(mon, first_cpu->cpu_index); - cpu =3D first_cpu; - } - assert(cpu !=3D NULL); - if (synchronize) { - cpu_synchronize_state(cpu); - } - return cpu; -} - -CPUState *mon_get_cpu(Monitor *mon) -{ - return mon_get_cpu_sync(mon, true); -} - -CPUArchState *mon_get_cpu_env(Monitor *mon) -{ - CPUState *cs =3D mon_get_cpu(mon); - - return cs ? cpu_env(cs) : NULL; -} - -int monitor_get_cpu_index(Monitor *mon) -{ - CPUState *cs =3D mon_get_cpu_sync(mon, false); - - return cs ? cs->cpu_index : UNASSIGNED_CPU_INDEX; -} - -void hmp_info_registers(Monitor *mon, const QDict *qdict) -{ - bool all_cpus =3D qdict_get_try_bool(qdict, "cpustate_all", false); - int vcpu =3D qdict_get_try_int(qdict, "vcpu", -1); - CPUState *cs; - - if (all_cpus) { - CPU_FOREACH(cs) { - monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index); - cpu_dump_state(cs, NULL, CPU_DUMP_FPU | CPU_DUMP_VPU); - } - } else { - cs =3D vcpu >=3D 0 ? qemu_get_cpu(vcpu) : mon_get_cpu(mon); - - if (!cs) { - if (vcpu >=3D 0) { - monitor_printf(mon, "CPU#%d not available\n", vcpu); - } else { - monitor_printf(mon, "No CPU available\n"); - } - return; - } - - monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index); - cpu_dump_state(cs, NULL, CPU_DUMP_FPU | CPU_DUMP_VPU); - } -} - -static void memory_dump(Monitor *mon, int count, int format, int wsize, - uint64_t addr, int is_physical) -{ - int l, line_size, i, max_digits, len; - uint8_t buf[16]; - uint64_t v; - CPUState *cs =3D mon_get_cpu(mon); - const unsigned int addr_width =3D is_physical ? 8 : (target_long_bits(= ) * 2); - const bool big_endian =3D target_big_endian(); - - if (!cs && (format =3D=3D 'i' || !is_physical)) { - monitor_printf(mon, "Can not dump without CPU\n"); - return; - } - - if (format =3D=3D 'i') { - monitor_disas(mon, cs, addr, count, is_physical); - return; - } - - len =3D wsize * count; - if (wsize =3D=3D 1) { - line_size =3D 8; - } else { - line_size =3D 16; - } - max_digits =3D 0; - - switch (format) { - case 'o': - max_digits =3D DIV_ROUND_UP(wsize * 8, 3); - break; - default: - case 'x': - max_digits =3D (wsize * 8) / 4; - break; - case 'u': - case 'd': - max_digits =3D DIV_ROUND_UP(wsize * 8 * 10, 33); - break; - case 'c': - wsize =3D 1; - break; - } - - while (len > 0) { - monitor_printf(mon, "%0*" PRIx64 ":", addr_width, addr); - l =3D len; - if (l > line_size) { - l =3D line_size; - } - if (is_physical) { - AddressSpace *as =3D cs ? cs->as : &address_space_memory; - MemTxResult r =3D address_space_read(as, addr, - MEMTXATTRS_UNSPECIFIED, buf= , l); - if (r !=3D MEMTX_OK) { - monitor_printf(mon, " Cannot access memory\n"); - break; - } - } else { - if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) { - monitor_printf(mon, " Cannot access memory\n"); - break; - } - } - i =3D 0; - while (i < l) { - switch (wsize) { - default: - case 1: - v =3D ldub_p(buf + i); - break; - case 2: - v =3D (big_endian ? lduw_be_p : lduw_le_p)(buf + i); - break; - case 4: - v =3D (uint32_t)(big_endian ? ldl_be_p : ldl_le_p)(buf + i= ); - break; - case 8: - v =3D (big_endian ? ldq_be_p : ldq_le_p)(buf + i); - break; - } - monitor_printf(mon, " "); - switch (format) { - case 'o': - monitor_printf(mon, "0%*" PRIo64, max_digits, v); - break; - case 'x': - monitor_printf(mon, "0x%0*" PRIx64, max_digits, v); - break; - case 'u': - monitor_printf(mon, "%*" PRIu64, max_digits, v); - break; - case 'd': - monitor_printf(mon, "%*" PRId64, max_digits, v); - break; - case 'c': - monitor_printc(mon, v); - break; - } - i +=3D wsize; - } - monitor_printf(mon, "\n"); - addr +=3D l; - len -=3D l; - } -} - -void hmp_memory_dump(Monitor *mon, const QDict *qdict) -{ - int count =3D qdict_get_int(qdict, "count"); - int format =3D qdict_get_int(qdict, "format"); - int size =3D qdict_get_int(qdict, "size"); - vaddr addr =3D qdict_get_int(qdict, "addr"); - - memory_dump(mon, count, format, size, addr, 0); -} - -void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict) -{ - int count =3D qdict_get_int(qdict, "count"); - int format =3D qdict_get_int(qdict, "format"); - int size =3D qdict_get_int(qdict, "size"); - hwaddr addr =3D qdict_get_int(qdict, "addr"); - - memory_dump(mon, count, format, size, addr, 1); -} - -void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint64_t size, Error **err= p) -{ - Int128 gpa_region_size; - MemoryRegionSection mrs =3D memory_region_find(get_system_memory(), - addr, size); - - if (!mrs.mr) { - error_setg(errp, - "No memory is mapped at address 0x%" HWADDR_PRIx, addr); - return NULL; - } - - if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) { - error_setg(errp, - "Memory at address 0x%" HWADDR_PRIx " is not RAM", addr= ); - memory_region_unref(mrs.mr); - return NULL; - } - - gpa_region_size =3D int128_make64(size); - if (int128_lt(mrs.size, gpa_region_size)) { - error_setg(errp, "Size of memory region at 0x%" HWADDR_PRIx - " exceeded.", addr); - memory_region_unref(mrs.mr); - return NULL; - } - - *p_mr =3D mrs.mr; - return qemu_map_ram_ptr(mrs.mr->ram_block, mrs.offset_within_region); -} - -void hmp_gpa2hva(Monitor *mon, const QDict *qdict) -{ - hwaddr addr =3D qdict_get_int(qdict, "addr"); - Error *local_err =3D NULL; - MemoryRegion *mr =3D NULL; - void *ptr; - - ptr =3D gpa2hva(&mr, addr, 1, &local_err); - if (local_err) { - error_report_err(local_err); - return; - } - - monitor_printf(mon, "Host virtual address for 0x%" HWADDR_PRIx - " (%s) is %p\n", - addr, mr->name, ptr); - - memory_region_unref(mr); -} - -void hmp_gva2gpa(Monitor *mon, const QDict *qdict) -{ - vaddr addr =3D qdict_get_int(qdict, "addr"); - CPUState *cs =3D mon_get_cpu(mon); - hwaddr gpa; - - if (!cs) { - monitor_printf(mon, "No cpu\n"); - return; - } - - gpa =3D cpu_get_phys_page_debug(cs, addr & TARGET_PAGE_MASK); - if (gpa =3D=3D -1) { - monitor_printf(mon, "Unmapped\n"); - } else { - monitor_printf(mon, "gpa: 0x%" HWADDR_PRIx "\n", - gpa + (addr & ~TARGET_PAGE_MASK)); - } -} - -#ifdef CONFIG_LINUX -static uint64_t vtop(void *ptr, Error **errp) -{ - uint64_t pinfo; - uint64_t ret =3D -1; - uintptr_t addr =3D (uintptr_t) ptr; - uintptr_t pagesize =3D qemu_real_host_page_size(); - off_t offset =3D addr / pagesize * sizeof(pinfo); - int fd; - - fd =3D open("/proc/self/pagemap", O_RDONLY); - if (fd =3D=3D -1) { - error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap"); - return -1; - } - - /* Force copy-on-write if necessary. */ - qatomic_add((uint8_t *)ptr, 0); - - if (pread(fd, &pinfo, sizeof(pinfo), offset) !=3D sizeof(pinfo)) { - error_setg_errno(errp, errno, "Cannot read pagemap"); - goto out; - } - if ((pinfo & (1ull << 63)) =3D=3D 0) { - error_setg(errp, "Page not present"); - goto out; - } - ret =3D (pinfo & 0x007fffffffffffffull) * pagesize; - ret |=3D addr & (pagesize - 1); - -out: - close(fd); - return ret; -} - -void hmp_gpa2hpa(Monitor *mon, const QDict *qdict) -{ - hwaddr addr =3D qdict_get_int(qdict, "addr"); - Error *local_err =3D NULL; - MemoryRegion *mr =3D NULL; - void *ptr; - uint64_t physaddr; - - ptr =3D gpa2hva(&mr, addr, 1, &local_err); - if (local_err) { - error_report_err(local_err); - return; - } - - physaddr =3D vtop(ptr, &local_err); - if (local_err) { - error_report_err(local_err); - } else { - monitor_printf(mon, "Host physical address for 0x%" HWADDR_PRIx - " (%s) is 0x%" PRIx64 "\n", - addr, mr->name, (uint64_t) physaddr); - } - - memory_region_unref(mr); -} -#endif diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 33a88ce205a..8ca40b447ae 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -17,9 +17,11 @@ #include "system/address-spaces.h" #include "system/ioport.h" #include "exec/gdbstub.h" +#include "exec/target_page.h" #include "gdbstub/enums.h" #include "monitor/hmp.h" #include "qemu/help_option.h" +#include "monitor/hmp-target.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" @@ -28,7 +30,10 @@ #include "qobject/qdict.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "system/hw_accel.h" +#include "system/memory.h" #include "system/system.h" +#include "disas/disas.h" =20 bool hmp_handle_error(Monitor *mon, Error *err) { @@ -435,3 +440,352 @@ void hmp_dumpdtb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "DTB dumped to '%s'\n", filename); } #endif + +/* Set the current CPU defined by the user. Callers must hold BQL. */ +int monitor_set_cpu(Monitor *mon, int cpu_index) +{ + CPUState *cpu; + + cpu =3D qemu_get_cpu(cpu_index); + if (cpu =3D=3D NULL) { + return -1; + } + g_free(mon->mon_cpu_path); + mon->mon_cpu_path =3D object_get_canonical_path(OBJECT(cpu)); + return 0; +} + +/* Callers must hold BQL. */ +static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize) +{ + CPUState *cpu =3D NULL; + + if (mon->mon_cpu_path) { + cpu =3D (CPUState *) object_resolve_path_type(mon->mon_cpu_path, + TYPE_CPU, NULL); + if (!cpu) { + g_free(mon->mon_cpu_path); + mon->mon_cpu_path =3D NULL; + } + } + if (!mon->mon_cpu_path) { + if (!first_cpu) { + return NULL; + } + monitor_set_cpu(mon, first_cpu->cpu_index); + cpu =3D first_cpu; + } + assert(cpu !=3D NULL); + if (synchronize) { + cpu_synchronize_state(cpu); + } + return cpu; +} + +CPUState *mon_get_cpu(Monitor *mon) +{ + return mon_get_cpu_sync(mon, true); +} + +CPUArchState *mon_get_cpu_env(Monitor *mon) +{ + CPUState *cs =3D mon_get_cpu(mon); + + return cs ? cpu_env(cs) : NULL; +} + +int monitor_get_cpu_index(Monitor *mon) +{ + CPUState *cs =3D mon_get_cpu_sync(mon, false); + + return cs ? cs->cpu_index : UNASSIGNED_CPU_INDEX; +} + +void hmp_info_registers(Monitor *mon, const QDict *qdict) +{ + bool all_cpus =3D qdict_get_try_bool(qdict, "cpustate_all", false); + int vcpu =3D qdict_get_try_int(qdict, "vcpu", -1); + CPUState *cs; + + if (all_cpus) { + CPU_FOREACH(cs) { + monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index); + cpu_dump_state(cs, NULL, CPU_DUMP_FPU | CPU_DUMP_VPU); + } + } else { + cs =3D vcpu >=3D 0 ? qemu_get_cpu(vcpu) : mon_get_cpu(mon); + + if (!cs) { + if (vcpu >=3D 0) { + monitor_printf(mon, "CPU#%d not available\n", vcpu); + } else { + monitor_printf(mon, "No CPU available\n"); + } + return; + } + + monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index); + cpu_dump_state(cs, NULL, CPU_DUMP_FPU | CPU_DUMP_VPU); + } +} + +static void memory_dump(Monitor *mon, int count, int format, int wsize, + uint64_t addr, int is_physical) +{ + int l, line_size, i, max_digits, len; + uint8_t buf[16]; + uint64_t v; + CPUState *cs =3D mon_get_cpu(mon); + const unsigned int addr_width =3D is_physical ? 8 : (target_long_bits(= ) * 2); + const bool big_endian =3D target_big_endian(); + + if (!cs && (format =3D=3D 'i' || !is_physical)) { + monitor_printf(mon, "Can not dump without CPU\n"); + return; + } + + if (format =3D=3D 'i') { + monitor_disas(mon, cs, addr, count, is_physical); + return; + } + + len =3D wsize * count; + if (wsize =3D=3D 1) { + line_size =3D 8; + } else { + line_size =3D 16; + } + max_digits =3D 0; + + switch (format) { + case 'o': + max_digits =3D DIV_ROUND_UP(wsize * 8, 3); + break; + default: + case 'x': + max_digits =3D (wsize * 8) / 4; + break; + case 'u': + case 'd': + max_digits =3D DIV_ROUND_UP(wsize * 8 * 10, 33); + break; + case 'c': + wsize =3D 1; + break; + } + + while (len > 0) { + monitor_printf(mon, "%0*" PRIx64 ":", addr_width, addr); + l =3D len; + if (l > line_size) { + l =3D line_size; + } + if (is_physical) { + AddressSpace *as =3D cs ? cs->as : &address_space_memory; + MemTxResult r =3D address_space_read(as, addr, + MEMTXATTRS_UNSPECIFIED, buf= , l); + if (r !=3D MEMTX_OK) { + monitor_printf(mon, " Cannot access memory\n"); + break; + } + } else { + if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) { + monitor_printf(mon, " Cannot access memory\n"); + break; + } + } + i =3D 0; + while (i < l) { + switch (wsize) { + default: + case 1: + v =3D ldub_p(buf + i); + break; + case 2: + v =3D (big_endian ? lduw_be_p : lduw_le_p)(buf + i); + break; + case 4: + v =3D (uint32_t)(big_endian ? ldl_be_p : ldl_le_p)(buf + i= ); + break; + case 8: + v =3D (big_endian ? ldq_be_p : ldq_le_p)(buf + i); + break; + } + monitor_printf(mon, " "); + switch (format) { + case 'o': + monitor_printf(mon, "0%*" PRIo64, max_digits, v); + break; + case 'x': + monitor_printf(mon, "0x%0*" PRIx64, max_digits, v); + break; + case 'u': + monitor_printf(mon, "%*" PRIu64, max_digits, v); + break; + case 'd': + monitor_printf(mon, "%*" PRId64, max_digits, v); + break; + case 'c': + monitor_printc(mon, v); + break; + } + i +=3D wsize; + } + monitor_printf(mon, "\n"); + addr +=3D l; + len -=3D l; + } +} + +void hmp_memory_dump(Monitor *mon, const QDict *qdict) +{ + int count =3D qdict_get_int(qdict, "count"); + int format =3D qdict_get_int(qdict, "format"); + int size =3D qdict_get_int(qdict, "size"); + vaddr addr =3D qdict_get_int(qdict, "addr"); + + memory_dump(mon, count, format, size, addr, 0); +} + +void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict) +{ + int count =3D qdict_get_int(qdict, "count"); + int format =3D qdict_get_int(qdict, "format"); + int size =3D qdict_get_int(qdict, "size"); + hwaddr addr =3D qdict_get_int(qdict, "addr"); + + memory_dump(mon, count, format, size, addr, 1); +} + +void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint64_t size, Error **err= p) +{ + Int128 gpa_region_size; + MemoryRegionSection mrs =3D memory_region_find(get_system_memory(), + addr, size); + + if (!mrs.mr) { + error_setg(errp, + "No memory is mapped at address 0x%" HWADDR_PRIx, addr); + return NULL; + } + + if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) { + error_setg(errp, + "Memory at address 0x%" HWADDR_PRIx " is not RAM", addr= ); + memory_region_unref(mrs.mr); + return NULL; + } + + gpa_region_size =3D int128_make64(size); + if (int128_lt(mrs.size, gpa_region_size)) { + error_setg(errp, "Size of memory region at 0x%" HWADDR_PRIx + " exceeded.", addr); + memory_region_unref(mrs.mr); + return NULL; + } + + *p_mr =3D mrs.mr; + return qemu_map_ram_ptr(mrs.mr->ram_block, mrs.offset_within_region); +} + +void hmp_gpa2hva(Monitor *mon, const QDict *qdict) +{ + hwaddr addr =3D qdict_get_int(qdict, "addr"); + Error *local_err =3D NULL; + MemoryRegion *mr =3D NULL; + void *ptr; + + ptr =3D gpa2hva(&mr, addr, 1, &local_err); + if (local_err) { + error_report_err(local_err); + return; + } + + monitor_printf(mon, "Host virtual address for 0x%" HWADDR_PRIx + " (%s) is %p\n", + addr, mr->name, ptr); + + memory_region_unref(mr); +} + +void hmp_gva2gpa(Monitor *mon, const QDict *qdict) +{ + vaddr addr =3D qdict_get_int(qdict, "addr"); + CPUState *cs =3D mon_get_cpu(mon); + hwaddr gpa; + + if (!cs) { + monitor_printf(mon, "No cpu\n"); + return; + } + + gpa =3D cpu_get_phys_page_debug(cs, addr & TARGET_PAGE_MASK); + if (gpa =3D=3D -1) { + monitor_printf(mon, "Unmapped\n"); + } else { + monitor_printf(mon, "gpa: 0x%" HWADDR_PRIx "\n", + gpa + (addr & ~TARGET_PAGE_MASK)); + } +} + +#ifdef CONFIG_LINUX +static uint64_t vtop(void *ptr, Error **errp) +{ + uint64_t pinfo; + uint64_t ret =3D -1; + uintptr_t addr =3D (uintptr_t) ptr; + uintptr_t pagesize =3D qemu_real_host_page_size(); + off_t offset =3D addr / pagesize * sizeof(pinfo); + int fd; + + fd =3D open("/proc/self/pagemap", O_RDONLY); + if (fd =3D=3D -1) { + error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap"); + return -1; + } + + /* Force copy-on-write if necessary. */ + qatomic_add((uint8_t *)ptr, 0); + + if (pread(fd, &pinfo, sizeof(pinfo), offset) !=3D sizeof(pinfo)) { + error_setg_errno(errp, errno, "Cannot read pagemap"); + goto out; + } + if ((pinfo & (1ull << 63)) =3D=3D 0) { + error_setg(errp, "Page not present"); + goto out; + } + ret =3D (pinfo & 0x007fffffffffffffull) * pagesize; + ret |=3D addr & (pagesize - 1); + +out: + close(fd); + return ret; +} + +void hmp_gpa2hpa(Monitor *mon, const QDict *qdict) +{ + hwaddr addr =3D qdict_get_int(qdict, "addr"); + Error *local_err =3D NULL; + MemoryRegion *mr =3D NULL; + void *ptr; + uint64_t physaddr; + + ptr =3D gpa2hva(&mr, addr, 1, &local_err); + if (local_err) { + error_report_err(local_err); + return; + } + + physaddr =3D vtop(ptr, &local_err); + if (local_err) { + error_report_err(local_err); + } else { + monitor_printf(mon, "Host physical address for 0x%" HWADDR_PRIx + " (%s) is 0x%" PRIx64 "\n", + addr, mr->name, (uint64_t) physaddr); + } + + memory_region_unref(mr); +} +#endif diff --git a/monitor/meson.build b/monitor/meson.build index a71523a1ce8..763fcaba6c5 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -9,4 +9,4 @@ system_ss.add(files( system_ss.add([spice_headers, files('qmp-cmds.c')]) =20 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice]) + if_true: [files('hmp-target.c'), spice]) --=20 2.52.0