Generalize start-powered-off property from ARM
v4 cover Generalize start-powered-off property from ARM
This version tries to fix an issue found by David Gibson when running the Travis CI:
Unexpected error in qdev_prop_set_after_realize() at /home/travis/build/dgibson/qemu/hw/core/qdev-properties.c:30:
qemu-system-mips64el: Attempt to set property 'start-powered-off' on anonymous device (type 'I6400-mips64-cpu') after it was realized Broken pipe/home/travis/build/dgibson/qemu/tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) Aborted (core dumped)
ERROR qom-test - too few tests run (expected 8, got 0) /home/travis/build/dgibson/qemu/tests/Makefile.include:650: recipe for target 'check-qtest-mips64el' failed
Philippe Mathieu-Daudé spotted the problem:
Quoted 4 lines
Good catch.
hw/mips/cps.c,hw/ppc/e500.candhw/sparc/sun4m.care incorrectly setting the property after the cpu is realized because the cpu is created withcpu_create(). We need to create them withobject_initialize_child()and realize them manually withqdev_realize().
But I found very few examples of CPUs initialized with object_initialize_child() (e.g., atmega.c, rx62n.c, nrf51_soc.c) so instead of using object_initialize_child(), I replaced the call to cpu_create() with object_new() and a call to qdev_realize() shortly after the start-powered-off property is set. I thought this would be the more prudent change, keeping the code as close to the previous one as possible.
I tried reproducing the Travis CI problem withmake docker-test-misc@debian-mips64el-cross but I didn't succeed, so I'm not sure if this version solves the issue.
Original cover letter bellow, followed by changelog:
The ARM code has a start-powered-off property in ARMCPU, which is a subclass of CPUState. This property causes arm_cpu_reset() to set CPUState::halted to 1, signalling that the CPU should start in a halted state. Other architectures also have code which aim to achieve the same effect, but without using a property.
The ppc/spapr version has a bug where QEMU does a KVM_RUN on the vcpu before cs->halted is set to 1, causing the vcpu to run while it's still in an unitialized state (more details in patch 3).
Peter Maydell mentioned the ARM start-powered-off property and Eduardo Habkost suggested making it generic, so this patch series does that, for all cases which I was able to find via grep in the code.
The only problem is that I was only able to test these changes on a ppc64le pseries KVM guest, so except for patches 2 and 3, all others are only build-tested. Also, my grasp of QOM lifecycle is basically non-existant so please be aware of that when reviewing this series.
The last patch may be wrong, as pointed out by Eduardo, so I marked it as RFC. It may make sense to drop it.
Applies cleanly on yesterday's master.
Changes since v3:
General:
- Added David's, Greg's and Cornelia's Reviewed-by and Acked-by to some of the patches.
- Rebased on top of dgibson/ppc-for-5.2.
Patch "ppc/e500: Use start-powered-off CPUState property" Patch "mips/cps: Use start-powered-off CPUState property" Patch "sparc/sun4m: Use start-powered-off CPUState property"
- Initialize CPU object with object_new() and qdev_realize() instead of cpu_create().
- Removed Reviewed-by's and Acked-by's from these patches because of these changes.
Changes since v2:
General:
- Added Philippe's Reviewed-by to some of the patches.
Patch "ppc/spapr: Use start-powered-off CPUState property"
- Set the CPUState::start_powered_off variable directly rather than using object_property_set_bool(). Suggested by Philippe.
Patch "sparc/sun4m: Remove main_cpu_reset()"
- New patch. Suggested by Philippe.
Patch "sparc/sun4m: Use start-powered-off CPUState property"
- Remove secondary_cpu_reset(). Suggested by Philippe.
- Remove setting of cs->halted = 1 from cpu_devinit(). Suggested by Philippe.
Patch "Don't set CPUState::halted in cpu_devinit()"
- Squashed into previous patch. Suggested by Philippe.
Patch "sparc/sun4m: Use one cpu_reset() function for main and secondary CPUs"
- Dropped.
Patch "target/s390x: Use start-powered-off CPUState property"
- Set the CPUState::start_powered_off variable directly rather than using object_property_set_bool(). Suggested by Philippe.
- Mention in the commit message Eduardo's observation that before this patch, the code didn't set cs->halted on reset.
Thiago Jung Bauermann (8):
target/arm: Move start-powered-off property to generic CPUState target/arm: Move setting of CPU halted state to generic code ppc/spapr: Use start-powered-off CPUState property ppc/e500: Use start-powered-off CPUState property mips/cps: Use start-powered-off CPUState property sparc/sun4m: Remove main_cpu_reset()
sparc/sun4m: Use start-powered-off CPUState property target/s390x: Use start-powered-off CPUState property
exec.c | 1 + hw/core/cpu.c | 2 +- hw/mips/cps.c | 16 ++++++++++++---- hw/ppc/e500.c | 19 +++++++++++++++---- hw/ppc/spapr_cpu_core.c | 10 +++++----- hw/sparc/sun4m.c | 37 ++++++++++--------------------------- include/hw/core/cpu.h | 4 ++++ target/arm/cpu.c | 4 +--- target/arm/cpu.h | 3 --- target/arm/kvm32.c | 2 +- target/arm/kvm64.c | 2 +- target/s390x/cpu.c | 2 +- 12 files changed, 52 insertions(+), 50 deletions(-)
PATCH v4 1/8 target/arm: Move start-powered-off property to generic CPUState
There are other platforms which also have CPUs that start powered off, so generalize the start-powered-off property so that it can be used by them.
Note that ARMv7MState also has a property of the same name but this patch doesn't change it because that class isn't a subclass of CPUState so it wouldn't be a trivial change.
This change should not cause any change in behavior.
--- exec.c | 1 + include/hw/core/cpu.h | 4 ++++ target/arm/cpu.c | 5 ++--- target/arm/cpu.h | 3 --- target/arm/kvm32.c | 2 +- target/arm/kvm64.c | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-)
exec.c +1 -0
@@ -899,6 +899,7 @@ Property cpu_common_props[] = {DEFINE_PROP_LINK ("memory" , CPUState, memory,TYPE_MEMORY_REGION , MemoryRegion *), #endif +DEFINE_PROP_BOOL ("start-powered-off" , CPUState, start_powered_off, false), DEFINE_PROP_END_OF_LIST(), };
include/hw/core/cpu.h +4 -0
@@ -374,6 +374,10 @@ struct CPUState {bool created;bool stop;bool stopped; + +/* Should CPU start in powered-off state? */ +bool start_powered_off; +bool unplug;bool crash_occurred;bool exit_request;
target/arm/cpu.c +2 -3
@@ -174,8 +174,8 @@ static void arm_cpu_reset(DeviceState *dev) env->vfp.xregs[ARM_VFP_MVFR1 ] = cpu->isar.mvfr1; env->vfp.xregs[ARM_VFP_MVFR2 ] = cpu->isar.mvfr2; - cpu->power_state = cpu->start_powered_off ?PSCI_OFF :PSCI_ON ; - s->halted = cpu->start_powered_off; + 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' ;
@@ -2182,7 +2182,6 @@ static const ARMCPUInfo arm_cpus[] = { };static Property arm_cpu_properties[] = { -DEFINE_PROP_BOOL ("start-powered-off" ,ARMCPU , start_powered_off, false),DEFINE_PROP_UINT32 ("psci-conduit" ,ARMCPU , psci_conduit,0 ),DEFINE_PROP_UINT64 ("midr" ,ARMCPU , midr,0 ), DEFINE_PROP_UINT64("mp-affinity", ARMCPU,
target/arm/cpu.h +0 -3
@@ -810,9 +810,6 @@ struct ARMCPU {*/ uint32_t psci_version; -/* Should CPU start in PSCI powered-off state? */ -bool start_powered_off; -/* Current power state, access guarded by BQL */ ARMPSCIState power_state;
target/arm/kvm32.c +1 -1
@@ -218,7 +218,7 @@ int kvm_arch_init_vcpu(CPUState *cs)/* Determine init features for this CPU */ memset (cpu->kvm_init_features,0 ,sizeof (cpu->kvm_init_features)); -if (cpu->start_powered_off) { +if (cs->start_powered_off) { cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_POWER_OFF ; }if (kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_PSCI_0_2 )) {
target/arm/kvm64.c +1 -1
@@ -775,7 +775,7 @@ int kvm_arch_init_vcpu(CPUState *cs)/* Determine init features for this CPU */ memset (cpu->kvm_init_features,0 ,sizeof (cpu->kvm_init_features)); -if (cpu->start_powered_off) { +if (cs->start_powered_off) { cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_POWER_OFF ; }if (kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_PSCI_0_2 )) {
PATCH v4 2/8 target/arm: Move setting of CPU halted state to generic code
In reply to Thiago Jung BauermannThis change is in a separate patch because it's not so obvious that it won't cause a regression.
--- hw/core/cpu.c | 2 +- target/arm/cpu.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
hw/core/cpu.c +1 -1
@@ -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 );
target/arm/cpu.c +0 -1
@@ -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' ;
PATCH v4 3/8 ppc/spapr: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannPowerPC sPAPR CPUs start in the halted state, and spapr_reset_vcpu() attempts to implement this by setting CPUState::halted to 1. But that's too late for the case of hotplugged CPUs in a machine configure with 2 or more threads per core.
By then, other parts of QEMU have already caused the vCPU to run in an unitialized state a couple of times. For example, ppc_cpu_reset() calls ppc_tlb_invalidate_all(), which ends up calling async_run_on_cpu(). This kicks the new vCPU while it has CPUState::halted = 0, causing QEMU to issue a KVM_RUN ioctl on the new vCPU before the guest is able to make the start-cpu RTAS call to initialize its register state.
This problem doesn't seem to cause visible issues for regular guests, but on a secure guest running under the Ultravisor it does. The Ultravisor relies on being able to snoop on the start-cpu RTAS call to map vCPUs to guests, and this issue causes it to see a stray vCPU that doesn't belong to any guest.
Fix by setting the start-powered-off CPUState property in spapr_create_vcpu(), which makes cpu_common_reset() initialize CPUState::halted to 1 at an earlier moment.
--- hw/ppc/spapr_cpu_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/ppc/spapr_cpu_core.c +5 -5
@@ -36,11 +36,6 @@ static void spapr_reset_vcpu(PowerPCCPU *cpu)cpu_reset (cs); -/* All CPUs start halted. CPU0 is unhalted from the machine level -* reset code and the rest are explicitly started up by the guest -* using an RTAS call */ - cs->halted =1 ; - env->spr[SPR_HIOR ] =0 ; lpcr = env->spr[SPR_LPCR ];
@@ -274,6 +269,11 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc, int i, Error **errp) cs =CPU (obj); cpu =POWERPC_CPU (obj); +/* +* All CPUs start halted. CPU0 is unhalted from the machine level reset code +* and the rest are explicitly started up by the guest using an RTAS call. +*/ + cs->start_powered_off = true; cs->cpu_index = cc->core_id + i;spapr_set_vcpu_id (cpu, cs->cpu_index, &local_err);if (local_err) {
PATCH v4 4/8 ppc/e500: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannInstead of setting CPUState::halted to 1 in ppce500_cpu_reset_sec(), 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() because cpu_create() realizes the CPU and it's not possible to set a property after the object is realized.
--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
hw/ppc/e500.c +15 -4
@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }
@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);
@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. +*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort); + } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); } }
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
Quoted 39 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inppce500_cpu_reset_sec(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)hw/ppc/e500.c +2
-4@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);
hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 904
Quoted 10 lines
hw/ppc/e500.c +7
-0@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. +*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort);
[*]
hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 911
Quoted 7 lines
hw/ppc/e500.c +6
-0+ } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }
The last 4 lines are equivalent to:
qdev_realize(DEVICE(cs), NULL, &error_fatal)) {This is also the preferred form, as we can not propagate errors from the machine_init() handler.
Since you use &error_abort in [*], maybe you want to use it here too.
Quoted 3 lines
hw/ppc/e500.c +0
-0}
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
Quoted 61 lines · Philippe Mathieu-Daudé
Quoted 39 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inppce500_cpu_reset_sec(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)hw/ppc/e500.c +2
-4@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 904
Quoted 10 lines
hw/ppc/e500.c +7
-0@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. +*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort);[*]
hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 911
Quoted 7 lines
hw/ppc/e500.c +6
-0+ } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }
Quoted 3 lines
The last 4 lines are equivalent to:
qdev_realize(DEVICE(cs), NULL, &error_fatal)) {
I meant:
qdev_realize(DEVICE(cs), NULL, &error_fatal);
Quoted 10 lines
This is also the preferred form, as we can not propagate errors from the
machine_init()handler.Since you use
&error_abortin [*], maybe you want to use it here too.Quoted 3 lines
hw/ppc/e500.c +0
-0}
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
Hello Philippe,
Thanks for your review.
Quoted 62 lines · Philippe Mathieu-Daudé
Quoted 61 lines · Philippe Mathieu-Daudé
Quoted 39 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inppce500_cpu_reset_sec(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)hw/ppc/e500.c +2
-4@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 904
Quoted 10 lines
hw/ppc/e500.c +7
-0@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. +*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort);[*]
Quoted 7 lines
hw/ppc/e500.c +6
-0+ } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }
Quoted 7 lines
Quoted 3 lines
The last 4 lines are equivalent to:
qdev_realize(DEVICE(cs), NULL, &error_fatal)) {I meant:
qdev_realize(DEVICE(cs), NULL, &error_fatal);
Ah! Thanks for pointing it out. I'll use that (along with qdev_realize_and_unref()).
Quoted 6 lines
Quoted 6 lines
This is also the preferred form, as we can not propagate errors from the
machine_init()handler.Since you use
&error_abortin [*], maybe you want to use it here too.
I think &error_fatal is better since it preserves the behavior from cpu_create().
--
Thiago Jung Bauermann
IBM Linux Technology Center
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
Quoted 42 lines · Thiago Jung Bauermann
Hello Philippe,
Thanks for your review.
Quoted 23 lines · Philippe Mathieu-Daudé
Quoted 22 lines · Philippe Mathieu-Daudé
hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 904
Quoted 11 lines
hw/ppc/e500.c +7
-0@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. +*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort);[*]
Quoted 7 lines
hw/ppc/e500.c +6
-0+ } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }Quoted 7 lines
Quoted 3 lines
The last 4 lines are equivalent to:
qdev_realize(DEVICE(cs), NULL, &error_fatal)) {I meant:
qdev_realize(DEVICE(cs), NULL, &error_fatal);Ah! Thanks for pointing it out. I'll use that (along with
qdev_realize_and_unref()).Quoted 2 lines
Quoted 2 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
This is also the preferred form, as we can not propagate errors from the
machine_init()handler.Since you use
&error_abortin [*], maybe you want to use it here too.I think
&error_fatalis better since it preserves the behavior fromcpu_create().
I'll change [*] to &error_fatal as well, for consistency.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
In reply to Philippe Mathieu-DaudéQuoted 61 lines · On Tue, 18 Aug 2020 09:22:05 +0200 Philippe Mathieu-Daudé <[email protected]>…
Quoted 39 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inppce500_cpu_reset_sec(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)hw/ppc/e500.c +2
-4@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 904
Quoted 10 lines
hw/ppc/e500.c +7
-0@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. +*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort);[*]
hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 911
Quoted 7 lines
hw/ppc/e500.c +6
-0+ } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }
Quoted 6 lines
The last 4 lines are equivalent to:
qdev_realize(DEVICE(cs), NULL, &error_fatal)) {This is also the preferred form, as we can not propagate errors from the
machine_init()handler.
not exactly, it will leak refference, but we are dying anyways so who cares.
Quoted 8 lines
Since you use
&error_abortin [*], maybe you want to use it here too.Quoted 3 lines
hw/ppc/e500.c +0
-0}
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannOn Tue, 18 Aug 2020 00:33:19 -0300
Thiago Jung Bauermann <[email protected]> wrote:
[...]
Quoted 3 lines
Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.
cpu_create was introduced to remove code duplication in simple cases where we do not need to set properties on created cpu.
returning back to manual object_new + realize() is fine if it 's only small set of of boards. If it's tree-wide change then that would bring back all code duplication that cpu_create() got rid of.
An alternative way is to use 'hotplug' callbacks to let board set additional properties before cpu's realize is called.
example:
hw/ppc/spapr.c:
spapr_machine_class_init()
mc->get_hotplug_handler = spapr_get_hotplug_handler;
hc->pre_plug = spapr_machine_device_pre_plug; ...
static const TypeInfo spapr_machine_info = {
...
{ TYPE_HOTPLUG_HANDLER },
that might work in generic case if it is put into generic machine code, and existing users of mc->get_hotplug_handler/hc->pre_plug were taken care of. In which case board would only need to set MachineClass:cpu-start-powered-of to gate property setting.
Quoted 38 lines
Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)hw/ppc/e500.c +6
-4@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot.
hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 911
Quoted 10 lines
hw/ppc/e500.c +9
-0+*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort); + } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }
btw:
board leaks cpu reference (from cpu_create()/object_new()) since qdev_realize() adds it's own and the caller of object_new() is suposed to free the original one.
in this case qdev_realize_and_unref() fits nicely.
Quoted 3 lines
hw/ppc/e500.c +0
-0}
Re: [PATCH v4 4/8] ppc/e500: Use start-powered-off CPUState property
Hi Igor,
Thank you for reviewing these patches, and the tips you provided here and on other messages on how to fix the refcount issues.
Quoted 9 lines · Igor Mammedov
On Tue, 18 Aug 2020 00:33:19 -0300
Thiago Jung Bauermann <[email protected]> wrote:[...]
Quoted 3 lines
Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.
Quoted 6 lines
cpu_createwas introduced to remove code duplication in simple cases where we do not need to set properties on created cpu.returning back to manual
object_new+realize()is fine if it 's only small set of of boards. If it's tree-wide change then that would bring back all code duplication thatcpu_create()got rid of.
This is only necessary for boards where the secondary CPUs start powered off, so it's not a tree-wide change.
Quoted 13 lines
An alternative way is to use 'hotplug' callbacks to let board set additional properties before cpu's realize is called.
example:
hw/ppc/spapr.c:spapr_machine_class_init() mc->get_hotplug_handler = spapr_get_hotplug_handler; hc->pre_plug = spapr_machine_device_pre_plug; ... static const TypeInfo spapr_machine_info = { ... { TYPE_HOTPLUG_HANDLER },
Quoted 4 lines
that might work in generic case if it is put into generic machine code, and existing users of mc->get_hotplug_handler/hc->pre_plug were taken care of. In which case board would only need to set MachineClass:cpu-start-powered-of to gate property setting.
Thank you for this idea. Though if possible I'd like to keep the new code as similar as possible to the original code to minimize unwanted "perturbations" in how and when objects are created and initialized.
Quoted 53 lines
Quoted 38 lines
Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/ppc/e500.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)hw/ppc/e500.c +6
-4@@ -704,9 +704,6 @@ static void ppce500_cpu_reset_sec(void *opaque)cpu_reset (cs); -/* Secondary CPU starts in halted state for now. Needs to change when -implementing non-kernel boot. */ - cs->halted =1 ; cs->exception_index =EXCP_HLT ; }@@ -864,8 +861,9 @@ void ppce500_init(MachineState *machine)PowerPCCPU *cpu;CPUState *cs;qemu_irq *input; +Error *err =NULL ; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);@@ -897,6 +895,19 @@ void ppce500_init(MachineState *machine) }else {/* Secondary CPUs */ qemu_register_reset (ppce500_cpu_reset_sec, cpu); + +/* +* Secondary CPU starts in halted state for now. Needs to change +* when implementing non-kernel boot. hw/ppc/e500.c void ppce500_init(MachineState *machine) · line 911
Quoted 10 lines
hw/ppc/e500.c +9
-0+*/ +object_property_set_bool (OBJECT (cs),"start-powered-off" , true, + &error_abort); + } + +if (!qdev_realize (DEVICE (cs),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cs)); +exit (EXIT_FAILURE ); }btw:
board leaks cpu reference (from cpu_create()/object_new()) sinceqdev_realize()adds it's own and the caller ofobject_new()is suposed to free the original one.
Quoted 1 line
in this case
qdev_realize_and_unref()fits nicely.
I will make this change.
--
Thiago Jung Bauermann
IBM Linux Technology Center
PATCH v4 5/8 mips/cps: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannInstead 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() because cpu_create() realizes the CPU and it's not possible to set a property after the object is realized.
--- hw/mips/cps.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
hw/mips/cps.c +12 -4
@@ -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,9 @@ 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)); +Error *err =NULL ; + + cpu =MIPS_CPU (object_new (s->cpu_type));/* Init internal devices */ cpu_mips_irq_init_cpu (cpu);
@@ -89,7 +88,16 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) env->itc_tag =mips_itu_get_tag_region (&s->itu); env->itu = &s->itu; } +/* All VPs are halted on reset. Leave powering up to CPC. */ +object_property_set_bool (OBJECT (cpu),"start-powered-off" , true, + &error_abort);qemu_register_reset (main_cpu_reset, cpu); + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + } } cpu =MIPS_CPU (first_cpu);
Re: [PATCH v4 5/8] mips/cps: Use start-powered-off CPUState property
Quoted 42 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inmain_cpu_reset(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/mips/cps.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/mips/cps.c +3
-4@@ -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,9 @@ 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)); +Error *err =NULL ; + + cpu =MIPS_CPU (object_new (s->cpu_type));/* Init internal devices */ cpu_mips_irq_init_cpu (cpu);@@ -89,7 +88,16 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) env->itc_tag =mips_itu_get_tag_region (&s->itu); env->itu = &s->itu; }
hw/mips/cps.c static void mips_cps_realize(DeviceState *dev, Error **errp) · line 100
Quoted 10 lines
hw/mips/cps.c +9
-0+/* All VPs are halted on reset. Leave powering up to CPC. */ +object_property_set_bool (OBJECT (cpu),"start-powered-off" , true, + &error_abort);qemu_register_reset (main_cpu_reset, cpu); + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + }
Here errp is available, so we can propagate the error to the caller:
if (!qdev_realize(DEVICE(cpu), NULL, errp)) {
return;
}For example in hw/mips/boston.c:
object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS);
object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type,
&error_fatal);
object_property_set_int(OBJECT(&s->cps), "num-vp", machine->smp.cpus,
&error_fatal);
sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal);This will be propagated here ---------------^^^^^^^^^^^^^
Quoted 4 lines
hw/mips/cps.c +0
-0} cpu =MIPS_CPU (first_cpu);
Re: [PATCH v4 5/8] mips/cps: Use start-powered-off CPUState property
Quoted 56 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inmain_cpu_reset(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/mips/cps.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/mips/cps.c +3
-4@@ -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,9 @@ 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)); +Error *err =NULL ; + + cpu =MIPS_CPU (object_new (s->cpu_type));/* Init internal devices */ cpu_mips_irq_init_cpu (cpu);@@ -89,7 +88,16 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) env->itc_tag =mips_itu_get_tag_region (&s->itu); env->itu = &s->itu; }hw/mips/cps.c static void mips_cps_realize(DeviceState *dev, Error **errp) · line 100
Quoted 10 lines
hw/mips/cps.c +9
-0+/* All VPs are halted on reset. Leave powering up to CPC. */ +object_property_set_bool (OBJECT (cpu),"start-powered-off" , true, + &error_abort);qemu_register_reset (main_cpu_reset, cpu); + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + }Here errp is available, so we can propagate the error to the caller:
Quoted 1 line
if (!qdev_realize(DEVICE(cpu), NULL, errp)) {Igor corrected me in the previous patch, to avoid leaking the reference this snippet misses:
object_unref(OBJECT(cpu));
Quoted 18 lines
return; }For example in
hw/mips/boston.c:object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS); object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type, &error_fatal); object_property_set_int(OBJECT(&s->cps), "num-vp", machine->smp.cpus, &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal);This will be propagated here ---------------^^^^^^^^^^^^^
Quoted 4 lines
hw/mips/cps.c +0
-0} cpu =MIPS_CPU (first_cpu);
Re: [PATCH v4 5/8] mips/cps: Use start-powered-off CPUState property
Quoted 57 lines · Philippe Mathieu-Daudé
Quoted 56 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inmain_cpu_reset(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/mips/cps.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/mips/cps.c +3
-4@@ -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,9 @@ 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)); +Error *err =NULL ; + + cpu =MIPS_CPU (object_new (s->cpu_type));/* Init internal devices */ cpu_mips_irq_init_cpu (cpu);@@ -89,7 +88,16 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) env->itc_tag =mips_itu_get_tag_region (&s->itu); env->itu = &s->itu; }hw/mips/cps.c static void mips_cps_realize(DeviceState *dev, Error **errp) · line 100
Quoted 10 lines
hw/mips/cps.c +9
-0+/* All VPs are halted on reset. Leave powering up to CPC. */ +object_property_set_bool (OBJECT (cpu),"start-powered-off" , true, + &error_abort);qemu_register_reset (main_cpu_reset, cpu); + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + }Here errp is available, so we can propagate the error to the caller:
Quoted 6 lines
Quoted 1 line
if (!qdev_realize(DEVICE(cpu), NULL, errp)) {Igor corrected me in the previous patch, to avoid leaking the reference this snippet misses:
object_unref(OBJECT(cpu));
Well this is simply:
if (!qdev_realize_and_unref(DEVICE(cpu), NULL, errp)) {Quoted 20 lines
Quoted 19 lines
return; }For example in
hw/mips/boston.c:object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS); object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type, &error_fatal); object_property_set_int(OBJECT(&s->cps), "num-vp", machine->smp.cpus, &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal);This will be propagated here ---------------^^^^^^^^^^^^^
Quoted 4 lines
hw/mips/cps.c +0
-0} cpu =MIPS_CPU (first_cpu);
Re: [PATCH v4 5/8] mips/cps: Use start-powered-off CPUState property
In reply to Philippe Mathieu-DaudéQuoted 56 lines · Philippe Mathieu-Daudé
Quoted 42 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 inmain_cpu_reset(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.Also change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/mips/cps.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/mips/cps.c +3
-4@@ -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,9 @@ 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)); +Error *err =NULL ; + + cpu =MIPS_CPU (object_new (s->cpu_type));/* Init internal devices */ cpu_mips_irq_init_cpu (cpu);@@ -89,7 +88,16 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) env->itc_tag =mips_itu_get_tag_region (&s->itu); env->itu = &s->itu; }hw/mips/cps.c static void mips_cps_realize(DeviceState *dev, Error **errp) · line 100
Quoted 10 lines
hw/mips/cps.c +9
-0+/* All VPs are halted on reset. Leave powering up to CPC. */ +object_property_set_bool (OBJECT (cpu),"start-powered-off" , true, + &error_abort);qemu_register_reset (main_cpu_reset, cpu); + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + }Here errp is available, so we can propagate the error to the caller:
Quoted 3 lines
if (!qdev_realize(DEVICE(cpu), NULL, errp)) {
return;
}Ah, nice. I made this change (using qdev_realize_and_unref()).
I also changed object_property_set_bool() to use errp as well instead of &error_abort (and also early return on error).
Quoted 10 lines
For example in
hw/mips/boston.c:object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS); object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type, &error_fatal); object_property_set_int(OBJECT(&s->cps), "num-vp", machine->smp.cpus, &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal);This will be propagated here ---------------^^^^^^^^^^^^^
Interesting. Thanks for the explanation.
--
Thiago Jung Bauermann
IBM Linux Technology Center
PATCH v4 6/8 sparc/sun4m: Remove main_cpu_reset()
In reply to Thiago Jung BauermannWe rely on cpu_common_reset() to set cs->halted to 0, so main_cpu_reset() is pointless.
--- hw/sparc/sun4m.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
hw/sparc/sun4m.c +1 -12
@@ -218,15 +218,6 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level) { } -static void main_cpu_reset (void *opaque) -{ -SPARCCPU *cpu = opaque; -CPUState *cs =CPU (cpu); - -cpu_reset (cs); - cs->halted =0 ; -} -static void secondary_cpu_reset (void *opaque) {SPARCCPU *cpu = opaque;
@@ -827,9 +818,7 @@ static void cpu_devinit(const char *cpu_type, unsigned int id, env = &cpu->env;cpu_sparc_set_id (env, id); -if (id ==0 ) { -qemu_register_reset (main_cpu_reset, cpu); - }else { +if (id !=0 ) {qemu_register_reset (secondary_cpu_reset, cpu); cs =CPU (cpu); cs->halted =1 ;
PATCH v4 7/8 sparc/sun4m: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannInstead 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.
This makes secondary_cpu_reset() unnecessary, so remove it.
Also remove setting of cs->halted from cpu_devinit(), which seems out of place when compared to similar code in other architectures (e.g., ppce500_init() in hw/ppc/e500.c).
Finally, change creation of CPU object from cpu_create() to object_new() and qdev_realize() because cpu_create() realizes the CPU and it's not possible to set a property after the object is realized.
--- hw/sparc/sun4m.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
hw/sparc/sun4m.c +10 -16
@@ -218,15 +218,6 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level) { } -static void secondary_cpu_reset (void *opaque) -{ -SPARCCPU *cpu = opaque; -CPUState *cs =CPU (cpu); - -cpu_reset (cs); - cs->halted =1 ; -} -static void cpu_halt_signal (void *opaque,int irq,int level) {if (level && current_cpu) {
@@ -810,21 +801,24 @@ static const TypeInfo ram_info = {static void cpu_devinit (const char *cpu_type,unsigned int id,uint64_t prom_addr,qemu_irq **cpu_irqs) { -CPUState *cs;SPARCCPU *cpu;CPUSPARCState *env; +Error *err =NULL ; - cpu =SPARC_CPU (cpu_create (cpu_type)); + cpu =SPARC_CPU (object_new (cpu_type)); env = &cpu->env;cpu_sparc_set_id (env, id); -if (id !=0 ) { -qemu_register_reset (secondary_cpu_reset, cpu); - cs =CPU (cpu); - cs->halted =1 ; - } +object_property_set_bool (OBJECT (cpu),"start-powered-off" , id !=0 , + &error_abort); *cpu_irqs =qemu_allocate_irqs (cpu_set_irq, cpu,MAX_PILS ); env->prom_addr = prom_addr; + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + } }static void dummy_fdc_tc (void *opaque,int irq,int level)
Re: [PATCH v4 7/8] sparc/sun4m: Use start-powered-off CPUState property
Quoted 59 lines · Thiago Jung Bauermann
Instead of setting
CPUState::haltedto 1 insecondary_cpu_reset(), use the start-powered-off property which makescpu_common_reset()initialize it to 1 in common code.This makes
secondary_cpu_reset()unnecessary, so remove it.Also remove setting of
cs->haltedfromcpu_devinit(), which seems out of place when compared to similar code in other architectures (e.g.,ppce500_init()inhw/ppc/e500.c).Finally, change creation of CPU object from
cpu_create()toobject_new()andqdev_realize()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Suggested-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/sparc/sun4m.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)hw/sparc/sun4m.c +2
-16@@ -218,15 +218,6 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level) { } -static void secondary_cpu_reset (void *opaque) -{ -SPARCCPU *cpu = opaque; -CPUState *cs =CPU (cpu); - -cpu_reset (cs); - cs->halted =1 ; -} -static void cpu_halt_signal (void *opaque,int irq,int level) {if (level && current_cpu) {@@ -810,21 +801,24 @@ static const TypeInfo ram_info = {static void cpu_devinit (const char *cpu_type,unsigned int id,uint64_t prom_addr,qemu_irq **cpu_irqs) { -CPUState *cs;SPARCCPU *cpu;CPUSPARCState *env; +Error *err =NULL ; - cpu =SPARC_CPU (cpu_create (cpu_type)); + cpu =SPARC_CPU (object_new (cpu_type)); env = &cpu->env;cpu_sparc_set_id (env, id); -if (id !=0 ) { -qemu_register_reset (secondary_cpu_reset, cpu); - cs =CPU (cpu); - cs->halted =1 ; - }
hw/sparc/sun4m.c static const TypeInfo ram_info = { · line 821
Quoted 10 lines
hw/sparc/sun4m.c +8
-0+object_property_set_bool (OBJECT (cpu),"start-powered-off" , id !=0 , + &error_abort); *cpu_irqs =qemu_allocate_irqs (cpu_set_irq, cpu,MAX_PILS ); env->prom_addr = prom_addr; + +if (!qdev_realize (DEVICE (cpu),NULL , &err)) { +error_report_err (err); +object_unref (OBJECT (cpu)); +exit (EXIT_FAILURE ); + }
Simply use:
qdev_realize(DEVICE(cpu), NULL, &error_abort);
Quoted 4 lines
hw/sparc/sun4m.c +0
-0}static void dummy_fdc_tc (void *opaque,int irq,int level)
PATCH v4 8/8 target/s390x: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannInstead of setting CPUState::halted to 1 in s390_cpu_initfn(), use the start-powered-off property which makes cpu_common_reset() initialize it to 1 in common code.
Note that this changes behavior by setting cs->halted to 1 on reset, which didn't happen before.
--- target/s390x/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/cpu.c +1 -1
@@ -291,7 +291,7 @@ static void s390_cpu_initfn(Object *obj)S390CPU *cpu =S390_CPU (obj);cpu_set_cpustate_pointers (cpu); - cs->halted =1 ; + cs->start_powered_off = true; cs->exception_index =EXCP_HLT ;#if !defined(CONFIG_USER_ONLY ) object_property_add(obj, "crash-information", "GuestPanicInformation",