summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2016-09-21 15:29:26 +1000
committerDavid Gibson <david@gibson.dropbear.id.au>2016-09-23 12:39:07 +1000
commit27a83f8e7ed63ced7e36c47a42f46ab44ee02bd8 (patch)
tree1734209201984a861a8beb644948b3a9d42d883c /monitor.c
parent58eb53083ccac82bc9c8e4b5f0800dcc47d22927 (diff)
downloadqemu-27a83f8e7ed63ced7e36c47a42f46ab44ee02bd8.tar.gz
monitor: fix crash for platforms without a CPU 0
Now that we allow CPU hot unplug on a few platforms, we can end up in a situation where we don't have a CPU with index 0. Or at least we could, if we didn't have code to explicitly prohibit unplug of CPU 0. Longer term we want to allow CPU 0 unplug, this patch is an early step in allowing this, by removing an assumption in the monitor code that CPU 0 always exists. Signed-off-by: Cédric Le Goater <clg@kaod.org> [dwg: Rewrote commit message to better explain background] Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c
index 8bb8bbfd15..83c4edfce0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1025,7 +1025,7 @@ int monitor_set_cpu(int cpu_index)
CPUState *mon_get_cpu(void)
{
if (!cur_mon->mon_cpu) {
- monitor_set_cpu(0);
+ monitor_set_cpu(first_cpu->cpu_index);
}
cpu_synchronize_state(cur_mon->mon_cpu);
return cur_mon->mon_cpu;