[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/33] mips/cps: Use start-powered-off CPUState property
From: |
David Gibson |
Subject: |
[PULL 19/33] mips/cps: Use start-powered-off CPUState property |
Date: |
Tue, 8 Sep 2020 15:19:39 +1000 |
From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Instead of setting CPUState::halted to 1 in main_cpu_reset(), use the
start-powered-off property which makes cpu_common_reset() initialize it
to 1 in common code.
Also change creation of CPU object from cpu_create() to object_new() and
qdev_realize_and_unref() because cpu_create() realizes the CPU and it's not
possible to set a property after the object is realized.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Message-Id: <20200826055535.951207-6-bauerman@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/mips/cps.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/mips/cps.c b/hw/mips/cps.c
index 615e1a1ad2..23c0f87e41 100644
--- a/hw/mips/cps.c
+++ b/hw/mips/cps.c
@@ -52,9 +52,6 @@ static void main_cpu_reset(void *opaque)
CPUState *cs = CPU(cpu);
cpu_reset(cs);
-
- /* All VPs are halted on reset. Leave powering up to CPC. */
- cs->halted = 1;
}
static bool cpu_mips_itu_supported(CPUMIPSState *env)
@@ -76,7 +73,17 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
bool saar_present = false;
for (i = 0; i < s->num_vp; i++) {
- cpu = MIPS_CPU(cpu_create(s->cpu_type));
+ cpu = MIPS_CPU(object_new(s->cpu_type));
+
+ /* All VPs are halted on reset. Leave powering up to CPC. */
+ if (!object_property_set_bool(OBJECT(cpu), "start-powered-off", true,
+ errp)) {
+ return;
+ }
+
+ if (!qdev_realize_and_unref(DEVICE(cpu), NULL, errp)) {
+ return;
+ }
/* Init internal devices */
cpu_mips_irq_init_cpu(cpu);
--
2.26.2
- [PULL 10/33] spapr/xive: Allocate IPIs independently from the other sources, (continued)
- [PULL 10/33] spapr/xive: Allocate IPIs independently from the other sources, David Gibson, 2020/09/08
- [PULL 11/33] spapr/xive: Allocate vCPU IPIs from the vCPU contexts, David Gibson, 2020/09/08
- [PULL 12/33] ppc/spapr_nvdimm: use g_autofree in spapr_nvdimm_validate_opts(), David Gibson, 2020/09/08
- [PULL 13/33] spapr, spapr_nvdimm: fold NVDIMM validation in the same place, David Gibson, 2020/09/08
- [PULL 14/33] ppc/spapr_nvdimm: do not enable support with 'nvdimm=off', David Gibson, 2020/09/08
- [PULL 15/33] target/arm: Move start-powered-off property to generic CPUState, David Gibson, 2020/09/08
- [PULL 18/33] ppc/e500: Use start-powered-off CPUState property, David Gibson, 2020/09/08
- [PULL 17/33] ppc/spapr: Use start-powered-off CPUState property, David Gibson, 2020/09/08
- [PULL 20/33] sparc/sun4m: Don't set cs->halted = 0 in main_cpu_reset(), David Gibson, 2020/09/08
- [PULL 24/33] hw/ppc/ppc4xx_pci: Replace pointless warning by assert(), David Gibson, 2020/09/08
- [PULL 19/33] mips/cps: Use start-powered-off CPUState property,
David Gibson <=
- [PULL 22/33] target/s390x: Use start-powered-off CPUState property, David Gibson, 2020/09/08
- [PULL 21/33] sparc/sun4m: Use start-powered-off CPUState property, David Gibson, 2020/09/08
- [PULL 16/33] target/arm: Move setting of CPU halted state to generic code, David Gibson, 2020/09/08
- [PULL 23/33] hw/ppc/ppc4xx_pci: Use ARRAY_SIZE() instead of magic value, David Gibson, 2020/09/08
- [PULL 26/33] ppc/spapr_nvdimm: turn spapr_dt_nvdimm() static, David Gibson, 2020/09/08
- [PULL 25/33] ppc: introducing spapr_numa.c NUMA code helper, David Gibson, 2020/09/08
- [PULL 29/33] spapr, spapr_numa: move lookup-arrays handling to spapr_numa.c, David Gibson, 2020/09/08
- [PULL 28/33] spapr, spapr_numa: handle vcpu ibm,associativity, David Gibson, 2020/09/08
- [PULL 31/33] spapr: move h_home_node_associativity to spapr_numa.c, David Gibson, 2020/09/08
- [PULL 30/33] spapr_numa: move NVLink2 associativity handling to spapr_numa.c, David Gibson, 2020/09/08