From 27a83f8e7ed63ced7e36c47a42f46ab44ee02bd8 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 21 Sep 2016 15:29:26 +1000 Subject: [PATCH] monitor: fix crash for platforms without a CPU 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 [dwg: Rewrote commit message to better explain background] Reviewed-by: Igor Mammedov Reviewed-by: Eduardo Habkost Reviewed-by: Luiz Capitulino Signed-off-by: David Gibson --- monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;