target_get_monitor_def() is now only a dead stub. Remove as pointless.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Message-Id: <[email protected]>
---
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
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);
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 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;
@@ -86,16 +84,10 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char
*name)
}
}
- if (cs->cc->sysemu_ops->monitor_get_register) {
- ret = cs->cc->sysemu_ops->monitor_get_register(cs, name, pval);
- } else {
- ret = target_get_monitor_def(cs, name, &tmp);
- if (!ret) {
- *pval = (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);
}
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 <[email protected]>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#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 2f4e1ab4300..3489b1f20dd 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -75,7 +75,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'))
--
2.53.0
