On Wed, 22 Jul 2020 23:56:51 -0300
Thiago Jung Bauermann <bauer...@linux.ibm.com> wrote:
> This change is in a separate patch because it's not so obvious that it
> won't cause a regression.
>
> Suggested-by: Eduardo Habkost <ehabk...@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> Signed-off-by: Thiago Jung Bauermann <bauer...@linux.ibm.com>
> ---
Reviewed-by: Greg Kurz <gr...@kaod.org>
> hw/core/cpu.c | 2 +-
> target/arm/cpu.c | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> NB: I wasn't able to run this patch on an ARM machine. I did run it on
> a ppc64le pseries KVM guest.
>
> diff --git a/hw/core/cpu.c b/hw/core/cpu.c
> index 594441a150..71bb7859f1 100644
> --- a/hw/core/cpu.c
> +++ b/hw/core/cpu.c
> @@ -258,7 +258,7 @@ static void cpu_common_reset(DeviceState *dev)
> }
>
> cpu->interrupt_request = 0;
> - cpu->halted = 0;
> + cpu->halted = cpu->start_powered_off;
> cpu->mem_io_pc = 0;
> cpu->icount_extra = 0;
> atomic_set(&cpu->icount_decr_ptr->u32, 0);
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index ec65c7653f..b6c65e4df6 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -175,7 +175,6 @@ static void arm_cpu_reset(DeviceState *dev)
> env->vfp.xregs[ARM_VFP_MVFR2] = cpu->isar.mvfr2;
>
> cpu->power_state = s->start_powered_off ? PSCI_OFF : PSCI_ON;
> - s->halted = s->start_powered_off;
>
> if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
> env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';
