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é <philmd@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
---
monitor/monitor-internal.h | 1 -
monitor/hmp-target.c | 39 -------------------------------------
monitor/hmp.c | 40 ++++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index feca111ae31..3ecd394ecf6 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -181,7 +181,6 @@ void monitor_data_destroy_qmp(MonitorQMP *mon);
void coroutine_fn monitor_qmp_dispatcher_co(void *data);
void qmp_dispatcher_co_wake(void);
-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);
diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c
index 5e9f1b0db5b..a3306b69c93 100644
--- a/monitor/hmp-target.c
+++ b/monitor/hmp-target.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/target-info.h"
#include "monitor-internal.h"
#include "monitor/qdev.h"
#include "net/slirp.h"
@@ -60,44 +59,6 @@ HMPCommand *hmp_cmds_for_target(bool info_command)
return info_command ? hmp_info_cmds : hmp_cmds;
}
-/*
- * 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 = target_monitor_defs();
- CPUState *cs = mon_get_cpu(mon);
- void *ptr;
- uint64_t tmp = 0;
- int ret;
-
- if (cs == NULL || md == NULL) {
- return -1;
- }
-
- for(; md->name != NULL; md++) {
- if (hmp_compare_cmd(name, md->name)) {
- if (md->get_value) {
- int64_t val = md->get_value(mon, md, md->offset);
- *pval = target_long_bits() == 32 ? (int32_t)val : val;
- } else {
- CPUArchState *env = mon_get_cpu_env(mon);
- ptr = (uint8_t *)env + md->offset;
- *pval = *(int32_t *)ptr;
- }
- return 0;
- }
- }
-
- ret = target_get_monitor_def(cs, name, &tmp);
- if (!ret) {
- *pval = target_long_bits() == 32 ? (int32_t)tmp : tmp;
- }
-
- return ret;
-}
-
static int
compare_mon_cmd(const void *a, const void *b)
{
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 0e5913fabb1..1d645090667 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -355,6 +355,8 @@ static bool gdb_get_register(Monitor *mon, int64_t *pval, const char *name)
static const char *pch;
static sigjmp_buf expr_env;
+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, ...)
{
@@ -1595,3 +1597,41 @@ 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
+ */
+int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
+{
+ const MonitorDef *md = target_monitor_defs();
+ CPUState *cs = mon_get_cpu(mon);
+ void *ptr;
+ uint64_t tmp = 0;
+ int ret;
+
+ if (cs == NULL || md == NULL) {
+ return -1;
+ }
+
+ for(; md->name != NULL; md++) {
+ if (hmp_compare_cmd(name, md->name)) {
+ if (md->get_value) {
+ int64_t val = md->get_value(mon, md, md->offset);
+ *pval = target_long_bits() == 32 ? (int32_t)val : val;
+ } else {
+ CPUArchState *env = mon_get_cpu_env(mon);
+ ptr = (uint8_t *)env + md->offset;
+ *pval = *(int32_t *)ptr;
+ }
+ return 0;
+ }
+ }
+
+ ret = target_get_monitor_def(cs, name, &tmp);
+ if (!ret) {
+ *pval = target_long_bits() == 32 ? (int32_t)tmp : tmp;
+ }
+
+ return ret;
+}
--
2.53.0