Expose x86_monitor_defs within target/i386/ and register
it as CPUClass::legacy_monitor_defs hook.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/i386/cpu.h     | 2 ++
 target/i386/cpu.c     | 1 +
 target/i386/monitor.c | 7 ++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index b0c730b3390..7420ee3b8ea 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -34,6 +34,8 @@
 #include "qemu/timer.h"
 #include "standard-headers/asm-x86/kvm_para.h"
 
+extern const MonitorDef *x86_monitor_defs;
+
 #define XEN_NR_VIRQS 24
 
 #ifdef TARGET_X86_64
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index b5e483e8cd2..c5d9c51c1ad 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -10745,6 +10745,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, const void *data)
     cc->gdb_core_xml_file = "i386-32bit.xml";
 #endif
     cc->disas_set_info = x86_disas_set_info;
+    cc->legacy_monitor_defs = x86_monitor_defs;
 
     dc->user_creatable = true;
 
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index ddc666d3451..9a0cc73bbf4 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -599,7 +599,7 @@ static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md,
     return env->eip + env->segs[R_CS].base;
 }
 
-const MonitorDef monitor_defs[] = {
+static const MonitorDef monitor_defs[] = {
 #define SEG(name, seg) \
     { name ".limit", offsetof(CPUX86State, segs[seg].limit) },
     SEG("cs", R_CS)
@@ -612,7 +612,4 @@ const MonitorDef monitor_defs[] = {
     { NULL },
 };
 
-const MonitorDef *target_monitor_defs(void)
-{
-    return monitor_defs;
-}
+const MonitorDef *x86_monitor_defs = monitor_defs;
-- 
2.53.0