From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dave@treblig.org>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
qemu-riscv@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
qemu-s390x@nongnu.org, kvm@vger.kernel.org, qemu-ppc@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Jason Herne" <jjherne@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Matthew Rosato" <mjrosato@linux.ibm.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"David Hildenbrand" <david@kernel.org>,
"Cornelia Huck" <cohuck@redhat.com>
Subject: [PATCH v2 20/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions
Date: Fri, 10 Apr 2026 21:53:14 +0200 [thread overview]
Message-ID: <20260410195323.17937-21-philmd@linaro.org> (raw)
In-Reply-To: <20260410195323.17937-1-philmd@linaro.org>
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é <philmd@linaro.org>
---
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/storage-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
#include "hw/core/qdev.h"
-#include "monitor/monitor.h"
#include "qom/object.h"
#define TYPE_S390_STATTRIB "s390-storage_attributes"
@@ -72,7 +71,4 @@ static inline Object *kvm_s390_stattrib_create(void)
}
#endif
-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-keys.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
#include "hw/core/qdev.h"
-#include "monitor/monitor.h"
#include "qom/object.h"
#define TYPE_S390_SKEYS "s390-skeys"
@@ -123,8 +122,6 @@ int s390_skeys_set(S390SKeysState *ks, uint64_t start_gfn,
S390SKeysState *s390_get_skeys_device(void);
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);
#define TYPE_DUMP_SKEYS_INTERFACE "dump-skeys-interface"
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index b444095f684..a0a063db8e4 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -182,4 +182,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);
+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"
#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"
--
2.53.0
next prev parent reply other threads:[~2026-04-10 19:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-10 19:52 [PATCH v2 00/27] monitor: Remove need of per-target handlers Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 01/27] monitor: Have MonitorDef::get_value() always return int64_t type Philippe Mathieu-Daudé
2026-04-13 2:42 ` Richard Henderson
2026-04-10 19:52 ` [PATCH v2 02/27] monitor: Remove target_long use in get_monitor_def() Philippe Mathieu-Daudé
2026-04-13 2:54 ` Richard Henderson
2026-04-10 19:52 ` [PATCH v2 03/27] monitor: Reduce target-specific methods further Philippe Mathieu-Daudé
2026-04-13 2:54 ` Richard Henderson
2026-04-10 19:52 ` [PATCH v2 04/27] monitor: Remove 'monitor/hmp-target.h' header Philippe Mathieu-Daudé
2026-04-10 19:52 ` [PATCH v2 05/27] monitor: Forward-declare the MonitorDef type Philippe Mathieu-Daudé
2026-04-13 3:10 ` Richard Henderson
2026-04-10 19:53 ` [PATCH v2 06/27] cpus: Introduce SysemuCPUOps::monitor_defs hook Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 07/27] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 08/27] target/m68k: " Philippe Mathieu-Daudé
2026-04-13 3:59 ` Richard Henderson
2026-04-10 19:53 ` [PATCH v2 09/27] target/sparc: " Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 10/27] monitor: Remove target_monitor_defs() Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 11/27] cpus: Introduce SysemuCPUOps::monitor_get_register() hook Philippe Mathieu-Daudé
2026-04-13 4:09 ` Richard Henderson
2026-04-10 19:53 ` [PATCH v2 12/27] target/riscv: Register target_get_monitor_def in SysemuCPUOps Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 13/27] monitor: Remove target_get_monitor_def() Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 14/27] monitor/meson: Use SPICE with migration HMP commands Philippe Mathieu-Daudé
2026-04-15 14:58 ` Peter Xu
2026-04-15 18:30 ` Pierrick Bouvier
2026-04-10 19:53 ` [PATCH v2 15/27] stubs: Rename monitor* -> qmp* files Philippe Mathieu-Daudé
2026-04-15 18:30 ` Pierrick Bouvier
2026-04-10 19:53 ` [PATCH v2 16/27] monitor: Make 'info via' a generic command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 17/27] monitor: Make Xen emulation commands generic ones Philippe Mathieu-Daudé
2026-04-10 20:03 ` David Woodhouse
2026-04-10 19:53 ` [PATCH v2 18/27] system: Expose 'arch_init.h' as 'qemu/target-arch-defs.h' Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 19/27] monitor: Introduce HMPCommand::arch_bitmask field Philippe Mathieu-Daudé
2026-04-13 4:41 ` Richard Henderson
2026-04-10 19:53 ` Philippe Mathieu-Daudé [this message]
2026-04-13 8:08 ` [PATCH v2 20/27] hw/s390x: Reduce 'monitor/monitor.h' inclusions Cornelia Huck
2026-04-10 19:53 ` [PATCH v2 21/27] monitor: Do not check TARGET_S390X to build s390x commands Philippe Mathieu-Daudé
2026-04-13 8:10 ` Cornelia Huck
2026-04-10 19:53 ` [PATCH v2 22/27] monitor: Do not check TARGET_I386 to build target/i386/ commands Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 23/27] monitor: Do not check TARGET_I386 to build 'info sgx' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 24/27] monitor: Do not check TARGET_I386 to build 'info sev' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 25/27] monitor: Do not check TARGET_I386/RISCV to build 'info mem' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 26/27] monitor: Do not check multiple TARGET_* to build 'info tlb' command Philippe Mathieu-Daudé
2026-04-10 19:53 ` [PATCH v2 27/27] monitor: Merge hmp-target.c code within hmp-cmds.c Philippe Mathieu-Daudé
2026-04-13 8:13 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260410195323.17937-21-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=dave@treblig.org \
--cc=david@kernel.org \
--cc=farman@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=jjherne@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox