| Message ID | 20200722035016.469075-7-bauerman@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Generalize start-powered-off property from ARM | expand |
On Wed, Jul 22, 2020 at 12:50:13AM -0300, Thiago Jung Bauermann wrote: > Instead of setting CPUState::halted to 1 in secondary_cpu_reset(), use the > start-powered-off property which makes cpu_common_reset() initialize it > to 1 in common code. > > Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/sparc/sun4m.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > NB: I was only able to test that this patch builds. I wasn't able to > run it. > > diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c > index 9be930415f..766e79bb5e 100644 > --- a/hw/sparc/sun4m.c > +++ b/hw/sparc/sun4m.c > @@ -233,7 +233,6 @@ static void secondary_cpu_reset(void *opaque) > CPUState *cs = CPU(cpu); > > cpu_reset(cs); > - cs->halted = 1; > } > > static void cpu_halt_signal(void *opaque, int irq, int level) > @@ -833,6 +832,8 @@ static void cpu_devinit(const char *cpu_type, unsigned int id, > qemu_register_reset(secondary_cpu_reset, cpu); > cs = CPU(cpu); > cs->halted = 1; > + object_property_set_bool(OBJECT(cs), "start-powered-off", true, > + &error_abort); > } > *cpu_irqs = qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS); > env->prom_addr = prom_addr; >
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 9be930415f..766e79bb5e 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -233,7 +233,6 @@ static void secondary_cpu_reset(void *opaque) CPUState *cs = CPU(cpu); cpu_reset(cs); - cs->halted = 1; } static void cpu_halt_signal(void *opaque, int irq, int level) @@ -833,6 +832,8 @@ static void cpu_devinit(const char *cpu_type, unsigned int id, qemu_register_reset(secondary_cpu_reset, cpu); cs = CPU(cpu); cs->halted = 1; + object_property_set_bool(OBJECT(cs), "start-powered-off", true, + &error_abort); } *cpu_irqs = qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS); env->prom_addr = prom_addr;
Instead of setting CPUState::halted to 1 in secondary_cpu_reset(), use the start-powered-off property which makes cpu_common_reset() initialize it to 1 in common code. Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> --- hw/sparc/sun4m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) NB: I was only able to test that this patch builds. I wasn't able to run it.