diff options
| author | Thiago Jung Bauermann | 2020-08-26 07:55:29 +0200 |
|---|---|---|
| committer | David Gibson | 2020-09-08 02:08:42 +0200 |
| commit | 6ad1da667c8e21f019d4adc21702e06dd9225790 (patch) | |
| tree | e6349093638d318e4d58858e51111c095fb31637 | |
| parent | target/arm: Move start-powered-off property to generic CPUState (diff) | |
| download | qemu-6ad1da667c8e21f019d4adc21702e06dd9225790.tar.gz qemu-6ad1da667c8e21f019d4adc21702e06dd9225790.tar.xz qemu-6ad1da667c8e21f019d4adc21702e06dd9225790.zip | |
target/arm: Move setting of CPU halted state to generic code
This change is in a separate patch because it's not so obvious that it
won't cause a regression.
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Message-Id: <20200826055535.951207-3-bauerman@linux.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/core/cpu.c | 2 | ||||
| -rw-r--r-- | target/arm/cpu.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 22bc3f974a..8f65383ffb 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 9f814194fb..6b4e708c08 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'; |