From nobody Thu Apr 30 00:40:26 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=1776126661; cv=none; d=zohomail.com; s=zohoarc; b=RIonwclFJRjE9VMDxO75PDElV5R8Bsl4BF2vhyagTpWoF5mHnWDmT+X3JI4JbRJrtHYTGDv01E82+NPb31HmisZAUuQU+PtVvv8IjKmpVQLVQxhIfW67lg12L9xUNSyovwYhNHtokW+kq/8+MKdiLSNpme/vzPPamY3SqKCtfnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126661; 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=ic1a2UScFm+l31qFyAeBECmSh2Gb91aNOowxEajWjpI=; b=XrtVFitOO7jkY/mpeaD35HZ0L7aKnhYBLqRXLTCo8upB4rdHF5+XJJXLnaY/rFDRLPzwajihdXhma/xblGrt8x87SdcOxa+x8LLg6loaSqgjBPopyTkkmTCk84RLB4CWHuAngKAM0fXcH13ksLqana1uLn6ZLTxgHm1tHg1ul6E= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126660904279.0343601036209; Mon, 13 Apr 2026 17:31:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRfX-0001KP-6p; Mon, 13 Apr 2026 20:30:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRfS-0001J8-Pn for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:16 -0400 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 1wCRfQ-0002ib-VP for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:14 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488b8efed61so48075135e9.1 for ; Mon, 13 Apr 2026 17:30:11 -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-488d5df2062sm111489175e9.12.2026.04.13.17.30.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126610; x=1776731410; 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=ic1a2UScFm+l31qFyAeBECmSh2Gb91aNOowxEajWjpI=; b=n/3YsrQTztswBfRiq2esjfseFvG54/HZSXSx7K4chREEAu0SoQbppf3hDYx2G1XfSY K8USQnq+mslq/NzfT+4JDlQQKnG0ers+tmqKNt1PPjsx6z4RsgayMjr1uKYVpXL8YrR9 qhPzlkIJ07NRmf/mPpr2KxgMU2jUJomTDJ6/fBZcGHbKuY5sH2EVH4QWz9XopAB/pzOw bgRaNaaQRdBKm56D3bqC0ACB3/LYCYKQcFfzAqULC2w3QtmZ1gu2jMCpu0SWk3jB3SIH XUMexxoxGS7kyMIrASuzcH3QXCKS/+BhPj2nACWMGdu2BwOMdekwqpftexGAGyVWLn1k 3RjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126610; x=1776731410; 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=ic1a2UScFm+l31qFyAeBECmSh2Gb91aNOowxEajWjpI=; b=qwFxLYSCj2W21bbZlPjOzcEtoAX0GzBEWj2p5oHuVerXE8pN0pSTOev/k4tSJWR8/g 52ObLiAMDas4KYdapvRUCM5yk5peRfQw0j0eIez3zucsvhiJb1ENoV0MgwciAw5hrtW9 uVuIjzKY1JhraD3bBcWOiwA5apc7R/H3fhk37lr/9H2xS43CqP+e7RZPvhkSYBSOw7Yk P6GVY2Nv3Udwl1++3ajcbSC5gkT1cKJVzAg1RW/y5kXLvt+59xMuEzL0znwlSs6DXbht xl4T1nbOIE4ZScFe9VhyYcx0H6VKQG1as4eAH8uPCiOH3tcqC76HPO+17+690+6Uxv4O w2Aw== X-Gm-Message-State: AOJu0YxLz6JrEJHir6sboOmMsZF9PIbEaSF1KxTAsps1iLOBLhwICipV NV3fHQaeHOYo0fT4vOLIOUIBINLncQDIaWF7tDPlyEEqPfOx/OeIH2JjNEiupTWpv67ERfzZ/Ns PI210DA0= X-Gm-Gg: AeBDieviLqDod1PJEEIfUb7fpP18FwIZs/sCtFFVirs+6j5TaGlJbWkCVP7mnXCHQgL ZGzJ4el++WIe3OiWUJEKtI7wlqldkYAgYmoMsm8TmZkmlHHwicEeSgwvZXWKQoczm7Xxpd8e5Da ni2v8MsP1GjAiiK2YolfFs6DDPAQYi9s68bw+et3njmMWMzZzC4YIruyzKKpM0Nh+wdhowPsFyT YgLkZWkfZ9PRdYeB+CPILBoGx9oi44OTOEuIsx1XTnBXdNCttBocCE1mcKwtsFlGl1rT88r0Hxt agEmcziYckvHvPxO7uauJUmrPc7XERomOz5KwzbNvQBblr7odxcaCrxXXdiMvDEofbL+jRBz1Xk K7Ukc5qTBJ8iBADjbp/ALmnRD+PujKsN9shd5hefKvVYnbau/2faGArdnFZbm5m73fHNheURKrN ULJ/V0/57mz0kcf4IMKaFRI7O7t1QHndQnbqJX8Ds8A0UywAoC1L8hT9EhH6IsCD7yQopcvXaI X-Received: by 2002:a05:600c:4ecb:b0:485:3cef:d6ea with SMTP id 5b1f17b1804b1-488dc76d45amr173706655e9.13.1776126610324; Mon, 13 Apr 2026 17:30:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 01/27] stubs: Rename monitor* -> qmp* files Date: Tue, 14 Apr 2026 02:29:33 +0200 Message-ID: <20260414003001.97571-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126664424158500 We use 'HMP' for Human monitor and 'QMP' for 'Machine protocol'. These files aren't about human monitor but QMP, so rename them for clarity using the 'qmp-' prefix instead of 'monitor-'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Eric Farman Reviewed-by: Richard Henderson --- MAINTAINERS | 6 ++++++ stubs/{monitor-arm-gic.c =3D> qmp-arm-gic.c} | 0 ...nitor-cpu-s390x-kvm.c =3D> qmp-cpu-s390x-kvm.c} | 0 stubs/{monitor-cpu-s390x.c =3D> qmp-cpu-s390x.c} | 0 stubs/{monitor-cpu.c =3D> qmp-cpu.c} | 0 stubs/{monitor-i386-rtc.c =3D> qmp-i386-rtc.c} | 0 stubs/{monitor-i386-sev.c =3D> qmp-i386-sev.c} | 0 stubs/{monitor-i386-sgx.c =3D> qmp-i386-sgx.c} | 0 stubs/{monitor-i386-xen.c =3D> qmp-i386-xen.c} | 0 stubs/meson.build | 16 ++++++++-------- 10 files changed, 14 insertions(+), 8 deletions(-) rename stubs/{monitor-arm-gic.c =3D> qmp-arm-gic.c} (100%) rename stubs/{monitor-cpu-s390x-kvm.c =3D> qmp-cpu-s390x-kvm.c} (100%) rename stubs/{monitor-cpu-s390x.c =3D> qmp-cpu-s390x.c} (100%) rename stubs/{monitor-cpu.c =3D> qmp-cpu.c} (100%) rename stubs/{monitor-i386-rtc.c =3D> qmp-i386-rtc.c} (100%) rename stubs/{monitor-i386-sev.c =3D> qmp-i386-sev.c} (100%) rename stubs/{monitor-i386-sgx.c =3D> qmp-i386-sgx.c} (100%) rename stubs/{monitor-i386-xen.c =3D> qmp-i386-xen.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 535d1d3398e..eb212c31ac2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -121,6 +121,7 @@ F: include/hw/s390x/ F: include/hw/watchdog/wdt_diag288.h F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img +F: stubs/qmp-cpu-s390x.c F: target/s390x/ F: docs/system/target-s390x.rst F: docs/system/s390x/ @@ -496,6 +497,7 @@ M: Christian Borntraeger R: Eric Farman R: Matthew Rosato S: Supported +F: stubs/qmp-cpu-s390x-kvm.c F: target/s390x/kvm/ F: target/s390x/machine.c F: target/s390x/sigp.c @@ -510,6 +512,8 @@ L: kvm@vger.kernel.org S: Supported F: docs/system/i386/amd-memory-encryption.rst F: docs/system/i386/sgx.rst +F: stubs/qmp-i386-sev.c +F: stubs/qmp-i386-sgx.c F: target/i386/kvm/ F: target/i386/sev* F: scripts/kvm/vmxcap @@ -522,6 +526,7 @@ S: Supported F: include/system/kvm_xen.h F: target/i386/kvm/xen* F: hw/i386/kvm/xen* +F: stubs/qmp-i386-xen.c F: tests/functional/x86_64/test_kvm_xen.py =20 Guest CPU Cores (other accelerators) @@ -800,6 +805,7 @@ F: include/hw/timer/a9gtimer.h F: include/hw/timer/arm_mptimer.h F: include/hw/timer/armv7m_systick.h F: include/hw/misc/armv7m_ras.h +F: stubs/qmp-arm-gic.c F: tests/qtest/test-arm-mptimer.c =20 Bananapi M2U diff --git a/stubs/monitor-arm-gic.c b/stubs/qmp-arm-gic.c similarity index 100% rename from stubs/monitor-arm-gic.c rename to stubs/qmp-arm-gic.c diff --git a/stubs/monitor-cpu-s390x-kvm.c b/stubs/qmp-cpu-s390x-kvm.c similarity index 100% rename from stubs/monitor-cpu-s390x-kvm.c rename to stubs/qmp-cpu-s390x-kvm.c diff --git a/stubs/monitor-cpu-s390x.c b/stubs/qmp-cpu-s390x.c similarity index 100% rename from stubs/monitor-cpu-s390x.c rename to stubs/qmp-cpu-s390x.c diff --git a/stubs/monitor-cpu.c b/stubs/qmp-cpu.c similarity index 100% rename from stubs/monitor-cpu.c rename to stubs/qmp-cpu.c diff --git a/stubs/monitor-i386-rtc.c b/stubs/qmp-i386-rtc.c similarity index 100% rename from stubs/monitor-i386-rtc.c rename to stubs/qmp-i386-rtc.c diff --git a/stubs/monitor-i386-sev.c b/stubs/qmp-i386-sev.c similarity index 100% rename from stubs/monitor-i386-sev.c rename to stubs/qmp-i386-sev.c diff --git a/stubs/monitor-i386-sgx.c b/stubs/qmp-i386-sgx.c similarity index 100% rename from stubs/monitor-i386-sgx.c rename to stubs/qmp-i386-sgx.c diff --git a/stubs/monitor-i386-xen.c b/stubs/qmp-i386-xen.c similarity index 100% rename from stubs/monitor-i386-xen.c rename to stubs/qmp-i386-xen.c diff --git a/stubs/meson.build b/stubs/meson.build index 7189ff63ed5..2d334a5a8f3 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -78,14 +78,14 @@ if have_system stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) - stub_ss.add(files('monitor-arm-gic.c')) - stub_ss.add(files('monitor-i386-rtc.c')) - stub_ss.add(files('monitor-i386-sev.c')) - stub_ss.add(files('monitor-i386-sgx.c')) - stub_ss.add(files('monitor-i386-xen.c')) - stub_ss.add(files('monitor-cpu.c')) - stub_ss.add(files('monitor-cpu-s390x.c')) - stub_ss.add(files('monitor-cpu-s390x-kvm.c')) + stub_ss.add(files('qmp-arm-gic.c')) + stub_ss.add(files('qmp-i386-rtc.c')) + stub_ss.add(files('qmp-i386-sev.c')) + stub_ss.add(files('qmp-i386-sgx.c')) + stub_ss.add(files('qmp-i386-xen.c')) + stub_ss.add(files('qmp-cpu.c')) + stub_ss.add(files('qmp-cpu-s390x.c')) + stub_ss.add(files('qmp-cpu-s390x-kvm.c')) endif =20 if have_system or have_user --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126674; cv=none; d=zohomail.com; s=zohoarc; b=T5W/5vDpfzVBAjKGqkA8Q54dwAZEhuZTP4s6eSx/H4kLHIe4gLVOc+qGIJOG0uWdM3RR1zEsd/zGZ08Xo9EZFH2mzJnUYIpdm87lWx0OdbI5KvQp9FOJPnRmcqsSV8aiQ/dUgkKazUKXSHn064xwgwBQ5vlUZRySl22f35LOmic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126674; 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=1hmYqwWSqPmJMgJvimCb5gTwLjtaQvrO8BVqR+We6PI=; b=N9rcfzaQHvs61tlBlUPW7rDRdzOzvUT636d2JaiPg4f54XO9vOD4FV1JVtMzO4qpF0rWguQQURjjP4dSe4NLJuXZmh4NghGFw0jnQODKazhvKcC8TxkLapO4oyXiI/qJVCL4rJdfTAfvdELu0sBdlmbB1FK/N5Akl9YVkJRbSDA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126674152104.21984215893269; Mon, 13 Apr 2026 17:31:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRfd-0001LK-OJ; Mon, 13 Apr 2026 20:30:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRfY-0001Kf-OX for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:21 -0400 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 1wCRfX-0002oe-4V for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:20 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-488afb0427eso61863715e9.1 for ; Mon, 13 Apr 2026 17:30:18 -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-488ede1e217sm10743045e9.5.2026.04.13.17.30.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126617; x=1776731417; 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=1hmYqwWSqPmJMgJvimCb5gTwLjtaQvrO8BVqR+We6PI=; b=tOCRO8X896QZGcamXX/PQvFBRb8W0vsXU9UunOpHZzt86rhz+QrlFokqnsdxEcRKJl 7zP0wt/iIh0oPHLXBsHI+Qvzio34eIq3n+BkXa9yd+71Hjvuc+C424cqLsngRzQfpKd/ 3uBKJQUQH4CTF9xRMV7LJR2skcx4o/9FXF7oeVdqHZnv9X3XbJRYTK+Sv6QtdbKtW2vY C39dE5Sgc4i9ppiK5ZEBWFaTBTQopkhoDLlXP1rsnRMoUkITukAGeZ0ZYg2B4JEVzWr2 tsKy16Q8EeW8wbYuSEsCsGTeI12hLho8UMzYDF2SdoHHk1WSckckz2Auo0sd9Ah6CLzA eP9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126617; x=1776731417; 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=1hmYqwWSqPmJMgJvimCb5gTwLjtaQvrO8BVqR+We6PI=; b=FcKbSaLdYwWWofXiU2JYUurWht8wWT6Qj1cp1Lf2pc5raDp6nWfBcGp6DQ5FbAe0+U 1oLX7zagyH40FoSgxLheF0+9wjhF8s8oszMniiD1FTVfTvtaO7zGnbbIRzRddMgSP1F9 aR1HRWiAbNF25ic/ev0Tcuj70mu+n8OZ4oAgafU+uCdd9jhXTOlqP6AyQfzgLUSNLxnp 1IxtOV1YPZaMfU8/Ttf09Z8YNisBe9DBuQ3bNORBPNiiYahSSlcockBEx73gkMk/Kbel nqX+3Rornl6MdVnDFM/qjSkO0fCuIz/qjQlkUc/nD0weJsS2MvAIwAonXexRTptGbGWA S/PQ== X-Gm-Message-State: AOJu0YyxI5pi6TBU8OCfeP2N/uLPGkBBQgEdTaxH77TyoB8ANO+FVdmu 3bnhah7N+VmL2FGuSpZ8EMNnb/zwWJhMXjAslNOgOQR4LZwaZW/hPiz4OmGjpTU79VakQldkHUw DBXGM/K4= X-Gm-Gg: AeBDies8eSK/LTcOlTBJkH05Ij6dzZeu4lL3y3o8CwDbBRraf3h4qhHbAMTTmjdMRbL YQxv6+Eu9feMHheMeR7N3e/KTE6T36ZEAF+7mZn2AUDLKA0pwfMesbsMz5vkv1jOSc5S9iBZW/2 jjbB49J0WeEhPi3re1I8C6xf4SmVhTcoKTMGwqA0FDMMdIj1kdjcfcUYv7Tqim6QSImyz1BxNw5 iNZbWSW24YZn6LU8E5G4pJWWgGB8ptWt4aj9KmxcYv2+83Nxyn9F3XaFQwuJalT5t+Ici2ufwYD +PtNmI0srv/jDNaSNncfII454Ul/HZG6LH/zM4pEcmESg4m4r0MqaFhOdS/hY9ztl4He3D1Gc5q LalK9ZLh/QAaq5/Qt90viUjSNo4DskySxEHx9F78l2wnJ9RjZH34tJbHgIa9VNS7zkZkv8TLvyu MR0K3gjBBXB85ZzIA1x7ni7NjaPS6Qyl3mIp5dOkfSp21NA8/4VFA9ev4A+LaXce1S1nIzgTBi X-Received: by 2002:a05:600c:5298:b0:485:3ee1:eba5 with SMTP id 5b1f17b1804b1-488d68820abmr222091915e9.27.1776126617313; Mon, 13 Apr 2026 17:30:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Fabiano Rosas Subject: [PATCH v3 02/27] monitor/meson: Use SPICE with migration HMP commands Date: Tue, 14 Apr 2026 02:29:34 +0200 Message-ID: <20260414003001.97571-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126675775158500 When moving code around in commit 27be86351ec ("migration: Move the QMP command from monitor/ to migration/") we forgot to update the meson rule about SPICE pkg-config flags. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- migration/meson.build | 2 +- monitor/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/migration/meson.build b/migration/meson.build index c9f0f5f9f21..e583822dec6 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -23,7 +23,6 @@ system_ss.add(files( 'fd.c', 'file.c', 'global_state.c', - 'migration-hmp-cmds.c', 'migration.c', 'multifd.c', 'multifd-device-state.c', @@ -37,6 +36,7 @@ system_ss.add(files( 'socket.c', 'tls.c', ), gnutls, zlib) +system_ss.add([spice_headers, files('migration-hmp-cmds.c'), spice]) =20 if get_option('replication').allowed() system_ss.add(files('colo-failover.c', 'colo.c', 'multifd-colo.c')) diff --git a/monitor/meson.build b/monitor/meson.build index 2647100e04c..585251804e4 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -5,8 +5,8 @@ system_ss.add(files( 'hmp-cmds.c', 'hmp.c', 'qemu-config-qmp.c', + 'qmp-cmds.c', )) -system_ss.add([spice_headers, files('qmp-cmds.c')]) =20 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: [files('hmp-target.c'), spice]) + if_true: [files('hmp-target.c')]) --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126707; cv=none; d=zohomail.com; s=zohoarc; b=D1mxYRlkLeO/FZJlODPrOZhgsPadKtkKEZmBK7hXFl/5NxlGO1aNG1auCVW0uneW3QjEP7WIYB7hdfIe6S0WWeR8PxDQ5kdhCYyQxY2eqyokX5COTjgiCH31la4C50jbBugipxI9GYHk+wWc1EnDh7MWZyp5hxh4CtxUQz2WTOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126707; 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=ais8/utTBMgt739AAzrSb5RSknUsBIEhQKlzpInZIV8=; b=KqRZ+xiyEgw78yznRTyoRq6i6s5NjmPY0UsiDvZjj1PvyyoEmknBOfqnGIGoAmQtD0A3UMPVN8hLfuKB3JgIsDXL5pmJVRpt6TI9XnyEuyX2ETXs4k01CspsAQN8pqygIeyKl//Kufb/EBt7eKicCkjys6MRgbH3DIVf+IWWDt8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126707932451.4816775185727; Mon, 13 Apr 2026 17:31:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRfh-0001Le-7E; Mon, 13 Apr 2026 20:30:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRff-0001LO-JO for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:27 -0400 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 1wCRfe-0002ql-2J for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:27 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-488ad135063so47984855e9.0 for ; Mon, 13 Apr 2026 17:30:25 -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-488ede1df12sm13946415e9.4.2026.04.13.17.30.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126624; x=1776731424; 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=ais8/utTBMgt739AAzrSb5RSknUsBIEhQKlzpInZIV8=; b=Is1yK11DkQfpvyrMCerjGiC4j8emhrEnMLTZ/a/fP+d5oG142u74CEQxsoaHdeB1QE TtqEXob+gq8VfrSvw5XAB4JS4rj9UPzhRja3cUtFZxMB5yakKHY8me1Ei79n+xysTkhY 9L/7f9UPQ9sIc94DU1YFCQMVWK+ebtk9KN0VPBZ8KGxHYBQP5+YWr81BzbwGv2n8LC/y gm9dSM6tYZjcyLsSv2RO35g6DyGItBx2Zjtd03uXNX08A0CMOFs39DWr/iGeidf1ztFQ Iox2on4hJa+tDKpbbh8NQuBFcPxfHsrnhZmM0Tm1qqJP1OYSbJ68anPemSwonwajfdB0 BV9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126624; x=1776731424; 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=ais8/utTBMgt739AAzrSb5RSknUsBIEhQKlzpInZIV8=; b=opHVLeMk6yRxe+U8gxUyxVAjj/PN/kUycaSX7rZMW7gvqzS39iMJqu5ZEnr6uIl8D5 nxpj+Mz4NAKubN93eXhKhDpXmn6wkm2H3u68+6lT8SW4G+VQnMcpDuNZdHfRSThB6N6m rwJZu6wG/V7LWyr3s+DqWI1Pcx83Zlhgxa+Qq6OjXSEUziPQtY6v0ev5s5Zxwye48HEH 0HCWXAPy8D0Xj4VKlm0ZQDgr/F3eKUXMXkI3qRi9A9zFXe630WyKZbjmF7BuqVTYP74R gV8rB6g7+9/7vuIGw7zIzGI0ry0yrHdhoAdO5qsj1K4vMW5uX0n5QURqUBcFFddzu75L WzJg== X-Gm-Message-State: AOJu0YyVeQCJ7hr5gZuin5IOs9MQZX3ElCuDz5t3q3fQ5Z0inwaX7KFJ +adS+TxJ8pkj7yinOT/CQl/3yvmKdyiRV2+t1Meaea4bB4Kj+zc0DD4B9LFvedPKuoPUJP63seU pfI7sXaE= X-Gm-Gg: AeBDieuVO1FatBqqLO+nx/RY5vv165lVmZKPhe2GDsy18fjPaFBlo3ZlhALPji2WDEk t39bYTUnMJFW16LJmTgMOzFVoMSGbDGsJdx96QWyBbgQfNTym5iWnN1JxEjMPfxMCBM9hro32MR thD7cJcxaYcsGxafE00+K1z9r06XIfQwfZLs9mEACHKXmo+gHaW7CSjNNJnqMHhfdUwOgO0jPAQ hyyhC+J5RSNvQESwJqTtMC+XX27/LMsPNtl+2pBy+RjuXfyJ4l7KRFmCSgnJOGaZr9qz2VaAi66 YXvQ9o2ghkMEoVt6WfMBDM36AxZ8zSCogv+mEEjmPrRuJmlGLbdRpHzpfRUARCxOTGlE/V/mGAm bUuvOtq2HDv+vsxa7wkYYGVe+4qjS7jhemRdrRfmzKRkfKEaj3TfiCAmtjDro7OkSdVyPUdsNAV goh8ogPGOf6iJvk8yLS7uN7rNR3vRPLICSBaYnVCl74tGL8bIqj+MLbdKeet1gPsFfEWvIg5gr X-Received: by 2002:a05:600c:3f0a:b0:488:afb5:6a21 with SMTP id 5b1f17b1804b1-488d68764b0mr208133185e9.15.1776126624404; Mon, 13 Apr 2026 17:30:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 03/27] monitor: Restrict monitor_set_cpu() method scope Date: Tue, 14 Apr 2026 02:29:35 +0200 Message-ID: <20260414003001.97571-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126709788158500 As mentioned in commit 755f196898e ("qapi: Convert the cpu command") 15 years ago, the monitor_set_cpu() method is a temporary bridge between QMP -> HMP and shouldn't be used elsewhere. Make its scope internal to monitor/. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/monitor/monitor.h | 1 - monitor/monitor-internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 296690e1f1c..55649a86641 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -37,7 +37,6 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_lis= t ap) int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3); void monitor_printc(Monitor *mon, int ch); void monitor_flush(Monitor *mon); -int monitor_set_cpu(Monitor *mon, int cpu_index); int monitor_get_cpu_index(Monitor *mon); =20 int monitor_puts_locked(Monitor *mon, const char *str); diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index feca111ae31..80b4a8150bf 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -175,6 +175,7 @@ void monitor_data_destroy(Monitor *mon); int monitor_can_read(void *opaque); void monitor_list_append(Monitor *mon); void monitor_fdsets_cleanup(void); +int monitor_set_cpu(Monitor *mon, int cpu_index); =20 void qmp_send_response(MonitorQMP *mon, const QDict *rsp); void monitor_data_destroy_qmp(MonitorQMP *mon); --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126741; cv=none; d=zohomail.com; s=zohoarc; b=DrcEeB6fN2YAJeJqXmAKWrDp+pHagMDoH+n0/veXHXnbKru4+JeScofd2XqfphaN8T1OIoO9NoidDTJEVnft2czqkIu9kRztMWiIlL5bIk/d/3txtjfunA16ImVWVh83qYv0PfPEHRgQLXp0pWcMlWs8AHMxL0qglVZsQLXXIOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126741; 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=0CmPVb2/ogwjAlnnYuGyR2Fi1HqXfACxK/cgdkaWWa4=; b=ERPEZOjTsdT0Cr2twlR9PCI5rYTyWcYHCOD7hVY04ZDHXN9NmzoqwHmO7HrafNOz9HobqGMOg/Y7kGvah5iUiEB1giI/XjIttaCdYsglXP6JSV1voqMkgOtqtvUCjiozYMW52tPMTPhHROyY/rDEX72+1RSF185m0tcf7cMSMuk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126741094121.48553469751073; Mon, 13 Apr 2026 17:32:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRg6-0001Mz-FC; Mon, 13 Apr 2026 20:30:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRfo-0001MP-8V for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:37 -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 1wCRfm-0002rE-Kn for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:35 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-43d73352cf2so1483052f8f.1 for ; Mon, 13 Apr 2026 17:30:34 -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-43d63e4f16bsm35133528f8f.26.2026.04.13.17.30.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126632; x=1776731432; 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=0CmPVb2/ogwjAlnnYuGyR2Fi1HqXfACxK/cgdkaWWa4=; b=SkryPy6bNnm+oWhLGHLBPokmG11EmJi7b3jORu1nweoFMEFABVMJjmsPz5mkarQmNn wlkyKmIv/06MdAsSCPqppZrptCMEct/Rd7GDOt5U4H3UaDdIqc11r8bOz9xO+v9u9382 uCEzjr7B7QIjuQasJO5a4viuKTcky27CI6b+KJYBMfW11j9WAPatW9tawZ+DEWh/ZiHr 9I/WOZMEsoprC4ViOgcWF3ewISkWLxwzB6rNjDmwYq1rXCZ145tU8B7AC9ZiluKQMRi0 NgEPj4rr2kg4Q+HRp/DaZTYQjpzz1AWJLQ3UPOhyAD7NH9Ioo8bCRZnkq/WvTS1KHbjE Hx8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126632; x=1776731432; 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=0CmPVb2/ogwjAlnnYuGyR2Fi1HqXfACxK/cgdkaWWa4=; b=IVau2M3iGW2oKTkUtVysf2l23LYCNj3xOeGhUGJW3ZN4EEHwoHl+nFAE+Mcw9CM/gb SMs/pvULCkfTUeSGxkCyU6G/jmI77Rim33q6Wlme2epiKvBS3qScwIV3lt0hBZc7FpmP EMf3cEVkiStw3pmM8rLYoprldFEdnd2W+zAQYRB+uz3s+Vku48fQd8DDT8v6waXvq/QH eU3ndyxDmbJBCrcIeKUaGi/PiLM5KvY4mAFzyi/M8cB0r3XpG9xQL8W/Zvb3zGP0FAAg UaCyhkQ/5C0nPehyIdQyjhFkvGzJrzq1dCfEAu5YHPANPFYFePPZ1y12EdS4VK+KyD9A IHeQ== X-Gm-Message-State: AOJu0Yxd09d7JkOv1o+9+UFv4o/5e8Jia15qos9Av1HXBkCDuS159Plk JjhqHXF+0n+gTzLOw/T0p7oFjhBW6FdzZ7DOW1zBofkAAbQ3dalYZzi1pmJZKC9/1F1KeNCtxnr ZX8AZ+Qs= X-Gm-Gg: AeBDievt2ZZKRs4YraXeaqPRsIcD/PA0z0h7PGx2fDBMThohzLnRWceYLRxEM+PNscm uv+pxuKlXrbmi7/cN4222VZvTcElwUiZZmAdFLa/dnlpBKRYpgRo8sZFgb62h+7fM1ZA8VCjN4a gBBhSGxegKz4RGbjJkpW6oo3nrx4btmJouNYLSw+G0MYMi5mSOEME+J8KMrhdiIEbYiov4UKinT U8UY3dLeQh7Zj1krtWuy5doiJUWIkUaXe9GjcKJ4x/IKFrw+PacsxNL+JLUfF0bA9oIhycxOyxn nCpsfzUyTdulRoUDzfh5ACRsTT0JExMKHmNfkP64kWqTrexMwa87zkNLiD3c61tGsGacut3BBG9 yrsMQfqwguHJbMqHSE6rAuvCV03rbXUJTKAsA366avg4vt7K2cJz7Px+wfvnRE/qRk2bvfYb7uz Y47Sf5a5ZbZxgFywz0mhS/hQ+fXhSNB7s5rOmxWN8QG3dYKC7fqYRCYVsda1+ORWfjnVztsMQ7 X-Received: by 2002:a05:6000:605:b0:43d:7b90:fa2a with SMTP id ffacd0b85a97d-43d7b90fe46mr6814908f8f.3.1776126632496; Mon, 13 Apr 2026 17:30:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , qemu-ppc@nongnu.org Subject: [PATCH v3 04/27] monitor: Make 'info via' a generic command Date: Tue, 14 Apr 2026 02:29:36 +0200 Message-ID: <20260414003001.97571-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 1776126741971158500 In order to build hmp-commands-info.hx once we need to stop using device target-specific check. Use the generic pattern to make the command available on all targets, providing a stub with kind error message when the device is not available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- MAINTAINERS | 2 +- hw/misc/mos6522-stub.c | 16 ++++++++++++++++ hmp-commands-info.hx | 2 -- hw/misc/meson.build | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 hw/misc/mos6522-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index eb212c31ac2..cf462793a79 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1558,7 +1558,7 @@ F: hw/ppc/mac_newworld.c F: hw/pci-host/uninorth.c F: hw/pci-bridge/dec.[hc] F: hw/misc/macio/ -F: hw/misc/mos6522.c +F: hw/misc/mos6522*.c F: hw/nvram/mac_nvram.c F: hw/ppc/fw_cfg.c F: hw/input/adb* diff --git a/hw/misc/mos6522-stub.c b/hw/misc/mos6522-stub.c new file mode 100644 index 00000000000..85eb0ee36ee --- /dev/null +++ b/hw/misc/mos6522-stub.c @@ -0,0 +1,16 @@ +/* + * QEMU MOS6522 VIA stubs + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/monitor.h" +#include "monitor/hmp.h" + +void hmp_info_via(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "MOS6522 VIA is not available in this QEMU\n"); +} diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 74c741f80e2..463038c302a 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -885,7 +885,6 @@ SRST Show intel SGX information. ERST =20 -#if defined(CONFIG_MOS6522) { .name =3D "via", .args_type =3D "", @@ -893,7 +892,6 @@ ERST .help =3D "show guest mos6522 VIA devices", .cmd =3D hmp_info_via, }, -#endif =20 SRST ``info via`` diff --git a/hw/misc/meson.build b/hw/misc/meson.build index cd084a19363..fa6a961ac9a 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -20,6 +20,7 @@ system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('arm= v7m_ras.c')) =20 # Mac devices system_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c')) +stub_ss.add(files('mos6522-stub.c')) system_ss.add(when: 'CONFIG_DJMEMC', if_true: files('djmemc.c')) system_ss.add(when: 'CONFIG_IOSB', if_true: files('iosb.c')) =20 --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126719; cv=none; d=zohomail.com; s=zohoarc; b=chYd9D3MLs5N6ps5XfvFEDRxN/25WwspwOt+31SLcF3ubE/EmwCKF/TA+J8VAHW9El3bcu2DcXhEWxSnxbOCyizoSDZkkhGBVENU6rJA5qZBAYMoaakV/9LeCpm/FawchzdSo6qrYyx9EpoEIHOTeYVgYNRCyUAv2NVhsFwclno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126719; 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=+E+v9dwQEh1rdTkmhs/D+nnUCn7aDH8mDMozjNzzNdU=; b=Ir/6xF3+ckBA79sjbocyfm/95DCn1ZV0p4s7GKBbeJf3DC0R/mJv4vCWVLmL5dlnTPgn97lGxqInmwpqxFKFizNBjvCqlKbmwiWwTRS72vmEU9dWhPn8i+eTlXZMZbrazU1YOtpFey96cqwXcHOOWgxYLeqJjsyIRikcUOLFhnk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126718944273.14310226686734; Mon, 13 Apr 2026 17:31:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgM-0001fI-LV; Mon, 13 Apr 2026 20:31:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRfx-0001NE-HA for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:54 -0400 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 1wCRfw-0002ym-0t for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:45 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4888375f735so48719395e9.3 for ; Mon, 13 Apr 2026 17:30:43 -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-488ec77508csm33651015e9.0.2026.04.13.17.30.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126642; x=1776731442; 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=+E+v9dwQEh1rdTkmhs/D+nnUCn7aDH8mDMozjNzzNdU=; b=bAbAZTNBekyEvSOdGpuBaH00Q05n0AQgoRktJNF/0PdyxEWkyPLsgckEkPqfbukV2O YOBUU7VRJgSiq2AcU8gZVrLPHwENs9f2ZLAYO28UnHeDYaizWgRJTTyZUrDYbQ4Og+qB bYhIp9JjJ61lL+aHuj1vMJdtHt8fwFOajcayvMt/18GuH7iXs8ob0sXrijtt1EQ9q9TV aaTnpqVgE6VpGze7D0nGElb/fjz2CIJx8R/66KZBYsYdsCUPi04g4Nm3R/sDLOm+EaFW lxErPf8jHISqzHQJ8OU2OE2jwDcZwpOIHG9fczQ0m0eHz3QuDQJ/hl/wmuF2Fnz8CsLt Zrpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126642; x=1776731442; 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=+E+v9dwQEh1rdTkmhs/D+nnUCn7aDH8mDMozjNzzNdU=; b=VXZuzlvrVLwZ4RzqqlpjY1/eTn7ww2vQ7j0+mV7fvyz4MaixjKPxAD2SfHWfqgf3vm DtQzVodK4yLHY92EexngqyxQWAKRbIjd4L2fOU3Dj54tGtsgTtPhvBCZayFKrebY7mRO xNrBIYUxYTNmgBB92SBvLndjcvuK10/uY1zix/cNbxnk/7k6EpWdelooE1gRk8Mx53kJ esVraOZV9YhSatMTYClrgn/fKSnEH74DCVysRD3ZQ90mW/8hJdXqZaRpgU2LuAcvlITd OCC/f7uG+e3HIltdxVpWx/zo9Es+lMvWJX2XMkiDdTW+nasqGenx9tLMmFAUq+PlIKnc Bo4Q== X-Gm-Message-State: AOJu0YznagFttWbDaAtARYCYqQEp3PdNVhB4dF8zdFMYHH0koekindYu Hv9tVozgdzy8UcXIxvUb3Zo+YKMzmYL/Scy2rq0ozVdJgh0CBIqbZHTZaVZJGKSVqL+9GWYq+nk UjTetDbU= X-Gm-Gg: AeBDiev0xNiOkneCfPUyweKst3GQV0NjC4tGV/OdiIK0mor/Ik8J6BcrRU+S+HDk0HY usjXoPc9HL2kYWusCLiSDxckQDepE68923U4qgmOse8rVMzndKnoZpIWm1Z2cYE6p9w2xIvJTg4 KZSKXgE2yljxjpcplNfVs1eXddgd/6GoXBl0nTyXNKzNYBfj676NQB7wxAvLWa8EM1Tsy9EjuXf NeCPKC2HktyQF3GQkMH6xspLPtwCin3s35wWnp14SlubraZnT1UTljI5byD3w7PKoFga34T2mVO QBhAxWes4pdpKM/dIo5gOILgDZrQLnq/5jqBCHEd+i6YTUmhIFco28rebaz9Rsm2gRJW/z1nGeN c6azHIzcHta+U3rt2tBvqApnro5sPefFr2r/Lir2Vwe2Ed0JHjONxQ4JhXk1SRed5/dA+UhcYhT C0LsnCNVQVwrXog+tzWQt4K2qbBDSFGabOglTBaD3kQ9fF9PYKE0Kp36CEv5OaCFcQtngcVnPV X-Received: by 2002:a05:600c:64c4:b0:485:39b2:a47c with SMTP id 5b1f17b1804b1-488d686892emr184339135e9.25.1776126642217; Mon, 13 Apr 2026 17:30:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Woodhouse , David Woodhouse , Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v3 05/27] monitor: Make Xen emulation commands generic ones Date: Tue, 14 Apr 2026 02:29:37 +0200 Message-ID: <20260414003001.97571-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126720364158500 In order to build hmp-commands.hx once we need to stop using device target-specific check. Use the generic pattern to make the command available on all targets, providing a stub with kind error message when the feature is not available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Woodhouse Reviewed-by: Richard Henderson --- hw/i386/kvm/xen-stubs.c | 12 ++++++++++++ hmp-commands.hx | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/i386/kvm/xen-stubs.c b/hw/i386/kvm/xen-stubs.c index ce73119ee7a..bf6ac28bef4 100644 --- a/hw/i386/kvm/xen-stubs.c +++ b/hw/i386/kvm/xen-stubs.c @@ -12,6 +12,8 @@ #include "qemu/osdep.h" =20 #include "qapi/error.h" +#include "monitor/monitor.h" +#include "monitor/hmp.h" =20 #include "xen_evtchn.h" #include "xen_primary_console.h" @@ -37,3 +39,13 @@ void xen_primary_console_create(void) void xen_primary_console_set_be_port(uint16_t port) { } + +void hmp_xen_event_list(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "XEN emulation is not available in this QEMU\n"); +} + +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "XEN emulation is not available in this QEMU\n"); +} diff --git a/hmp-commands.hx b/hmp-commands.hx index 5cc4788f12d..06d7b17bf25 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1839,7 +1839,6 @@ SRST ERST #endif =20 -#if defined(CONFIG_XEN_EMU) { .name =3D "xen-event-inject", .args_type =3D "port:i", @@ -1866,4 +1865,3 @@ SRST ``xen-event-list`` List event channels in the guest ERST -#endif --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126707; cv=none; d=zohomail.com; s=zohoarc; b=kILn8mVOqPyZTciLA3/qMCR/hoOW8DYMrJn0IsG1JBqzO//f3hGXe0QY5HgWMS7zXz3wd25O6gpvZRvnINprC0DMUoxKsEfVBWK7RdQJA4hjdG40IAK3Ur1AqNpiItkFGQ8One79/Smr2UxpMiONuQB0cxZr6mJ/hx7Gxlr1xSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126707; 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=jNmfOCyqLz0SabOc53BsZGwxrvu834OnrqGQI5BnOaw=; b=CH9CVliCUPUeDK3OlLeMmFhwnWDNyTbnzTS8j+Ya0esSw3A4vq78K2M/OBY7zKTnzOeNb3Fyg0Xijooa5jSTlqx5hcCuAYOJu2TCJRDlmZ8bi9mEXqksnwLf1ADa9G/uzyaDVcovovzNvdGjvI2w6a8h3PurUgPlb3ZQyhL89TY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126707687873.2327711393162; Mon, 13 Apr 2026 17:31:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgI-0001aK-QJ; Mon, 13 Apr 2026 20:31:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRg5-0001Nc-B7 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:54 -0400 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 1wCRg3-00036g-A4 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:53 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-482f454be5bso52631345e9.0 for ; Mon, 13 Apr 2026 17:30:50 -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-488ee049333sm4619955e9.15.2026.04.13.17.30.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126649; x=1776731449; 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=jNmfOCyqLz0SabOc53BsZGwxrvu834OnrqGQI5BnOaw=; b=YASOfh4yha4PTARrxLs+CRUXTEeJdQlyYa7iQnHbbiJQ6dqNpgB7QAf2MCgSenYNdz t1KHxZxDAyaRcVD4eproJEIBgScRR9iDWRGHVWay+5ZnAII8XsPCsLjcuUAuORyDHpC9 XjHn2hZntOhbQ/o5IeRuWBSZGmPVuVEWGvHQV/mMLEcryNn2Vfx8WI9Ap7mTuGOHOX7E BKRmyklh/ygTIgtQwd6jbQf0rjgl5ePs8Na2P+kuA7xjE29L2c/fSEzI8hvX4eOCdnn3 PHe/d3LV/zG57Uvqzs3E6ZLIXozQ8y1j1KXDqfW2czivbg22DvziATI2QlkEK10wY2YR X7iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126649; x=1776731449; 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=jNmfOCyqLz0SabOc53BsZGwxrvu834OnrqGQI5BnOaw=; b=f/2FK3D7UBNYRCmGdJbvINGpoUD0xXl4/Fq5krebPdjmnezM38MAsVsrmrGiTtHbgm IbT4JJDTJNbJ/p7cYVAsw3g11lzvLzp1umOM3dRHu1tHEgfr7MKKGo3pm6dRqRfR/gaP VthSG95DaNETTXl3fHw2an29MesJI3QmN6qvfy/ddMsL2fkBzd4M5B3N/p1jvNlLsxPr 5Hoi1C+xIrGhTLpFQT1FYSrvSWnIvtdTcuTGjSGzo7VWVMLbJMx9PO67rAQmPsl01J6+ XdjEb8GqhBXjAeR16El0spVtdQZoe+Y7wLDTSkziAMWte67XgPWsNrKM50BOcpaF9lYV /mVA== X-Gm-Message-State: AOJu0YwPYqJPXhgF4zZ3xowKQ059Nx+UzXAL4E+cUGZtl6y32TO4tt3m 5dTc/E/kdWprAlnJuouV+01wZMRkJzM10ecudSy3fzTd0AbcHXSsQMiVFoFBNvQOGyIbQtxf1Ea Jy3Mrdm0= X-Gm-Gg: AeBDiesmvZei1R3b2zRgyDJpIeDxZ2YDuHhNTwpqmwhWrKrkgSZZ6Rcr73oweVxkTIZ nCiqgLanptGUfUXMq/ypl3dj9OYVY6RayhNnIaNP5/HtuB1wi6QwGxjn7thPwVW/q/oKkFbs88O ZhFeEhl9nl/sBAzUwIqb/AAdnfLqn9xezXwinpr9aIiOo+b7b/C6dNnpfvFjpha7WEa+zjJPLrP KkKTXBQ/57dgUV/BLQvyYx3mkbtp+526Epqjx8eeQLhlmIOxUjiFyMbme8OnBIIZ8u49uK7XUkM VH1nGA6E3Wv4fuLjlqiS0wwRQBta9iMTwNTRgeObZDN72kdNjLShhEAQMlMrtYKxp0A9aMJZIIu A4igkVMCnQmNY8FzvdQEXNdQFeRsnm1IBncXftEUp17+v3CGn+Midd51+CWHKmcClwQSX360J5W Ytd4/vzSZR5R6QlZOlsQcs00bh+ISXpMo7ch6yrwJr9uLnDIu0lrebVGcnzPSP4WxeAJwd2oqgg ZSaDYewMkM= X-Received: by 2002:a05:600c:19cd:b0:488:c239:d498 with SMTP id 5b1f17b1804b1-488d68712d5mr212332115e9.8.1776126649309; Mon, 13 Apr 2026 17:30:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v3 06/27] system: Expose 'arch_init.h' as 'qemu/base-arch-defs.h' Date: Tue, 14 Apr 2026 02:29:38 +0200 Message-ID: <20260414003001.97571-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126708674154100 We already have a file unit outside of the local system' folder which include "system/arch_init.h". We want more files to use it, so make it official it is a generic header by moving it under include. Rename as "qemu/base-arch-defs.h" which is more descriptive. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- system/arch_init.h =3D> include/qemu/base-arch-defs.h | 10 ++++++++-- hw/pci/pci.c | 2 +- system/arch_init.c | 2 +- system/qdev-monitor.c | 2 +- system/vl.c | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) rename system/arch_init.h =3D> include/qemu/base-arch-defs.h (92%) diff --git a/system/arch_init.h b/include/qemu/base-arch-defs.h similarity index 92% rename from system/arch_init.h rename to include/qemu/base-arch-defs.h index 0c2b1f3a5d0..f33465738c9 100644 --- a/system/arch_init.h +++ b/include/qemu/base-arch-defs.h @@ -1,5 +1,11 @@ -#ifndef QEMU_ARCH_INIT_H -#define QEMU_ARCH_INIT_H +/* + * QEMU base architecture bit definitions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_BASE_ARCH_DEFS_H +#define QEMU_BASE_ARCH_DEFS_H =20 #include "qapi/qapi-types-machine.h" =20 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2c3657d00de..a38dffd4899 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -36,7 +36,7 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "net/net.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/numa.h" #include "system/runstate.h" #include "system/system.h" diff --git a/system/arch_init.c b/system/arch_init.c index 604d5909ed0..1ad2f3d6f78 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "qemu/bitops.h" #include "qemu/target-info-qapi.h" =20 diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 2ed95e83602..2e9dbb9b5c2 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -23,7 +23,7 @@ #include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "monitor/qdev.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/runstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" diff --git a/system/vl.c b/system/vl.c index 0e1fc217b4f..c89fe8378c5 100644 --- a/system/vl.c +++ b/system/vl.c @@ -112,7 +112,7 @@ #include "trace/control.h" #include "qemu/plugin.h" #include "qemu/queue.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/confidential-guest-support.h" =20 #include "ui/qemu-spice.h" --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126708; cv=none; d=zohomail.com; s=zohoarc; b=bS4ZqswGOnki5KssnVdx5xvUgf2yGd7TQazxW9hwHNjx44xowHXDI/YFDVPVvlOUq/AGjLN99p/8m8v3hUIodVBZspmOth9nDurg0Ga8rRrhE1kD/23l9pe11PHqzNqnjswb6XhtZGAKAd4jKeyK8bWqMlsL/rY3d4Lj0DeWSbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126708; 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=1bo5Y+UZCJy4gHCz2x1tdhwNQXL4/DMiX/PocQwagYM=; b=itHBdOAv8GoGks8tYjhxE9dLQdPlS0sBzoV6O302jdQBIqDECo0s1gNeI3uFlziPOV/nvKGCJq6ZOMmu7XvlLOhS1RpBMGreO+kGNLYRqtucONCP84n5739gln8p4FPh4JIgQgNVgPuDnWDpW2ANSEUHjGx0iOumFfW4Tu1hYHk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177612670889335.09958621149872; Mon, 13 Apr 2026 17:31:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgM-0001fY-LV; Mon, 13 Apr 2026 20:31:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgC-0001S2-6M for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:02 -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 1wCRgA-00039b-47 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:30:59 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4887ca8e529so32220435e9.0 for ; Mon, 13 Apr 2026 17:30:57 -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-488ede156a1sm5574775e9.2.2026.04.13.17.30.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126656; x=1776731456; 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=1bo5Y+UZCJy4gHCz2x1tdhwNQXL4/DMiX/PocQwagYM=; b=LYj+B3S97dxjy7f6ZCf/qmbLRl/SOhttxHpYUpIVCfORDz7nBQ5nFwEY+szRPJLMHx qAyITHyQHjR+xdqk7qMFK5LoLLndIkNfbA9JvE4QWg3CKtZDKkUvDnzfUWjRZGzabKAz TpQxkU8u1HxJ52Npms+5PRfXG1syrAWkrVye6LsK+5V8PyReLi8f5LwrUjOcsoJNuF58 9UpusRNdxD1iReHNAHjZyM/K4xifSb0xgxK6FaR0aH1PXXIYv9Mg3W5Z42TXSyjzbHJB dFygrFNFOKc+Cp2hGJzz0tvIksF7k3re4tM4tOObLJwQvGhnS6XXryYOO/sIJIcsESoG yM/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126656; x=1776731456; 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=1bo5Y+UZCJy4gHCz2x1tdhwNQXL4/DMiX/PocQwagYM=; b=PsiQ151SYQXz4YLLkmkGag4Zg6oBW98Xqob+9RxP7CDOy5GLNGofilJ3ZLfoBE1dqI 14/fdTwwIu3rEcIZ70jfS9vGOymkhdkQFqxqsSUMo8Ap230qtdOJ8P8JCaSe91btsklu cZjQSkfvRoWmf/ZiFu6sEe43b93MpeuavBxKrWVcRx9JURFPA0z9VkJqilZpVy3fFsnp CavhX0hVekicqSjqKO0Yc7vhslnji93BsBdgZ2f87EV6i5Z9AeXV/P9i9jffEGkrz1qF 72XA9eteW4IlopWKTVY5uqaupMUP8S6vh3WGkchZxHlLHCBmEMRhY4lETX5xy7MKLk3p AVWg== X-Gm-Message-State: AOJu0Yzr+FXY8BiEKzyIHs4k8DzBIoYGPxHQDkzTSAw9Fc+HFIAuLWIZ OEIj9NFD615B5CC2YYpTLonooSu9AZytx3aDSS2q3MYUDMkKtsPdaTdenNjQEW+rpC8ajSwihM2 tklVMFhg= X-Gm-Gg: AeBDieuvEb4fvA7LCshieTqzmOOnYJXDuEP0rzJo+UiB/I4OTQ3Ak9xqbs1tOdlO/VW BIkPFL3inIts1tK6ZvjrSSoq+fcukfwHzxtgV+dqTguu86SsM3nK7Ev29m+rOpZCBILIqQ5m2fb YAsRrczokgBYVqLwahrC9o+iS9nlG0cD2sZHtFM/7vhDQvaGfiFsU0OmdUdxDmqxLrao3yuHbe1 3u9PTFFfuooK+15Gt17LKW/aU8x+lXFYpEnCfTTww5OWZG/K4/kXgAjxws+ul5QImJPABSu5Ohh HdJsj0GuBDgibmehOASkFJRbFETwD5LsY0nK8SQ/6mDLbjVj3G9pltSgfpRGb2+p8l+2pLkRsKJ jby2vktscGEkhSqcPNP/huoC8v/OfQrArKHnHSvRlO17AXVSyS8k3bYPh0dgf1mV6AzzWl7XieD 7GIw0sLR82NHDIth9E5VUc+cmEBRHBodeXQOk+nsD12J4Bq+XCl5+btVOJYbNtBxCAU1enw+yY X-Received: by 2002:a05:600c:8717:b0:477:9890:9ab8 with SMTP id 5b1f17b1804b1-488d6816f5amr210993855e9.3.1776126656164; Mon, 13 Apr 2026 17:30:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/27] monitor: Introduce HMPCommand::arch_bitmask field Date: Tue, 14 Apr 2026 02:29:39 +0200 Message-ID: <20260414003001.97571-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126709847158500 Add the @arch_bitmask field to the HMPCommand structure, allowing to restrict a command to a set of target architectures (represented by the QEMU_ARCH_* enum constants). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- monitor/monitor-internal.h | 11 ++++++++++- monitor/hmp-target.c | 1 + monitor/hmp.c | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 80b4a8150bf..eaf9a607783 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -82,7 +82,6 @@ typedef struct HMPCommand { * the formatted text. */ HumanReadableText *(*cmd_info_hrt)(Error **errp); - bool coroutine; /* * @sub_table is a list of 2nd level of commands. If it does not exist, * cmd should be used. If it exists, sub_table[?].cmd should be @@ -90,6 +89,16 @@ typedef struct HMPCommand { */ struct HMPCommand *sub_table; void (*command_completion)(ReadLineState *rs, int nb_args, const char = *str); + + /* Keep non-pointer data at the end to minimize holes. */ + + /** + * @arch_bitmask: bitmask of QEMU_ARCH_* constants + * Allow to restrict the command for a particular set of + * target architectures. + */ + uint32_t arch_bitmask; + bool coroutine; } HMPCommand; =20 struct Monitor { diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index da7dd7f31f2..f6dce326cf5 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/base-arch-defs.h" #include "monitor-internal.h" #include "monitor/qdev.h" #include "net/slirp.h" diff --git a/monitor/hmp.c b/monitor/hmp.c index 0e5913fabb1..e881c26c305 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -36,6 +36,7 @@ #include "qemu/cutils.h" #include "qemu/log.h" #include "qemu/option.h" +#include "qemu/base-arch-defs.h" #include "qemu/target-info.h" #include "qemu/units.h" #include "exec/gdbstub.h" @@ -219,6 +220,9 @@ static bool cmd_can_preconfig(const HMPCommand *cmd) =20 static bool cmd_available(const HMPCommand *cmd) { + if (cmd->arch_bitmask && !qemu_arch_available(cmd->arch_bitmask)) { + return false; + } return phase_check(PHASE_MACHINE_READY) || cmd_can_preconfig(cmd); } =20 --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126697; cv=none; d=zohomail.com; s=zohoarc; b=oEa9J5TFSzRO2Y4ZZPZW+x4ru4xcb3uP/j+H82fwUPvG4VnFYLncmHrm5loK68Zs0JqFm1Hyu23M/1kXYpI+PMQ52h2IH6wkJeHsxOLpYeR2GBj7xWzak0Zjq9Lc9xTbmFheE0uj2Yjuh7CFpg7idS0XXQjECtn9W43oYjkYIXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126697; 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=iqT5An8t/Rup8MOLjBq+qy6AZymRqDsPAbrkKupI24o=; b=OT/GZLdKbXEFWBVheTcWhK+PcLLObtvEdAE+rMmQNbqvqe2PDHXUMQUwjA5XaF3R2dsMyEw2Rf4EZ41TgTAwQtMiQLRtgtnZ0eVzmBSp9/NLM8Fvrt0A1QKBRzj5qJjy+XhHTxJt7O3e632Tz47b2+6sOkUh752t/9QfwdPkq3o= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126697568195.2114335960099; Mon, 13 Apr 2026 17:31:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgS-0001pp-9T; Mon, 13 Apr 2026 20:31:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgK-0001fQ-R4 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:10 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRgI-0003B5-8q for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:07 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so34952325e9.2 for ; Mon, 13 Apr 2026 17:31:05 -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-488d68479b2sm105283705e9.25.2026.04.13.17.31.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126663; x=1776731463; 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=iqT5An8t/Rup8MOLjBq+qy6AZymRqDsPAbrkKupI24o=; b=Q6MhdpYxb4x1S+qHUdXHuDdMr6C06GtAMCXyHk3WE0ik4NlGKlt579ARBDvNbcD0BO 8kAmsNP6/mrupJlM/g4/U4j87iZsypmSz5xwX1lJfMZ74gOeXlZ+UbJYdt0Q+phsjur9 BftCAekaimrNpL+b+TJY4yTD+ks7nARSLwOGfzm09MSsX3Y7YfrKfnneZGZrpBgfxTg+ XTixRiN5SLa4oA5WCdBAVfXX7CqPHPU2RhC0XHHMp5G8vozBymqsVgjSZLNObvQ80wFf djZqB7xS1dotd7l+C/NVyoVX8Sv10AcUP7i5NmQrfR8FJthHdRZi9sfqvotumZ3sDshi WBxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126663; x=1776731463; 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=iqT5An8t/Rup8MOLjBq+qy6AZymRqDsPAbrkKupI24o=; b=Ze1oj6TYGeI4geh0a8NTg8iGu2LDsLSS5Cq1PtvyvUWskFuLU3TqcNGfohe7X9JwKv KALsGuqr1epp4yTqIhegrY+SykW6kT8ugFaU4Q4cFvYI/EfsxF3+guZG2BSF/H66FbRM +EmGWfgZAzyVDKfEgZi3TBNAIGGowPIu+6mwqjHBm1YNztCMLbyC3qC6bRXBxErOKw8k ixpCa9+H+0pmWytJ3dt1itAePLLYGMb+FeCy849nhpjZCpD9dQrJAyVo1fQoAWN67V8o GAyIknc9Wc9Vy2Y/ql832cncE4LoVGVgvvbTHpzwXH4X9XqeYVBZf8AFqnHpkecSC3dt +cTA== X-Gm-Message-State: AOJu0Yycr0MCgw3nQs7OLlcr+bKcOXQ/+xank0sfTz5NHEvEr3e1FT+b HVTGYRB4lGORZMkQ9GrbOVtwbBsSGLWUfYp2BzcmHDbcCKsgPtWjk9Nc/UIT5plThKHDixalu+p gOXbvdR0= X-Gm-Gg: AeBDiesEq4V2McfrTc9x/GRROkx3abNC5K8RbQdSIPCt7d2KYSKmKzAZmOh/ZjyGpqP d0T8cu05lFB5J83eXPDxtKwSsCLVUQlA7ANExh5l+Z4xys49Xztn6iJM70MicM4X9TJl3/Zg2B0 KdHCiZPKaCh1PVmGbmIaQboTxIHzTKzXFomGa8Es89ZcRzA44Ah9PX/8XJkgQmBqxiAE+1Ipjm4 D9ETi7P5jyZO51VyOl1Yjc3Dul4YzF8DuUOi60fOHkJOLrfUGP9faxUsyneP7H9RdRIN5eEBDz4 wEYpj0jPgPWQefZqqz8P4ma6wtDBFqi+XtAxJr0dgBzWAlIBDk0OTCO6QsIjgSTL4hC8uuPoNWb xxV/1fyXFTcdHiwBVd+zS6XzPHxm011yWRCBS8KPDgOVHPNi36EiS+Uzt0TnByGl+TU4VbNskV+ 9gEwTODpJrciuptZYEhhwDAkAYnJ7qZmx+gVjqmO1A9hDkwyISObgdhwOGr1gQlCLVgXKrEUo8 X-Received: by 2002:a05:600c:43d5:b0:488:d8b6:abda with SMTP id 5b1f17b1804b1-488d8b6acdfmr118139995e9.19.1776126663425; Mon, 13 Apr 2026 17:31:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Halil Pasic , Christian Borntraeger , Jason Herne , Eric Farman , Matthew Rosato , Ilya Leoshkevich , David Hildenbrand , qemu-s390x@nongnu.org Subject: [PATCH v3 08/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions Date: Tue, 14 Apr 2026 02:29:40 +0200 Message-ID: <20260414003001.97571-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1776126698118158500 We want to make the HMP commands available for all targets, move the declarations to "monitor/hmp.h" where all other are, and only include the monitor headers in the source files. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Cornelia Huck Reviewed-by: Eric Farman --- include/hw/s390x/storage-attributes.h | 4 ---- include/hw/s390x/storage-keys.h | 3 --- include/monitor/hmp.h | 5 +++++ hw/s390x/s390-skeys.c | 2 ++ hw/s390x/s390-stattrib.c | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/stora= ge-attributes.h index 66716a97c05..0305873b019 100644 --- a/include/hw/s390x/storage-attributes.h +++ b/include/hw/s390x/storage-attributes.h @@ -13,7 +13,6 @@ #define S390_STORAGE_ATTRIBUTES_H =20 #include "hw/core/qdev.h" -#include "monitor/monitor.h" #include "qom/object.h" =20 #define TYPE_S390_STATTRIB "s390-storage_attributes" @@ -72,7 +71,4 @@ static inline Object *kvm_s390_stattrib_create(void) } #endif =20 -void hmp_info_cmma(Monitor *mon, const QDict *qdict); -void hmp_migrationmode(Monitor *mon, const QDict *qdict); - #endif /* S390_STORAGE_ATTRIBUTES_H */ diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-key= s.h index 2d02936c31c..666c05e2996 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -13,7 +13,6 @@ #define S390_STORAGE_KEYS_H =20 #include "hw/core/qdev.h" -#include "monitor/monitor.h" #include "qom/object.h" =20 #define TYPE_S390_SKEYS "s390-skeys" @@ -123,8 +122,6 @@ int s390_skeys_set(S390SKeysState *ks, uint64_t start_g= fn, S390SKeysState *s390_get_skeys_device(void); =20 void s390_qmp_dump_skeys(const char *filename, Error **errp); -void hmp_dump_skeys(Monitor *mon, const QDict *qdict); -void hmp_info_skeys(Monitor *mon, const QDict *qdict); =20 #define TYPE_DUMP_SKEYS_INTERFACE "dump-skeys-interface" =20 diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 9c2330205fc..d694bfdf768 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -173,4 +173,9 @@ void hmp_gva2gpa(Monitor *mon, const QDict *qdict); void hmp_gpa2hva(Monitor *mon, const QDict *qdict); void hmp_gpa2hpa(Monitor *mon, const QDict *qdict); =20 +void hmp_dump_skeys(Monitor *mon, const QDict *qdict); +void hmp_info_skeys(Monitor *mon, const QDict *qdict); +void hmp_info_cmma(Monitor *mon, const QDict *qdict); +void hmp_migrationmode(Monitor *mon, const QDict *qdict); + #endif diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index d974d97b5e7..7dca67d6618 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -24,6 +24,8 @@ #include "system/kvm.h" #include "migration/qemu-file-types.h" #include "migration/register.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" #include "trace.h" =20 #define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys = */ diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 2e83aa211cd..74b23b0a995 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -15,6 +15,8 @@ #include "system/ram_addr.h" #include "migration/qemu-file.h" #include "migration/register.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" #include "hw/core/qdev-properties.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126718; cv=none; d=zohomail.com; s=zohoarc; b=NA//cTN9l2wiY+uX89dGEV0hf4IYevxqHBpRN1aEdxpGjjquS5Vi8RxguQyDlrxJOewCF+O89LD4iAvjkmnZ5sfFw2s1aJdxUGQ+h/BgklAtSQ99yt9VVJurT03vEfzclwq6avcIasPZeZ9c5IQ38pWPd3aKvg1iq1mXUNxgbbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126718; 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=QyVhBxhNqIKQm4mEyhy8i6F7z6Ge4ld3eF+gEeCDR2s=; b=ZlUVuIAVTqQ6nDOeVixMuf3XPbi9qx7LlhSIn3Y78Olpinh7t9eRhrIUT3FnW6DlUiGSxJvLG3THa2GBxwUzSBOk77C1qTd0eImiDNsAFsd6Wyfu6YcWwNPbLI4Sh//zQPZ3FWUdenLvkaUdk5DXLelO41/NMGyPpj7PlEZO0cM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126718683846.3515700911585; Mon, 13 Apr 2026 17:31:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgT-00020u-SN; Mon, 13 Apr 2026 20:31:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgS-0001oq-2L for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:16 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRgP-0003Bm-H2 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:15 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488aa77a06eso83638825e9.0 for ; Mon, 13 Apr 2026 17:31:12 -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-488ede1de4asm15084895e9.4.2026.04.13.17.31.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126670; x=1776731470; 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=QyVhBxhNqIKQm4mEyhy8i6F7z6Ge4ld3eF+gEeCDR2s=; b=DfeoilOnivvmryKNscefH+nzIR5AHUbtGeCB3W8MzaoXayzVVznRnoUpHaUBzNA2b9 KAOtEhEmTkQJmcVL0XVn/6nokuiwq4N384YAfaeKFSJLEOx7Vb7UKnOeJcJL4pL/Y1pi J9L/7dk816o9Cb9NAMfhgPBWFma2E2GxpQf1cZP5wy9lawHEw34zj3gZXjxzUFuuIlI5 gM9r3mSyRscX1tguLCEkwUGrlibPEPM6pNJQ2cr4Bnr9vtW1Q+L5xwH3llBZUoX/PDDe EJIRpxcYonbEh6We3kkBuyjbQZ25XNltxiE16nvApP48xzlot+dXmVe5pIyic65vFdAz FKIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126670; x=1776731470; 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=QyVhBxhNqIKQm4mEyhy8i6F7z6Ge4ld3eF+gEeCDR2s=; b=r0Y5KWPIXvNL+aKyP7/cttUXs82Mqyk8u3DR2OBWvaW2hutcGvaC9NQBByfYCoQjOm lCSq6+QUD5XhDXe9KBzZ2tXKm0xEVfZZSbXnTo6UpPpbsilqMNVirxvsvpm9EHkHmrUV /hd91YSs2wQIZDM73sT/YnNuv0wVM8VebDQmbNl5Tu2JfA9KorQ5y20OJabSqrOgOOHF HHbp1fXZpelawuAUPGYeDO+g1yNzajS6OVuLeLKXaz89u7NwlH03Grgk7iIiIwhhOUPl RAct7a3wUODCwOyboW8yzO+x2uXqOp9aqTLjOu6V0sqZk4u4eLhviv0IoLQI5KndQAKU 2uWQ== X-Gm-Message-State: AOJu0YwQZ7xskD39k2L2Xk93KMrLCpA4fWXegdWaawdKjStLqZzOfIo9 y50+aXZYYhtEFAf0/CG6SWJZZlj1j4CC8YiS5oGIGBscstyxDb1QVrBbBABEwsEOYXnz5n7cdDl MDOyeNRc= X-Gm-Gg: AeBDiet6jNCz356xthC1nsEUVhx2BfZqLvPwgxEx9VYfEVvu+7uS0SP0ARUPija7cWe UKdQ1lft/oabUAAlp+2LulJsNhFEGg+Gc89t9iZdB6atxRAWf8nUjnAMicBwyVaZYhI8mgjllN9 BRpiFwDqIyQ4FCJS1uwZdxY6GulzgkKI7BqFYObR94OrEBzIbxyxBJKcmHcaThyC0KSqsIom4k5 KHF513Q/iQpWMd55SFffpYl6Qqcg1+9ZwbGfZhgpX1jBb0nIEEKEDhNp3vVDsD7oLrTXsukxfQl nXEB49Wqf9jeZt7cPXrm+EcXEB+ujci6tmhByjzyBsGAoJmvSEo06AftJvXdZhrPniRmdRxVsPJ 7IzHAB+G3tgbNk6nMREd9x/RtkiLpDL7Ab7gXYb3LR8aY5iKdo6gYhOGxBrRFuCqOks7CsaCBri xpPpjIlCDUFY6N/KTpeu6rgwmmhfVzFsMqPKThkDogbQF61mbpf8YiI/ljZvLUcCmFz55Flffo X-Received: by 2002:a05:600c:331e:b0:486:fba7:b150 with SMTP id 5b1f17b1804b1-488d684323amr118458355e9.15.1776126670568; Mon, 13 Apr 2026 17:31:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Eric Farman , Matthew Rosato , qemu-s390x@nongnu.org Subject: [PATCH v3 09/27] monitor: Do not check TARGET_S390X to build s390x commands Date: Tue, 14 Apr 2026 02:29:41 +0200 Message-ID: <20260414003001.97571-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1776126720863154100 These commands are filtered at build-time for s390x binary. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands[-info].hx files once. Since the methods are used inconditionally within hw/s390x/, define them in the same stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Cornelia Huck Reviewed-by: Eric Farman --- MAINTAINERS | 1 + include/monitor/hmp.h | 7 +++++++ monitor/hmp-target.c | 5 ----- stubs/hmp-cmds-hw-s390x.c | 15 +++++++++++++++ hmp-commands-info.hx | 6 ++---- hmp-commands.hx | 6 ++---- stubs/meson.build | 1 + 7 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 stubs/hmp-cmds-hw-s390x.c diff --git a/MAINTAINERS b/MAINTAINERS index cf462793a79..306835ff678 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -122,6 +122,7 @@ F: include/hw/watchdog/wdt_diag288.h F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img F: stubs/qmp-cpu-s390x.c +F: stubs/hmp-cmds-hw-s390x.c F: target/s390x/ F: docs/system/target-s390x.rst F: docs/system/s390x/ diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index d694bfdf768..a29185741b8 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -16,6 +16,13 @@ =20 #include "qemu/readline.h" #include "qapi/qapi-types-common.h" +#include "monitor/monitor.h" + +#define HMP_STUB(cmd) \ + void hmp_##cmd(Monitor *mon, const QDict *qdict) \ + { \ + g_assert_not_reached(); \ + } =20 bool hmp_handle_error(Monitor *mon, Error *err); void hmp_help_cmd(Monitor *mon, const char *name); diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index f6dce326cf5..a222fd4c96a 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -36,11 +36,6 @@ #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-machine.h" =20 -#if defined(TARGET_S390X) -#include "hw/s390x/storage-keys.h" -#include "hw/s390x/storage-attributes.h" -#endif - /* Make devices configuration available for use in hmp-commands*.hx templa= tes */ #include CONFIG_DEVICES =20 diff --git a/stubs/hmp-cmds-hw-s390x.c b/stubs/hmp-cmds-hw-s390x.c new file mode 100644 index 00000000000..2b4f4cac79f --- /dev/null +++ b/stubs/hmp-cmds-hw-s390x.c @@ -0,0 +1,15 @@ +/* + * Human Monitor hw/s390x stubs + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(dump_skeys) +HMP_STUB(info_cmma) +HMP_STUB(info_skeys) +HMP_STUB(migrationmode) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 463038c302a..28dec25642d 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -717,30 +717,28 @@ SRST Show rocker OF-DPA groups. ERST =20 -#if defined(TARGET_S390X) { .name =3D "skeys", .args_type =3D "addr:l", .params =3D "address", .help =3D "Display the value of a storage key", .cmd =3D hmp_info_skeys, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``info skeys`` *address* Display the value of a storage key (s390 only) ERST =20 -#if defined(TARGET_S390X) { .name =3D "cmma", .args_type =3D "addr:l,count:l?", .params =3D "address [count]", .help =3D "Display the values of the CMMA storage attributes= for a range of pages", .cmd =3D hmp_info_cmma, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``info cmma`` *address* diff --git a/hmp-commands.hx b/hmp-commands.hx index 06d7b17bf25..ff65b39b454 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1125,30 +1125,28 @@ SRST =20 ERST =20 -#if defined(TARGET_S390X) { .name =3D "dump-skeys", .args_type =3D "filename:F", .params =3D "", .help =3D "Save guest storage keys into file 'filename'.\n", .cmd =3D hmp_dump_skeys, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``dump-skeys`` *filename* Save guest storage keys to a file. ERST =20 -#if defined(TARGET_S390X) { .name =3D "migration_mode", .args_type =3D "mode:i", .params =3D "mode", .help =3D "Enables or disables migration mode\n", .cmd =3D hmp_migrationmode, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``migration_mode`` *mode* diff --git a/stubs/meson.build b/stubs/meson.build index 2d334a5a8f3..32c16209543 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -86,6 +86,7 @@ if have_system stub_ss.add(files('qmp-cpu.c')) stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) + stub_ss.add(files('hmp-cmds-hw-s390x.c')) endif =20 if have_system or have_user --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126696; cv=none; d=zohomail.com; s=zohoarc; b=YUpC5eglrU9CtJgCm8kNFdx2ziE9QVm5k4YpNosYv5KKJSVI2Y1IN2bJzBNQRss7BC9XO7GA91a98n+429T5JffoHYbSwbIwiUwMth5+ErfqEt+oRR1d/AkYAP6oq5CYXt2Kbn/6zNjwGtk6AXrVA2HuwzobdJc7VERg/nXDaQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126696; 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=4HhO+vrX/AM//JPlmWhzirx7E6tYyJP7oHGnG3g4hvE=; b=LL5VY+1yuaPf6WIQ2K5kTRCf7StqraBStiytgPsjaaqz1A03nQLslyuYFtxWZde6lFM7pDuzXkylMh4iz4Mn6iPkcu+JOfD4LK3Rfdx3tjpekIhDsm/30aEn3VEHScpPLWhoAMmYJgn5HO78slZ0XHonkH6IWlhHlJ/S4Hr6lQ8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126696008626.5377025372904; Mon, 13 Apr 2026 17:31:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgY-0002L3-TI; Mon, 13 Apr 2026 20:31:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgX-0002Ev-Bu for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:21 -0400 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 1wCRgV-0003Cd-IR for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:21 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488afb0427eso61868225e9.1 for ; Mon, 13 Apr 2026 17:31:19 -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-488ede1e217sm10822615e9.5.2026.04.13.17.31.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126678; x=1776731478; 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=4HhO+vrX/AM//JPlmWhzirx7E6tYyJP7oHGnG3g4hvE=; b=cEKIUQTOu4UTY373u49k8K1qJkBYaSD77VDfzR2Axvl3JpF26fn5qqGoxTCKN3Msw6 k//4JHxZav8yJdQXejpTwUNVLCySIE/s51t+rY7+jSPTkZRrJB3AsQN906SnOBukQG+d G8kYz3Uclt6MdNREJlxCcUskMXF6B5aclBFabEVsrjiRE9LLHsmKDWQFUmihOKEar1gx oyTnV4faX4Cu90TH7/aidXVVVFLxHiJRwxEgC/bj3rvUl/ITBREaubJ/tP//wcvgezQP CB/UQxciM5zslnQ5118xvlwK5JTFt09GRU/jkfqJXGRIjZKw1g9xS3DtBNORFXuE8NO4 zq+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126678; x=1776731478; 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=4HhO+vrX/AM//JPlmWhzirx7E6tYyJP7oHGnG3g4hvE=; b=B1SC1pKieaoiL8lL/4qbO5aqFYCGxBZMlCpuOOFiaYmtC3YcU7g7/xTXJbY4wyzb+V dgQQx7xmh1fbiAy4ZmS65omIkDFlBu3n9gIhHjJoYGHg9RNBUGiCkbJdsTyczERPVIUG kDvoZWmtI5b858bdfikf/ikl24vnRfVS+WaiWmS9kRQPUp+Ff6hIXN0PQhkYL5U3JsqA OQB4K2sxX+1v4W2QQKrj8k7/qMKBWJYamIteTjWKyc2KpcuF39uQshZ11F4gQwvjIbG8 Vuid+oUFv1M+kDFzSVTX3OnSdMS5LDnk3b1lUnObMn/oAeV7hBvtrlc8j9sWah3ftyXN i65A== X-Gm-Message-State: AOJu0YzrSKuXl5jPEzK+lumsTugOv7MdRCY+fdkP20SQCVIM/ixZkZjn uyui/ALSAkdO6aPS7JXrKbzydDV+aMPyIqDwaOqDe7mytoJ1eGW8nM23LWHsy6YMOp0Tmz8ea9T /pFrGPB4= X-Gm-Gg: AeBDiete2YzyRsNjdQEiKEgdZY45SZ+VnVyYB8eCcP0d7PC/jLArOZJPS2ShlUK2hop 3LKj+q+/TGNOKTqNaGUuGuq0LoDEnAxAmQ6sG67Ll7wmkfr+juQM/uqGFaGyRxC3FaCkbi+MR8g 6DYds34V6ipamV1Kas45IdyYiiGZy7b50g7dgQ3JSj949m5IRDrm1ghOSglM7MY5rKGL8poL0kZ q1fk/4xIiy00/fz9pBWFllgMkUArEeBQN+3xq0/RjpL8vTketqwBCSFfGTZ0nwHBcMNYH3UD+Dj +A6s/hER/fAnWBKJO5OvGC0JTxPmlnPcDd2B9uaRODOFUXxoL1DuivN8Bjwc3KXSL5KHndni3Ix 09fWCmUxxsdFwwn0Rw2aL1+KWYsFXdKH3cV4+Y2TRQbAyNBT+22nBU7DHHghiJD0IuO6nM1G4zN 4f/9ytbgDAjYjkfKIbJhN1uuhi2wwca5W3WymE8HK8Csob30DnX6CveK2/p0lDoOHjSsEFHOB6 X-Received: by 2002:a05:600c:3150:b0:486:fcc7:d6a with SMTP id 5b1f17b1804b1-488d67f4c4dmr233519535e9.13.1776126677556; Mon, 13 Apr 2026 17:31:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH v3 10/27] monitor: Do not check TARGET_I386 to build target/i386/ commands Date: Tue, 14 Apr 2026 02:29:42 +0200 Message-ID: <20260414003001.97571-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126698582154100 These commands are filtered at build-time for i386/x86_64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands[-info].hx files once. Since these methods are used inconditionally within target/i386/, define them in the same stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- MAINTAINERS | 1 + stubs/hmp-cmds-target-i386.c | 13 +++++++++++++ hmp-commands-info.hx | 4 +--- hmp-commands.hx | 5 +---- stubs/meson.build | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 stubs/hmp-cmds-target-i386.c diff --git a/MAINTAINERS b/MAINTAINERS index 306835ff678..a0c8f484163 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -148,6 +148,7 @@ F: configs/targets/i386-softmmu.mak F: configs/targets/x86_64-softmmu.mak F: docs/system/i386/ F: docs/system/target-i386* +F: stubs/hmp-cmds-target-i386.c F: target/i386/*.[ch] F: target/i386/Kconfig F: target/i386/meson.build diff --git a/stubs/hmp-cmds-target-i386.c b/stubs/hmp-cmds-target-i386.c new file mode 100644 index 00000000000..43a167056d5 --- /dev/null +++ b/stubs/hmp-cmds-target-i386.c @@ -0,0 +1,13 @@ +/* + * Human Monitor x86 stubs + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_local_apic) +HMP_STUB(mce) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 28dec25642d..b575e4ac993 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -113,16 +113,14 @@ SRST Show the cpu registers. ERST =20 -#if defined(TARGET_I386) { .name =3D "lapic", .args_type =3D "apic-id:i?", .params =3D "[apic-id]", .help =3D "show local apic state (apic-id: local apic to rea= d, default is which of current CPU)", - .cmd =3D hmp_info_local_apic, + .arch_bitmask =3D QEMU_ARCH_I386, }, -#endif =20 SRST ``info lapic`` diff --git a/hmp-commands.hx b/hmp-commands.hx index ff65b39b454..cfd53bdc744 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1488,18 +1488,15 @@ SRST Stop the QEMU embedded NBD server. ERST =20 - -#if defined(TARGET_I386) - { .name =3D "mce", .args_type =3D "broadcast:-b,cpu_index:i,bank:i,status:l,mcg_stat= us:l,addr:l,misc:l", .params =3D "[-b] cpu bank status mcgstatus addr misc", .help =3D "inject a MCE on the given CPU [and broadcast to o= ther CPUs with -b option]", .cmd =3D hmp_mce, + .arch_bitmask =3D QEMU_ARCH_I386, }, =20 -#endif SRST ``mce`` *cpu* *bank* *status* *mcgstatus* *addr* *misc* Inject an MCE on the given CPU (x86 only). diff --git a/stubs/meson.build b/stubs/meson.build index 32c16209543..4d1a803c17c 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -87,6 +87,7 @@ if have_system stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) + stub_ss.add(files('hmp-cmds-target-i386.c')) endif =20 if have_system or have_user --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126709; cv=none; d=zohomail.com; s=zohoarc; b=DH5zlWh95I9B4/NheLY9Vz6TZloJjhRdiy2pPUU+CBz+J5aW38/MGHqDgwJIuLfjw6e9xsMg9BPwZOWUpeT1Gdtt9lfVcZ2IvEh8eGd5yY/Vbd75c4HLXW/pOcOA2PRNg5GJoenVFcMFn/U8V/JlUHsCxCB9PBv3dBoM/VEZn1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126709; 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=+gugBCWVY82uTJlbHhOJnHmVxWC9Bv2gRPQgW/p0QwY=; b=c231wGBUNlBVAhneddBHsGScd6j2Ky+Kw9N6xT85Q86yVuvTcwHiEfsDg6/0ei67HYu9RwDAXVdMsgg8hwDsOb9DBNlHAmxZQDV0HjclP0HfpApmg//gWUINsDS/KHKzrNA7Z2zY4YaYO0CnsvQeXZ8NQUY5nDIDL6NKntiMVnU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126709162866.9817459444625; Mon, 13 Apr 2026 17:31:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgf-0002Nh-9c; Mon, 13 Apr 2026 20:31:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRge-0002Mp-4m for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:28 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRgc-0003D8-IQ for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:27 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so34954525e9.2 for ; Mon, 13 Apr 2026 17:31:26 -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-488ee019d9bsm5975475e9.14.2026.04.13.17.31.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126685; x=1776731485; 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=+gugBCWVY82uTJlbHhOJnHmVxWC9Bv2gRPQgW/p0QwY=; b=iGl8kVKlrLMtqXw35uWpKljGwVyucgKvZ4XyDTvbzj6gEPtLbGTmKIkUSiGxwSgRhF YoYJuZ1WjnP841BzPlj2ZnJt7ezSTKFLzfg1uKuK9AjP/fE0/9Nk4w7fKV4qnhEzAqGZ hlhz9GfpkDE7Ud/DxH8yPYAqZKsryjdBqK+P07KIpTx/gk/BLAVEh9jSMQxzTfDXq9Hr 4qFiRQ9BqqVCAvo8qLefxFcdwRUA4BYB2EHRCT3e2+/l4yEjelMpW5nbXx9dvdmWKRue w/aXOasIgR1xLq/BhTxofPaqC6LgMnwQtUzQonVvS4/rIHfapf5fVlO5nLlevCyep8m6 /EYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126685; x=1776731485; 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=+gugBCWVY82uTJlbHhOJnHmVxWC9Bv2gRPQgW/p0QwY=; b=Spz4ESEgiFhwY9/ZXGB0sGCn0hH/CyR5q/Ih64IeMefqklgyglNxuJzp+7H6we52Mg 8qHtUhHicjq0mb1nHgBlanlF/Fd2SDzkoSR4Ex8cRsM96IOsZh40GLg1l8mZcCVLx+IL O2Fe6m3czhl+3uVsT/bjCNihbYSiMIWCJ89oA3+CN1HOo/V3zNEnxkD0iVQAZYTqtGx5 qkMOrsu/AUuTnK0qOVBA3DKbkQ3pqQINgUMRjYixqjctyKSdYRZMlyYDdp4MQe3SnHiW sClf/9I5XGq2Ob5IuR7bYbzqd1RXtyIPNDOTufzq8ELD4sXzdfdbtBjGsNVLBXH0rT/T BIPA== X-Gm-Message-State: AOJu0Yzb6eKt3alUB5rmeKnXBWmbKnPdycFPyHVg3OVtYIqFsPqTqaRV 6BLLez5kFpJ8BDP1OFht515PvWTuQFBZ+MB3p8mj/hlCC/cX2B5oNlTs6zR79RWfGt75CuDVtJV hFUT0mP8= X-Gm-Gg: AeBDievP3epU1fHE82dT+SULgQXb6s2+A0lz3NemIbbZ18dfW1Dm1cM20CvVz/M8uFt Z8ALwjTCSX35yLlD0GtvK8lCij5j6Dj8qErx36mK0qSPpEW4kbTPL6ta/jccXSsvppOPKkVP6lX 38tkEvwLQs810ftjgHqzkLeYPhM+j2CQMGQerluc+34EDuA58Go2uBiRM2TTJ7rvqtDmXTJP0Xd TwWrVlckwCv4MSwX6F6Gp2ush/tfz0F8UY5SelMUnrGLtHDROQW1NB+wBJBeeT1pIIaGlpQwsUI SXzlAFKeQaLINCDOIQkOyRlfUdLtkBCi37rkzH8t3lGwkf9HEJKsN2CzHifLw3/F2yLM+Qx6tIF AFOgH7cZl8+5Z+r2BTdEpG8qGOFYRVERsnQln9kFBuDWsZWL4sX+3uyBQdipF2wyCAe84MP5xnf ki1EvkUbMDWl2CEnx4CCoTvQyMMxq7oj1DxSznuEoub2+AbC3v9UjjNbPte/cSI2v8PcUD6uF3 X-Received: by 2002:a05:600c:5249:b0:485:7f02:afd5 with SMTP id 5b1f17b1804b1-488d680079bmr201952685e9.13.1776126684652; Mon, 13 Apr 2026 17:31:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Marcelo Tosatti , kvm@vger.kernel.org Subject: [PATCH v3 11/27] monitor: Do not check TARGET_I386 to build 'info sgx' command Date: Tue, 14 Apr 2026 02:29:43 +0200 Message-ID: <20260414003001.97571-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1776126710724154100 This command is filtered at build-time for i386/x86_64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter it at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on the CONFIG_SGX definition, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- MAINTAINERS | 1 + hw/i386/sgx-hmp-stub.c | 16 ++++++++++++++++ hw/i386/sgx-stub.c | 5 ----- hmp-commands-info.hx | 3 +-- hw/i386/meson.build | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 hw/i386/sgx-hmp-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index a0c8f484163..16a3d71af02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -514,6 +514,7 @@ L: kvm@vger.kernel.org S: Supported F: docs/system/i386/amd-memory-encryption.rst F: docs/system/i386/sgx.rst +F: hw/i386/sgx* F: stubs/qmp-i386-sev.c F: stubs/qmp-i386-sgx.c F: target/i386/kvm/ diff --git a/hw/i386/sgx-hmp-stub.c b/hw/i386/sgx-hmp-stub.c new file mode 100644 index 00000000000..cf1d9a6344b --- /dev/null +++ b/hw/i386/sgx-hmp-stub.c @@ -0,0 +1,16 @@ +/* + * Human Monitor 'info sgx' stub (CONFIG_SGX) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" + +void hmp_info_sgx(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "SGX is not available in this QEMU\n"); +} diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c index 1dd8d9afbfa..2b083c77bc1 100644 --- a/hw/i386/sgx-stub.c +++ b/hw/i386/sgx-stub.c @@ -23,11 +23,6 @@ SgxInfo *qmp_query_sgx_capabilities(Error **errp) return NULL; } =20 -void hmp_info_sgx(Monitor *mon, const QDict *qdict) -{ - monitor_printf(mon, "SGX is not available in this QEMU\n"); -} - void pc_machine_init_sgx_epc(PCMachineState *pcms) { memset(&pcms->sgx_epc, 0, sizeof(SGXEPCState)); diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index b575e4ac993..da9fdc0ab7b 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -866,15 +866,14 @@ SRST Display the vcpu dirty page limit information. ERST =20 -#if defined(TARGET_I386) { .name =3D "sgx", .args_type =3D "", .params =3D "", .help =3D "show intel SGX information", .cmd =3D hmp_info_sgx, + .arch_bitmask =3D QEMU_ARCH_I386, }, -#endif =20 SRST ``info sgx`` diff --git a/hw/i386/meson.build b/hw/i386/meson.build index 63ae57baa51..b611fbb5a7f 100644 --- a/hw/i386/meson.build +++ b/hw/i386/meson.build @@ -24,6 +24,7 @@ i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iom= mu.c')) i386_ss.add(when: 'CONFIG_VTD_ACCEL', if_true: files('intel_iommu_accel.c'= )) i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'), if_false: files('sgx-stub.c')) +stub_ss.add(files('sgx-hmp-stub.c')) =20 i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c')) i386_ss.add(when: 'CONFIG_PC', if_true: files( --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126698; cv=none; d=zohomail.com; s=zohoarc; b=mmH3e1S8BCIf4IdgeGW9nAxTpNjhovWpP5uA6Nft7LEZX23RoYaBpF62nV7hANDmLx2DV98PnI4I0qVQrcBJowsZed5av/8NJFai6ZErmsVFyoZ6X5x4cHVj7VMvo6PTQRed3IPTvhP+93KQcBrxrikUpEkMsCN1BvspTWEzQWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126698; 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=bt+4kyReD5cZ8XMM2eCoJcAo0IpKXrafGm4URfy/RPM=; b=H8rh43Ch5I8dfwnjbH673vW8pxqdSdhtjxMMNdMDROshiY1z8DCmshgzJ+ExZuYRf1YZrCSe9aItSXwo0YZAjJ5mK5d11umBcNvre0NfbPiUkgwH/uVqACW3JvzCDo8vVE3GaLaq+4V8jLwubbXplR8B1D73RghEamy+/n7uIE4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126698617698.3930376815883; Mon, 13 Apr 2026 17:31:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgl-0002pC-Sy; Mon, 13 Apr 2026 20:31:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgl-0002lS-2y for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:35 -0400 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 1wCRgj-0003F3-Ds for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:34 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so34955205e9.2 for ; Mon, 13 Apr 2026 17:31:33 -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-488ede1e05bsm12018185e9.6.2026.04.13.17.31.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126692; x=1776731492; 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=bt+4kyReD5cZ8XMM2eCoJcAo0IpKXrafGm4URfy/RPM=; b=vgg2DXgiAQDowJFrSu+KqdEc8kILn9hc91SrGCLEc0ZleLJRBPehsKwGxAOq9XU5nc 5w2BoBmB+QxUIrDSW1E83pFFPVJJgswZ2pAMNt7AnpL2YtmDJAFpUETdZvdAclvbKoml B8gfq2Yk29/rPox7bv84wS3XLhBnoNj92sa1kRcdPtXlFXSwoc4d1SSHT4feI7rrpOVs YB7+P3sM259EOr8TTdvTnOBArxIB8kSZ4OB67Jxg4Qz/XWER17q3sVKCuX1b+d7FdZQh ueRMuIl/2bHdgms8bnQDHOT2WDStqf1QabvLdo9Y18Q/biH1pIZFmYvLSSJb3TbwKaBK BV2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126692; x=1776731492; 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=bt+4kyReD5cZ8XMM2eCoJcAo0IpKXrafGm4URfy/RPM=; b=Rooqe2baIW0LssJ+HiwQYlLEJUPSxa9oQztEZOuPq/jrZAjGvXmwjfeaD5KJLJIgtB /zh0t4FKifzb2dG7Jha4VZtcqnd4Rm4Xs8D+q+Txx3NftH0wRo07yNXUwF1loT5AfBPE 9aeN/k11tlfQ0mEjiRoko+Gm8R3dhXBqsVqbQ9R1AFKPbaIsFQCgBVL0Z/u91a7Ai6eL UMuBiTz4pznArS9JVStO/KMXOS3QRxgsDUeoiv/igImoHm+f+YEgglFm8C9Gw6XYe5UO Xzc0jCiNBOcPK8xe984e4P6YXSNEOqSlFBpu+PgfdJBhaA/Jo2nufOzY3b7FfCGAkEUZ ppRA== X-Gm-Message-State: AOJu0YxEUAzPkB0f1/iIqsDe8RArWLv1XBj26Mo58lCZqw9S+iPJmuYE OOstrNPHse8c8Cct+4965kQPhW014Cx+h+vI3EztXB4PIjFVGn5b+LYyAPUCZxgGOBxXDAxO2nn DDu33Y3c= X-Gm-Gg: AeBDietpGopNvmKSX9br4XPQZiethdxk0SFzH+H0i09DVgjTT9sCTLwg0LrFv49/bLR o7cArDEgOCm4n9ffQHz3mpZv8AIToFwOTk8yjzJXYen38VpkrTLkaKaR9FsXw8LcyJ60K2SuJtM BiXFJ2W4BfKrdqaFPYQ8TtJaLlKxQkqCakvbYqJGQkzQAH2OPz3ySa1J06c7XHYTQKlVPItQmxI n3rwBpy/tDddBdG7/x/Z5RSJM9abdwLihyw4ktMNN2JJvP9KH0LZMNVMZ8Jz8sbfB0NGrRqnHSA VHgZ8TrxN3ulFU/pfXDhXERWvPQjwc1Wv8Wpceyhyk8MOHmC7HkKlTn5ResqCmQPyOpHON2yE8j MNQVNohj8BiqvkjTlS0NQ2afV+pf4UZcuPvyhDvepi7qzLAHk8lsnpjrqWySBy25cFO/oBy1a08 vzme10aKY/c5PuHHYHRI7I5u/+bqKUL7JwVpDiOsOYPJqhFlz3CXFMg4ISEpDKv6dwJ6EsS9wi X-Received: by 2002:a05:600c:64c4:b0:485:30d4:6b9e with SMTP id 5b1f17b1804b1-488d686c04fmr187577555e9.21.1776126691684; Mon, 13 Apr 2026 17:31:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcelo Tosatti , Zhao Liu , kvm@vger.kernel.org Subject: [PATCH v3 12/27] monitor: Do not check TARGET_I386 to build 'info sev' command Date: Tue, 14 Apr 2026 02:29:44 +0200 Message-ID: <20260414003001.97571-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126700724154100 This command is filtered at build-time for i386/x86_64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter it at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on the CONFIG_SEV definition, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- MAINTAINERS | 1 + stubs/hmp-cmd-info_sev.c | 16 ++++++++++++++++ target/i386/sev-system-stub.c | 5 ----- hmp-commands-info.hx | 3 +-- stubs/meson.build | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 stubs/hmp-cmd-info_sev.c diff --git a/MAINTAINERS b/MAINTAINERS index 16a3d71af02..580a80ab254 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -515,6 +515,7 @@ S: Supported F: docs/system/i386/amd-memory-encryption.rst F: docs/system/i386/sgx.rst F: hw/i386/sgx* +F: stubs/hmp-cmd-info_sev.c F: stubs/qmp-i386-sev.c F: stubs/qmp-i386-sgx.c F: target/i386/kvm/ diff --git a/stubs/hmp-cmd-info_sev.c b/stubs/hmp-cmd-info_sev.c new file mode 100644 index 00000000000..f3624423a33 --- /dev/null +++ b/stubs/hmp-cmd-info_sev.c @@ -0,0 +1,16 @@ +/* + * Human Monitor 'info sev' stub (CONFIG_SEV) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" + +void hmp_info_sev(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "SEV is not available in this QEMU\n"); +} diff --git a/target/i386/sev-system-stub.c b/target/i386/sev-system-stub.c index fb84aee94d2..2ea85597cf9 100644 --- a/target/i386/sev-system-stub.c +++ b/target/i386/sev-system-stub.c @@ -32,11 +32,6 @@ int sev_es_save_reset_vector(void *flash_ptr, uint64_t f= lash_size) g_assert_not_reached(); } =20 -void hmp_info_sev(Monitor *mon, const QDict *qdict) -{ - monitor_printf(mon, "SEV is not available in this QEMU\n"); -} - void pc_system_parse_sev_metadata(uint8_t *flash_ptr, size_t flash_size) { } diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index da9fdc0ab7b..336ab870a2c 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -812,15 +812,14 @@ SRST enabled) memory in bytes. ERST =20 -#if defined(TARGET_I386) { .name =3D "sev", .args_type =3D "", .params =3D "", .help =3D "show SEV information", .cmd =3D hmp_info_sev, + .arch_bitmask =3D QEMU_ARCH_I386, }, -#endif =20 SRST ``info sev`` diff --git a/stubs/meson.build b/stubs/meson.build index 4d1a803c17c..4a1d687a111 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -86,6 +86,7 @@ if have_system stub_ss.add(files('qmp-cpu.c')) stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) + stub_ss.add(files('hmp-cmd-info_sev.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) endif --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126738; cv=none; d=zohomail.com; s=zohoarc; b=HyB/L10wbD+VjuU6A6BvYjEwF0qzhqwq+q+cdNVtZQxEVB2S8WdwwQEg8kOM+kVaFgyAvPF5kuV5wOT2tdMYLGFbSV8yj4uYq1uH1c8l1o6G1PqZkJzjzHFE+1euYVlAyBQbiMAD671AYc6wLgyh8Ct2xc+XUhgKNqeQloAJ6k4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126738; 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=L00sTYsnDkewYLMKY3Xwi/QsSf8SDpEAlxJYefdp+KA=; b=O6vLfmbWWDpd01Yobb/U3iWGHI92KTuiry081KlCxDz1b9XWEzmXG/vRKvM5YhRkYn7LP/uj/GxtxxHBgYW+9YLaMH2wL9vmIzIZxt/lRXsH+k0tCwI7AI9DWKREZIeBRqyeafo704f8r7jRUGfwKYONFbeP4EwCksrvAmiAk/Y= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126738139946.7785490025801; Mon, 13 Apr 2026 17:32:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRgs-0003BB-Vr; Mon, 13 Apr 2026 20:31:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgs-00038F-28 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:42 -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 1wCRgq-0003FN-E3 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:41 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-43d43e09de5so2934452f8f.1 for ; Mon, 13 Apr 2026 17:31:40 -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-43d63de2a69sm37588554f8f.4.2026.04.13.17.31.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126699; x=1776731499; 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=L00sTYsnDkewYLMKY3Xwi/QsSf8SDpEAlxJYefdp+KA=; b=QQ1XdI2YiJreBBpp7xQlOEpJh6qKdkNE/w0Hvq+Qlsm8xDXHrmUmMc4krfjcPA7K4Q uCagRIXaNKnxfeJLnRg5da5P6zuil9EwcYgH7rQ6aXnIHTtYJMqB8KavW3sHjZQzGmaM Gkd91WIZl3zzHVkMtJirf3+lIYiUskEFmnqNX19nEjWFCFwHT08TaraBLcwojA/qXw0M txQ+euOyhH/bHeuqSJeVqdfzPuuIC0XMug0CpdigK3rwZuaX5u0UNdx8PTVST74UH5n9 MFCrVXmXe4GGPkTS+27rMCrvefX/ZUw6p7y+BS85DWuzl4q6Rs7e/P3JIwE0l9f7hKZ4 wS3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126699; x=1776731499; 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=L00sTYsnDkewYLMKY3Xwi/QsSf8SDpEAlxJYefdp+KA=; b=H0/nX67lnbaIl2MiO6+X5dcXL6J9y+hWlP6IEUwR3S1H6Ng87sHNcVfF0e0A9Dp/tD E/0woraVg+wSCmhJikpPkwkgqSUtmtR/sEtyBKNvdRR9nS8d0NvnQ6maxtpuV1lxhGhA JoICVPXsmbpmwuqZea7FqogpNGuvoNALhR8EuRcaNfHd9UXA/wrYtIk6XE9rIoDlZr6f XiAd5+sDDKuqLqUZUTiCqsAjTtRPeYsNgPXcsdrRk1VN3pfNoHVZTCbHEOmU4tN6n458 RY9YAGsDzrI/Q+st1OOGhUn1pGqo6E38ylXXbp8hoL4UJo0+bGwqJWkf39vU33edYQG4 ObgQ== X-Gm-Message-State: AOJu0YwHGgExZA12P6Uch37ztTddXFHVYvlHhFNExxg4HB9L97Z7broa ccEuZivV3gjisMkaBbcOwIy2lscw2vPWJXU5Pf/dra8xpECRgaqHRf1+qhCZk5IZxC0aMZ8M6vn pmenUO/I= X-Gm-Gg: AeBDievZjv6Ho3tFiQmDAIv4eKRW++fjYlsBpyYQEJ9EEx4dLV7DrAWrsykMRjnxEqr 548fhNH0I/6dFgbUbFqzM5boHnr+CIPHSg2O3E0LDYpZlZZ+/WD1s4ViUUSI0RZ3Jh2iwpdaqHM aZwMGjCF7giwJ+qTI35jnrz3pUnyYQPyE+YYPBZDjqF3X0Z2sO3X9sOkpwOb2GamjDlV5MmdDgP DvGvZDKcYvt2UhakVqQaR0v4V1nS8dSgpusEDMPrmYL/PBx3MRIdpn62HWM8W8+VbHAlkcPWzzn fbMYAj5bLILiQHvX5avwTTON2I34x8rL4+8soEBqSdp9CmINQaChXy8Pti1bwU+SwpocWwZupxG f4c7fhtW5GDwOJLzHA+qTsGh0grdyPctUZBcFbw3XZtvyhrFF2P+xl4Zk/0P1s0lrfcYyGdgZ4e 56ic535+5Qnb9IDXFbCqsUhMNcW8xczuoUgTG4L3pGbFRQXupJAY0sRUPNPUwG4C1HS82BvXDh X-Received: by 2002:a05:6000:2585:b0:43d:73d4:b34 with SMTP id ffacd0b85a97d-43d73d4185bmr10976447f8f.16.1776126698629; Mon, 13 Apr 2026 17:31:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 13/27] monitor: Do not check TARGET_I386/RISCV to build 'info mem' command Date: Tue, 14 Apr 2026 02:29:45 +0200 Message-ID: <20260414003001.97571-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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=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: 1776126741121154100 This command is filtered at build-time for i386/x86_64 and riscv32/riscv64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter it at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on a pair of distinct targets, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- stubs/hmp-cmd-info_mem.c | 12 ++++++++++++ hmp-commands-info.hx | 3 +-- stubs/meson.build | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 stubs/hmp-cmd-info_mem.c diff --git a/stubs/hmp-cmd-info_mem.c b/stubs/hmp-cmd-info_mem.c new file mode 100644 index 00000000000..8a53e367a9f --- /dev/null +++ b/stubs/hmp-cmd-info_mem.c @@ -0,0 +1,12 @@ +/* + * Human Monitor 'info mem' stub + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_mem) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 336ab870a2c..2d0a8f7d48f 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -209,15 +209,14 @@ SRST Show virtual to physical memory mappings. ERST =20 -#if defined(TARGET_I386) || defined(TARGET_RISCV) { .name =3D "mem", .args_type =3D "", .params =3D "", .help =3D "show the active virtual memory mappings", .cmd =3D hmp_info_mem, + .arch_bitmask =3D QEMU_ARCH_I386 | QEMU_ARCH_RISCV, }, -#endif =20 SRST ``info mem`` diff --git a/stubs/meson.build b/stubs/meson.build index 4a1d687a111..9aaf80e6c1b 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -86,6 +86,7 @@ if have_system stub_ss.add(files('qmp-cpu.c')) stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) + stub_ss.add(files('hmp-cmd-info_mem.c')) stub_ss.add(files('hmp-cmd-info_sev.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126741; cv=none; d=zohomail.com; s=zohoarc; b=CGdCVNW4a9/WPGQ70DCboALEvCZDwe5Qj+Veuhy6qYZis1uM/QhQHaT/6PBnJpDf0QrSpMm7AixmKgBXVOh5acUjOgUrjiXCF0pS+nhOw0WW9tS5F7+3e/YvqDtt+EtnQatDglkbwMk5nu95NvEUdlxXww+Y7XCqohZqMStvo/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126741; 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=hdZYTb6QkoSaXIdFzLZ7MdrxJm++U0xBy0kLQ4+r/XE=; b=PIhyfLEhh0HEHvKcPPsWaAcVXwC2WKjq69Gz5kW73tOiYuYwK7wGddNm7fMDVuuvZ5N8ZEH2kioGy/bN/9HkOEK5k5VEmR53ljx+QvlepMoefZJO0qB43kyhGPCqOXjbEE1kw+F3i9cJMgLdSUBcsQlmHyyMkciQGxTa9O/NuxA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126741170143.14883198198083; Mon, 13 Apr 2026 17:32:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRh1-0003td-8l; Mon, 13 Apr 2026 20:31:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRgz-0003hX-H2 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:49 -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 1wCRgx-0003HY-LV for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:49 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso52948945e9.1 for ; Mon, 13 Apr 2026 17:31:47 -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-488d5d703c1sm108817045e9.3.2026.04.13.17.31.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126706; x=1776731506; 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=hdZYTb6QkoSaXIdFzLZ7MdrxJm++U0xBy0kLQ4+r/XE=; b=pk+WWLtsqk+ae+kSKDZ5KBhVoMx0Sqz9LsPPpAU67bFocm0108pb8hbwc5RXo4/xTa h7abJOxxH9lHRXsqxYfSvpdCup9Dqv867vH8QTJzXNP6QChJGiPisjTuBHKZ/NjIdvJ6 BmB1MOAIr4nMdp9qbWBCxjcEjCvb2/PcvM3cAmz5HO+j+rInIUoXPKbk4VhAHisE2klK 8+gREQlFR7lNCeVzCwNjS86NTGJUzL2UzVZmn05TEpbfEoWJsayApKYEmSIcKPDD4U2P MdzCHC+mefnJpa1xphnfbVosEemnKX5kVCvcopBsAXC9/Zxz1zWDkhp3NfD1zAg4PiT8 seHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126706; x=1776731506; 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=hdZYTb6QkoSaXIdFzLZ7MdrxJm++U0xBy0kLQ4+r/XE=; b=MidLA7p1JXySPWEetcqaE5/Icp1cGTljP4hZ5OfvlAXGfU8nbph4E+w+1iXVVAkp1z c+OHsaBjXEdaK2+NKkMrWa9TyOcWfK82wgpHHYjqH/sdrkOb4fmeUtvnkF6XQpWzZhSS uTy6FGGf35T91FOR8ed4bJac6n6Twe05R0F62+rmZIIVWophf/mRlL/HG9yr8/vJ54Wp Yd73nBE122WKO3Ng2wCYTIrEZMTEtT2fwSFuJENzrEOOmf/NRUbWVwDHHA/7Dl5mTX9Z +VUGjeNnaZEIJmNOOcQThRVVKpfMqCEIS+WUMwg4sq2f+DZtBcxE7kfutEj/v+FiO0+H e9Tw== X-Gm-Message-State: AOJu0YxPSnlMDOIQ9i4dmnL51SnFvyEzuaxbGpeyqdXI+JxiRBAoxV6J 0wtO1qj9qw+SYx73UrOZmDAi18aCkz/uN2kV7DWPNEjSmMMMRx/nj9SzElGT/NuandUgm6Gk0Xg 9f34bSE0= X-Gm-Gg: AeBDievVeKH5VKOhQQS+r8yl+9Z+kW7kCO/5a5W34F1U5S/mTUDFQ4y1wy9jcL90P7d HcaGLeulnJNo96CGzpwOU6GqAvXpeq0MRK5zMqnZgKz5La+h2Y4PxgLilU3zFekxOc/8Mk3c+rn nGaDhPRBIj9ssjCINAQ+LwDCrtoSdXxCbdg/PNx0JfxwK6COQB+b+JDZ7unXYQs446ETR72lIOK QRiQzCwLvMT+6iEvM8Zp+0yfMWrvNAx9PvOXMtBsuQR3hVBW9HKlxJ3usV+bhkVTwo/uaV9sM0S G06XKljFY44a6RxtHySE/lyjxF3VZptqerC0PaME/WvS3unalbJWc6pfxYP3w3vgFF/Hg0SVjvA aCCyK1ei1i5u9CAiX5+NfccFG+pLqcFTgmnVndZ/PS/MBCvpshKKUzrtL02QXU+H4tMvM62kMvx 9z4WKzUUwrrQJYAERHPjSPSSXzuSjnQ9iFOJe+oidDTMn049GIAVEMJOeADkygHk0P3jIx/HKj X-Received: by 2002:a05:600c:3ba4:b0:488:c6e9:1e0c with SMTP id 5b1f17b1804b1-488d6847de9mr199741155e9.5.1776126705962; Mon, 13 Apr 2026 17:31:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 14/27] monitor: Do not check multiple TARGET_* to build 'info tlb' command Date: Tue, 14 Apr 2026 02:29:46 +0200 Message-ID: <20260414003001.97571-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126741940158500 This command is filtered at build-time for a selection of binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on a pair of distinct targets, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- stubs/hmp-cmd-info_tlb.c | 12 ++++++++++++ hmp-commands-info.hx | 5 ++--- stubs/meson.build | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 stubs/hmp-cmd-info_tlb.c diff --git a/stubs/hmp-cmd-info_tlb.c b/stubs/hmp-cmd-info_tlb.c new file mode 100644 index 00000000000..a144e68c1c7 --- /dev/null +++ b/stubs/hmp-cmd-info_tlb.c @@ -0,0 +1,12 @@ +/* + * Human Monitor 'info tlb' stub + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_tlb) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 2d0a8f7d48f..0898221a486 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -193,16 +193,15 @@ SRST Show PCI information. ERST =20 -#if defined(TARGET_I386) || defined(TARGET_SH4) || defined(TARGET_SPARC) |= | \ - defined(TARGET_PPC) || defined(TARGET_XTENSA) || defined(TARGET_M68K) { .name =3D "tlb", .args_type =3D "", .params =3D "", .help =3D "show virtual to physical memory mappings", .cmd =3D hmp_info_tlb, + .arch_bitmask =3D QEMU_ARCH_I386 | QEMU_ARCH_SH4 | QEMU_ARCH_SPARC= \ + | QEMU_ARCH_PPC | QEMU_ARCH_XTENSA | QEMU_ARCH_M68= K, }, -#endif =20 SRST ``info tlb`` diff --git a/stubs/meson.build b/stubs/meson.build index 9aaf80e6c1b..398822f47fa 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -88,6 +88,7 @@ if have_system stub_ss.add(files('qmp-cpu-s390x-kvm.c')) stub_ss.add(files('hmp-cmd-info_mem.c')) stub_ss.add(files('hmp-cmd-info_sev.c')) + stub_ss.add(files('hmp-cmd-info_tlb.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) endif --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126729; cv=none; d=zohomail.com; s=zohoarc; b=hmb6d6pAV2ncoKRsjdELs8D0L0liRKCA6v/zA8Jio38LrVkJgQuQ8oMleJ/m6r8yQ7p1jygVn+inJf//Majm6utBG5LnW5451KivGmKsPyvT2GVpl0xO6XO4UN62sRWVBd8anTFS6oD6qqH3Pu0ulKguF0eDaG//SLQc3zuBfoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126729; 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=e+EDDgWhJI3ORltCGjgBjB3nc854c+rlyGvs0etBPgA=; b=O7gGZwbSKLZG3EnhOFkjf/J9l8v6YLcIRRnfQdRrgfm1cXFesxwJ1HELzNWRQPqWixpj9NmqYOevnruWFfIAZU0gVH53DQ+Yy7y3Tn4TM1BYFGiko6Cjo8w5wqpT2WlgwFv7wL/eCbI31H5cyixzN2ODRdVZrrkfWegHeLeVygY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126729570819.0615004976166; Mon, 13 Apr 2026 17:32:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRh8-00051m-KO; Mon, 13 Apr 2026 20:31:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRh6-0004hr-Io for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:56 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRh4-0003M0-Ls for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:31:56 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43d64313c39so2752313f8f.3 for ; Mon, 13 Apr 2026 17:31:54 -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-43d7c135fd6sm14694414f8f.28.2026.04.13.17.31.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126713; x=1776731513; 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=e+EDDgWhJI3ORltCGjgBjB3nc854c+rlyGvs0etBPgA=; b=ioRPO7nzNfpEFh2dn+h8ECnRhycx3trFIglluKEpAa5BNKXQZ09IxuQGVKI7Jc5RV3 BixTxW4/gCJ7EIYHPC6v0lDwPrPwU13V9Pd/VkCqJ7clH54LfM+p9kCMRvAwT3BnRROE kERI4nxGnS2w012DSJIAeVszbAEw1QCHrkIRkz7ywl3GfqWNs0xj1WTD09r55jHcYkmd ZW4nO3ZPkCij/JNnQ0hWFlV+56V43CA4Jh5MUolJwT4Q78jkB7facb2ADgNZFcI8pyD6 EQn/6VHfqDKfzevmHlyv4Yuxyrah9DouRqMfdKgrGvqP1wTE0m7UNv8CIS/56hF7yLOF FNAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126713; x=1776731513; 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=e+EDDgWhJI3ORltCGjgBjB3nc854c+rlyGvs0etBPgA=; b=QV35nZK6V/F3bu9Oj1HvccBwgZmnvMfJsgIyZM03+Zf0zToPKg885E9fijF7RAP9Ss IuBsudzkFAiKxGTthPMfm4CWQ1QtqgHWJjBwvgAgYegH2SbeEn0TUDOJrzZ/+r7KpRAH lXozQqdmxlfjINqPNeltHkNLk/bEwjFXg/9ZJFFp6VpnNj6BBNoBKSLKxLNMXxyeD+Hb 8fZZ9jjuZNbEhzjeAAxfjVbhCy8Jgy9PPLWbf6KVNcq78/xy4fSiuK5e2T1t+fjQJuvR wuHWOW/1NJK8Oc8KRlh9Ywy3/ZsV6w13809DPf9LHznhs3Ho0h98IfObCIKTVOOsTV1I fwKg== X-Gm-Message-State: AOJu0Yym7mwLIHD1ck27+jcp7mkUJZLqWBZ2FHoTS9eq+RFjbQenZs5+ wYFOXbwJzbUJyp/CBHIfE3Osf8PQLIG2Ym9/FCBTyqH5gndOAg6QyhO6GpJfpNmcgG0wT4hRX9B WwSv91wQ= X-Gm-Gg: AeBDieuU6fFe4xeeKfLVQwWByFkkTAzKRrGYCB5Xd5zeTMvXNWqxJGB+XG7rb1Xm7bc oayZ/Xea86/Wl+sawo325WI55l1eo5/39oG/Q8TWFseaj8YleJj1zUKE6AkIbDyEkoIslxAz9bM 3ZhQmGNHtb+kAbQkrNO7KPTAh5imPupNH3jNEM8IEFwJWw8X2vwAeZXXaQXc182bZkGSAowIAre 5W5eXVrSmzU7h4vWY2pNW91en98kh/USN98HN/geh9L0UKv2hb4tqGKPEhP8B14WCiFBVuEO3s6 3EiggP90k4QZ8I3igNxOggo6Xzn47kecaMMJCp0tKKMV4iBp1lhrIiTshfFkCdWnB0IgVSNvqYl D6NtGOiM2fBcZE5JHl/M69jf+gUNH25AQ9ODR6LNMxvYmf1UNP5iCuy0zrGFlL2zQDoAGxkjvzV Yux/pLPLXMNbZzm2CPUqp+U9p+PqFoN3gANGP/HdCiLfOZMcmAIC8r2X3o7Nfs9T4n1+QehHUh X-Received: by 2002:a05:6000:1a8b:b0:43d:7e6f:37fa with SMTP id ffacd0b85a97d-43d7e6f38cemr3183194f8f.19.1776126712801; Mon, 13 Apr 2026 17:31:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 15/27] cpus: Introduce SysemuCPUOps::monitor_get_register() hook Date: Tue, 14 Apr 2026 02:29:47 +0200 Message-ID: <20260414003001.97571-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1776126731019154100 Allow targets to register their legacy target_get_monitor_def() in SysemuCPUOps; check it first in get_monitor_def() otherwise fall back to previous per-target helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/core/sysemu-cpu-ops.h | 8 ++++++++ monitor/hmp-target.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-= ops.h index 7b2d2d2610f..5b831393cf4 100644 --- a/include/hw/core/sysemu-cpu-ops.h +++ b/include/hw/core/sysemu-cpu-ops.h @@ -85,6 +85,14 @@ typedef struct SysemuCPUOps { */ bool (*internal_is_big_endian)(CPUState *cpu); =20 + /** + * @monitor_get_register: Callback to fill @pval with register @name v= alue. + * This field is legacy, use @gdb_core_xml_file + * to dump registers instead. + * Returns: 0 on success or negative errno on failure. + */ + int (*monitor_get_register)(CPUState *cs, const char *name, int64_t *p= val); + /** * @legacy_vmsd: Legacy state for migration. * Do not use in new targets, use #DeviceClass::vmsd ins= tead. diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index a222fd4c96a..46ccbd14aec 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -35,6 +35,7 @@ #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-machine.h" +#include "hw/core/sysemu-cpu-ops.h" =20 /* Make devices configuration available for use in hmp-commands*.hx templa= tes */ #include CONFIG_DEVICES @@ -85,9 +86,13 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const c= har *name) } } =20 - ret =3D target_get_monitor_def(cs, name, &tmp); - if (!ret) { - *pval =3D (target_long) tmp; + if (cs->cc->sysemu_ops->monitor_get_register) { + ret =3D cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); + } else { + ret =3D target_get_monitor_def(cs, name, &tmp); + if (!ret) { + *pval =3D (target_long) tmp; + } } =20 return ret; --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126748; cv=none; d=zohomail.com; s=zohoarc; b=dAGuKwCFB2atAm+m7iCBjta8STX3KDln2tsx6LDt3+7UlFFnJXQxFv1G7kJAGR8tHnaueVakvLHqNMFgE37pgbmb/xohZFpxo7qLzEZz0FH8LDpRv+pDins2bstXEUhob4Z7i49YWwpnx5eR3mCSkiINzqY6sXE+H9m5UI8XTIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126748; 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=SqimOdJ6hFzYLdeBM1HdjXv15zxnUiOqn0YPr8e4A/0=; b=WONUf11IQ1ypw6Zfqfn/lGxAZCym8nyu8ar271b2PKRmSvzqn9hacZec45XLG2Eg/i1XNhq1yWT1X+z7ykY3SlNUsx5FSfJqFzSlOsWnMNE5E5uhOYOT53G1wJ242JzemFDoVaS4UzW5ImePGGXrZ5S/hYHMS7FxCSFb+71nh98= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126748494149.471901101718; Mon, 13 Apr 2026 17:32:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRhX-0005z1-JV; Mon, 13 Apr 2026 20:32:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRhE-0005jh-HA for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:07 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRhC-0003Mp-Pm for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:04 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-43d43e09de5so2934523f8f.1 for ; Mon, 13 Apr 2026 17:32:02 -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-43ea5f26274sm1779835f8f.1.2026.04.13.17.31.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126721; x=1776731521; 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=SqimOdJ6hFzYLdeBM1HdjXv15zxnUiOqn0YPr8e4A/0=; b=J3rUscBDQ5kYcgZri7Fy0sXMqwzTAUahuniyX0Te0sm3QmfS+gwo+bNgdSoXxqH0Qx P95lkWLf4aUUcUEdA/OiHwFAkihdJr9KUaEC0zFfvsJag+egkWpjpgQC7o15nSfJ1hDW Ef+b8mb25V4caclGE268n4n9iq2cRgLnbt1PJVl/DqPuISJ2tQPaG/kRGtpgSx7+TBf1 iFgkSZhNWUqb07j3qyiubBTgN7f9AYX23k9Ehs5dYbFZpupqkxnbHBtbc+NwywT82OIT K/k9myCCVoHiy5VN+JvSwoDSF/eqaLq9uzA5T7F9a1ki3w/z5YU0ILveAGyvmkmZd6WS T5bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126721; x=1776731521; 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=SqimOdJ6hFzYLdeBM1HdjXv15zxnUiOqn0YPr8e4A/0=; b=J+Uxew2QHRlAEosmwM/mzLh/Ew0Z84M96VjXR3eotoFTdDraisD/m+tulKaYAGsyyR U2gAaWpj4Sqe4bz/dbnzLt54hy1b5/3yXTmzMSAtorFCXd+maJchbAST8QZ4TJkFaCqw Vr3kvtgLB4yoiRBzneQr4Ye4+3TGNa6Eq08PYjN6NbeSZdV+2oqYdYjI325NfpjroL+c CLYIFLrW+aGF7w9Rxt60qziLRHzuyYrqMVNOMiDCkxiFkaooGFVbXA8AYuzlAvaP3faD xg44HOzDK3LtfeD8huKjqp3px1fm8+0zUdcdSUuDbQ9poWXVthn4uKVmrS75poXgGzo7 uICQ== X-Gm-Message-State: AOJu0YzFq52wvc+Upj0IxLymB8NNT790AEPDX+/0PR/oUDMACm2jzjy9 IlVeMgo0/O7HmrHRv0nE/Uk1h2EOsSTJsUgayt2mf+ZlrZs2Nsobb0tM5tSHKQgrVREKlFv8R9l 3YZvX1zQ= X-Gm-Gg: AeBDievaNaRkX9QG3WzM7nQMRd8TOX/deRvZ04XZl9d2uoa1B2E8WE+qlAUz8PYXc+X TCJFTNvNpSMQp7IGIU2Bi0lTu74gIYkXLt5Sv29hVRkz7ZlLFCPajihktMxF1aMzR/Ql6PAVq72 wOf+hdpzlobd96znqhIgqDB8B7mcN2evY2pQP+r2bUOw/VRysm3C5fDlunTMb09oI5pZimDqP7r X4vWQfukejrXwqtiAHmLJrxvhWEWd89yK+oDsvAXYcLpJySU6cj7803OK/yH9zOW3Zo+dRUJWPM tLtasDxVK5Ah6/5daKo79e1jmgAvLXTb3pyh+zxRLHxtdNtUXThUUz6Dv0fmxnd3M0A5IRpIUJu 6duY/8r5Kbt4fHxKu+csqRkJj2UV/iuQzOm5jX1V5Ri+yRiKHM072rG2KwJpIS7gNABompds4jV ZmA4IdpXX+ljXdOOSz102zOJ+ozO7MT+7zwoT98cpa4HB3F1gPq5Sh1W6NpCMoxYNsYKMocVM9 X-Received: by 2002:a05:6000:1087:b0:43d:6a13:1efd with SMTP id ffacd0b85a97d-43d6a131f32mr13020649f8f.6.1776126720527; Mon, 13 Apr 2026 17:32:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org Subject: [PATCH v3 16/27] target/riscv: Register target_get_monitor_def in SysemuCPUOps Date: Tue, 14 Apr 2026 02:29:48 +0200 Message-ID: <20260414003001.97571-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: 1776126751454154100 Rename target_get_monitor_def() as riscv_monitor_get_register_legacy() and register it as SysemuCPUOps::monitor_get_register() handler. Take care to sign-extend values for 32-bit HARTs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/riscv/internals.h | 3 +++ target/riscv/cpu.c | 1 + target/riscv/monitor.c | 11 +++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 460346dd6de..28b61d25888 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -245,4 +245,7 @@ static inline int insn_len(uint16_t first_word) return (first_word & 3) =3D=3D 3 ? 4 : 2; } =20 +int riscv_monitor_get_register_legacy(CPUState *cs, const char *name, + int64_t *pval); + #endif diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 8ac935ac06e..dbd88fa6655 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2720,6 +2720,7 @@ static const struct SysemuCPUOps riscv_sysemu_ops =3D= { .get_phys_page_debug =3D riscv_cpu_get_phys_page_debug, .write_elf64_note =3D riscv_cpu_write_elf64_note, .write_elf32_note =3D riscv_cpu_write_elf32_note, + .monitor_get_register =3D riscv_monitor_get_register_legacy, .legacy_vmsd =3D &vmstate_riscv_cpu, }; #endif diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index a9d31114442..00a68c26abc 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -27,6 +27,7 @@ #include "monitor/hmp.h" #include "monitor/hmp-target.h" #include "system/memory.h" +#include "internals.h" =20 #ifdef TARGET_RISCV64 #define PTE_HEADER_FIELDS "vaddr paddr "\ @@ -311,16 +312,18 @@ static bool reg_is_vreg(const char *name) return false; } =20 -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval) +int riscv_monitor_get_register_legacy(CPUState *cs, const char *name, + int64_t *pval) { - CPURISCVState *env =3D &RISCV_CPU(cs)->env; + RISCVCPU *hart =3D RISCV_CPU(cs); + CPURISCVState *env =3D cpu_env(cs); target_ulong val =3D 0; uint64_t val64 =3D 0; int i; =20 if (reg_is_ulong_integer(env, name, &val, false) || reg_is_ulong_integer(env, name, &val, true)) { - *pval =3D val; + *pval =3D riscv_cpu_is_32bit(hart) ? (int32_t)val : val; return 0; } =20 @@ -369,7 +372,7 @@ int target_get_monitor_def(CPUState *cs, const char *na= me, uint64_t *pval) * to do the filtering of the registers that are present. */ if (res =3D=3D RISCV_EXCP_NONE) { - *pval =3D val; + *pval =3D riscv_cpu_is_32bit(hart) ? (int32_t)val : val; return 0; } } --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126748; cv=none; d=zohomail.com; s=zohoarc; b=EKGBKVamQrN+QlMyQfCLJmr0R6DUa65JFl9W7MJ+66svCSgIqsoZiToefRbU9DtQiNVRM5t2q45FPDapP9/U+pjEpolQ4KWqPL4X46E5CHkk0HWnx4nCi9DNhRj0uYb+C9rieXMaWOksWyANVQ6kXZjRFFbd8moUI4l+YryJ8I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126748; 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=xKNy0httwE1FyS382gLwVKQ/bynBm+cBhYz+ssqf0KI=; b=RGprMZ08THPD8Gqpe6EE6tlBZ6s8vOor+Up5rti+VpfnEW0DUcTQUJoeG2/kRfDAxCKldnOrLlpD8IQ60WbT8OFknCJ9M0s78dUYPq79iG19tsx1bGOcpesTpMjq0BOzTBhhEPKOgahmvNlEaj+O8dfNEQm9tzd2KdbiwkbCC68= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126748944587.1694415209098; Mon, 13 Apr 2026 17:32:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRha-0006L4-5p; Mon, 13 Apr 2026 20:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRhL-0005od-V9 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:15 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRhJ-0003NO-UF for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:11 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-43cff5dafc3so3591125f8f.1 for ; Mon, 13 Apr 2026 17:32:09 -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-43d7b219576sm9618493f8f.19.2026.04.13.17.32.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126728; x=1776731528; 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=xKNy0httwE1FyS382gLwVKQ/bynBm+cBhYz+ssqf0KI=; b=q6KPoyIoNK4ZOVABhSFlOpBMnraMKPBBGg+mAdtgyeFqnpKq6U+rG/3MeP8KNoAoTe wlS1nvIukoJpLr/sZEYdzK63ybvV34tNnLKhBUSU41lf+fjrt1tQ7jcgE4heworaASmd SV05x+JU8iK3tMgNuIvcqU4A0XF/ceAeKHKN7YWsOAbOqqd/NFJ/oHAqohk7z+48HbXP RFP1OWQKOOdI3DC2cSIYJeJd51AN/d5sUvDyUMnLWUtFEQ6YnwZTIWZOmKebTtABaZMF VItlokQnZWTMypE1mE9/+O3Zh/GBYR/oz+Lyswt88RsKY7AL+3pLarJ6sIL6a1G1D34K CRBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126728; x=1776731528; 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=xKNy0httwE1FyS382gLwVKQ/bynBm+cBhYz+ssqf0KI=; b=bnCfKJ46lsreHbN+HZKJfEp+Yd9INExy6RVoXumBcWggTdxsjL+x4H/OC09hA+/Bhl MjvwrYycwoJsClZSwIKJLeXftWBmBSUq0m8FvAg9BjaEdrlSYrX0m+ZlAW7CRYNmCHMm 05yKhue2hnzspBCy/kp8AIRG4lXpoOtV2I2upW1bLoMm6vKUya2bOo/b2rRLYxtJ/0N3 DGFSNO9UwOQvXjhrrafiaN/VZX4ryXj3EE2yoEyZ14bWKkKgIUNr3uftqx92ytuhVYhG 8+GR1aCeTX4nmJaaESmeR6TvuVjO/PUXAxYrhnSQNSggGh6RKt6GZrtPjxsGnpUQmO0e xuoQ== X-Gm-Message-State: AOJu0YxA99v+mFJW1/Kn/yGFlcC0lov4HGAnCXafP79OG0Cf9nEsoIDW DScZIlTWFw/Lihnze6Cz4WuG6a8lBoJB+Ijdt+020ITioIW6NQC/O0zxfiGIEOVnZ7ojbNq9RC/ VaTTJ6NE= X-Gm-Gg: AeBDieuX0zCke90DgfMDBHjjmBBUptYZeexYDZ6KvkMi0ikEB6i36wi2q4j5Dhzu2Bs Hhwq+Fe0SLMGtcUvtxUbRfi10PfHGDTtRyDWsnSGRs6FQUTBYAobTJmMaXaxQGSUH5GOye7QQhp jQf+/umJsKvyJPMikBQsXa+WlpfF7mNkY3/vD7hjZvs//fgMirtjEy9RDimf/WjrKz1A9JrE4OR A0/z8SQfNjIMSsrPQ/6Avmz1GIV5JsrBKH337/u+G18uMczdugVxl7WKiNB4ZivEwYc7Y4d5uc0 k/0FqhkB2g1hMhAi3z3gIt7IdFu9xhboKX3uAM8umsRwQbAHU1EdAd45lolMsIpNRHFlBJJCy99 8XuXZHH6pb1P/xaJxamHxU88kfcJByH/enZawnInWsROGb43PYWNR9TezZHTQSuUY0L8J4NXHup p1zpoQ3s0XLF4XA1JPHe9hZTNBnPdbbLTgsxLdCjYw36wdbTC3N59JQwPEdk3onaWVzbJae/bv X-Received: by 2002:a05:6000:22c1:b0:43d:7ea1:fb53 with SMTP id ffacd0b85a97d-43d7ea1fbd4mr2618357f8f.33.1776126727664; Mon, 13 Apr 2026 17:32:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 17/27] monitor: Remove target_get_monitor_def() Date: Tue, 14 Apr 2026 02:29:49 +0200 Message-ID: <20260414003001.97571-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: 1776126750056158500 target_get_monitor_def() is now only a dead stub. Remove as pointless. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/monitor/hmp-target.h | 1 - monitor/hmp-target.c | 14 +++----------- stubs/target-get-monitor-def.c | 29 ----------------------------- stubs/meson.build | 1 - 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 stubs/target-get-monitor-def.c diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index ce0bb1983cc..008c1a6570c 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -38,7 +38,6 @@ struct MonitorDef { #endif =20 const MonitorDef *target_monitor_defs(void); -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); =20 CPUArchState *mon_get_cpu_env(Monitor *mon); CPUState *mon_get_cpu(Monitor *mon); diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 46ccbd14aec..c2ddcd67e51 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -66,8 +66,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const ch= ar *name) const MonitorDef *md =3D target_monitor_defs(); CPUState *cs =3D mon_get_cpu(mon); void *ptr; - uint64_t tmp =3D 0; - int ret; =20 if (cs =3D=3D NULL || md =3D=3D NULL) { return -1; @@ -86,16 +84,10 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const = char *name) } } =20 - if (cs->cc->sysemu_ops->monitor_get_register) { - ret =3D cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); - } else { - ret =3D target_get_monitor_def(cs, name, &tmp); - if (!ret) { - *pval =3D (target_long) tmp; - } + if (!cs->cc->sysemu_ops->monitor_get_register) { + return -1; } - - return ret; + return cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); } =20 static int diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c deleted file mode 100644 index 394e0f9a7d2..00000000000 --- a/stubs/target-get-monitor-def.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Stub for target_get_monitor_def. - * - * Copyright IBM Corp., 2015 - * - * Author: Alexey Kardashevskiy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "qemu/osdep.h" - -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); - -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval) -{ - return -1; -} diff --git a/stubs/meson.build b/stubs/meson.build index 398822f47fa..2bf376e15e3 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -74,7 +74,6 @@ if have_system stub_ss.add(files('igvm.c')) endif stub_ss.add(files('kvm.c')) - stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126755; cv=none; d=zohomail.com; s=zohoarc; b=TDBXVNgbLVWXNivvFEqs4lJPCEjFGJWC7wRXCHFU/ZBHBCnLm9IcxVkifvcPoOPTwKL/doLTrz29Dk8QmvlbWTKARKu2VqkJawZVB6LtOvstIwTZHPSoTIoRcL5vQdMvg2pcq3yWp69YrlJ0OvM5hFFC8l62bdLWeBrRlfXw5lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126755; 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=u67MdwYZYxVP5k0toQDZeYU1ghiGZ0fFyZnuWFb4BCE=; b=YZQdynoBgGCcOtJediDZF8AzyTrUvlIF5ZQVKjtOyBFhMUDUFvJJ2WeP2F0JkwgTjllMcJ/FeDy2zGVEd2hGDGF9/Oi4/XdYRhilTsI8iHXLajbsXrXaXUqSwJ4sO8k+40VcIbd1ZQzvPI6lCMipBWOEZ6/oi1HoVS8a7kUb6l4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126755833495.8251334979017; Mon, 13 Apr 2026 17:32:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRhb-0006bN-9r; Mon, 13 Apr 2026 20:32:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRhV-00062r-R9 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:23 -0400 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 1wCRhS-0003Nr-U2 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:21 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso77670625e9.3 for ; Mon, 13 Apr 2026 17:32:17 -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-488ee019d9bsm6022655e9.14.2026.04.13.17.32.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126735; x=1776731535; 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=u67MdwYZYxVP5k0toQDZeYU1ghiGZ0fFyZnuWFb4BCE=; b=jB5T4fiGzKPxRRvun0p7r7Z1MdGiddYRzYSms9G+ma0UsLXaGL/pBgNhl8iG0QcV4K wH6LcRSzoSBcxIuaUOck7jQ1naCQyoktjd1itZTUkPjhUxfcLTNaWaOcRVhY9nyGTqFE yKYttGANwXCVsimEO3D2M873WX/D65S5/nN0sq5qMO4D2gTuKfZ4BshnGFd26M+TohRj Cz9j/AGT1JeudNCnDA2H/dQ/Qyz/zra0lHSnFQMOIW2bM+NK8S8vjwOBmsyy5sFVTGV8 +Xkuf+6icD+TvtU6TyXhlX3g14Pb78omwCoGrw36VYPiDW+lCe6aEk7NYPOypKPJn49C Btgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126735; x=1776731535; 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=u67MdwYZYxVP5k0toQDZeYU1ghiGZ0fFyZnuWFb4BCE=; b=oQooOOTRjYmM633Bi+9mwXMYn6njqKpbDMRXAxbOdphcZkfOJJZwHoadtC5MclRQi5 /j7Em21yRXAopHNkrhU0+y6jgNWyFOtkiUinPUjrLfgi4MLbt931SZkzN4gs0UucWkar ve88iOcKpGRRoVgrG51ld+fi7VCYWS3NJtzi6nBPkmYcdgxn7lent4SyqrxTi/27Rljm gou/IhCGCsCVGG39PcUj1RO69LpcH7B1DwxSKHn4Gjz8slmagq97c1djnXfVQHqOSYAS h7Xiza6+14kUY2etMOJnDnwheXZkaU3GNDASWegzyeiiUCaQo+qItTCjoUXDkF3IeWnX zZ0w== X-Gm-Message-State: AOJu0YxY0mc0GU7tf1VWp+wxU43jj2CIlILS4o6XC6d1TOYj76hVxzi1 jip2O5ez+x/vDEYQS00TLv/0SMndUvdELYpZ0egzdXGOZCjxppymKIaiuORbRtRA6qkHYbTUb5R EZBnG4wc= X-Gm-Gg: AeBDiesLLCdAE6nI0yWJhQa+BF7AXMIH8f5M+rMy04UIbIa2a05KvuCDxwn3VQolFiI tJxFqP0FoVAteIxEiH25/NT5AWQy9nUO2hAKFK5rDXIJ3eU/bfPzXJDftMkxUbzdqfuEkA7PIPg AnUhGxQM9K60UoB9g0qeS9MMAWkBnuZLyQC/iBx85kGBDaLVPAamEWxt/cgKgN/8aU4FPyDY9C5 7RE5Mp+dSqyZ8wnPQvNeheu5W1SEu/AoMoCy5O0VE6ZUho2yJ1zkiuSBg3wp2tDfMgCvfT/k3vI T0u+5VbW6TWf9srMRtteI2VDOLcJB/kjVhdZW4zD7XNk9lg1ycVLnpZcTrUwTq2xuPNaj7ta4te ITGkCgHwx4Fub5lqYbMlYCcBlUf1tupmRJyPG+zUcFgWW6kYXhoxWMmxSE2hcBhFEMzbE3zca12 WtbAPhf+7cHeyn11ATRZtS98Vlv+f/donOywAmXe+Qk9WlEecuQJIYLlaLQAbIX6RrcQIutleo X-Received: by 2002:a05:600c:608e:b0:488:8185:e672 with SMTP id 5b1f17b1804b1-488d688d2fbmr209037355e9.30.1776126735488; Mon, 13 Apr 2026 17:32:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH v3 18/27] monitor: Have MonitorDef::get_value() always return int64_t type Date: Tue, 14 Apr 2026 02:29:50 +0200 Message-ID: <20260414003001.97571-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126757313154100 Simplify MonitorDef::get_value() handler by having it always return a int64_t type. Let the single caller (x86 targets) sign-extend the returned value, directly handling 64-bit CPUs in 32-bit or 16-bit mode. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/monitor/hmp-target.h | 6 +----- target/i386/monitor.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 008c1a6570c..ae34ca65ded 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -27,15 +27,11 @@ =20 typedef struct MonitorDef MonitorDef; =20 -#ifdef COMPILING_PER_TARGET -#include "exec/target_long.h" struct MonitorDef { const char *name; int offset; - target_long (*get_value)(Monitor *mon, const struct MonitorDef *md, - int val); + int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); }; -#endif =20 const MonitorDef *target_monitor_defs(void); =20 diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 977f65fe16c..98df5c7fd12 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -593,11 +593,16 @@ void hmp_mce(Monitor *mon, const QDict *qdict) } } =20 -static target_long monitor_get_pc(Monitor *mon, const struct MonitorDef *m= d, - int val) +static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, + int offset) { CPUArchState *env =3D mon_get_cpu_env(mon); - return env->eip + env->segs[R_CS].base; + int64_t ret =3D env->eip + env->segs[R_CS].base; + + if (!(env->hflags & HF_CS64_MASK)) { + ret =3D (int32_t)ret; + } + return ret; } =20 const MonitorDef monitor_defs[] =3D { --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126750; cv=none; d=zohomail.com; s=zohoarc; b=dFfq7WfyUMx5osFk58qu8r45xTCxjgR/uiTQbuqQFAuXzDlB8J19AsN5b8f7PPr0MwbJrBa3rWwUHQDl/d7K2rCgNy1s86eoyE1rrLLpul61XfSsYs9Bj3jgNr60MPRIvjZ4BNneGmhWwHMmAGShan7v+R7mEB/JxlHurPBkK4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126750; 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=Yf0UOppZ5JAgjvZrWj0IpmyixhCJmn1cGuxvSP3WFgU=; b=BeeZTLtXGddiTJvq+Yj1GOeUs2FBUuAEWrZ27M1jZ2AkWEdGiP5i0FkcXf7KmW7SIs1rll5R7iR2w7bJN0ZyBxFc464D9iKqYjJBCcwvclioSwOwHWGTEtnThtjmS1Jkh8VXdhmuiQoKeQVpky1Rl+RrD9CDvzghF8wXZuM/BRo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126750228997.5939201272694; Mon, 13 Apr 2026 17:32:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRhc-0006rl-Ii; Mon, 13 Apr 2026 20:32:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRhb-0006c3-78 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRhY-0003OO-KW for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:26 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43d01d6b50cso5066479f8f.1 for ; Mon, 13 Apr 2026 17:32:24 -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-43d7b219576sm9619728f8f.19.2026.04.13.17.32.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126742; x=1776731542; 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=Yf0UOppZ5JAgjvZrWj0IpmyixhCJmn1cGuxvSP3WFgU=; b=p3H1mLNUPhuT4vzOw7pyTQpqcXf8kzI3nujN4Fda5Wp7hAGlQqldrFivXpAsTI/0nI WVJ+GOEzLFBH097I/N2SWkjZWAszor+sgsfCY7x5g5ZpEI4TBVqBgsKO/g6bvejYhjqG X5lQAIRyDivBMgUdvX3Ga7ATqsVq+ApptmHEywAOCJPNPgXN2Gu6lcnw8Uik/CvMHA9e s3/5cbOVLOI2onVdiUEWcutuq2B83i7LkbRod8JSWfio6ZiP/98vNdJ4pvKQ0ei29L3L tslXVSEgin8+dQGu+9gUtfW3UXzAbPpbGHsz6fP17+WAf18vdc9MGsCE6F6nRhCBEvII OJYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126742; x=1776731542; 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=Yf0UOppZ5JAgjvZrWj0IpmyixhCJmn1cGuxvSP3WFgU=; b=Imk5xvjB3i8auBzEiMQPiWc1xhtf3/VC4BxZNs1DGbx4gnX7NE7pRaSmSSkEToLKS+ ELffB89DH7IT/zpy6jW4FfhdeKYE0vfwJvFDR4S8IYGfDRScevFVk+TWrf5d8mIPxMIk 5Cea+f9ZBVN4dciDBFKVj8j9Z1Iudp14afLHgEzv+TpYYmQUl5HLhvrdyl9JrVAOLTaK jZBEtcvcSE33thafL8IDvWZ1YeKCpZUCNgD1DsZWv0pvaG1u5fGNC8zUZPR4cOiK1LLB 31YMOeXGM9B/daS87ZWE7CwTvyL1NXrRWe9e/uNG4RekKU+MyIerVJgK8HwgmMck2eY+ P4hg== X-Gm-Message-State: AOJu0YzQGkbr7EZMAW0XHwu+wAXIB1dXD9Qb7cZZBtxybzO2ZimrVIYD 41TZJQREy0RIQtnb7twycKwnoc0gzyi+qedTJcTB0cNG346aEhHCUHJmkLYVcxqy2G2nDEUmiIN Da1yz6R8= X-Gm-Gg: AeBDiesMKBkSis0IH3acAPxXaX05pTOgsYZ/wiGI8+nxKuC8PqYNKOWY6NVabovb+Gm kFsaoEcvqpHTy6KvLqQhFpzGV4bAY/7KTLcuDYbOunilgaM2NuMd8NRKuiJZpLE5Ga2BxfNx8Ka bv+Z/Bn9TXA2s/9BUnPJU3bpE0LmFXORG9zl6zeymh81UKdKjmdG/GdOkcb8IqCubxzZhBbFnHz fok+V1BH5Jjvsy+4uOYNQoWkXhD3H+5OzN6tkyTRHqyZRWcfFzbvy/QOdXGn1MGZZ5QGk4EGeRI cwlu5qVcjvZEtPDu/bgk+jfmSYevNwUo+YT3BlkLlfgq6XI1kL/g/ZO5n7FbtYQw1mi4OKZsEyK AnSv3NIKU5obBsfXKgGhjOxnmN3qiXnptojPyxzqMIM75un2nFXgM/JHfDvlsLPvUvSWzC2+6WO zh1wZVefioNV1c3SzYcAeNW+MBy+C9iX5SEPyviSPxFvHYafFKHA5KS74Efi5nOfKF0So/9FqR X-Received: by 2002:a5d:64e9:0:b0:43d:76d8:5794 with SMTP id ffacd0b85a97d-43d76d8593emr10892707f8f.36.1776126742333; Mon, 13 Apr 2026 17:32:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 19/27] monitor: Reduce target-specific methods further Date: Tue, 14 Apr 2026 02:29:51 +0200 Message-ID: <20260414003001.97571-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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: 1776126752026158500 get_monitor_def() doesn't use any target-specific declaration anymore, move it to hmp.c to compile it once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Richard Henderson --- monitor/monitor-internal.h | 1 - monitor/hmp-target.c | 33 --------------------------------- monitor/hmp.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index eaf9a607783..a5c4aba306e 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -191,7 +191,6 @@ void monitor_data_destroy_qmp(MonitorQMP *mon); void coroutine_fn monitor_qmp_dispatcher_co(void *data); void qmp_dispatcher_co_wake(void); =20 -int get_monitor_def(Monitor *mon, int64_t *pval, const char *name); void handle_hmp_command(MonitorHMP *mon, const char *cmdline); int hmp_compare_cmd(const char *name, const char *list); =20 diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index c2ddcd67e51..550a7178052 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -57,39 +57,6 @@ HMPCommand *hmp_cmds_for_target(bool info_command) return info_command ? hmp_info_cmds : hmp_cmds; } =20 -/* - * Set @pval to the value in the register identified by @name. - * return 0 if OK, -1 if not found - */ -int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) -{ - const MonitorDef *md =3D target_monitor_defs(); - CPUState *cs =3D mon_get_cpu(mon); - void *ptr; - - if (cs =3D=3D NULL || md =3D=3D NULL) { - return -1; - } - - for(; md->name !=3D NULL; md++) { - if (hmp_compare_cmd(name, md->name)) { - if (md->get_value) { - *pval =3D md->get_value(mon, md, md->offset); - } else { - CPUArchState *env =3D mon_get_cpu_env(mon); - ptr =3D (uint8_t *)env + md->offset; - *pval =3D *(int32_t *)ptr; - } - return 0; - } - } - - if (!cs->cc->sysemu_ops->monitor_get_register) { - return -1; - } - return cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); -} - static int compare_mon_cmd(const void *a, const void *b) { diff --git a/monitor/hmp.c b/monitor/hmp.c index e881c26c305..618ded40207 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include #include "hw/core/qdev.h" +#include "hw/core/sysemu-cpu-ops.h" #include "monitor-internal.h" #include "monitor/hmp.h" #include "monitor/hmp-target.h" @@ -359,6 +360,8 @@ static bool gdb_get_register(Monitor *mon, int64_t *pva= l, const char *name) static const char *pch; static sigjmp_buf expr_env; =20 +static int get_monitor_def(Monitor *mon, int64_t *pval, const char *name); + static G_NORETURN G_GNUC_PRINTF(2, 3) void expr_error(Monitor *mon, const char *fmt, ...) { @@ -1599,3 +1602,36 @@ void monitor_register_hmp_info_hrt(const char *name, } g_assert_not_reached(); } + +/* + * Set @pval to the value in the register identified by @name. + * return 0 if OK, -1 if not found + */ +static int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) +{ + const MonitorDef *md =3D target_monitor_defs(); + CPUState *cs =3D mon_get_cpu(mon); + void *ptr; + + if (cs =3D=3D NULL || md =3D=3D NULL) { + return -1; + } + + for(; md->name !=3D NULL; md++) { + if (hmp_compare_cmd(name, md->name)) { + if (md->get_value) { + *pval =3D md->get_value(mon, md, md->offset); + } else { + CPUArchState *env =3D mon_get_cpu_env(mon); + ptr =3D (uint8_t *)env + md->offset; + *pval =3D *(int32_t *)ptr; + } + return 0; + } + } + + if (!cs->cc->sysemu_ops->monitor_get_register) { + return -1; + } + return cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); +} --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126769; cv=none; d=zohomail.com; s=zohoarc; b=k4AYpO5xm7WsH4XEkBL1Gm0n8mPVELQKtCAVqyPEHRuCsn1CSEbMv9oWcaqm9PBQoj+nTxba+xwjIFnWcVYmmHmmgwZM2mOeg6kQV24JOtZpXw5pDul2olSmwJa9ZKgKRCNcCbehNhjeive/Q6U3bX2mWjgA25bflCslLKSR5SM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126769; 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=GQw0sqD4HWji1OvXTjA/TSCdlWVBswvkpmTeaVjGoNA=; b=kQwZPCt8TeK27yQFOAKIEhFa9AtrCnVDZ2GfaUV65/BYQ8ddu6WiMrG/1kGpTVdc3MR3oD24YvId1Zyo/phsSqtna53Y9YFzE0vVBFRnsRi1bF+pfKRWxnRB0KgZ3tn6IV3JEKSaDmQmKz2I66x4VaaBx3Onxn+ZrYNCmb12oWE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126769165865.6852194429184; Mon, 13 Apr 2026 17:32:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRhk-0007o7-W4; Mon, 13 Apr 2026 20:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRhj-0007gV-Ay for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:35 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRhg-0003Pf-D5 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:35 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488b00ed86fso51874035e9.3 for ; Mon, 13 Apr 2026 17:32: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 5b1f17b1804b1-488d5d85ae9sm148749875e9.3.2026.04.13.17.32.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126750; x=1776731550; 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=GQw0sqD4HWji1OvXTjA/TSCdlWVBswvkpmTeaVjGoNA=; b=t4LEoMdfxEWNSL5AMoiFxacJoAdOvcZj0Xvzb5bce5gO5R8reIXcSxR2r7V0PtXYO3 StYGnT8XlSFZNq3rEXutw7V0DVwth1X8YskmxDvnfNmVEzoUVFoLT9KnkEbLb7hkOhNP Cxz9sJZRQITrZUwGsMmZYZh3Q71ry4vECZsoaJ0B7gxn8P+DlAjbAT0KbB3FOHb9bLiz hRlGOVAgxeddQNXlWfvXENQ4LA+d5AoF0vDT93pnUtq2Gc0kGGwZ5dM+7LX2ButIpm9z SpKp86KPa3QeC4ALj9BSkLGakLtSFhAilqXuLSupUSkLsmKRjaExuL943VKDzA7vHBvg Iinw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126750; x=1776731550; 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=GQw0sqD4HWji1OvXTjA/TSCdlWVBswvkpmTeaVjGoNA=; b=QGN2gtHizwezpdXhfvMHCHisr3StyzljIYzWz84LDj9szZPwJFhF+2C5cXSVauZJR/ RFJ1d/o9sRyHw+BTjZCV056IoS84MfefkgDBSPISTVdOB7qZ71WutC7MKOV9AxVU342H RgVCan2k8RfkFAjRqokFSz4Dcct0dUaFuDjQhRzFxHNpwfHqeHlV+WzvTgoezQb1TWHh 0VTATmZbIZmKaskG8wkNughpKwmtr4wXIOsAZI8dEwLrs5lOyD1Sb0Xt9Di9W2rt/IL8 fetni4qnE2RsOW8C3UoFihR7toSLA8WfrFiS2T4KFLN7jvnmfhLgOhu2ZDv86nE3xY26 vj9A== X-Gm-Message-State: AOJu0YyxzqkqMkeERww9xpBWfwV+T7YfZCxo+iIb2h+dTYU+bsn79Sr6 1bsXX3qrQqfLyDPf45Muwp/aW1VcN6rupW+LSEe5Aj+fZFNB+RX22LHhfYvFxuP2dtWX+BZ79mV XFKAflMQ= X-Gm-Gg: AeBDiesPpdMXzbTApjZ5EkULMzG0dtmuMn2kF1ewJ68ATr2UGHmqdSrujXUsVVMdnVJ 7heEUEKQ+BY2Zv8yd2EdpahD0Y2qj/4mOMtEs8dBSUcT1eKWlJd4f1UhAcsxAT8TT9UoFNAs6oT C7oQ35sFfnrc1W43MBelc7xBd7QRvIXQHQcOx6irPGM5UzU/rh1oq+lRRDFfmsqqiwpofNGV+9K a7lculyvQdhAFanegidibe+1dZ7ChQr9T+TMNIvvDqYXnYSwwbiaZKyPYyz4+X7EFoSvaQIN30N WDYhzph0ig7HZLjuJcvJH0qC7Qz1JjV01QOG63y8o9sz687LUzm5i7xda9Lgo7SY+Ckr6Sm6zpB 58EVgu5KELpZ0OJfQOY8ZLKfkLb3ItxSzDervZDrJbdlitXYX9m0mBrkyP50MxnAb4noF3csrl+ aAHKhhGgU0OO8t/lc3Cs4YX+eckAKbxa06dHwoxuSl9J4RhCvD1YCA+TTCiJUR3z7JLZqPfYi+ X-Received: by 2002:a05:600c:8b2f:b0:485:3423:727d with SMTP id 5b1f17b1804b1-488d688d46cmr197075255e9.26.1776126750155; Mon, 13 Apr 2026 17:32:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcelo Tosatti , "Michael S. Tsirkin" , Marcel Apfelbaum , Zhao Liu , Laurent Vivier , Nicholas Piggin , Chinmay Rath , Glenn Miles , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , Yoshinori Sato , Mark Cave-Ayland , Artyom Tarasenko , Max Filippov , kvm@vger.kernel.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v3 20/27] monitor: Remove 'monitor/hmp-target.h' header Date: Tue, 14 Apr 2026 02:29:52 +0200 Message-ID: <20260414003001.97571-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1776126771723154100 The "monitor/hmp-target.h" header doesn't contain any target-specific declarations anymore. Merge it with "monitor/hmp.h", its target-agnostic counterpart. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Richard Henderson --- MAINTAINERS | 1 - include/monitor/hmp-target.h | 41 ----------------------------------- include/monitor/hmp.h | 11 ++++++++++ hw/i386/sgx-stub.c | 1 - hw/i386/sgx.c | 1 - monitor/hmp-cmds.c | 1 - monitor/hmp-target.c | 1 - monitor/hmp.c | 1 - stubs/target-monitor-defs.c | 2 +- target/i386/cpu-apic.c | 1 - target/i386/monitor.c | 1 - target/i386/sev-system-stub.c | 1 - target/i386/sev.c | 1 - target/m68k/monitor.c | 1 - target/ppc/monitor.c | 2 -- target/riscv/monitor.c | 1 - target/sh4/monitor.c | 1 - target/sparc/monitor.c | 1 - target/xtensa/monitor.c | 1 - 19 files changed, 12 insertions(+), 59 deletions(-) delete mode 100644 include/monitor/hmp-target.h diff --git a/MAINTAINERS b/MAINTAINERS index 580a80ab254..5dcd24a8a89 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3421,7 +3421,6 @@ F: hmp.h F: hmp-commands*.hx F: include/monitor/hmp.h F: include/monitor/hmp-completion.h -F: include/monitor/hmp-target.h F: tests/qtest/test-hmp.c F: include/qemu/qemu-print.h F: util/qemu-print.c diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h deleted file mode 100644 index ae34ca65ded..00000000000 --- a/include/monitor/hmp-target.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * QEMU monitor - * - * 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. - */ - -#ifndef MONITOR_HMP_TARGET_H -#define MONITOR_HMP_TARGET_H - -typedef struct MonitorDef MonitorDef; - -struct MonitorDef { - const char *name; - int offset; - int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); -}; - -const MonitorDef *target_monitor_defs(void); - -CPUArchState *mon_get_cpu_env(Monitor *mon); -CPUState *mon_get_cpu(Monitor *mon); - -#endif /* MONITOR_HMP_TARGET_H */ diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index a29185741b8..8abe3168924 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -24,6 +24,17 @@ g_assert_not_reached(); \ } =20 +typedef struct MonitorDef { + const char *name; + int offset; + int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); +} MonitorDef; + +const MonitorDef *target_monitor_defs(void); + +CPUArchState *mon_get_cpu_env(Monitor *mon); +CPUState *mon_get_cpu(Monitor *mon); + bool hmp_handle_error(Monitor *mon, Error *err); void hmp_help_cmd(Monitor *mon, const char *name); strList *hmp_split_at_comma(const char *str); diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c index 2b083c77bc1..59d58926311 100644 --- a/hw/i386/sgx-stub.c +++ b/hw/i386/sgx-stub.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "hw/i386/pc.h" #include "hw/i386/sgx-epc.h" #include "qapi/qapi-commands-misc-i386.h" diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index 5e792e8e6e9..7e4c509f5a4 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -17,7 +17,6 @@ #include "monitor/qdev.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qapi/qapi-commands-misc-i386.h" diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index bc26b39d708..e81632f5551 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -22,7 +22,6 @@ #include "monitor/hmp.h" #include "qemu/help_option.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 550a7178052..2739383607d 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -28,7 +28,6 @@ #include "monitor/qdev.h" #include "net/slirp.h" #include "system/device_tree.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "monitor/hmp-completion.h" #include "block/block-hmp-cmds.h" diff --git a/monitor/hmp.c b/monitor/hmp.c index 618ded40207..d7b2f731def 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -28,7 +28,6 @@ #include "hw/core/sysemu-cpu-ops.h" #include "monitor-internal.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qobject/qdict.h" #include "qobject/qnum.h" #include "qemu/bswap.h" diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c index 35a0a342772..0dd4cdb34f6 100644 --- a/stubs/target-monitor-defs.c +++ b/stubs/target-monitor-defs.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "monitor/hmp-target.h" +#include "monitor/hmp.h" =20 const MonitorDef *target_monitor_defs(void) { diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index eaa10ad2a3d..5599a4675c5 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -11,7 +11,6 @@ #include "qapi/error.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "system/hw_accel.h" #include "system/kvm.h" #include "system/xen.h" diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 98df5c7fd12..1befb8ea824 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "qobject/qdict.h" #include "qapi/error.h" diff --git a/target/i386/sev-system-stub.c b/target/i386/sev-system-stub.c index 2ea85597cf9..d97536cca1c 100644 --- a/target/i386/sev-system-stub.c +++ b/target/i386/sev-system-stub.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qapi/error.h" #include "sev.h" =20 diff --git a/target/i386/sev.c b/target/i386/sev.c index 261b6aaa37b..b44b5a1c2b9 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -40,7 +40,6 @@ #include "qom/object.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qapi/qapi-commands-misc-i386.h" #include "confidential-guest.h" #include "hw/i386/pc.h" diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 94bb12833af..be7411edca6 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "monitor/monitor.h" =20 void hmp_info_tlb(Monitor *mon, const QDict *qdict) diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index 776a76602ea..7c88e0e2bda 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -7,9 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/ctype.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "cpu.h" =20 diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index 00a68c26abc..a6250bcccca 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -25,7 +25,6 @@ #include "cpu_bits.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "system/memory.h" #include "internals.h" =20 diff --git a/target/sh4/monitor.c b/target/sh4/monitor.c index 2da6a5426eb..50324d3600c 100644 --- a/target/sh4/monitor.c +++ b/target/sh4/monitor.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" =20 static void print_tlb(Monitor *mon, int idx, tlb_t *tlb) diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index a60671a60a4..99abddbf1e0 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" =20 =20 diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index fbf60d55530..2af84934f83 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" =20 void hmp_info_tlb(Monitor *mon, const QDict *qdict) --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126787; cv=none; d=zohomail.com; s=zohoarc; b=VgXK2IrzUWhlFDsUJElYnipe4srTn+mZBWEpVA0h1YLIw1RRBto51mbcwOLhOgWGlr6G86I01sJP+pcetmDwJ3w0HOLVdlpy9vyrpFPvNh6RnQRe0aYuCm+rjQhixmiYgI8mcA5Vg5M76wfhWHvcY3CFwUNN1/MjCv3seyN0bR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126787; 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=/VyMpbZZBycD9uof5+Mpu9kfOlAUg4ZoswdMUmEvtEU=; b=DUGIu4UjP9SAJpBLBhsSvLJYNZVngeMufU0NtTcWezLrZtnEwetu7gP/GacaonTyTVstHttNA8L3iyqGF9w6boj/r7m+lUo6ZGPHu6L/ADJgDHhpThOGsK49fneByXuTOZizNU8ZywSS3uWscGnMdQW5TAnUJb0YwpE+Hg4kkKY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126787847937.8623509005715; Mon, 13 Apr 2026 17:33:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRhp-0007yX-8v; Mon, 13 Apr 2026 20:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRho-0007si-DW for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:40 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRhn-0003Qf-0d for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:40 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso41171555e9.0 for ; Mon, 13 Apr 2026 17:32:38 -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-488ede1513csm6532565e9.2.2026.04.13.17.32.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126757; x=1776731557; 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=/VyMpbZZBycD9uof5+Mpu9kfOlAUg4ZoswdMUmEvtEU=; b=fF1Qx1SOtv+N82yZCJqHFDysCP7ZWqobntnoGtUEV0HfT2c+y19cZ3S/oplMI8MRnj AzqQPN2HTaxh+/kwoB8uj2f91W2DBHqie1WJ/fmcnUmDMX1cxcslaScTQPW8ifuLc/Xw 1Uqd5vW3JjsFZ1v/AeA8MIyicK4LecWv3s7VwZTlwj1K8IvxrTvwotlk3PUJEIYDHvMT pyV4OIvY6stwMsqShQ9L+Dd4DyfVi3S1yCMjK2nzyjLR9V/w7XjQGYekyhuDSmBAqTmq uDCClodvBtFp3esNL/rktotN670z4Atj5fCoCm/D5Qnjl236oTlOGuGSglh6WVnbYEbH y9Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126757; x=1776731557; 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=/VyMpbZZBycD9uof5+Mpu9kfOlAUg4ZoswdMUmEvtEU=; b=cYh1+CrDhq/Axtf3RqvotpmjgxqDNeiuaLI+hHyv5ax5Yk14yAkSYZVVCLLzMZYkrL racsa0N2MckVtN5NfMCWVY8od+2LsqxEiqpPj+klaDuQ7hiFPMGTAYoxBtgRG2BnJSj/ nHft3wf6SucEzLqupi5TTlcK0LNDbiGITAGLrJrZis3wWuQhbPZwrxkelEJ3PnnUdd+f i0u4TYMM8yHPzVhKAMc9Vr0TckrsNwj673xwe4Dp+jHNZ26cfUI3MZbhZOi+ji/FxjT7 mF2DgwUquN6MkCOAG87AJKzToLX98PyW43hxUoAvGJ+sFKgY0umkMwpt/8ul4ObAJJd9 0RIQ== X-Gm-Message-State: AOJu0Ywmxi8Xsfcp9LQLVhreOID6nnr/v5BrfDKElSh12+734ja3oMm/ lk/K55qYL3x/tb1ZFtKXszeIJK02Jh7f0YcUGsA37RV9rH0BeujDwrk8jYzS1iiIgnXCKbwKvga Im4Fn8Uk= X-Gm-Gg: AeBDieudrHfZ2e/2VvAigk3bZwIItJLWUYrsrkXy3mrDqzpOuUSXWux6DIO75aLNeZj LWYASd1aXgDkWxU/tTTW1upcxPinGIdpkYksMTVmzTSihHuAfW0GrH5qAScok04MK2cKNudBixB Yg5whSpdirrp/w9Ajb0rrj9UZDZ2TpjLqkMJJmwjmCThZFfOybrD9ZWvrZciNJS9Z66gjZz+p8+ wCs+TwP2dhPZmf8hGLJ5i8i2mQ5u6LMD4B7xzbXjN2ikzoLtu5s9gR1D7a9Hp8/DxnjkHv7ABZq uzDq1Arod4H45XPcaT6YUFPA+rJ2QbA1DW1WDIV9rXRcQzUWRgwsl0ua7MdcUN/s+o5/0/+Nkmk EMlte0JYXt6c8SsA85ncsSStCgWVIsX5z7srZelz+AzeX4KsK62KfqRkXi1Gr3lrenr9C3uYlre 7vS6Bmc8wRBc8JMWytGEIi+JcOWJ/HkUBk6xPbZwisjBsi+tDmaCzjdgnoIjW1nlFUUIvkmNph X-Received: by 2002:a05:600c:a416:b0:485:41c4:e2e4 with SMTP id 5b1f17b1804b1-488d6860571mr145539645e9.23.1776126757174; Mon, 13 Apr 2026 17:32:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 21/27] monitor: Forward-declare the MonitorDef type Date: Tue, 14 Apr 2026 02:29:53 +0200 Message-ID: <20260414003001.97571-22-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1776126790201158500 Rather than having core header forced to include "monitor/hmp.h" to get the MonitorDef type declaration, forward-declare it in "qemu/typedefs.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/monitor/hmp.h | 6 +++--- include/qemu/typedefs.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 8abe3168924..22784bd4c79 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -24,11 +24,11 @@ g_assert_not_reached(); \ } =20 -typedef struct MonitorDef { +struct MonitorDef { const char *name; int offset; - int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); -} MonitorDef; + int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); +}; =20 const MonitorDef *target_monitor_defs(void); =20 diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 416a8c9acea..07f2ae7c9f1 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -72,6 +72,7 @@ typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationState MigrationState; typedef struct Monitor Monitor; +typedef struct MonitorDef MonitorDef; typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126794; cv=none; d=zohomail.com; s=zohoarc; b=BAUiALYTfww140gCMIKzkNZmywfi4Z0WUEgkly5UJEaBDgtdesgyTOam4TRReya6zl+wYIuUGli4BEvZQXmOu2QWUQCBi38Q2zkglMFAgV2drg0LCTjZ0f2tVM8vJ4ZGlMxzhxIuvlhzhBHJvcZKzz9zjOZZgUtRmRzt+47z528= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126794; 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=CX4HMtCLtaKxWP+CnhHEeurJGMT23nAqgS5xqErMf6U=; b=nXERRW/P15cLbJAQuzCz8Tiepw3R4MkhKCvIU4SgbZnbW25TRUndqXwsoggNUQT7nSXX+D88ovvPLlRwR/jImYMVwijhJUX18SDWwaSCnNW6l1e8WTSLRPgOpp1LgtA+BhqW1BoJOgE/ppsEcghNBGmx5R97cLBqhZIMEnNiei0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126794057888.9847957229987; Mon, 13 Apr 2026 17:33:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRhx-0000Fc-EP; Mon, 13 Apr 2026 20:32:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRhv-000070-NM for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:47 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRhu-0003R8-6k for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:47 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4888375f735so48729125e9.3 for ; Mon, 13 Apr 2026 17:32:45 -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-488ede15cfbsm6671665e9.1.2026.04.13.17.32.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126764; x=1776731564; 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=CX4HMtCLtaKxWP+CnhHEeurJGMT23nAqgS5xqErMf6U=; b=G7u7xKi0tZu3txuhUQEw4Dq7y8/C1MGPYCs7P6udmIu+w8eeerjH8S/AjyosUdrUd3 38YOPlWX3YuFPJhl1yPoJ0UC7Y0F/+dxWs+x1orgFWe4i2UtZ+A2h1eRqk3Z9jnTX97C 8Z1GqZgpqA0uSBpuqMuwUQWR0UDxz83JbZxHx+0BS4p45ta1qRkoApbi91jl3bLpJN/X /plioCzsOo/iA3iyDyKk7BzoSrcU0FPjmajxwPOhKYqokeiSUvTeWJ4uf5hciFrh5h0R sE0RvjiNS1VbtKwUwByuC7JxpVDmZwx0IDxFKt6PGw06sgRO6GpRhwBJhvseG8DhMVau FB3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126764; x=1776731564; 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=CX4HMtCLtaKxWP+CnhHEeurJGMT23nAqgS5xqErMf6U=; b=NRkq1TlMBCwaV92wfBPychL4nV7+0TbkCfVboNiTT9cGtuSowqM8TGA2Bk/YJwD3yY mXjGCZJJmELOnZY8hQiJSGDD3bLwmSAe6WJyDHdkk14Ep9LQd+Ir22ghzYLtAeWvNpI+ vH2s3wMHTkCRSdO6VFLW+mFNgG0mBoLI9lEGTRTiKzgf04r1RQnCj2rz6HYhTv2dxxHf /v44T5U2urkiQ0dpYjCK3L1fZYc/UG5Xw9y2mFh5+Lh3Q6TROB1YOLtWFkZr6vyODx97 9JnIGRKeUAlP2im+AomescneS6C4Bajb2DHgvqYyr0jKOPxSad0CNQIQimiu2ShxvEvg Kfqw== X-Gm-Message-State: AOJu0YzRObQuNN5O+SaDJXQ7630Fz1/7t1xyTsbfadzdH/lL5Uhk5WbX vmosyvkd4/MBFm7Ewegf80s0r8Odk1YavF+Wlpndi2qhZiJ3XWQAqzCKNWTCm5KZ1QPOMjR4kb7 KxvA892s= X-Gm-Gg: AeBDies3M/QM3i7HkYHCi2GeTnnk4pZzV7FXBS9UPrcj17bSIc9ZKS0qtCzeQlmsfxV AuilmP6qHMw9LJAO3OS/3Gj76l60pwUOUyrr0xL++LmnYOh604YzKzmKb6yL7pV1zamL93eW7l2 qC/OG6KNSx/ts8ZsAxunI/KFpD870jvkaxsPt1LpuMF68mrS9JmlZR511r58Q8Nr+MYsaa9e/o8 EdHFu8T0gDjjaQSRzLvQc1Byw8CMZ8wcopKCbYf+20ZjuFSI8qvlkRNZ7fiRSrTRt0v8Q2ZIwLU KpYiHGKp60lwQpltKnvsGqgnF3dUbmqwPv0fHcVT6gc9Vuqe29NKO0FzdOxk6qCXgAZWQqLaPow nIICdaIJV9XLsltbKlI7AngXAkkiRBollfgpCSWD29IVlHkCrKa+P1ahtNUyWeYPj2Knev8ahpb SyXqN+pnhhNixMgQg/qy8ongl56lP8/h5E+Zs97zRx1G74zrXh64FFpDOaJYisxcbbMsNFE9NY X-Received: by 2002:a05:600c:c08e:b0:480:3ad0:93bf with SMTP id 5b1f17b1804b1-488d6864d41mr142234575e9.24.1776126764432; Mon, 13 Apr 2026 17:32:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 22/27] cpus: Introduce SysemuCPUOps::monitor_defs hook Date: Tue, 14 Apr 2026 02:29:54 +0200 Message-ID: <20260414003001.97571-23-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1776126795894154100 Allow targets to register their legacy target_monitor_defs() in SysemuCPUOps; check it first in get_monitor_def() otherwise fall back to previous per-target helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/core/sysemu-cpu-ops.h | 6 ++++++ monitor/hmp.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-= ops.h index 5b831393cf4..94e36ecdd18 100644 --- a/include/hw/core/sysemu-cpu-ops.h +++ b/include/hw/core/sysemu-cpu-ops.h @@ -93,6 +93,12 @@ typedef struct SysemuCPUOps { */ int (*monitor_get_register)(CPUState *cs, const char *name, int64_t *p= val); =20 + /** + * @monitor_defs: Array of MonitorDef entries. This field is legacy, + * use @gdb_core_xml_file to dump registers instead. + */ + const MonitorDef *monitor_defs; + /** * @legacy_vmsd: Legacy state for migration. * Do not use in new targets, use #DeviceClass::vmsd ins= tead. diff --git a/monitor/hmp.c b/monitor/hmp.c index d7b2f731def..70e5e5c2367 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1608,11 +1608,15 @@ void monitor_register_hmp_info_hrt(const char *name, */ static int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) { - const MonitorDef *md =3D target_monitor_defs(); CPUState *cs =3D mon_get_cpu(mon); + const MonitorDef *md; void *ptr; =20 - if (cs =3D=3D NULL || md =3D=3D NULL) { + if (cs =3D=3D NULL) { + return -1; + } + md =3D cs->cc->sysemu_ops->monitor_defs ?: target_monitor_defs(); + if (md =3D=3D NULL) { return -1; } =20 --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126785; cv=none; d=zohomail.com; s=zohoarc; b=FWoNLtrQLqo3wNxGaEVQjLgDD+t9/oi9F+SyYLwScIb24eT+hMyLgxaExxEbp1lGwBetOPSrUV/5NRV0L0pLSaFdp+ALkcqWZTpKcI9A03gHi7vgN/CcNb3QXctOLI7VKz0CNDIIUTYXNoOmacibA3gsLuW8mJYnhnnT2XCoXQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126785; 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=rxLEbMZsZkzsDTrSuMDqm5sZgfXseQNGksHS6C02fq4=; b=dbdaIY0wKzI1IVDVgua/TYK5h5CQvW8ziHbxiYWubZPgt7/7r/4SbPyYJnZ64bIT/1mzvoRDomlwsQIKL2QESGscPipek3SlbzpTSCA8UwZwV43I2z4/jY4DC5zGhecTVK8lgA7+Yxz4EAZlcwCeleHVheXESKgoJWZcrjGkWpw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126785376841.6520493870015; Mon, 13 Apr 2026 17:33:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRi3-0000LL-TH; Mon, 13 Apr 2026 20:32:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRi2-0000KW-Rk for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:54 -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 1wCRi1-0003Rf-9G for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:32:54 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso41172535e9.0 for ; Mon, 13 Apr 2026 17:32:52 -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-488d681ecd5sm109676535e9.19.2026.04.13.17.32.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126771; x=1776731571; 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=rxLEbMZsZkzsDTrSuMDqm5sZgfXseQNGksHS6C02fq4=; b=GnKbDW+VrUbCy8fUAEH+TPOo69e78WgfE9LBx5IjGxovN7j1SfJYXELIfjREVM6ghX mwWizmmzVVPtdT8CExjZ6fVD1NLuXR5eWqv2MQdJ7zMqezMMn7yl6ToI8VptT2yQxLl2 gitBWzvS5UZA/o9c9Yn2IYqt5TNzI/mr0jelV1G7+ZO7DGkpJ42eNW5H9F9r3UqhyxrM qm6Y7GNXznoFL6T9FcO/FdiJpH5XkUcywyK14OB6j4n2ZtVrV1JPGoHoA9p//wf1my9O Hud+/kTmnpSrYxurw/dsKr//fdWQGQneORISnaD18+NkAj1/HZE+oc6T+t1d0KDk/wrQ R71Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126771; x=1776731571; 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=rxLEbMZsZkzsDTrSuMDqm5sZgfXseQNGksHS6C02fq4=; b=MKAjhNVgA/dwrwMzuerkBRHbCcVdYXRL75Fm7ywyuSjttR234sbiOQ+LICBwqqlAiJ GE1VtsRyJrjNqh8MVCVqqVG7/2zW2JN6p8BqXN4N5n789/bD1bNhsCf/Gg5iLELoPei3 keFlad5RaEmSvP8NhMxXp08/9916WIBpwgAmxkQi+QOmAkXnNv0KYvkPD6XWRd1NRDKb Aq3q5lPt1CEHVolG+b1l8CgOfJHeLmdAqWW8BtU1I2f9iFRwSI3ogfTljZZZQanV/MIN GyvGnUmSevyXq0ka8hjDluwzlrGre+Zj2b+zdlyuOVR+JhjrFEQw2ruk04GcoKENYu1Z vc3g== X-Gm-Message-State: AOJu0Yy1ZvAKD29W/XWGfTl0jdXkL/NL7WqfciKfT1VLBSxnoMBTeuPp 98k3FXZ5tSwgNktSRqGx7wOwVidkBl8vSvKgL7PK2HExvif+LCeCUNAzjT1kwZ9VTQBm8+hhqDy GO843I+g= X-Gm-Gg: AeBDievtS51p4Kher7hxrxqZsQUUAk8BdNTV/r+fKvaR6XwPQ7a++uWSLx1EsDFpbnl s7mcczqKqW6nnNmizJ5PXK4mqtLHgWbqz9FBREfLj8kcq4B/iawpcn69bJDH+BDilHEXhBQDhPu wMbGBVaNAsmNwwl67FnZpfZ5Lbk0NudPmDDTgQgAbyKSVsVun5opjsTrQYUxiMMVqctyTG4nKNz Ni4XRtjLi4Tqu+l6r++YjlanosQpPseO6eSfHmmrG/9FOFKE4D0jyIril/rS8ZUHioG79t+voja teLGJw7GC+UsHIQwCUXGK+8JVHhAuZxPbYERC2wZAuvEZruIUx8UAFnpCJ9HCdSRWeAR6+RpJ5C 74naF0v23vwt3eHv42fb3mWMrK5B7ITkjTZMM9xKlDwlh/lBaVBiA98nQBWl/DfJHewlCEEckv3 FdqSjS/8uiYxMETntM3wIxCOzjit9FIhdewbDtGzHk5XybCVyEckdN2ESGM6zUj2bQe8uAHL2v X-Received: by 2002:a05:600c:8883:b0:488:b87b:3052 with SMTP id 5b1f17b1804b1-488d689b400mr157810815e9.29.1776126771428; Mon, 13 Apr 2026 17:32:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH v3 23/27] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Tue, 14 Apr 2026 02:29:55 +0200 Message-ID: <20260414003001.97571-24-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126787784154100 Restrict x86_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook, allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/i386/cpu.c | 29 +++++++++++++++++++++++++++++ target/i386/monitor.c | 30 ------------------------------ 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c6fd1dc00eb..4cb8c627295 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -39,6 +39,7 @@ #include "exec/watchpoint.h" #ifndef CONFIG_USER_ONLY #include "confidential-guest.h" +#include "monitor/hmp.h" #include "system/reset.h" #include "qapi/qapi-commands-machine.h" #include "system/address-spaces.h" @@ -10685,6 +10686,33 @@ static const Property x86_cpu_properties[] =3D { }; =20 #ifndef CONFIG_USER_ONLY + +static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, + int offset) +{ + CPUArchState *env =3D mon_get_cpu_env(mon); + int64_t ret =3D env->eip + env->segs[R_CS].base; + + if (!(env->hflags & HF_CS64_MASK)) { + ret =3D (int32_t)ret; + } + return ret; +} + +static const MonitorDef x86_monitor_defs[] =3D { +#define SEG(name, seg) \ + { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, + SEG("cs", R_CS) + SEG("ds", R_DS) + SEG("es", R_ES) + SEG("ss", R_SS) + SEG("fs", R_FS) + SEG("gs", R_GS) + { "pc", 0, monitor_get_pc, }, + { NULL }, +#undef SEG +}; + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps i386_sysemu_ops =3D { @@ -10698,6 +10726,7 @@ static const struct SysemuCPUOps i386_sysemu_ops = =3D { .write_elf64_note =3D x86_cpu_write_elf64_note, .write_elf32_qemunote =3D x86_cpu_write_elf32_qemunote, .write_elf64_qemunote =3D x86_cpu_write_elf64_qemunote, + .monitor_defs =3D x86_monitor_defs, .legacy_vmsd =3D &vmstate_x86_cpu, }; #endif diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 1befb8ea824..a536712c755 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -591,33 +591,3 @@ void hmp_mce(Monitor *mon, const QDict *qdict) flags); } } - -static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, - int offset) -{ - CPUArchState *env =3D mon_get_cpu_env(mon); - int64_t ret =3D env->eip + env->segs[R_CS].base; - - if (!(env->hflags & HF_CS64_MASK)) { - ret =3D (int32_t)ret; - } - return ret; -} - -const MonitorDef monitor_defs[] =3D { -#define SEG(name, seg) \ - { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, - SEG("cs", R_CS) - SEG("ds", R_DS) - SEG("es", R_ES) - SEG("ss", R_SS) - SEG("fs", R_FS) - SEG("gs", R_GS) - { "pc", 0, monitor_get_pc, }, - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126794; cv=none; d=zohomail.com; s=zohoarc; b=NZYjdn3ZSJyvLT1wRSsjWV5hKDukx8OYz4gFQw6pQ55a6bQWBrZxtXsh+pQKIoce9EzmcOR2LRFXosgbpx+NNO/tqF/woDIBdC8DQmwhEmEbHAfIwn1XNJvngm/UUQmfhP0HyhFZnUn0O65Aii4Co/bhrU97muVUQLzvcZkurkg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126794; 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=pWkinHow/eylS7JBe+fWXt/Nq4YrC48hyztEBorpfGw=; b=AEMsLesR9/B6nBFZv5qxP+vMk1/gvfE6JhVahy/R3zJ4KqN8EJ7iQqiyBUViRdeWNDwnNf934E5zQ1Fr+BRflCXR/+2bnMQSgud5DoYMgyX1uejzW2JyxhdcXhr3aRWiBBYvwQrlDp63A8amt1t1+iipw5HX4jQKwj2KauHfo/Y= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126794034282.91227518020287; Mon, 13 Apr 2026 17:33:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRiD-0000w8-7Y; Mon, 13 Apr 2026 20:33:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRiB-0000ku-A5 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:03 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRi9-0003Tf-Lb for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:02 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-43cf906b007so2985560f8f.0 for ; Mon, 13 Apr 2026 17:33:01 -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-43d63e46713sm37894676f8f.21.2026.04.13.17.32.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126780; x=1776731580; 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=pWkinHow/eylS7JBe+fWXt/Nq4YrC48hyztEBorpfGw=; b=nK3t8jmhtQO5RI4gnnisp8pJg3GE/3iuDWY0WOyZK/2z7rW0lJAX5FSIBncYFvvDmu xhTjXen1rgEw6oP75MQ+9cyKr1iF6fo3MeMEEPDHFvBj86/j1YuMIJHlUHoEDadUbMxV KOTQ/K4e2N9TkQZ7onCVK6+1cu4Ci8qDNiirQ5p4an6Jn22Sq990K/a4Wdfb9efGQkTJ Ppjlo1tkZkMbQMz1NY2PmqwBnKpeMU/E/fgK2rqPsmAd7jRZfzCv+e//T3nX0kZaJqY9 kh/FVGYVsGlvslS06eFJI2l8hBizpQM/y4zvnvqXkKgHZBMDW4b5JmSQf6P+gDedvwRh nSSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126780; x=1776731580; 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=pWkinHow/eylS7JBe+fWXt/Nq4YrC48hyztEBorpfGw=; b=VZFgXZPhDic3kCSutU1mmX20pyRzXemS+WNEtZye+fz2xL/Z6/gLghpUpfnhbVE5ey ZScdqLDid3fahuPRnxnkJ1EWw98L9QRIeTidSwjVShh7Yo2XgTJHGQX8y3vVP2geEh5H gFVdskF+odL8d3Iq0su0ekJtMCU/SNFzckZ2Tur9c/q27csIjJiZce0nCTxi0i040y8m W7Ja35d+KFGa+wJxGwXLfte9vbY50oZhYsAlHOtjVrDXRZsn+HwxEu3Ia+IW1ilFr8EM /FjKkG23o2bLGjhZPTkNuee74gs8e1s00H2OmlBK/FHx5PhXyHurUchdqf+jyeaIcNhd rP2A== X-Gm-Message-State: AOJu0YzxaTVOnn2bp6VcbdBSW7FGiSUjNYhNHKiZUerEgy2Bpk6CSUgI IzXbPHdUD9AZy84RSyoG1GuK6jbYefYxUJy4lVS6Ax5upBv/uJQDu/BsuxsPq2BCJGpAGI4JHD/ hOhHSh+I= X-Gm-Gg: AeBDiesIk6sktejIhiD58K2j2ncuU6Jq0PR+m7jj7diiTg3wfz7bUn1weLyOJd9rh0h CbjT6wKYOY11Y6uy/Uv9n/yk9hi1VS7nFdHq8+SNY+Ct1j143xmmq1Qa2cnjaHBBJ6+GGoIKl3g x5XpvAJ63XGks63VOM3NDkYdg/v2GBfYBuEXEVPZ42Z5JecdHUmDn101sFNHF6pyenoeoE1r1Qj V/oV/bIaIYSK/walK8mj/Ejbvh9XkoqU6ydoABwDD29/7ICEpI5sdWOypwpStEoqDir+UWuSn2t VBKhSzOMXTjACUs5v3z3eaQCfKaV76LG5iKUoEZPUxmCr3/xlfWuKeJwyWw4ffKm5riyx7nt6pu 3Z/DVzQyg4Z2dqE7buzp75tRgVXlDDzrhkYnXZPww6ptbfyj8BqicJszNBJ8gWw5HvgKRizMoDr vDz7MtvF8X2PvgK1VpNZFE/S0GvuZ5AQWAYnReY1m8uz1tjAGTstxF67bmbUm/678KvJN0c5vL X-Received: by 2002:a05:6000:200f:b0:43b:9a9f:8956 with SMTP id ffacd0b85a97d-43d6428e889mr21221402f8f.22.1776126779907; Mon, 13 Apr 2026 17:32:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PATCH v3 24/27] target/m68k: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Tue, 14 Apr 2026 02:29:56 +0200 Message-ID: <20260414003001.97571-25-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: 1776126795924154100 Restrict m68k_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook, allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/m68k/cpu.c | 18 ++++++++++++++++++ target/m68k/monitor.c | 21 --------------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index d849a4a90fc..f704a6af613 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -25,6 +25,7 @@ =20 #ifndef CONFIG_USER_ONLY #include "migration/vmstate.h" +#include "monitor/hmp.h" #endif =20 #include "cpu.h" @@ -602,11 +603,28 @@ static const VMStateDescription vmstate_m68k_cpu =3D { }, }; =20 +static const MonitorDef m68k_monitor_defs[] =3D { + { "ssp", offsetof(CPUM68KState, sp[0]) }, + { "usp", offsetof(CPUM68KState, sp[1]) }, + { "isp", offsetof(CPUM68KState, sp[2]) }, + { "sfc", offsetof(CPUM68KState, sfc) }, + { "dfc", offsetof(CPUM68KState, dfc) }, + { "urp", offsetof(CPUM68KState, mmu.urp) }, + { "srp", offsetof(CPUM68KState, mmu.srp) }, + { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) }, + { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) }, + { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) }, + { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) }, + { "mmusr", offsetof(CPUM68KState, mmu.mmusr) }, + { NULL }, +}; + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps m68k_sysemu_ops =3D { .has_work =3D m68k_cpu_has_work, .get_phys_page_debug =3D m68k_cpu_get_phys_page_debug, + .monitor_defs =3D m68k_monitor_defs, }; #endif /* !CONFIG_USER_ONLY */ =20 diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index be7411edca6..3e0df40a6b8 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -21,24 +21,3 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) =20 dump_mmu(env1); } - -static const MonitorDef monitor_defs[] =3D { - { "ssp", offsetof(CPUM68KState, sp[0]) }, - { "usp", offsetof(CPUM68KState, sp[1]) }, - { "isp", offsetof(CPUM68KState, sp[2]) }, - { "sfc", offsetof(CPUM68KState, sfc) }, - { "dfc", offsetof(CPUM68KState, dfc) }, - { "urp", offsetof(CPUM68KState, mmu.urp) }, - { "srp", offsetof(CPUM68KState, mmu.srp) }, - { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) }, - { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) }, - { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) }, - { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) }, - { "mmusr", offsetof(CPUM68KState, mmu.mmusr) }, - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126797; cv=none; d=zohomail.com; s=zohoarc; b=El45IpECFKTAUAKhzj6a9tnXHNmYNYjFAapfTvyvA/GH/t3cW/UaRAoCOCQOmYx13nLkyCZiyultQxMrY5/T8fr8F3SyyqOhRgMqUWy7Fe+f6XLE9AWBQrQ2wez+tqPD8l6j+QZJBrvnaCRkLnAtlUbF/lbCfIgvD63Q9xWLrF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126797; 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=P+MkKHTxKAsGH7mkXb7QOys2aguqDNuWH1H2LcjP2Ig=; b=QEEP9hBMvKgCJYJmqtrUrfO9zrAoBMOUC0Gc/i4FsLOUEU2qvTRB6Vgna+h1N99auLJsKg6eBGfXvLnNB3lIuVI/cruuG1EHapeTesCybLAZfMTN+oSWhliSowSIaXUmvJWJr8vcZ8Y26Azkpg9AhRf1Ky2R+J0Qo75QmyFa3Ko= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126797329629.2640371289036; Mon, 13 Apr 2026 17:33:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRiK-0001B5-4y; Mon, 13 Apr 2026 20:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRiI-0001AE-3C for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:10 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRiG-0003b4-Hk for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:09 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4887fd35e60so35228265e9.2 for ; Mon, 13 Apr 2026 17:33: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-488ede24eb0sm5829775e9.8.2026.04.13.17.33.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126787; x=1776731587; 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=P+MkKHTxKAsGH7mkXb7QOys2aguqDNuWH1H2LcjP2Ig=; b=ufCm6J0fs61FwhPg5m4XSAoo5iYs3af31GLjX/BGJHbcwo1neesSsWV7EMFdRVAGD+ yewAks2lfdH+39Gk6kSrF76D0Fe6kT8i4VjzlYRZrm7DOE5tlFWW637HXAkxHYkg6Y0u mbpxTC57uEsEIildL8Fl5FmRFixQGVOhhVFzTRxuG+vYGFX46XTqKiX/1cBn1E9is/Fy 0wAiDInD2W2uHCUweieFDm8c41OgYALUKUOpVMgo/o6KDqDNlW1gkBElw8dP84N+hppq cRt9EHtJwUhL5nmhAz7lGgq+Xreii+JmssbK7AShLXIBXdvT0LP6kbvH5Wk+nAf/TkgA fSGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126787; x=1776731587; 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=P+MkKHTxKAsGH7mkXb7QOys2aguqDNuWH1H2LcjP2Ig=; b=jJzr7bFvETX8yjcQxm6E11a+j7hwihWRN/qtPkAS8N5EFGeEojuQxLZe1Wqwrw6uV2 FK3x0bzI6zfRFzySLuvR4m8YXxP3GStIjDkaP4D9RG2Vc95OjbVYqSqylfiieRovYjkr yfhVs1Ap22EdGNgWxU2k9glQOS0ZgSwo0aRvLkw+kNLSega4+g7H3KFgNeIaLXPEXzwO qxJrM9uek+pcRdhIEOqGZQwF+8FutbWsfYZiBdJ+nJMMYnzSck9MVPUTzoSBxg/hs/Iu jvLS2toUU7lv9+tc6UOHB4spEQWbsToVYHyzhyGe+LE/PkuEIF6zNuh0kfHPzgteZcJt MGuA== X-Gm-Message-State: AOJu0Yyq1oLYgdYHlj9vgP+Gx6+SDks+SFrYGiN0kx3fdbXMmejx3nhf O85Qrp+GH+MIXVWFSOZ2KA+vGK1NZEUtGHhbIjuxAUGVn5zSvaPo5gCnGYEqL6WzHKVRAkxUdYq AqhIYok0= X-Gm-Gg: AeBDiesiesbhbHFdPA64WNRd684ENI8WEcKPt9DfR8pHdBSWqq6/OFXWilvSA+GczdB hhxUiQ8AnhAsocI/UbcNQCZbwNvzgDEumYlWFXpvBPDGf3aF1sdP2Er1ALUBEN2XqtAC3U6OLa1 N06iSyDn3oSa6qaI0v77npJBpg/cfsbhXBZL2PQdAUdrxS7DdP9MxURh1vvbVjhzA29cmqvqNxq B1qNjD/1A5G//OhA2Ls2yIfVYF/7oWGv30qwI+UoKma55Sz0JbMZ6dHAK3cXLDmh//PScAAKokf PLSDBwRjFabC1H2hIQ0Kddw8qFlF1M1AcFYMHgh9UvWNUHe583kNcOnXmMntRvc6Ny8y+il6/yA PY3XpsY7qKnHtw38w+xR/ORzEfmH+i5kd8YafZA3kRMX3rA4ZKuBedsNJJeLgIO953sPs1p8mxy g91cq+Oc1qY1Id+oAKB3UDEv5sg+b8w7DIqe9FORq3dKqLYCCtmDr89Kbnekmba/1sJ1rytMRW X-Received: by 2002:a05:600c:3ba8:b0:488:af7f:7707 with SMTP id 5b1f17b1804b1-488d6836621mr210119185e9.18.1776126786861; Mon, 13 Apr 2026 17:33:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v3 25/27] target/sparc: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Tue, 14 Apr 2026 02:29:57 +0200 Message-ID: <20260414003001.97571-26-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1776126798594158500 Restrict sparc64_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook (taking care to not register it on 32-bit SPARC target), allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/sparc/cpu.c | 19 +++++++++++++++++++ target/sparc/monitor.c | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 1493336e7a2..9c5175aca34 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -993,12 +993,31 @@ static const Property sparc_cpu_properties[] =3D { }; =20 #ifndef CONFIG_USER_ONLY + +#ifdef TARGET_SPARC64 +#include "monitor/hmp.h" + +static const MonitorDef sparc64_monitor_defs[] =3D { + { "asi", offsetof(CPUSPARCState, asi) }, + { "pstate", offsetof(CPUSPARCState, pstate) }, + { "cansave", offsetof(CPUSPARCState, cansave) }, + { "canrestore", offsetof(CPUSPARCState, canrestore) }, + { "otherwin", offsetof(CPUSPARCState, otherwin) }, + { "wstate", offsetof(CPUSPARCState, wstate) }, + { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, + { NULL }, +}; +#endif + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps sparc_sysemu_ops =3D { .has_work =3D sparc_cpu_has_work, .get_phys_page_debug =3D sparc_cpu_get_phys_page_debug, .legacy_vmsd =3D &vmstate_sparc_cpu, +#if defined(TARGET_SPARC64) + .monitor_defs =3D sparc64_monitor_defs, +#endif }; #endif =20 diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index 99abddbf1e0..36f3d8d58e9 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -37,21 +37,3 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) } dump_mmu(env1); } - -const MonitorDef monitor_defs[] =3D { -#ifdef TARGET_SPARC64 - { "asi", offsetof(CPUSPARCState, asi) }, - { "pstate", offsetof(CPUSPARCState, pstate) }, - { "cansave", offsetof(CPUSPARCState, cansave) }, - { "canrestore", offsetof(CPUSPARCState, canrestore) }, - { "otherwin", offsetof(CPUSPARCState, otherwin) }, - { "wstate", offsetof(CPUSPARCState, wstate) }, - { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, -#endif - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126824; cv=none; d=zohomail.com; s=zohoarc; b=E+c2JUvZ3Ay1v2lbnBTXyYBHjhshqUsCYZN6ZMPHE/GhTWUevhziY/xKYeReHYsFomo3OpbS50+QNiyxMeZF26ZTiTlOkp+OEMYzQ0zjrGowoPxswPGlUbeWfs8D3l6QDgOIutRB5dN5Z6N3qtmzdsm6oQw/CjvwQwTDXaUIszU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126824; 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=u3CzJ/A2GgXwvTiMHFqbROF6u1z+P+1ZUB0NG8W5jSE=; b=FEBJkFgo8tRxxjnkSVrbRMYfKYzUxQkq7P8ORLflUDxvJdu0xZ6jZlbeq5NK6X+u47I7LDYyd7OAPImticqZ78p+5E7qmNruvK5kvZU+uSBNTHsZ1N/eRsakKSw5B4GJVOEyDmM6SCWgXBuIZ8J20Vv1JlNQLRJTdL+GTAQgqO8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126824695726.6637988644756; Mon, 13 Apr 2026 17:33:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRig-0001g4-Rp; Mon, 13 Apr 2026 20:33:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRiQ-0001LF-EH for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:20 -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 1wCRiO-0003fX-9Z for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:17 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso77677175e9.3 for ; Mon, 13 Apr 2026 17:33: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 ffacd0b85a97d-43d63e50200sm37149928f8f.29.2026.04.13.17.33.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:33:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126794; x=1776731594; 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=u3CzJ/A2GgXwvTiMHFqbROF6u1z+P+1ZUB0NG8W5jSE=; b=Id3w+UM1IA3FDiT5BFRyYlhyNrnGFKZjchfQ0dLgKGlrnRRnOCN6ZhZjBeAa9BLuuW jROLwqyVFHgVI68sb1fnUBKsMlUgbVmSbYFqESKlnkQVoriWiBu1Wq5/3nqYG3gUjyLY y6bzzicDSdU+hPluflskSaz8fsLtXFXGZmy7LC1oiK7qscWaJ5wYXJXJJZoS9MdBp9eI kJw2KqXg/iRhYLRJfKE4yhF+PQHxLPJsql0DsuAvpsQEM/XnCnXQBrbcXChEH1CSlzju 6HMjMTNWgoFDlJczN6IZ5DcM2isJ8wywGWEzoAkBSgjoftv5E6BOJpc6zuXjyiLSKBgx I4HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126794; x=1776731594; 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=u3CzJ/A2GgXwvTiMHFqbROF6u1z+P+1ZUB0NG8W5jSE=; b=NCC0DJL0Jyn6K8yuX7Z2jAcbevpGoJ6Xcp8mk0IFTiwAe8gS+D2rPYm01/pm/jiaQh dSMKOm9vRgu9GKBzt4NHuaxSagCcIG3PkvgREBM56eGKCdnB3F3jr6fmSqdcfrhXdI4D GGluOs3Bj8dV2Z6haw2L+iuWPzGp8kQINiUHDPIxvtKX3imLJv6Z86uQRQLbsqWSGnQm GjLuNCzjJqWdGLrLS0S5HlwmgAJuv2/S7bMqoMptmnCYQVKjaylEyjflD4USK8OPuU3s n09TLmA5PeSu5bz5El00F2MXJfpX3w9Omog7/jdiONX8StsKF8h+hxh8qnLC5JcUpSJj +3TQ== X-Gm-Message-State: AOJu0YzA7VmP8Rj+Fxhr71FWCdpGv6+kELRKYreWKclRZ8UKfReq6x7T 1zYPGRj914BFANJuaJc3mlr79GAHuatlHtl8VWsGRHb5B935NnDRJAjpnQx0/q5zcaqZHjW/Hqh SZO+Hbck= X-Gm-Gg: AeBDiesu0NZkXLIOxQshOYwjR8wdSzNW1Ti+3z2eHU4FinPVvB9Gg3JHfGiphzK3Vx2 LC5mkEQpsx34qM1tzV0olY4nZFy8e+fCqe3/C2GkpaKOt3g2vtQdEMDwsETcbLgQp60EvmTDnmU gyWFwECy/hNXbtWU2XbGp0yfuC6WFbw/U/4hLfLOK1sr5Zn6J3UnK6hCK8sIeJz1LsmYj5SH4rr e+vne7m0bac96OJd4R8nFGDyC8O7psKWa2ocLLjPhvOy/hgK2vhe+1p4iPPT6XlHMtcbZqpmVzn tvjIApTZLokNKYVli93MlSzAvrhulQSZcrPHhB5GTZAIme12XlhEnnEFJGBbbKjqYWRsfM7IwSv ZCGdBEbCCOeqGfQ4DqROjQ+dgcYfWWXIBCdXeUmM6Il3UEzBRgWEEG+BVvTviWne4EtaK0epQqX iLUHjzqXO64jBrpUwG7CBxISkmCig1dZzW2zvAzQ6JEnomifrbsCUh4I8AxNlDMp6TpeFZGS2Z X-Received: by 2002:a5d:5d0b:0:b0:43d:70e5:bfa9 with SMTP id ffacd0b85a97d-43d70e5c016mr11703055f8f.48.1776126794571; Mon, 13 Apr 2026 17:33:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 26/27] monitor: Remove target_monitor_defs() Date: Tue, 14 Apr 2026 02:29:58 +0200 Message-ID: <20260414003001.97571-27-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.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: 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: 1776126826228158500 target_monitor_defs() is now only a dead stub. Remove as pointless. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/monitor/hmp.h | 2 -- monitor/hmp.c | 2 +- stubs/target-monitor-defs.c | 7 ------- stubs/meson.build | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 stubs/target-monitor-defs.c diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 22784bd4c79..c8ce8579424 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -30,8 +30,6 @@ struct MonitorDef { int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); }; =20 -const MonitorDef *target_monitor_defs(void); - CPUArchState *mon_get_cpu_env(Monitor *mon); CPUState *mon_get_cpu(Monitor *mon); =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index 70e5e5c2367..6d0f5b251b9 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1615,7 +1615,7 @@ static int get_monitor_def(Monitor *mon, int64_t *pva= l, const char *name) if (cs =3D=3D NULL) { return -1; } - md =3D cs->cc->sysemu_ops->monitor_defs ?: target_monitor_defs(); + md =3D cs->cc->sysemu_ops->monitor_defs; if (md =3D=3D NULL) { return -1; } diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c deleted file mode 100644 index 0dd4cdb34f6..00000000000 --- a/stubs/target-monitor-defs.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "monitor/hmp.h" - -const MonitorDef *target_monitor_defs(void) -{ - return NULL; -} diff --git a/stubs/meson.build b/stubs/meson.build index 2bf376e15e3..3c6d0032e93 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -74,7 +74,6 @@ if have_system stub_ss.add(files('igvm.c')) endif stub_ss.add(files('kvm.c')) - stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) stub_ss.add(files('qmp-arm-gic.c')) --=20 2.53.0 From nobody Thu Apr 30 00:40:26 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=1776126822; cv=none; d=zohomail.com; s=zohoarc; b=BbqLB3vHxoJL8qvrwGCO0wfYwcWA1PJpaJ77KEhw7geXtcW3EXXAn+sJx/e/K/faznEcq9oA4NnEW7zVbCGIHrfyYVBknact4fGjCOShYOH60Jv/n5O8KpHFnX6OTWmZ029quqJJu0HuAOUg/Zf6IsXETmRmOtWsbwlLglZuGpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776126822; 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=ODwnfJVouK+JUVlbOBy8KRV4Th4vkJEO+Xt0lwwIQP8=; b=CZJ/6ZTFfgAY7nyaxXLGhPGiZUyutYm2EbhXq71T8/pEIGyKE+1cIQZuye4zoz7PNdhQQVmbO3H2LnADipZ5SZQReDbMpQl5haFF/+2qV4WJqa+Q7RDzN8JhywHdYijLBWWDqFEXUyLkohwdw4oCSQfqPqnGG3GF/MOYlmKgjHE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776126822565146.68729525687718; Mon, 13 Apr 2026 17:33:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCRie-0001WV-4N; Mon, 13 Apr 2026 20:33:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCRiX-0001TF-5d for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:26 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wCRiV-0003fv-9N for qemu-devel@nongnu.org; Mon, 13 Apr 2026 20:33:24 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-483487335c2so54767705e9.2 for ; Mon, 13 Apr 2026 17:33:22 -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-488ee038752sm5826945e9.9.2026.04.13.17.33.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 17:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1776126801; x=1776731601; 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=ODwnfJVouK+JUVlbOBy8KRV4Th4vkJEO+Xt0lwwIQP8=; b=dLB1Mi3LosnyTRuIlMQmSZshoWtfrlNSa5MDtEuOgZnAGZxpsk7pePs/HQtFarPPwG CsxaMsPS2z9m4VAQRks2pBg3A0yJEfvyymEj4NARpz6r7SORXqLA4sqk+XisdppBZL9D 3CuqYujfAlTvaY3MGmBQD+GQymWeafVz/1/HrLTIllLMRWdkrZpXMjPjx5EGTJXVl9G6 J6GL2U4yM2X0/LlFJqDu0xymNBAEPRPLbLlQEAIg8PH5egR28dxRlR1MeMvdwQb1fohu 78WW2Z7m8fdnDuWl4wu68WvpiFiQ+J2sTTz11X0G8VfCngHxgezR0FD9fEoCAzDT3r9t U+jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776126801; x=1776731601; 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=ODwnfJVouK+JUVlbOBy8KRV4Th4vkJEO+Xt0lwwIQP8=; b=ZUoIw3jtaofoNntzptkrcZ2OLvex5QaErTRfexEmSxZrQCPh8RxlJDvliuLMUx0gx+ J/dhIGbeJRXIIhy/iH0NccgvUqasRymKyH6r97bSsssAF9285D4/wsnoBVYz7ffLRGGU qmSeRhLme0uYRpHWehQfh7x73QeKtM+8PnU2U40iRf6bCyK1ByKW/wgmMibGRuk+TYgl RJEewUUEGztCwY3yVijX+qzd8I5JcJ6RT6lAH2i15x67gJegL4DFCgitWPTyobYlHthb Nha34Xsd/c5+g4Ex+BwjhNI3fc+F2xCz094sG2JYvhWt/Mc2lwnHMvyqW6YcIIfEuP5N qZ0g== X-Gm-Message-State: AOJu0YzMCtokQrWLpI3fWUEUEND2DLYlCd6/tF8pomdCjalCYtK5kJo+ ALosixP0ZC+suDh0TzdCRcFtXWDpjXV6c3kvmDJVUrR1G7h2wgALhyVP7578aozQRTiZt8g7aIZ tCStAF7U= X-Gm-Gg: AeBDiesZnz4dHWQ8mgxliP1zWhrkb3/sWYCB8+Bi/2geX8WWXBYP1p42aENTJ6cxjo7 EkC+RxZMS8aUPQBqwfq7GG9uYcnDoFPKcfLob0LNWy5aPOvih3LNpCxqcqPEouGlsAYCujVO79+ nqtq/KXyokmBKqmPG3sLqua+nb+/v1s7AZrO80KQSw7UMIvuikEZ7XojhkPHKx51t2UVgz73VdA IyDmH3EsDHjtkxoew/RSn8Tw++13uB8FNueR6gTY7Huaepj5LuTI467uIlNn1ZvPJ3w4bjSVUlZ G7nDTjUIP/cEnv4+YluKLs5zaFZVyCGeyqJ1EeOW/M22qEpd16nVPEtn77JWaDdeagTFUO5zIq1 4fZGkg/ms0VJORJW1hwAXMSJ3NvhqTKaQT1bfb3ONJwWBVuBBBwtIkmiUcZtDEy3nmKlXaT3lgB I2p+yS4LL7i6IsW+YWJLdNptAjVTBq7BkrS+xj4Wccb7kPCAAZDzpG1xNnF7ImtIDt47n2Q1SZ X-Received: by 2002:a05:600d:d:b0:485:2a85:e5ec with SMTP id 5b1f17b1804b1-488d67b8db8mr160288015e9.2.1776126801487; Mon, 13 Apr 2026 17:33:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 27/27] monitor: Merge hmp-target.c code within hmp-cmds.c Date: Tue, 14 Apr 2026 02:29:59 +0200 Message-ID: <20260414003001.97571-28-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414003001.97571-1-philmd@linaro.org> References: <20260414003001.97571-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1776126824348158500 hmp-target.c doesn't contain any target-specific code anymore. Merge it within hmp-cmds.c (which is already built once). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- MAINTAINERS | 1 - monitor/hmp-cmds.c | 40 ++++++++++++++++++++++++ monitor/hmp-target.c | 74 -------------------------------------------- monitor/meson.build | 3 -- 4 files changed, 40 insertions(+), 78 deletions(-) delete mode 100644 monitor/hmp-target.c diff --git a/MAINTAINERS b/MAINTAINERS index 5dcd24a8a89..d184e25ddd4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3414,7 +3414,6 @@ Human Monitor (HMP) M: Dr. David Alan Gilbert S: Maintained F: monitor/monitor-internal.h -F: monitor/hmp-target.c F: monitor/monitor.c F: monitor/hmp* F: hmp.h diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index e81632f5551..409a1a9c701 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -14,6 +14,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/base-arch-defs.h" #include "system/address-spaces.h" #include "system/ioport.h" #include "exec/gdbstub.h" @@ -22,19 +23,58 @@ #include "monitor/hmp.h" #include "qemu/help_option.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor-internal.h" +#include "monitor/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" +#include "block/block-hmp-cmds.h" #include "qobject/qdict.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "net/slirp.h" +#include "system/device_tree.h" #include "system/hw_accel.h" #include "system/memory.h" #include "system/system.h" #include "disas/disas.h" =20 +/* Please update hmp-commands.hx when adding or changing commands */ +static HMPCommand hmp_info_cmds[] =3D { +#include "hmp-commands-info.h" + { NULL, NULL, }, +}; + +/* hmp_cmds and hmp_info_cmds would be sorted at runtime */ +static HMPCommand hmp_cmds[] =3D { +#include "hmp-commands.h" + { NULL, NULL, }, +}; + +HMPCommand *hmp_cmds_for_target(bool info_command) +{ + return info_command ? hmp_info_cmds : hmp_cmds; +} + +static int +compare_mon_cmd(const void *a, const void *b) +{ + return strcmp(((const HMPCommand *)a)->name, + ((const HMPCommand *)b)->name); +} + +static void __attribute__((__constructor__)) sortcmdlist(void) +{ + qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1, + sizeof(*hmp_cmds), + compare_mon_cmd); + qsort(hmp_info_cmds, ARRAY_SIZE(hmp_info_cmds) - 1, + sizeof(*hmp_info_cmds), + compare_mon_cmd); +} + bool hmp_handle_error(Monitor *mon, Error *err) { if (err) { diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c deleted file mode 100644 index 2739383607d..00000000000 --- a/monitor/hmp-target.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * QEMU monitor, target-dependent part - * - * 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 "qemu/base-arch-defs.h" -#include "monitor-internal.h" -#include "monitor/qdev.h" -#include "net/slirp.h" -#include "system/device_tree.h" -#include "monitor/hmp.h" -#include "monitor/hmp-completion.h" -#include "block/block-hmp-cmds.h" -#include "qapi/qapi-commands-control.h" -#include "qapi/qapi-commands-misc.h" -#include "qapi/qapi-commands-machine.h" -#include "hw/core/sysemu-cpu-ops.h" - -/* Make devices configuration available for use in hmp-commands*.hx templa= tes */ -#include CONFIG_DEVICES - -/* Please update hmp-commands.hx when adding or changing commands */ -static HMPCommand hmp_info_cmds[] =3D { -#include "hmp-commands-info.h" - { NULL, NULL, }, -}; - -/* hmp_cmds and hmp_info_cmds would be sorted at runtime */ -static HMPCommand hmp_cmds[] =3D { -#include "hmp-commands.h" - { NULL, NULL, }, -}; - -HMPCommand *hmp_cmds_for_target(bool info_command) -{ - return info_command ? hmp_info_cmds : hmp_cmds; -} - -static int -compare_mon_cmd(const void *a, const void *b) -{ - return strcmp(((const HMPCommand *)a)->name, - ((const HMPCommand *)b)->name); -} - -static void __attribute__((__constructor__)) sortcmdlist(void) -{ - qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1, - sizeof(*hmp_cmds), - compare_mon_cmd); - qsort(hmp_info_cmds, ARRAY_SIZE(hmp_info_cmds) - 1, - sizeof(*hmp_info_cmds), - compare_mon_cmd); -} diff --git a/monitor/meson.build b/monitor/meson.build index 585251804e4..4c58dd148c0 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -7,6 +7,3 @@ system_ss.add(files( 'qemu-config-qmp.c', 'qmp-cmds.c', )) - -specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: [files('hmp-target.c')]) --=20 2.53.0