From 3d29fbef063ab1e8bfb9bc759ca94ab0becca9fa Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Thu, 17 May 2007 19:21:46 +0000 Subject: Force the primary CPU to run and other CPUs to halt, recalculate timers after system_reset. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2822 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/sun4m.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'hw/sun4m.c') diff --git a/hw/sun4m.c b/hw/sun4m.c index 89f4b41..fc410bd 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -243,7 +243,17 @@ void qemu_system_powerdown(void) static void main_cpu_reset(void *opaque) { CPUState *env = opaque; + cpu_reset(env); + env->halted = 0; +} + +static void secondary_cpu_reset(void *opaque) +{ + CPUState *env = opaque; + + cpu_reset(env); + env->halted = 1; } static void sun4m_hw_init(const struct hwdef *hwdef, int ram_size, @@ -266,10 +276,13 @@ static void sun4m_hw_init(const struct hwdef *hwdef, int ram_size, env = cpu_init(); cpu_sparc_register(env, def); envs[i] = env; - if (i != 0) + if (i == 0) { + qemu_register_reset(main_cpu_reset, env); + } else { + qemu_register_reset(secondary_cpu_reset, env); env->halted = 1; + } register_savevm("cpu", i, 3, cpu_save, cpu_load, env); - qemu_register_reset(main_cpu_reset, env); } /* allocate RAM */ cpu_register_physical_memory(0, ram_size, 0); -- cgit v1.1