diff options
| author | Thomas Huth <thuth@redhat.com> | 2017-01-13 13:12:35 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-02-21 18:29:01 +0000 |
| commit | 854e67fea6a6f181163a5467fc9ba04de8d181bb (patch) | |
| tree | 95528d10774a6b5021083310dee65c7bbe376274 /target/sh4/monitor.c | |
| parent | 5fc00480ab1ce767f1c6c63ae644e960295fed2c (diff) | |
| download | qemu-854e67fea6a6f181163a5467fc9ba04de8d181bb.zip qemu-854e67fea6a6f181163a5467fc9ba04de8d181bb.tar.gz qemu-854e67fea6a6f181163a5467fc9ba04de8d181bb.tar.bz2 | |
monitor: Fix crashes when using HMP commands without CPU
When running certain HMP commands ("info registers", "info cpustats",
"info tlb", "nmi", "memsave" or dumping virtual memory) with the "none"
machine, QEMU crashes with a segmentation fault. This happens because the
"none" machine does not have any CPUs by default, but these HMP commands
did not check for a valid CPU pointer yet. Add such checks now, so we get
an error message about the missing CPU instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1484309555-1935-1-git-send-email-thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'target/sh4/monitor.c')
| -rw-r--r-- | target/sh4/monitor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target/sh4/monitor.c b/target/sh4/monitor.c index 426e5d4..4c7f36c 100644 --- a/target/sh4/monitor.c +++ b/target/sh4/monitor.c @@ -44,6 +44,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) CPUArchState *env = mon_get_cpu_env(); int i; + if (!env) { + monitor_printf(mon, "No CPU available\n"); + return; + } + monitor_printf (mon, "ITLB:\n"); for (i = 0 ; i < ITLB_SIZE ; i++) print_tlb (mon, i, &env->itlb[i]); |