aboutsummaryrefslogtreecommitdiff
path: root/target/i386/monitor.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2017-01-13 13:12:35 +0100
committerDr. David Alan Gilbert <dgilbert@redhat.com>2017-02-21 18:29:01 +0000
commit854e67fea6a6f181163a5467fc9ba04de8d181bb (patch)
tree95528d10774a6b5021083310dee65c7bbe376274 /target/i386/monitor.c
parent5fc00480ab1ce767f1c6c63ae644e960295fed2c (diff)
downloadqemu-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/i386/monitor.c')
-rw-r--r--target/i386/monitor.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 468aa07..77ead60 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -210,6 +210,10 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
CPUArchState *env;
env = mon_get_cpu_env();
+ if (!env) {
+ monitor_printf(mon, "No CPU available\n");
+ return;
+ }
if (!(env->cr[0] & CR0_PG_MASK)) {
monitor_printf(mon, "PG disabled\n");
@@ -529,6 +533,10 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)
CPUArchState *env;
env = mon_get_cpu_env();
+ if (!env) {
+ monitor_printf(mon, "No CPU available\n");
+ return;
+ }
if (!(env->cr[0] & CR0_PG_MASK)) {
monitor_printf(mon, "PG disabled\n");
@@ -624,7 +632,13 @@ const MonitorDef *target_monitor_defs(void)
void hmp_info_local_apic(Monitor *mon, const QDict *qdict)
{
- x86_cpu_dump_local_apic_state(mon_get_cpu(), (FILE *)mon, monitor_fprintf,
+ CPUState *cs = mon_get_cpu();
+
+ if (!cs) {
+ monitor_printf(mon, "No CPU available\n");
+ return;
+ }
+ x86_cpu_dump_local_apic_state(cs, (FILE *)mon, monitor_fprintf,
CPU_DUMP_FPU);
}