* [PATCH v2 1/8] target/i386: Include missing 'svm.h' header in 'sev.h'
[not found] <20260117162926.74225-1-philmd@linaro.org>
@ 2026-01-17 16:29 ` Philippe Mathieu-Daudé
2026-01-19 5:37 ` Zhao Liu
2026-01-17 16:29 ` [PATCH v2 8/8] monitor: Remove 'monitor/hmp-target.h' header Philippe Mathieu-Daudé
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-17 16:29 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Paolo Bonzini, Pierrick Bouvier,
Dr. David Alan Gilbert, Markus Armbruster,
Philippe Mathieu-Daudé, Zhao Liu, Marcelo Tosatti, kvm
otarget/i386/cpu.h:2820:#include "svm.h"
target/i386/sev.h:17:#include "target/i386/svm.h"
"target/i386/sev.h" uses the vmcb_seg structure type, which
is defined in "target/i386/svm.h". Current builds succeed
because the files including "target/i386/sev.h" also include
"monitor/hmp-target.h", itself including "cpu.h" and finally
"target/i386/svm.h".
Include the latter, otherwise removing "cpu.h" from
"monitor/hmp-target.h" triggers:
../target/i386/sev.h:62:21: error: field has incomplete type 'struct vmcb_seg'
62 | struct vmcb_seg es;
| ^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/i386/sev.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/target/i386/sev.h b/target/i386/sev.h
index 9db1a802f6b..4358df40e48 100644
--- a/target/i386/sev.h
+++ b/target/i386/sev.h
@@ -14,6 +14,8 @@
#ifndef I386_SEV_H
#define I386_SEV_H
+#include "target/i386/svm.h"
+
#ifndef CONFIG_USER_ONLY
#include CONFIG_DEVICES /* CONFIG_SEV */
#endif
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 8/8] monitor: Remove 'monitor/hmp-target.h' header
[not found] <20260117162926.74225-1-philmd@linaro.org>
2026-01-17 16:29 ` [PATCH v2 1/8] target/i386: Include missing 'svm.h' header in 'sev.h' Philippe Mathieu-Daudé
@ 2026-01-17 16:29 ` Philippe Mathieu-Daudé
2026-01-19 2:03 ` Dr. David Alan Gilbert
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-17 16:29 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Paolo Bonzini, Pierrick Bouvier,
Dr. David Alan Gilbert, Markus Armbruster,
Philippe Mathieu-Daudé, Eduardo Habkost, Michael S. Tsirkin,
Marcel Apfelbaum, Zhao Liu, Marcelo Tosatti, Laurent Vivier,
Nicholas Piggin, Chinmay Rath, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Yoshinori Sato,
Mark Cave-Ayland, Artyom Tarasenko, Max Filippov, kvm, qemu-ppc,
qemu-riscv
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é <philmd@linaro.org>
---
MAINTAINERS | 2 +-
include/monitor/hmp-target.h | 60 -----------------------------------
include/monitor/hmp.h | 31 ++++++++++++++++++
hw/i386/sgx-stub.c | 2 +-
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 | 2 +-
target/i386/monitor.c | 1 -
target/i386/sev-system-stub.c | 2 +-
target/i386/sev.c | 1 -
target/m68k/monitor.c | 2 +-
target/ppc/ppc-qmp-cmds.c | 1 -
target/riscv/monitor.c | 2 +-
target/riscv/riscv-qmp-cmds.c | 1 -
target/sh4/monitor.c | 1 -
target/sparc/monitor.c | 1 -
target/xtensa/monitor.c | 1 -
20 files changed, 38 insertions(+), 78 deletions(-)
delete mode 100644 include/monitor/hmp-target.h
diff --git a/MAINTAINERS b/MAINTAINERS
index de8246c3ffd..1e0d71c7bb8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3377,7 +3377,7 @@ F: monitor/monitor.c
F: monitor/hmp*
F: hmp.h
F: hmp-commands*.hx
-F: include/monitor/hmp-target.h
+F: include/monitor/hmp.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 713936c4523..00000000000
--- a/include/monitor/hmp-target.h
+++ /dev/null
@@ -1,60 +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"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * 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 OTHER
- * 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;
- uint64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int val);
- int type;
-};
-
-#define MD_TLONG 0
-#define MD_I32 1
-
-const MonitorDef *target_monitor_defs(void);
-int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
-
-CPUArchState *mon_get_cpu_env(Monitor *mon);
-CPUState *mon_get_cpu(Monitor *mon);
-
-void hmp_info_mem(Monitor *mon, const QDict *qdict);
-void hmp_info_tlb(Monitor *mon, const QDict *qdict);
-void hmp_mce(Monitor *mon, const QDict *qdict);
-void hmp_info_local_apic(Monitor *mon, const QDict *qdict);
-void hmp_info_sev(Monitor *mon, const QDict *qdict);
-void hmp_info_sgx(Monitor *mon, const QDict *qdict);
-void hmp_info_via(Monitor *mon, const QDict *qdict);
-void hmp_memory_dump(Monitor *mon, const QDict *qdict);
-void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict);
-void hmp_info_registers(Monitor *mon, const QDict *qdict);
-void hmp_gva2gpa(Monitor *mon, const QDict *qdict);
-void hmp_gpa2hva(Monitor *mon, const QDict *qdict);
-void hmp_gpa2hpa(Monitor *mon, const QDict *qdict);
-
-#endif /* MONITOR_HMP_TARGET_H */
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 83721b5ffc6..fb678786101 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -17,6 +17,37 @@
#include "qemu/readline.h"
#include "qapi/qapi-types-common.h"
+typedef struct MonitorDef {
+ const char *name;
+ int offset;
+ uint64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int val);
+ int type;
+} MonitorDef;
+
+#define MD_TLONG 0
+#define MD_I32 1
+
+const MonitorDef *target_monitor_defs(void);
+
+int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
+
+CPUArchState *mon_get_cpu_env(Monitor *mon);
+CPUState *mon_get_cpu(Monitor *mon);
+
+void hmp_info_mem(Monitor *mon, const QDict *qdict);
+void hmp_info_tlb(Monitor *mon, const QDict *qdict);
+void hmp_mce(Monitor *mon, const QDict *qdict);
+void hmp_info_local_apic(Monitor *mon, const QDict *qdict);
+void hmp_info_sev(Monitor *mon, const QDict *qdict);
+void hmp_info_sgx(Monitor *mon, const QDict *qdict);
+void hmp_info_via(Monitor *mon, const QDict *qdict);
+void hmp_memory_dump(Monitor *mon, const QDict *qdict);
+void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict);
+void hmp_info_registers(Monitor *mon, const QDict *qdict);
+void hmp_gva2gpa(Monitor *mon, const QDict *qdict);
+void hmp_gpa2hva(Monitor *mon, const QDict *qdict);
+void hmp_gpa2hpa(Monitor *mon, const QDict *qdict);
+
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 d295e54d239..6e82773a86d 100644
--- a/hw/i386/sgx-stub.c
+++ b/hw/i386/sgx-stub.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
-#include "monitor/hmp-target.h"
+#include "monitor/hmp.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 e2801546ad6..54d2cae36d8 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -16,7 +16,6 @@
#include "hw/mem/memory-device.h"
#include "monitor/qdev.h"
#include "monitor/monitor.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 5a673cddb2a..7c2b69dfa5b 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -21,7 +21,6 @@
#include "gdbstub/enums.h"
#include "monitor/hmp.h"
#include "qemu/help_option.h"
-#include "monitor/hmp-target.h"
#include "monitor/monitor-internal.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c
index a3306b69c93..2574c5d8b4b 100644
--- a/monitor/hmp-target.c
+++ b/monitor/hmp-target.c
@@ -27,7 +27,6 @@
#include "monitor/qdev.h"
#include "net/slirp.h"
#include "system/device_tree.h"
-#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 82d2bbdf77d..4dc8c5f9364 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -27,7 +27,6 @@
#include "hw/core/qdev.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"
const MonitorDef *target_monitor_defs(void)
{
diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c
index eeee62b52a2..3b73a04597f 100644
--- a/target/i386/cpu-apic.c
+++ b/target/i386/cpu-apic.c
@@ -10,7 +10,7 @@
#include "qobject/qdict.h"
#include "qapi/error.h"
#include "monitor/monitor.h"
-#include "monitor/hmp-target.h"
+#include "monitor/hmp.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 cce23f987ef..1c16b003371 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 7c5c02a5657..f799a338d60 100644
--- a/target/i386/sev-system-stub.c
+++ b/target/i386/sev-system-stub.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
-#include "monitor/hmp-target.h"
+#include "monitor/hmp.h"
#include "qapi/error.h"
#include "sev.h"
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 1d70f96ec1f..31dbabe4b51 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -36,7 +36,6 @@
#include "migration/blocker.h"
#include "qom/object.h"
#include "monitor/monitor.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 161f41853ec..05d05440f42 100644
--- a/target/m68k/monitor.c
+++ b/target/m68k/monitor.c
@@ -7,7 +7,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "monitor/hmp-target.h"
+#include "monitor/hmp.h"
#include "monitor/monitor.h"
void hmp_info_tlb(Monitor *mon, const QDict *qdict)
diff --git a/target/ppc/ppc-qmp-cmds.c b/target/ppc/ppc-qmp-cmds.c
index 07938abb15f..08314e3c1cd 100644
--- a/target/ppc/ppc-qmp-cmds.c
+++ b/target/ppc/ppc-qmp-cmds.c
@@ -26,7 +26,6 @@
#include "cpu.h"
#include "monitor/monitor.h"
#include "qemu/ctype.h"
-#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c
index 8a77476db93..bc176dd8771 100644
--- a/target/riscv/monitor.c
+++ b/target/riscv/monitor.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "cpu_bits.h"
#include "monitor/monitor.h"
-#include "monitor/hmp-target.h"
+#include "monitor/hmp.h"
#include "system/memory.h"
#ifdef TARGET_RISCV64
diff --git a/target/riscv/riscv-qmp-cmds.c b/target/riscv/riscv-qmp-cmds.c
index d5e9bec0f86..79232d34005 100644
--- a/target/riscv/riscv-qmp-cmds.c
+++ b/target/riscv/riscv-qmp-cmds.c
@@ -34,7 +34,6 @@
#include "qemu/ctype.h"
#include "qemu/qemu-print.h"
#include "monitor/hmp.h"
-#include "monitor/hmp-target.h"
#include "system/kvm.h"
#include "system/tcg.h"
#include "cpu-qom.h"
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"
static void print_tlb(Monitor *mon, int idx, tlb_t *tlb)
diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c
index 3e1f4dd5c9c..79f564c551a 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"
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"
void hmp_info_tlb(Monitor *mon, const QDict *qdict)
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 8/8] monitor: Remove 'monitor/hmp-target.h' header
2026-01-17 16:29 ` [PATCH v2 8/8] monitor: Remove 'monitor/hmp-target.h' header Philippe Mathieu-Daudé
@ 2026-01-19 2:03 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2026-01-19 2:03 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Richard Henderson, Paolo Bonzini, Pierrick Bouvier,
Markus Armbruster, Eduardo Habkost, Michael S. Tsirkin,
Marcel Apfelbaum, Zhao Liu, Marcelo Tosatti, Laurent Vivier,
Nicholas Piggin, Chinmay Rath, Palmer Dabbelt, Alistair Francis,
Weiwei Li, Daniel Henrique Barboza, Liu Zhiwei, Yoshinori Sato,
Mark Cave-Ayland, Artyom Tarasenko, Max Filippov, kvm, qemu-ppc,
qemu-riscv
* Philippe Mathieu-Daudé (philmd@linaro.org) wrote:
> 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é <philmd@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
> ---
> MAINTAINERS | 2 +-
> include/monitor/hmp-target.h | 60 -----------------------------------
> include/monitor/hmp.h | 31 ++++++++++++++++++
> hw/i386/sgx-stub.c | 2 +-
> 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 | 2 +-
> target/i386/monitor.c | 1 -
> target/i386/sev-system-stub.c | 2 +-
> target/i386/sev.c | 1 -
> target/m68k/monitor.c | 2 +-
> target/ppc/ppc-qmp-cmds.c | 1 -
> target/riscv/monitor.c | 2 +-
> target/riscv/riscv-qmp-cmds.c | 1 -
> target/sh4/monitor.c | 1 -
> target/sparc/monitor.c | 1 -
> target/xtensa/monitor.c | 1 -
> 20 files changed, 38 insertions(+), 78 deletions(-)
> delete mode 100644 include/monitor/hmp-target.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index de8246c3ffd..1e0d71c7bb8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3377,7 +3377,7 @@ F: monitor/monitor.c
> F: monitor/hmp*
> F: hmp.h
> F: hmp-commands*.hx
> -F: include/monitor/hmp-target.h
> +F: include/monitor/hmp.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 713936c4523..00000000000
> --- a/include/monitor/hmp-target.h
> +++ /dev/null
> @@ -1,60 +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"), to deal
> - * in the Software without restriction, including without limitation the rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * 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 OTHER
> - * 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;
> - uint64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int val);
> - int type;
> -};
> -
> -#define MD_TLONG 0
> -#define MD_I32 1
> -
> -const MonitorDef *target_monitor_defs(void);
> -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
> -
> -CPUArchState *mon_get_cpu_env(Monitor *mon);
> -CPUState *mon_get_cpu(Monitor *mon);
> -
> -void hmp_info_mem(Monitor *mon, const QDict *qdict);
> -void hmp_info_tlb(Monitor *mon, const QDict *qdict);
> -void hmp_mce(Monitor *mon, const QDict *qdict);
> -void hmp_info_local_apic(Monitor *mon, const QDict *qdict);
> -void hmp_info_sev(Monitor *mon, const QDict *qdict);
> -void hmp_info_sgx(Monitor *mon, const QDict *qdict);
> -void hmp_info_via(Monitor *mon, const QDict *qdict);
> -void hmp_memory_dump(Monitor *mon, const QDict *qdict);
> -void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict);
> -void hmp_info_registers(Monitor *mon, const QDict *qdict);
> -void hmp_gva2gpa(Monitor *mon, const QDict *qdict);
> -void hmp_gpa2hva(Monitor *mon, const QDict *qdict);
> -void hmp_gpa2hpa(Monitor *mon, const QDict *qdict);
> -
> -#endif /* MONITOR_HMP_TARGET_H */
> diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
> index 83721b5ffc6..fb678786101 100644
> --- a/include/monitor/hmp.h
> +++ b/include/monitor/hmp.h
> @@ -17,6 +17,37 @@
> #include "qemu/readline.h"
> #include "qapi/qapi-types-common.h"
>
> +typedef struct MonitorDef {
> + const char *name;
> + int offset;
> + uint64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int val);
> + int type;
> +} MonitorDef;
> +
> +#define MD_TLONG 0
> +#define MD_I32 1
> +
> +const MonitorDef *target_monitor_defs(void);
> +
> +int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
> +
> +CPUArchState *mon_get_cpu_env(Monitor *mon);
> +CPUState *mon_get_cpu(Monitor *mon);
> +
> +void hmp_info_mem(Monitor *mon, const QDict *qdict);
> +void hmp_info_tlb(Monitor *mon, const QDict *qdict);
> +void hmp_mce(Monitor *mon, const QDict *qdict);
> +void hmp_info_local_apic(Monitor *mon, const QDict *qdict);
> +void hmp_info_sev(Monitor *mon, const QDict *qdict);
> +void hmp_info_sgx(Monitor *mon, const QDict *qdict);
> +void hmp_info_via(Monitor *mon, const QDict *qdict);
> +void hmp_memory_dump(Monitor *mon, const QDict *qdict);
> +void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict);
> +void hmp_info_registers(Monitor *mon, const QDict *qdict);
> +void hmp_gva2gpa(Monitor *mon, const QDict *qdict);
> +void hmp_gpa2hva(Monitor *mon, const QDict *qdict);
> +void hmp_gpa2hpa(Monitor *mon, const QDict *qdict);
> +
> 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 d295e54d239..6e82773a86d 100644
> --- a/hw/i386/sgx-stub.c
> +++ b/hw/i386/sgx-stub.c
> @@ -1,6 +1,6 @@
> #include "qemu/osdep.h"
> #include "monitor/monitor.h"
> -#include "monitor/hmp-target.h"
> +#include "monitor/hmp.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 e2801546ad6..54d2cae36d8 100644
> --- a/hw/i386/sgx.c
> +++ b/hw/i386/sgx.c
> @@ -16,7 +16,6 @@
> #include "hw/mem/memory-device.h"
> #include "monitor/qdev.h"
> #include "monitor/monitor.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 5a673cddb2a..7c2b69dfa5b 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -21,7 +21,6 @@
> #include "gdbstub/enums.h"
> #include "monitor/hmp.h"
> #include "qemu/help_option.h"
> -#include "monitor/hmp-target.h"
> #include "monitor/monitor-internal.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-control.h"
> diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c
> index a3306b69c93..2574c5d8b4b 100644
> --- a/monitor/hmp-target.c
> +++ b/monitor/hmp-target.c
> @@ -27,7 +27,6 @@
> #include "monitor/qdev.h"
> #include "net/slirp.h"
> #include "system/device_tree.h"
> -#include "monitor/hmp-target.h"
> #include "monitor/hmp.h"
> #include "block/block-hmp-cmds.h"
> #include "qapi/qapi-commands-control.h"
> diff --git a/monitor/hmp.c b/monitor/hmp.c
> index 82d2bbdf77d..4dc8c5f9364 100644
> --- a/monitor/hmp.c
> +++ b/monitor/hmp.c
> @@ -27,7 +27,6 @@
> #include "hw/core/qdev.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"
>
> const MonitorDef *target_monitor_defs(void)
> {
> diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c
> index eeee62b52a2..3b73a04597f 100644
> --- a/target/i386/cpu-apic.c
> +++ b/target/i386/cpu-apic.c
> @@ -10,7 +10,7 @@
> #include "qobject/qdict.h"
> #include "qapi/error.h"
> #include "monitor/monitor.h"
> -#include "monitor/hmp-target.h"
> +#include "monitor/hmp.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 cce23f987ef..1c16b003371 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 7c5c02a5657..f799a338d60 100644
> --- a/target/i386/sev-system-stub.c
> +++ b/target/i386/sev-system-stub.c
> @@ -13,7 +13,7 @@
>
> #include "qemu/osdep.h"
> #include "monitor/monitor.h"
> -#include "monitor/hmp-target.h"
> +#include "monitor/hmp.h"
> #include "qapi/error.h"
> #include "sev.h"
>
> diff --git a/target/i386/sev.c b/target/i386/sev.c
> index 1d70f96ec1f..31dbabe4b51 100644
> --- a/target/i386/sev.c
> +++ b/target/i386/sev.c
> @@ -36,7 +36,6 @@
> #include "migration/blocker.h"
> #include "qom/object.h"
> #include "monitor/monitor.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 161f41853ec..05d05440f42 100644
> --- a/target/m68k/monitor.c
> +++ b/target/m68k/monitor.c
> @@ -7,7 +7,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "monitor/hmp-target.h"
> +#include "monitor/hmp.h"
> #include "monitor/monitor.h"
>
> void hmp_info_tlb(Monitor *mon, const QDict *qdict)
> diff --git a/target/ppc/ppc-qmp-cmds.c b/target/ppc/ppc-qmp-cmds.c
> index 07938abb15f..08314e3c1cd 100644
> --- a/target/ppc/ppc-qmp-cmds.c
> +++ b/target/ppc/ppc-qmp-cmds.c
> @@ -26,7 +26,6 @@
> #include "cpu.h"
> #include "monitor/monitor.h"
> #include "qemu/ctype.h"
> -#include "monitor/hmp-target.h"
> #include "monitor/hmp.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c
> index 8a77476db93..bc176dd8771 100644
> --- a/target/riscv/monitor.c
> +++ b/target/riscv/monitor.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "cpu_bits.h"
> #include "monitor/monitor.h"
> -#include "monitor/hmp-target.h"
> +#include "monitor/hmp.h"
> #include "system/memory.h"
>
> #ifdef TARGET_RISCV64
> diff --git a/target/riscv/riscv-qmp-cmds.c b/target/riscv/riscv-qmp-cmds.c
> index d5e9bec0f86..79232d34005 100644
> --- a/target/riscv/riscv-qmp-cmds.c
> +++ b/target/riscv/riscv-qmp-cmds.c
> @@ -34,7 +34,6 @@
> #include "qemu/ctype.h"
> #include "qemu/qemu-print.h"
> #include "monitor/hmp.h"
> -#include "monitor/hmp-target.h"
> #include "system/kvm.h"
> #include "system/tcg.h"
> #include "cpu-qom.h"
> 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"
>
> static void print_tlb(Monitor *mon, int idx, tlb_t *tlb)
> diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c
> index 3e1f4dd5c9c..79f564c551a 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"
>
>
> 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"
>
> void hmp_info_tlb(Monitor *mon, const QDict *qdict)
> --
> 2.52.0
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/8] target/i386: Include missing 'svm.h' header in 'sev.h'
2026-01-17 16:29 ` [PATCH v2 1/8] target/i386: Include missing 'svm.h' header in 'sev.h' Philippe Mathieu-Daudé
@ 2026-01-19 5:37 ` Zhao Liu
0 siblings, 0 replies; 4+ messages in thread
From: Zhao Liu @ 2026-01-19 5:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Richard Henderson, Paolo Bonzini, Pierrick Bouvier,
Dr. David Alan Gilbert, Markus Armbruster, Marcelo Tosatti, kvm
On Sat, Jan 17, 2026 at 05:29:19PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Sat, 17 Jan 2026 17:29:19 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH v2 1/8] target/i386: Include missing 'svm.h' header in
> 'sev.h'
> X-Mailer: git-send-email 2.52.0
>
> otarget/i386/cpu.h:2820:#include "svm.h"
> target/i386/sev.h:17:#include "target/i386/svm.h"
>
> "target/i386/sev.h" uses the vmcb_seg structure type, which
> is defined in "target/i386/svm.h". Current builds succeed
> because the files including "target/i386/sev.h" also include
> "monitor/hmp-target.h", itself including "cpu.h" and finally
> "target/i386/svm.h".
>
> Include the latter, otherwise removing "cpu.h" from
> "monitor/hmp-target.h" triggers:
>
> ../target/i386/sev.h:62:21: error: field has incomplete type 'struct vmcb_seg'
> 62 | struct vmcb_seg es;
> | ^
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> target/i386/sev.h | 2 ++
> 1 file changed, 2 insertions(+)
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-01-19 5:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20260117162926.74225-1-philmd@linaro.org>
2026-01-17 16:29 ` [PATCH v2 1/8] target/i386: Include missing 'svm.h' header in 'sev.h' Philippe Mathieu-Daudé
2026-01-19 5:37 ` Zhao Liu
2026-01-17 16:29 ` [PATCH v2 8/8] monitor: Remove 'monitor/hmp-target.h' header Philippe Mathieu-Daudé
2026-01-19 2:03 ` Dr. David Alan Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox