Generalize start-powered-off property from ARM
PATCH v6 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 v6 1/8 target/arm: Move start-powered-off property to generic CPUState
In reply to Thiago Jung BauermannThere 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 )) {
v6 cover Generalize start-powered-off property from ARM
This version has one small fix in patch 7, and adds Philippe's Reviewed-bys.
Applies cleanly on dgibson/ppc-for-5.2.
Original cover letter below, 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.
Changes since v5:
Patch "ppc/e500: Use start-powered-off CPUState property" Patch "mips/cps: Use start-powered-off CPUState property" Patch "sparc/sun4m: Remove main_cpu_reset()"
Patch "target/s390x: Use start-powered-off CPUState property"
- Added Philippe's Reviewed-by.
Patch "sparc/sun4m: Use start-powered-off CPUState property"
- Move call to qdev_realize_and_unref() right after object_property_set_bool(), as suggested by Philippe.
Changes since v4:
Patch "ppc/e500: Use start-powered-off CPUState property" Patch "sparc/sun4m: Use start-powered-off CPUState property"
- Use qdev_realize_and_unref() instead of qdev_realize(), as suggested by Igor.
- Pass &error_fatal to qdev_realize_and_unref() instead of manually reporting the error and exiting QEMU, as suggested by Philippe.
- Changed object_property_set_bool() to use &error_fatal instead of &error_abort.
Patch "mips/cps: Use start-powered-off CPUState property"
- Use qdev_realize_and_unref() instead of qdev_realize(), as suggested by Igor.
- Use existing errp argument to propagate error back to the caller, as suggested by Philippe.
- Changed object_property_set_bool() to use existing errp argument to propagate error back to the caller instead of using &error_abort.
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 | 14 ++++++++++---- hw/ppc/e500.c | 14 ++++++++++---- hw/ppc/spapr_cpu_core.c | 10 +++++----- hw/sparc/sun4m.c | 31 ++++--------------------------- 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, 39 insertions(+), 50 deletions(-)
PATCH v6 3/8 ppc/spapr: Use start-powered-off CPUState property
PowerPC 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 v6 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_and_unref() because cpu_create() realizes the CPU and it's not possible to set a property after the object is realized.
--- hw/ppc/e500.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
hw/ppc/e500.c +10 -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 ; }
@@ -865,7 +862,7 @@ void ppce500_init(MachineState *machine)CPUState *cs;qemu_irq *input; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);
@@ -897,7 +894,16 @@ 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_fatal); } + +qdev_realize_and_unref (DEVICE (cs),NULL , &error_fatal); } env = firstenv;
PATCH v6 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_and_unref() because cpu_create() realizes the CPU and it's not possible to set a property after the object is realized.
--- hw/mips/cps.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
hw/mips/cps.c +10 -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,7 @@ 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));/* Init internal devices */ cpu_mips_irq_init_cpu (cpu);
@@ -89,7 +86,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. */ +if (!object_property_set_bool (OBJECT (cpu),"start-powered-off" , true, + errp)) { +return ; + }qemu_register_reset (main_cpu_reset, cpu); + +if (!qdev_realize_and_unref (DEVICE (cpu),NULL , errp)) { +return ; + } } cpu =MIPS_CPU (first_cpu);
PATCH v6 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 v6 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_and_unref() because cpu_create() realizes the CPU and it's not possible to set a property after the object is realized.
--- hw/sparc/sun4m.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
hw/sparc/sun4m.c +4 -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,19 +801,16 @@ 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; - 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_fatal); +qdev_realize_and_unref (DEVICE (cpu),NULL , &error_fatal); *cpu_irqs =qemu_allocate_irqs (cpu_set_irq, cpu,MAX_PILS ); env->prom_addr = prom_addr; }
PATCH v6 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",
Re: [PATCH v6 7/8] sparc/sun4m: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannQuoted 10 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).
Quoted 6 lines
Finally, change creation of CPU object from
cpu_create()toobject_new()andqdev_realize_and_unref()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]>
Quoted 49 lines
--- hw/sparc/sun4m.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)hw/sparc/sun4m.c +4
-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,19 +801,16 @@ 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; - 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_fatal); +qdev_realize_and_unref (DEVICE (cpu),NULL , &error_fatal); *cpu_irqs =qemu_allocate_irqs (cpu_set_irq, cpu,MAX_PILS ); env->prom_addr = prom_addr; }
Re: [PATCH v6 7/8] sparc/sun4m: Use start-powered-off CPUState property
Quoted 11 lines · Philippe Mathieu-Daudé
Quoted 10 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).
Quoted 8 lines
Quoted 6 lines
Finally, change creation of CPU object from
cpu_create()toobject_new()andqdev_realize_and_unref()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]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
David Gibson
AppliedQuoted 21 lines · Thiago Jung Bauermann
This version has one small fix in patch 7, and adds Philippe's Reviewed-bys.
Applies cleanly on dgibson/ppc-for-5.2.
Original cover letter below, 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 setCPUState::haltedto 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_RUNon the vcpu beforecs->haltedis 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.
Quoted 7 lines
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.
Applied to ppc-for-5.2.
Quoted 99 lines
Changes since v5:
Patch "ppc/e500: Use start-powered-off CPUState property" Patch "mips/cps: Use start-powered-off CPUState property" Patch "sparc/sun4m: Remove
main_cpu_reset()"
Patch "target/s390x: Use start-powered-off CPUState property"
- Added Philippe's Reviewed-by.Patch "sparc/sun4m: Use start-powered-off CPUState property"
- Move call toqdev_realize_and_unref()right afterobject_property_set_bool(), as suggested by Philippe.Changes since v4:
Patch "ppc/e500: Use start-powered-off CPUState property" Patch "sparc/sun4m: Use start-powered-off CPUState property"
- Useqdev_realize_and_unref()instead ofqdev_realize(), as suggested by Igor.
- Pass&error_fataltoqdev_realize_and_unref()instead of manually reporting the error and exiting QEMU, as suggested by Philippe.
- Changedobject_property_set_bool()to use&error_fatalinstead of&error_abort.Patch "mips/cps: Use start-powered-off CPUState property"
- Useqdev_realize_and_unref()instead ofqdev_realize(), as suggested by Igor.
- Use existing errp argument to propagate error back to the caller, as suggested by Philippe.
- Changedobject_property_set_bool()to use existing errp argument to propagate error back to the caller instead of using&error_abort.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 withobject_new()andqdev_realize()instead ofcpu_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 theCPUState::start_powered_offvariable directly rather than usingobject_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"
- Removesecondary_cpu_reset(). Suggested by Philippe.
- Remove setting ofcs->halted = 1fromcpu_devinit(). Suggested by Philippe.Patch "Don't set
CPUState::haltedincpu_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 theCPUState::start_powered_offvariable directly rather than usingobject_property_set_bool(). Suggested by Philippe.
- Mention in the commit message Eduardo's observation that before this patch, the code didn't setcs->haltedon 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: Removemain_cpu_reset()
sparc/sun4m: Use start-powered-off CPUState property target/s390x: Use start-powered-off CPUState propertyexec.c | 1 + hw/core/cpu.c | 2 +- hw/mips/cps.c | 14 ++++++++++---- hw/ppc/e500.c | 14 ++++++++++---- hw/ppc/spapr_cpu_core.c | 10 +++++----- hw/sparc/sun4m.c | 31 ++++--------------------------- 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, 39 insertions(+), 50 deletions(-)
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 27 lines · David Gibson
Quoted 26 lines · Thiago Jung Bauermann
This version has one small fix in patch 7, and adds Philippe's Reviewed-bys.
Applies cleanly on dgibson/ppc-for-5.2.
Original cover letter below, 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 setCPUState::haltedto 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_RUNon the vcpu beforecs->haltedis 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.
Quoted 4 lines
Quoted 2 lines
The last patch may be wrong, as pointed out by Eduardo, so I marked it as RFC. It may make sense to drop it.
Applied to ppc-for-5.2.
Great news. Thanks!
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v6 4/8] ppc/e500: Use start-powered-off CPUState property
In reply to Thiago Jung BauermannHello,
Quoted 10 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_and_unref()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>
This is breaking make check :
tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped)
ERROR boot-serial-test - too few tests run (expected 7, got 0)
make: *** [/home/legoater/work/qemu/qemu-powernv-5.2.git/tests/Makefile.include:650: check-qtest-ppc64] Error 1
make: *** Waiting for unfinished jobs....
gdb --args build/ppc64-softmmu/qemu-system-ppc64 -display none -M ppce500
...
Thread 1 "qemu-system-ppc" received signal SIGSEGV, Segmentation fault.
0x000055555596ebf2 in ppce500_init (machine=0x5555567aa6e0)
at /home/legoater/work/qemu/qemu-powernv-5.2.git/hw/ppc/e500.c:880
880 irqs[i].irq[OPENPIC_OUTPUT_INT] = input[PPCE500_INPUT_INT];
AFAIUI, 'input is not initialized since the CPU is not yet realized.
C.Quoted 45 lines
--- hw/ppc/e500.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)hw/ppc/e500.c +10
-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 ; }@@ -865,7 +862,7 @@ void ppce500_init(MachineState *machine)CPUState *cs;qemu_irq *input; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);@@ -897,7 +894,16 @@ 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_fatal); } + +qdev_realize_and_unref (DEVICE (cs),NULL , &error_fatal); } env = firstenv;
Re: [PATCH v6 4/8] ppc/e500: Use start-powered-off CPUState property
Quoted 17 lines · Cédric Le Goater
Hello,
Quoted 10 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_and_unref()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>This is breaking make check :
Quoted 15 lines
tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped)
ERROR boot-serial-test - too few tests run (expected 7, got 0)
make: *** [/home/legoater/work/qemu/qemu-powernv-5.2.git/tests/Makefile.include:650: check-qtest-ppc64] Error 1
make: *** Waiting for unfinished jobs....
gdb --args build/ppc64-softmmu/qemu-system-ppc64 -display none -M ppce500
...
Thread 1 "qemu-system-ppc" received signal SIGSEGV, Segmentation fault.
0x000055555596ebf2 in ppce500_init (machine=0x5555567aa6e0)
at /home/legoater/work/qemu/qemu-powernv-5.2.git/hw/ppc/e500.c:880
880 irqs[i].irq[OPENPIC_OUTPUT_INT] = input[PPCE500_INPUT_INT];
AFAIUI, 'input is not initialized since the CPU is not yet realized.Thiago, see ad938fc1d53 ("hw/arm/palm.c: Encapsulate misc GPIO handling in a device") and eventually f8a865d36dc ("hw/arm/allwinner-a10:
Simplify by passing IRQs with qdev_pass_gpios") to get an idea how you can fix that.
Quoted 49 lines
C.Quoted 45 lines
--- hw/ppc/e500.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)hw/ppc/e500.c +10
-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 ; }@@ -865,7 +862,7 @@ void ppce500_init(MachineState *machine)CPUState *cs;qemu_irq *input; - cpu =POWERPC_CPU (cpu_create (machine->cpu_type)); + cpu =POWERPC_CPU (object_new (machine->cpu_type)); env = &cpu->env; cs =CPU (cpu);@@ -897,7 +894,16 @@ 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_fatal); } + +qdev_realize_and_unref (DEVICE (cs),NULL , &error_fatal); } env = firstenv;
Re: [PATCH v6 4/8] ppc/e500: Use start-powered-off CPUState property
In reply to Cédric Le GoaterQuoted 17 lines · Cédric Le Goater
Hello,
Quoted 10 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_and_unref()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>This is breaking make check :
Quoted 16 lines
tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped)
ERROR boot-serial-test - too few tests run (expected 7, got 0)
make: *** [/home/legoater/work/qemu/qemu-powernv-5.2.git/tests/Makefile.include:650: check-qtest-ppc64] Error 1
make: *** Waiting for unfinished jobs....
gdb --args build/ppc64-softmmu/qemu-system-ppc64 -display none -M ppce500
...
Thread 1 "qemu-system-ppc" received signal SIGSEGV, Segmentation fault.
0x000055555596ebf2 in ppce500_init (machine=0x5555567aa6e0)
at /home/legoater/work/qemu/qemu-powernv-5.2.git/hw/ppc/e500.c:880
880 irqs[i].irq[OPENPIC_OUTPUT_INT] = input[PPCE500_INPUT_INT];
AFAIUI, 'input is not initialized since the CPU is not yet
realized.Sigh. For future reference, Thiago, running an all-targets make check is pretty much a minimum bar to test before posting.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v6 4/8] ppc/e500: Use start-powered-off CPUState property
Quoted 32 lines · David Gibson
Quoted 31 lines · Cédric Le Goater
Hello,
Quoted 10 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_and_unref()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>This is breaking make check :
tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped) ERROR boot-serial-test - too few tests run (expected 7, got 0) make: *** [/home/legoater/work/qemu/qemu-powernv-5.2.git/tests/Makefile.include:650: check-qtest-ppc64] Error 1 make: *** Waiting for unfinished jobs.... gdb --args build/ppc64-softmmu/qemu-system-ppc64 -display none -M ppce500 ... Thread 1 "qemu-system-ppc" received signal SIGSEGV, Segmentation fault. 0x000055555596ebf2 in ppce500_init (machine=0x5555567aa6e0) at /home/legoater/work/qemu/qemu-powernv-5.2.git/hw/ppc/e500.c:880 880 irqs[i].irq[OPENPIC_OUTPUT_INT] = input[PPCE500_INPUT_INT];
Quoted 5 lines
Quoted 2 lines
AFAIUI, 'input is not initialized since the CPU is not yet realized.
Sigh. For future reference, Thiago, running an all-targets make check is pretty much a minimum bar to test before posting.
Sorry for the breakage. I'm working on it.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v6 4/8] ppc/e500: Use start-powered-off CPUState property
In reply to Philippe Mathieu-DaudéQuoted 32 lines · Philippe Mathieu-Daudé
Quoted 31 lines · Cédric Le Goater
Hello,
Quoted 10 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_and_unref()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>This is breaking make check :
tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped) ERROR boot-serial-test - too few tests run (expected 7, got 0) make: *** [/home/legoater/work/qemu/qemu-powernv-5.2.git/tests/Makefile.include:650: check-qtest-ppc64] Error 1 make: *** Waiting for unfinished jobs.... gdb --args build/ppc64-softmmu/qemu-system-ppc64 -display none -M ppce500 ... Thread 1 "qemu-system-ppc" received signal SIGSEGV, Segmentation fault. 0x000055555596ebf2 in ppce500_init (machine=0x5555567aa6e0) at /home/legoater/work/qemu/qemu-powernv-5.2.git/hw/ppc/e500.c:880 880 irqs[i].irq[OPENPIC_OUTPUT_INT] = input[PPCE500_INPUT_INT];
Quoted 6 lines
Quoted 1 line
AFAIUI, 'input is not initialized since the CPU is not yet realized.
Thiago, see
ad938fc1d53("hw/arm/palm.c: Encapsulate misc GPIO handling in a device") and eventuallyf8a865d36dc("hw/arm/allwinner-a10:
Simplify by passing IRQs withqdev_pass_gpios") to get an idea how you can fix that.
Thanks for the references, those are very useful.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v6 6/8] sparc/sun4m: Remove main_cpu_reset()
In reply to Thiago Jung BauermannQuoted 32 lines · Thiago Jung Bauermann
We rely on
cpu_common_reset()to setcs->haltedto 0, somain_cpu_reset()is pointless.Suggested-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by David Gibson <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>--- hw/sparc/sun4m.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)hw/sparc/sun4m.c +0
-9@@ -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;
hw/sparc/sun4m.c static void cpu_devinit(const char *cpu_type, unsigned int id, · line 824
Quoted 10 lines
hw/sparc/sun4m.c +1
-3@@ -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 ;
Surprisingly, this patch also causes a make check failure:
$ make && make check-qtest GEN docs/index.html CC qga/main.o CC qemu-nbd.o CC qemu-storage-daemon.o CC monitor/qmp-cmds-control.o CC qemu-img.o CC qemu-io.o CC sparc-softmmu/hw/sparc/sun4m.o CC sparc-softmmu/softmmu/vl.o LINK qemu-ga LINK qemu-nbd LINK qemu-storage-daemon LINK qemu-img LINK sparc-softmmu/qemu-system-sparc LINK qemu-io TEST check-qtest-sparc: tests/qtest/prom-env-test Broken pipe /home/bauermann/trabalho/src/qemu/tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped) ERROR prom-env-test - too few tests run (expected 3, got 0) make: *** [/home/bauermann/trabalho/src/qemu/tests/Makefile.include:650: check-qtest-sparc] Fehler 1
Here's what I got from the core file:
$ gdb sparc-softmmu/qemu-system-sparc core.645493
Reading symbols from sparc-softmmu/qemu-system-sparc...
[New LWP 645497]
[New LWP 645496]
[New LWP 645493]
[New LWP 645495]
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".
Core was generated by `sparc-softmmu/qemu-system-sparc -qtest unix:/tmp/qtest-645490.sock -qtest-log /'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 0x0000000000000000 in ?? ()
[Current thread is 1 (Thread 0x7f713ce60700 (LWP 645497))]
(gdb) bt
#0 0x0000000000000000 in ()
#1 0x0000557b3d6155c5 in helper_compute_psr (env=env@entry=0x557b3f444030) at /home/bauermann/trabalho/src/qemu/target/sparc/cc_helper.c:459
#2 0x0000557b3d6156e9 in cpu_get_psr (env=env@entry=0x557b3f444030) at /home/bauermann/trabalho/src/qemu/target/sparc/win_helper.c:56
#3 0x0000557b3d61779c in sparc_cpu_do_interrupt (cs=0x557b3f43b7f0) at /home/bauermann/trabalho/src/qemu/target/sparc/int32_helper.c:76
#4 0x0000557b3d5e29a6 in cpu_handle_exception (ret=<synthetic pointer>, cpu=0x557b3f43b7f0) at /home/bauermann/trabalho/src/qemu/accel/tcg/cpu-exec.c:504
#5 cpu_exec (cpu=cpu@entry=0x557b3f43b7f0) at /home/bauermann/trabalho/src/qemu/accel/tcg/cpu-exec.c:729
#6 0x0000557b3d5f6c85 in tcg_cpu_exec (cpu=<optimized out>) at /home/bauermann/trabalho/src/qemu/softmmu/cpus.c:1356
#7 qemu_tcg_rr_cpu_thread_fn (arg=arg@entry=0x557b3f43b7f0) at /home/bauermann/trabalho/src/qemu/softmmu/cpus.c:1458
#8 0x0000557b3d81e919 in qemu_thread_start (args=0x7f713ce5e930) at /home/bauermann/trabalho/src/qemu/util/qemu-thread-posix.c:521
#9 0x00007f717dc6b432 in start_thread () at /lib64/libpthread.so.0
#10 0x00007f717db99913 in clone () at /lib64/libc.so.6
(gdb) up
#1 0x0000557b3d6155c5 in helper_compute_psr (env=env@entry=0x557b3f444030) at /home/bauermann/trabalho/src/qemu/target/sparc/cc_helper.c:459
459 new_psr = icc_table[CC_OP].compute_all(env);
(gdb) list
454
455 void helper_compute_psr(CPUSPARCState *env)
456 {
457 uint32_t new_psr;
458
459 new_psr = icc_table[CC_OP].compute_all(env);
460 env->psr = new_psr;
461 #ifdef TARGET_SPARC64
462 new_psr = xcc_table[CC_OP].compute_all(env);
463 env->xcc = new_psr;CC_OP is:
#define CC_OP (env->cc_op)
So:
(gdb) p env->cc_op
$1 = 0
0 is CC_OP_DYNAMIC, but the icc_table definition says:
static const CCTable icc_table[CC_OP_NB] = {
/* CC_OP_DYNAMIC should never happen */I don't know what is going on. So I will change this patch to keep main_cpu_reset() but drop the line which sets cs->halted to 0 (which does pass make check).
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v6 4/8] ppc/e500: Use start-powered-off CPUState property
In reply to Philippe Mathieu-DaudéQuoted 32 lines · Philippe Mathieu-Daudé
Quoted 31 lines · Cédric Le Goater
Hello,
Quoted 10 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_and_unref()becausecpu_create()realizes the CPU and it's not possible to set a property after the object is realized.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Thiago Jung Bauermann <[email protected]>This is breaking make check :
tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped) ERROR boot-serial-test - too few tests run (expected 7, got 0) make: *** [/home/legoater/work/qemu/qemu-powernv-5.2.git/tests/Makefile.include:650: check-qtest-ppc64] Error 1 make: *** Waiting for unfinished jobs.... gdb --args build/ppc64-softmmu/qemu-system-ppc64 -display none -M ppce500 ... Thread 1 "qemu-system-ppc" received signal SIGSEGV, Segmentation fault. 0x000055555596ebf2 in ppce500_init (machine=0x5555567aa6e0) at /home/legoater/work/qemu/qemu-powernv-5.2.git/hw/ppc/e500.c:880 880 irqs[i].irq[OPENPIC_OUTPUT_INT] = input[PPCE500_INPUT_INT];
Quoted 6 lines
Quoted 1 line
AFAIUI, 'input is not initialized since the CPU is not yet realized.
Thiago, see
ad938fc1d53("hw/arm/palm.c: Encapsulate misc GPIO handling in a device") and eventuallyf8a865d36dc("hw/arm/allwinner-a10:
Simplify by passing IRQs withqdev_pass_gpios") to get an idea how you can fix that.
I ended up not following this route. There were other patches in this series which also caused problems in make check, but in those cases it wasn't related to IRQ setup.
I started feeling like I had fallen into a rabbit hole so I opted instead to solve these problems by minimizing the consequences of the changes made by this patch series.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center