Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20191214-2' into staging

[mirror_qemu.git] / target / sparc / monitor.c

diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c
index 7cc1b0f87fcfa20309a673a6ecfb54b587f87cae..a7ea287cbccc4827f1acc6c041299ae6938029fb 100644 (file)
--- a/target/sparc/monitor.c
+++ b/target/sparc/monitor.c
@@ -25,14 +25,18 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 
 
 void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 {
     CPUArchState *env1 = mon_get_cpu_env();
 
-    dump_mmu((FILE*)mon, (fprintf_function)monitor_printf, env1);
+    if (!env1) {
+        monitor_printf(mon, "No CPU available\n");
+        return;
+    }
+    dump_mmu(env1);
 }
 
 #ifndef TARGET_SPARC64