cpu: Use DeviceClass reset instead of a special CPUClass reset
Subsystems (2)
PATCH 1/1 cpu: Use DeviceClass reset instead of a special CPUClass reset
The CPUClass has a 'reset' method. This is a legacy from when TYPE_CPU used not to inherit from TYPE_DEVICE. We don't need it any more, as we can simply use the TYPE_DEVICE reset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which calls device_cold_reset() and then the tracepoint function.
This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly calling device_cold_reset() or qdev_reset_all() on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset by
Note that this does not change the need for each machine or whatever to use qemu_register_reset() to arrange to call cpu_reset() -- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.
All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c
(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the parent_reset call being inside another function:
| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
---
Testing was by 'make check' and 'make check-acceptance'.
I need this patch as a preliminary to some arm stuff I'm doing, but I think it makes sense as a cleanup in its own right so I'm sending it out early for review. If it's not yet in master before I get round to finishing the stuff that depends on it I'll resend it as part of that series.
--- include/hw/core/cpu.h | 6 ---- target/alpha/cpu-qom.h | 2 +- target/arm/cpu-qom.h | 2 +- target/cris/cpu-qom.h | 2 +- target/hppa/cpu-qom.h | 2 +- target/i386/cpu-qom.h | 2 +- target/lm32/cpu-qom.h | 2 +- target/m68k/cpu-qom.h | 2 +- target/microblaze/cpu-qom.h | 2 +- target/mips/cpu-qom.h | 2 +- target/moxie/cpu.h | 2 +- target/nios2/cpu.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/riscv/cpu.h | 2 +- target/s390x/cpu-qom.h | 2 +- target/sh4/cpu-qom.h | 2 +- target/sparc/cpu-qom.h | 2 +- target/tilegx/cpu.h | 2 +- target/tricore/cpu-qom.h | 2 +- target/xtensa/cpu-qom.h | 2 +- hw/core/cpu.c | 19 +++--------- target/arm/cpu.c | 8 ++--- target/cris/cpu.c | 8 ++--- target/i386/cpu.c | 8 ++--- target/lm32/cpu.c | 8 ++--- target/m68k/cpu.c | 8 ++--- target/microblaze/cpu.c | 8 ++--- target/mips/cpu.c | 8 ++--- target/moxie/cpu.c | 7 +++-- target/nios2/cpu.c | 8 ++--- target/openrisc/cpu.c | 8 ++--- target/ppc/translate_init.inc.c | 8 ++--- target/riscv/cpu.c | 7 +++-- target/s390x/cpu.c | 8 +++-- target/sh4/cpu.c | 8 ++--- target/sparc/cpu.c | 8 ++--- target/tilegx/cpu.c | 7 +++-- target/tricore/cpu.c | 7 +++-- target/xtensa/cpu.c | 8 ++--- scripts/coccinelle/cpu-reset.cocci | 47 ++++++++++++++++++++++++++++++ 41 files changed, 144 insertions(+), 108 deletions(-) create mode 100644 scripts/coccinelle/cpu-reset.cocci
include/hw/core/cpu.h +0 -6
@@ -79,7 +79,6 @@ struct TranslationBlock;* @class_by_name: Callback to map -cpu command line model name to an * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. -* @reset: Callback to reset the #CPUState to its initial state. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @has_work: Callback for checking if there is work to do. * @do_interrupt: Callback for interrupt handling.
@@ -165,7 +164,6 @@ typedef struct CPUClass {ObjectClass *(*class_by_name)(const char *cpu_model);void (*parse_features)(const char *typename,char *str,Error **errp); -void (*reset)(CPUState *cpu);int reset_dump_flags;bool (*has_work)(CPUState *cpu);void (*do_interrupt)(CPUState *cpu);
@@ -1135,10 +1133,6 @@ void cpu_exec_unrealizefn(CPUState *cpu);*/ bool target_words_bigendian (void ); -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)); -#ifdef NEED_CPU_H #ifdef CONFIG_SOFTMMU
target/alpha/cpu-qom.h +1 -1
@@ -44,7 +44,7 @@ typedef struct AlphaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } AlphaCPUClass;typedef struct AlphaCPU AlphaCPU ;
target/arm/cpu-qom.h +1 -1
@@ -51,7 +51,7 @@ typedef struct ARMCPUClass {const ARMCPUInfo *info;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } ARMCPUClass;typedef struct ARMCPU ARMCPU ;
target/cris/cpu-qom.h +1 -1
@@ -45,7 +45,7 @@ typedef struct CRISCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t vr; } CRISCPUClass;
target/hppa/cpu-qom.h +1 -1
@@ -44,7 +44,7 @@ typedef struct HPPACPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } HPPACPUClass;typedef struct HPPACPU HPPACPU ;
target/i386/cpu-qom.h +1 -1
@@ -71,7 +71,7 @@ typedef struct X86CPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } X86CPUClass;typedef struct X86CPU X86CPU ;
target/lm32/cpu-qom.h +1 -1
@@ -44,7 +44,7 @@ typedef struct LM32CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } LM32CPUClass;typedef struct LM32CPU LM32CPU ;
target/m68k/cpu-qom.h +1 -1
@@ -44,7 +44,7 @@ typedef struct M68kCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } M68kCPUClass;typedef struct M68kCPU M68kCPU ;
target/microblaze/cpu-qom.h +1 -1
@@ -44,7 +44,7 @@ typedef struct MicroBlazeCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MicroBlazeCPUClass;typedef struct MicroBlazeCPU MicroBlazeCPU ;
target/mips/cpu-qom.h +1 -1
@@ -48,7 +48,7 @@ typedef struct MIPSCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const struct mips_def_t *cpu_def; } MIPSCPUClass;
target/moxie/cpu.h +1 -1
@@ -69,7 +69,7 @@ typedef struct MoxieCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MoxieCPUClass;/**
target/nios2/cpu.h +1 -1
@@ -50,7 +50,7 @@ typedef struct Nios2CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } Nios2CPUClass;#define TARGET_HAS_ICE 1
target/openrisc/cpu.h +1 -1
@@ -48,7 +48,7 @@ typedef struct OpenRISCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } OpenRISCCPUClass;#define TARGET_INSN_START_EXTRA_WORDS 1
target/ppc/cpu-qom.h +1 -1
@@ -166,7 +166,7 @@ typedef struct PowerPCCPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*parent_parse_features)(const char *type,char *str,Error **errp);uint32_t pvr;
target/riscv/cpu.h +1 -1
@@ -185,7 +185,7 @@ typedef struct RISCVCPUClass {CPUClass parent_class;/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } RISCVCPUClass;/**
target/s390x/cpu-qom.h +1 -1
@@ -61,7 +61,7 @@ typedef struct S390CPUClass {const char *desc;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*load_normal)(CPUState *cpu);void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;
target/sh4/cpu-qom.h +1 -1
@@ -51,7 +51,7 @@ typedef struct SuperHCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t pvr;uint32_t prr;
target/sparc/cpu-qom.h +1 -1
@@ -49,7 +49,7 @@ typedef struct SPARCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;sparc_def_t *cpu_def; } SPARCCPUClass;
target/tilegx/cpu.h +1 -1
@@ -118,7 +118,7 @@ typedef struct TileGXCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TileGXCPUClass;/**
target/tricore/cpu-qom.h +1 -1
@@ -36,7 +36,7 @@ typedef struct TriCoreCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TriCoreCPUClass;typedef struct TriCoreCPU TriCoreCPU ;
target/xtensa/cpu-qom.h +1 -1
@@ -56,7 +56,7 @@ typedef struct XtensaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const XtensaConfig *config; } XtensaCPUClass;
hw/core/cpu.c +4 -15
@@ -239,27 +239,16 @@ void cpu_dump_statistics(CPUState *cpu, int flags) } } -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)) -{ - *parent_reset = cc->reset; - cc->reset = child_reset; -} -void cpu_reset (CPUState *cpu) { -CPUClass *klass =CPU_GET_CLASS (cpu); - -if (klass->reset !=NULL ) { - (*klass->reset)(cpu); - } +device_cold_reset (DEVICE (cpu));trace_guest_cpu_reset (cpu); } -static void cpu_common_reset (CPUState *cpu) +static void cpu_common_reset (DeviceState *dev) { +CPUState *cpu =CPU (dev);CPUClass *cc =CPU_GET_CLASS (cpu);if (qemu_loglevel_mask (CPU_LOG_RESET )) {
@@ -419,7 +408,6 @@ static void cpu_class_init(ObjectClass *klass, void *data)CPUClass *k =CPU_CLASS (klass); k->parse_features = cpu_common_parse_features; - k->reset = cpu_common_reset; k->get_arch_id = cpu_common_get_arch_id; k->has_work = cpu_common_has_work; k->get_paging_enabled = cpu_common_get_paging_enabled;
@@ -440,6 +428,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_CPU , dc->categories); dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; + dc->reset = cpu_common_reset;device_class_set_props (dc, cpu_common_props);/* * Reason: CPUs still need special care by board code: wiring up
target/arm/cpu.c +4 -4
@@ -155,14 +155,14 @@ static void cp_reg_check_reset(gpointer key, gpointer value, gpointer opaque)assert (oldvalue == newvalue); } -/* CPUClass::reset() */ -static void arm_cpu_reset (CPUState *s) +static void arm_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);ARMCPU *cpu =ARM_CPU (s);ARMCPUClass *acc =ARM_CPU_GET_CLASS (cpu);CPUARMState *env = &cpu->env; - acc->parent_reset (s); + acc->parent_reset (dev);memset (env,0 , offsetof(CPUARMState , end_reset_fields));
@@ -2804,7 +2804,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize);device_class_set_props (dc, arm_cpu_properties); -cpu_class_set_parent_reset (cc, arm_cpu_reset, &acc->parent_reset); +device_class_set_parent_reset (dc, arm_cpu_reset, &acc->parent_reset); cc->class_by_name = arm_cpu_class_by_name; cc->has_work = arm_cpu_has_work;
target/cris/cpu.c +4 -4
@@ -40,15 +40,15 @@ static bool cris_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void cris_cpu_reset (CPUState *s) +static void cris_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);CRISCPU *cpu =CRIS_CPU (s);CRISCPUClass *ccc =CRIS_CPU_GET_CLASS (cpu);CPUCRISState *env = &cpu->env;uint32_t vr; - ccc->parent_reset (s); + ccc->parent_reset (dev); vr = env->pregs[PR_VR ];memset (env,0 , offsetof(CPUCRISState , end_reset_fields));
@@ -264,7 +264,7 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, cris_cpu_realizefn, &ccc->parent_realize); -cpu_class_set_parent_reset (cc, cris_cpu_reset, &ccc->parent_reset); +device_class_set_parent_reset (dc, cris_cpu_reset, &ccc->parent_reset); cc->class_by_name = cris_cpu_class_by_name; cc->has_work = cris_cpu_has_work;
target/i386/cpu.c +4 -4
@@ -5855,9 +5855,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, } } -/* CPUClass::reset() */ -static void x86_cpu_reset (CPUState *s) +static void x86_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);X86CPU *cpu =X86_CPU (s);X86CPUClass *xcc =X86_CPU_GET_CLASS (cpu);CPUX86State *env = &cpu->env;
@@ -5865,7 +5865,7 @@ static void x86_cpu_reset(CPUState *s)uint64_t xcr0;int i; - xcc->parent_reset (s); + xcc->parent_reset (dev);memset (env,0 , offsetof(CPUX86State , end_reset_fields));
@@ -7169,7 +7169,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) &xcc->parent_unrealize);device_class_set_props (dc, x86_cpu_properties); -cpu_class_set_parent_reset (cc, x86_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, x86_cpu_reset, &xcc->parent_reset); cc->reset_dump_flags =CPU_DUMP_FPU |CPU_DUMP_CCOP ; cc->class_by_name = x86_cpu_class_by_name;
target/lm32/cpu.c +4 -4
@@ -99,14 +99,14 @@ static bool lm32_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void lm32_cpu_reset (CPUState *s) +static void lm32_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);LM32CPU *cpu =LM32_CPU (s);LM32CPUClass *lcc =LM32_CPU_GET_CLASS (cpu);CPULM32State *env = &cpu->env; - lcc->parent_reset (s); + lcc->parent_reset (dev);/* reset cpu state */ memset (env,0 , offsetof(CPULM32State , end_reset_fields));
@@ -218,7 +218,7 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, lm32_cpu_realizefn, &lcc->parent_realize); -cpu_class_set_parent_reset (cc, lm32_cpu_reset, &lcc->parent_reset); +device_class_set_parent_reset (dc, lm32_cpu_reset, &lcc->parent_reset); cc->class_by_name = lm32_cpu_class_by_name; cc->has_work = lm32_cpu_has_work;
target/m68k/cpu.c +4 -4
@@ -41,16 +41,16 @@ static void m68k_set_feature(CPUM68KState *env, int feature) env->features |= (1u << feature); } -/* CPUClass::reset() */ -static void m68k_cpu_reset (CPUState *s) +static void m68k_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);M68kCPU *cpu =M68K_CPU (s);M68kCPUClass *mcc =M68K_CPU_GET_CLASS (cpu);CPUM68KState *env = &cpu->env;floatx80 nan =floatx80_default_nan (NULL );int i; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUM68KState , end_reset_fields));#ifdef CONFIG_SOFTMMU
@@ -273,7 +273,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, m68k_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, m68k_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, m68k_cpu_reset, &mcc->parent_reset); cc->class_by_name = m68k_cpu_class_by_name; cc->has_work = m68k_cpu_has_work;
target/microblaze/cpu.c +4 -4
@@ -102,14 +102,14 @@ static void microblaze_cpu_set_irq(void *opaque, int irq, int level) }#endif -/* CPUClass::reset() */ -static void mb_cpu_reset (CPUState *s) +static void mb_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MicroBlazeCPU *cpu =MICROBLAZE_CPU (s);MicroBlazeCPUClass *mcc =MICROBLAZE_CPU_GET_CLASS (cpu);CPUMBState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMBState , end_reset_fields)); env->res_addr =RES_ADDR_NONE ;
@@ -292,7 +292,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, mb_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mb_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mb_cpu_reset, &mcc->parent_reset); cc->class_by_name = mb_cpu_class_by_name; cc->has_work = mb_cpu_has_work;
target/mips/cpu.c +4 -4
@@ -96,14 +96,14 @@ static bool mips_cpu_has_work(CPUState *cs)return has_work; } -/* CPUClass::reset() */ -static void mips_cpu_reset (CPUState *s) +static void mips_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MIPSCPU *cpu =MIPS_CPU (s);MIPSCPUClass *mcc =MIPS_CPU_GET_CLASS (cpu);CPUMIPSState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMIPSState , end_reset_fields));
@@ -189,7 +189,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, mips_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mips_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mips_cpu_reset, &mcc->parent_reset); cc->class_by_name = mips_cpu_class_by_name; cc->has_work = mips_cpu_has_work;
target/moxie/cpu.c +4 -3
@@ -35,13 +35,14 @@ static bool moxie_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -static void moxie_cpu_reset (CPUState *s) +static void moxie_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MoxieCPU *cpu =MOXIE_CPU (s);MoxieCPUClass *mcc =MOXIE_CPU_GET_CLASS (cpu);CPUMoxieState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMoxieState , end_reset_fields)); env->pc =0x1000 ;
@@ -101,7 +102,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, moxie_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, moxie_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, moxie_cpu_reset, &mcc->parent_reset); cc->class_by_name = moxie_cpu_class_by_name;
target/nios2/cpu.c +4 -4
@@ -39,9 +39,9 @@ static bool nios2_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void nios2_cpu_reset (CPUState *cs) +static void nios2_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);Nios2CPU *cpu =NIOS2_CPU (cs);Nios2CPUClass *ncc =NIOS2_CPU_GET_CLASS (cpu);CPUNios2State *env = &cpu->env;
@@ -51,7 +51,7 @@ static void nios2_cpu_reset(CPUState *cs)log_cpu_state (cs,0 ); } - ncc->parent_reset (cs); + ncc->parent_reset (dev);memset (env->regs,0 ,sizeof (uint32_t ) *NUM_CORE_REGS ); env->regs[R_PC ] = cpu->reset_addr;
@@ -188,7 +188,7 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, nios2_cpu_realizefn, &ncc->parent_realize);device_class_set_props (dc, nios2_properties); -cpu_class_set_parent_reset (cc, nios2_cpu_reset, &ncc->parent_reset); +device_class_set_parent_reset (dc, nios2_cpu_reset, &ncc->parent_reset); cc->class_by_name = nios2_cpu_class_by_name; cc->has_work = nios2_cpu_has_work;
target/openrisc/cpu.c +4 -4
@@ -41,13 +41,13 @@ static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_or1k; } -/* CPUClass::reset() */ -static void openrisc_cpu_reset (CPUState *s) +static void openrisc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);OpenRISCCPU *cpu =OPENRISC_CPU (s);OpenRISCCPUClass *occ =OPENRISC_CPU_GET_CLASS (cpu); - occ->parent_reset (s); + occ->parent_reset (dev);memset (&cpu->env,0 , offsetof(CPUOpenRISCState , end_reset_fields));
@@ -150,7 +150,7 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, openrisc_cpu_realizefn, &occ->parent_realize); -cpu_class_set_parent_reset (cc, openrisc_cpu_reset, &occ->parent_reset); +device_class_set_parent_reset (dc, openrisc_cpu_reset, &occ->parent_reset); cc->class_by_name = openrisc_cpu_class_by_name; cc->has_work = openrisc_cpu_has_work;
target/ppc/translate_init.inc.c +4 -4
@@ -10669,16 +10669,16 @@ static bool ppc_cpu_has_work(CPUState *cs)return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } -/* CPUClass::reset() */ -static void ppc_cpu_reset (CPUState *s) +static void ppc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);PowerPCCPU *cpu =POWERPC_CPU (s);PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu);CPUPPCState *env = &cpu->env;target_ulong msr;int i; - pcc->parent_reset (s); + pcc->parent_reset (dev); msr = (target_ulong )0 ; msr |= (target_ulong )MSR_HVB ;
@@ -10885,7 +10885,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_always;device_class_set_props (dc, ppc_cpu_properties); -cpu_class_set_parent_reset (cc, ppc_cpu_reset, &pcc->parent_reset); +device_class_set_parent_reset (dc, ppc_cpu_reset, &pcc->parent_reset); cc->class_by_name = ppc_cpu_class_by_name; pcc->parent_parse_features = cc->parse_features;
target/riscv/cpu.c +4 -3
@@ -286,13 +286,14 @@ void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, env->pc = data[0 ]; } -static void riscv_cpu_reset (CPUState *cs) +static void riscv_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);RISCVCPU *cpu =RISCV_CPU (cs);RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (cpu);CPURISCVState *env = &cpu->env; - mcc->parent_reset (cs); + mcc->parent_reset (dev);#ifndef CONFIG_USER_ONLY env->priv =PRV_M ; env->mstatus &= ~(MSTATUS_MIE |MSTATUS_MPRV );
@@ -462,7 +463,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, riscv_cpu_realize, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, riscv_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, riscv_cpu_reset, &mcc->parent_reset); cc->class_by_name = riscv_cpu_class_by_name; cc->has_work = riscv_cpu_has_work;
target/s390x/cpu.c +5 -3
@@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; +DeviceState *dev =DEVICE (s); - scc->parent_reset (s); + scc->parent_reset (dev); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu);
@@ -450,8 +451,9 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; -static void s390_cpu_reset_full (CPUState *s) +static void s390_cpu_reset_full (DeviceState *dev) { +CPUState *s =CPU (dev);return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }
@@ -466,7 +468,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, s390x_cpu_properties); dc->user_creatable = true; -cpu_class_set_parent_reset (cc, s390_cpu_reset_full, &scc->parent_reset); +device_class_set_parent_reset (dc, s390_cpu_reset_full, &scc->parent_reset);#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif
target/sh4/cpu.c +4 -4
@@ -47,14 +47,14 @@ static bool superh_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void superh_cpu_reset (CPUState *s) +static void superh_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SuperHCPU *cpu =SUPERH_CPU (s);SuperHCPUClass *scc =SUPERH_CPU_GET_CLASS (cpu);CPUSH4State *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSH4State , end_reset_fields));
@@ -214,7 +214,7 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, superh_cpu_realizefn, &scc->parent_realize); -cpu_class_set_parent_reset (cc, superh_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, superh_cpu_reset, &scc->parent_reset); cc->class_by_name = superh_cpu_class_by_name; cc->has_work = superh_cpu_has_work;
target/sparc/cpu.c +4 -4
@@ -28,14 +28,14 @@//#define DEBUG_FEATURES -/* CPUClass::reset() */ -static void sparc_cpu_reset (CPUState *s) +static void sparc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SPARCCPU *cpu =SPARC_CPU (s);SPARCCPUClass *scc =SPARC_CPU_GET_CLASS (cpu);CPUSPARCState *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSPARCState , end_reset_fields)); env->cwp =0 ;
@@ -859,7 +859,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_realize);device_class_set_props (dc, sparc_cpu_properties); -cpu_class_set_parent_reset (cc, sparc_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, sparc_cpu_reset, &scc->parent_reset); cc->class_by_name = sparc_cpu_class_by_name; cc->parse_features = sparc_cpu_parse_features;
target/tilegx/cpu.c +4 -3
@@ -68,13 +68,14 @@ static bool tilegx_cpu_has_work(CPUState *cs)return true; } -static void tilegx_cpu_reset (CPUState *s) +static void tilegx_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TileGXCPU *cpu =TILEGX_CPU (s);TileGXCPUClass *tcc =TILEGX_CPU_GET_CLASS (cpu);CPUTLGState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);memset (env,0 , offsetof(CPUTLGState , end_reset_fields)); }
@@ -142,7 +143,7 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, tilegx_cpu_realizefn, &tcc->parent_realize); -cpu_class_set_parent_reset (cc, tilegx_cpu_reset, &tcc->parent_reset); +device_class_set_parent_reset (dc, tilegx_cpu_reset, &tcc->parent_reset); cc->class_by_name = tilegx_cpu_class_by_name; cc->has_work = tilegx_cpu_has_work;
target/tricore/cpu.c +4 -3
@@ -53,13 +53,14 @@ static void tricore_cpu_synchronize_from_tb(CPUState *cs, env->PC = tb->pc; } -static void tricore_cpu_reset (CPUState *s) +static void tricore_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TriCoreCPU *cpu =TRICORE_CPU (s);TriCoreCPUClass *tcc =TRICORE_CPU_GET_CLASS (cpu);CPUTriCoreState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);cpu_state_reset (env); }
@@ -153,7 +154,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, tricore_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, tricore_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, tricore_cpu_reset, &mcc->parent_reset); cc->class_by_name = tricore_cpu_class_by_name; cc->has_work = tricore_cpu_has_work;
target/xtensa/cpu.c +4 -4
@@ -67,14 +67,14 @@ bool xtensa_abi_call0(void) }#endif -/* CPUClass::reset() */ -static void xtensa_cpu_reset (CPUState *s) +static void xtensa_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);XtensaCPU *cpu =XTENSA_CPU (s);XtensaCPUClass *xcc =XTENSA_CPU_GET_CLASS (cpu);CPUXtensaState *env = &cpu->env; - xcc->parent_reset (s); + xcc->parent_reset (dev); env->exception_taken =0 ; env->pc = env->config->exception_vector[EXC_RESET0 + env->static_vectors];
@@ -184,7 +184,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, xtensa_cpu_realizefn, &xcc->parent_realize); -cpu_class_set_parent_reset (cc, xtensa_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, xtensa_cpu_reset, &xcc->parent_reset); cc->class_by_name = xtensa_cpu_class_by_name; cc->has_work = xtensa_cpu_has_work;
scripts/coccinelle/cpu-reset.cocci new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH] cpu: Use DeviceClass reset instead of a special CPUClass reset
Message-id: [email protected]
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
fatal: unable to access 'https://github.com/patchew-project/qemu/': Failed connect to github.com:443; No route to host
error: Could not fetch 3c8cf5a9c21ff8782164d1def7f44bd888713384
Traceback (most recent call last):
File "patchew-tester/src/patchew-cli", line 521, in test_one
git_clone_repo(clone, r["repo"], r["head"], logf, True)
File "patchew-tester/src/patchew-cli", line 48, in git_clone_repo
stdout=logf, stderr=logf)
File "/opt/rh/rh-python36/root/usr/lib64/python3.6/subprocess.py", line 291, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'remote', 'add', '-f', '--mirror=fetch', '3c8cf5a9c21ff8782164d1def7f44bd888713384', 'https://github.com/patchew-project/qemu']' returned non-zero exit status 1.
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed build test on FreeBSD host. Please find the details below.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with # HEAD pointing to a commit that has the patches applied on top of "base"
# branch if qemu-system-x86_64 --help >/dev/null 2>&1; then QEMU=qemu-system-x86_64 elif /usr/libexec/qemu-kvm --help >/dev/null 2>&1; then QEMU=/usr/libexec/qemu-kvm else exit 1 fi make vm-build-freebsd J=21 QEMU=$QEMU exit 0 === TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.FreeBSD/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 45 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit fromTYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);Signed-off-by Peter Maydell <[email protected]>
Quoted 8 lines
---
Testing was by 'make check' and 'make check-acceptance'.I need this patch as a preliminary to some arm stuff I'm doing, but I think it makes sense as a cleanup in its own right so I'm sending it out early for review. If it's not yet in master before I get round to finishing the stuff that depends on it I'll resend it as part of that series.
Nice cleanup, thanks.
Quoted 1,009 lines
--- include/hw/core/cpu.h | 6 ---- target/alpha/cpu-qom.h | 2 +- target/arm/cpu-qom.h | 2 +- target/cris/cpu-qom.h | 2 +- target/hppa/cpu-qom.h | 2 +- target/i386/cpu-qom.h | 2 +- target/lm32/cpu-qom.h | 2 +- target/m68k/cpu-qom.h | 2 +- target/microblaze/cpu-qom.h | 2 +- target/mips/cpu-qom.h | 2 +- target/moxie/cpu.h | 2 +- target/nios2/cpu.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/riscv/cpu.h | 2 +- target/s390x/cpu-qom.h | 2 +- target/sh4/cpu-qom.h | 2 +- target/sparc/cpu-qom.h | 2 +- target/tilegx/cpu.h | 2 +- target/tricore/cpu-qom.h | 2 +- target/xtensa/cpu-qom.h | 2 +- hw/core/cpu.c | 19 +++--------- target/arm/cpu.c | 8 ++--- target/cris/cpu.c | 8 ++--- target/i386/cpu.c | 8 ++--- target/lm32/cpu.c | 8 ++--- target/m68k/cpu.c | 8 ++--- target/microblaze/cpu.c | 8 ++--- target/mips/cpu.c | 8 ++--- target/moxie/cpu.c | 7 +++-- target/nios2/cpu.c | 8 ++--- target/openrisc/cpu.c | 8 ++--- target/ppc/translate_init.inc.c | 8 ++--- target/riscv/cpu.c | 7 +++-- target/s390x/cpu.c | 8 +++-- target/sh4/cpu.c | 8 ++--- target/sparc/cpu.c | 8 ++--- target/tilegx/cpu.c | 7 +++-- target/tricore/cpu.c | 7 +++-- target/xtensa/cpu.c | 8 ++--- scripts/coccinelle/cpu-reset.cocci | 47 ++++++++++++++++++++++++++++++ 41 files changed, 144 insertions(+), 108 deletions(-)create mode 100644
scripts/coccinelle/cpu-reset.cocciinclude/hw/core/cpu.h +0
-6@@ -79,7 +79,6 @@ struct TranslationBlock;* @class_by_name: Callback to map -cpu command line model name to an * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. -* @reset: Callback to reset the #CPUState to its initial state. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @has_work: Callback for checking if there is work to do. * @do_interrupt: Callback for interrupt handling. @@ -165,7 +164,6 @@ typedef struct CPUClass {ObjectClass *(*class_by_name)(const char *cpu_model);void (*parse_features)(const char *typename,char *str,Error **errp); -void (*reset)(CPUState *cpu);int reset_dump_flags;bool (*has_work)(CPUState *cpu);void (*do_interrupt)(CPUState *cpu);@@ -1135,10 +1133,6 @@ void cpu_exec_unrealizefn(CPUState *cpu);*/ bool target_words_bigendian (void ); -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)); -#ifdef NEED_CPU_H #ifdef CONFIG_SOFTMMU target/alpha/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct AlphaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } AlphaCPUClass;typedef struct AlphaCPU AlphaCPU ;target/arm/cpu-qom.h +1
-1@@ -51,7 +51,7 @@ typedef struct ARMCPUClass {const ARMCPUInfo *info;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } ARMCPUClass;typedef struct ARMCPU ARMCPU ;target/cris/cpu-qom.h +1
-1@@ -45,7 +45,7 @@ typedef struct CRISCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t vr; } CRISCPUClass;target/hppa/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct HPPACPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } HPPACPUClass;typedef struct HPPACPU HPPACPU ;target/i386/cpu-qom.h +1
-1@@ -71,7 +71,7 @@ typedef struct X86CPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } X86CPUClass;typedef struct X86CPU X86CPU ;target/lm32/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct LM32CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } LM32CPUClass;typedef struct LM32CPU LM32CPU ;target/m68k/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct M68kCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } M68kCPUClass;typedef struct M68kCPU M68kCPU ;target/microblaze/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct MicroBlazeCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MicroBlazeCPUClass;typedef struct MicroBlazeCPU MicroBlazeCPU ;target/mips/cpu-qom.h +1
-1@@ -48,7 +48,7 @@ typedef struct MIPSCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const struct mips_def_t *cpu_def; } MIPSCPUClass;target/moxie/cpu.h +1
-1@@ -69,7 +69,7 @@ typedef struct MoxieCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MoxieCPUClass;/** target/nios2/cpu.h +1
-1@@ -50,7 +50,7 @@ typedef struct Nios2CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } Nios2CPUClass;#define TARGET_HAS_ICE 1target/openrisc/cpu.h +1
-1@@ -48,7 +48,7 @@ typedef struct OpenRISCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } OpenRISCCPUClass;#define TARGET_INSN_START_EXTRA_WORDS 1target/ppc/cpu-qom.h +1
-1@@ -166,7 +166,7 @@ typedef struct PowerPCCPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*parent_parse_features)(const char *type,char *str,Error **errp);uint32_t pvr;target/riscv/cpu.h +1
-1@@ -185,7 +185,7 @@ typedef struct RISCVCPUClass {CPUClass parent_class;/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } RISCVCPUClass;/** target/s390x/cpu-qom.h +1
-1@@ -61,7 +61,7 @@ typedef struct S390CPUClass {const char *desc;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*load_normal)(CPUState *cpu);void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;target/sh4/cpu-qom.h +1
-1@@ -51,7 +51,7 @@ typedef struct SuperHCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t pvr;uint32_t prr;target/sparc/cpu-qom.h +1
-1@@ -49,7 +49,7 @@ typedef struct SPARCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;sparc_def_t *cpu_def; } SPARCCPUClass;target/tilegx/cpu.h +1
-1@@ -118,7 +118,7 @@ typedef struct TileGXCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TileGXCPUClass;/** target/tricore/cpu-qom.h +1
-1@@ -36,7 +36,7 @@ typedef struct TriCoreCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TriCoreCPUClass;typedef struct TriCoreCPU TriCoreCPU ;target/xtensa/cpu-qom.h +1
-1@@ -56,7 +56,7 @@ typedef struct XtensaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const XtensaConfig *config; } XtensaCPUClass;hw/core/cpu.c +4
-15@@ -239,27 +239,16 @@ void cpu_dump_statistics(CPUState *cpu, int flags) } } -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)) -{ - *parent_reset = cc->reset; - cc->reset = child_reset; -} -void cpu_reset (CPUState *cpu) { -CPUClass *klass =CPU_GET_CLASS (cpu); - -if (klass->reset !=NULL ) { - (*klass->reset)(cpu); - } +device_cold_reset (DEVICE (cpu));trace_guest_cpu_reset (cpu); } -static void cpu_common_reset (CPUState *cpu) +static void cpu_common_reset (DeviceState *dev) { +CPUState *cpu =CPU (dev);CPUClass *cc =CPU_GET_CLASS (cpu);if (qemu_loglevel_mask (CPU_LOG_RESET )) {@@ -419,7 +408,6 @@ static void cpu_class_init(ObjectClass *klass, void *data)CPUClass *k =CPU_CLASS (klass); k->parse_features = cpu_common_parse_features; - k->reset = cpu_common_reset; k->get_arch_id = cpu_common_get_arch_id; k->has_work = cpu_common_has_work; k->get_paging_enabled = cpu_common_get_paging_enabled;@@ -440,6 +428,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_CPU , dc->categories); dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; + dc->reset = cpu_common_reset;device_class_set_props (dc, cpu_common_props);/* * Reason: CPUs still need special care by board code: wiring up target/arm/cpu.c +4
-4@@ -155,14 +155,14 @@ static void cp_reg_check_reset(gpointer key, gpointer value, gpointer opaque)assert (oldvalue == newvalue); } -/* CPUClass::reset() */ -static void arm_cpu_reset (CPUState *s) +static void arm_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);ARMCPU *cpu =ARM_CPU (s);ARMCPUClass *acc =ARM_CPU_GET_CLASS (cpu);CPUARMState *env = &cpu->env; - acc->parent_reset (s); + acc->parent_reset (dev);memset (env,0 , offsetof(CPUARMState , end_reset_fields));@@ -2804,7 +2804,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize);device_class_set_props (dc, arm_cpu_properties); -cpu_class_set_parent_reset (cc, arm_cpu_reset, &acc->parent_reset); +device_class_set_parent_reset (dc, arm_cpu_reset, &acc->parent_reset); cc->class_by_name = arm_cpu_class_by_name; cc->has_work = arm_cpu_has_work;target/cris/cpu.c +4
-4@@ -40,15 +40,15 @@ static bool cris_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void cris_cpu_reset (CPUState *s) +static void cris_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);CRISCPU *cpu =CRIS_CPU (s);CRISCPUClass *ccc =CRIS_CPU_GET_CLASS (cpu);CPUCRISState *env = &cpu->env;uint32_t vr; - ccc->parent_reset (s); + ccc->parent_reset (dev); vr = env->pregs[PR_VR ];memset (env,0 , offsetof(CPUCRISState , end_reset_fields));@@ -264,7 +264,7 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, cris_cpu_realizefn, &ccc->parent_realize); -cpu_class_set_parent_reset (cc, cris_cpu_reset, &ccc->parent_reset); +device_class_set_parent_reset (dc, cris_cpu_reset, &ccc->parent_reset); cc->class_by_name = cris_cpu_class_by_name; cc->has_work = cris_cpu_has_work;target/i386/cpu.c +4
-4@@ -5855,9 +5855,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, } } -/* CPUClass::reset() */ -static void x86_cpu_reset (CPUState *s) +static void x86_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);X86CPU *cpu =X86_CPU (s);X86CPUClass *xcc =X86_CPU_GET_CLASS (cpu);CPUX86State *env = &cpu->env;@@ -5865,7 +5865,7 @@ static void x86_cpu_reset(CPUState *s)uint64_t xcr0;int i; - xcc->parent_reset (s); + xcc->parent_reset (dev);memset (env,0 , offsetof(CPUX86State , end_reset_fields));@@ -7169,7 +7169,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) &xcc->parent_unrealize);device_class_set_props (dc, x86_cpu_properties); -cpu_class_set_parent_reset (cc, x86_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, x86_cpu_reset, &xcc->parent_reset); cc->reset_dump_flags =CPU_DUMP_FPU |CPU_DUMP_CCOP ; cc->class_by_name = x86_cpu_class_by_name;target/lm32/cpu.c +4
-4@@ -99,14 +99,14 @@ static bool lm32_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void lm32_cpu_reset (CPUState *s) +static void lm32_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);LM32CPU *cpu =LM32_CPU (s);LM32CPUClass *lcc =LM32_CPU_GET_CLASS (cpu);CPULM32State *env = &cpu->env; - lcc->parent_reset (s); + lcc->parent_reset (dev);/* reset cpu state */ memset (env,0 , offsetof(CPULM32State , end_reset_fields));@@ -218,7 +218,7 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, lm32_cpu_realizefn, &lcc->parent_realize); -cpu_class_set_parent_reset (cc, lm32_cpu_reset, &lcc->parent_reset); +device_class_set_parent_reset (dc, lm32_cpu_reset, &lcc->parent_reset); cc->class_by_name = lm32_cpu_class_by_name; cc->has_work = lm32_cpu_has_work;target/m68k/cpu.c +4
-4@@ -41,16 +41,16 @@ static void m68k_set_feature(CPUM68KState *env, int feature) env->features |= (1u << feature); } -/* CPUClass::reset() */ -static void m68k_cpu_reset (CPUState *s) +static void m68k_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);M68kCPU *cpu =M68K_CPU (s);M68kCPUClass *mcc =M68K_CPU_GET_CLASS (cpu);CPUM68KState *env = &cpu->env;floatx80 nan =floatx80_default_nan (NULL );int i; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUM68KState , end_reset_fields));#ifdef CONFIG_SOFTMMU @@ -273,7 +273,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, m68k_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, m68k_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, m68k_cpu_reset, &mcc->parent_reset); cc->class_by_name = m68k_cpu_class_by_name; cc->has_work = m68k_cpu_has_work;target/microblaze/cpu.c +4
-4@@ -102,14 +102,14 @@ static void microblaze_cpu_set_irq(void *opaque, int irq, int level) }#endif -/* CPUClass::reset() */ -static void mb_cpu_reset (CPUState *s) +static void mb_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MicroBlazeCPU *cpu =MICROBLAZE_CPU (s);MicroBlazeCPUClass *mcc =MICROBLAZE_CPU_GET_CLASS (cpu);CPUMBState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMBState , end_reset_fields)); env->res_addr =RES_ADDR_NONE ;@@ -292,7 +292,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, mb_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mb_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mb_cpu_reset, &mcc->parent_reset); cc->class_by_name = mb_cpu_class_by_name; cc->has_work = mb_cpu_has_work;target/mips/cpu.c +4
-4@@ -96,14 +96,14 @@ static bool mips_cpu_has_work(CPUState *cs)return has_work; } -/* CPUClass::reset() */ -static void mips_cpu_reset (CPUState *s) +static void mips_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MIPSCPU *cpu =MIPS_CPU (s);MIPSCPUClass *mcc =MIPS_CPU_GET_CLASS (cpu);CPUMIPSState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMIPSState , end_reset_fields));@@ -189,7 +189,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, mips_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mips_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mips_cpu_reset, &mcc->parent_reset); cc->class_by_name = mips_cpu_class_by_name; cc->has_work = mips_cpu_has_work;target/moxie/cpu.c +4
-3@@ -35,13 +35,14 @@ static bool moxie_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -static void moxie_cpu_reset (CPUState *s) +static void moxie_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MoxieCPU *cpu =MOXIE_CPU (s);MoxieCPUClass *mcc =MOXIE_CPU_GET_CLASS (cpu);CPUMoxieState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMoxieState , end_reset_fields)); env->pc =0x1000 ;@@ -101,7 +102,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, moxie_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, moxie_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, moxie_cpu_reset, &mcc->parent_reset); cc->class_by_name = moxie_cpu_class_by_name;target/nios2/cpu.c +4
-4@@ -39,9 +39,9 @@ static bool nios2_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void nios2_cpu_reset (CPUState *cs) +static void nios2_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);Nios2CPU *cpu =NIOS2_CPU (cs);Nios2CPUClass *ncc =NIOS2_CPU_GET_CLASS (cpu);CPUNios2State *env = &cpu->env;@@ -51,7 +51,7 @@ static void nios2_cpu_reset(CPUState *cs)log_cpu_state (cs,0 ); } - ncc->parent_reset (cs); + ncc->parent_reset (dev);memset (env->regs,0 ,sizeof (uint32_t ) *NUM_CORE_REGS ); env->regs[R_PC ] = cpu->reset_addr;@@ -188,7 +188,7 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, nios2_cpu_realizefn, &ncc->parent_realize);device_class_set_props (dc, nios2_properties); -cpu_class_set_parent_reset (cc, nios2_cpu_reset, &ncc->parent_reset); +device_class_set_parent_reset (dc, nios2_cpu_reset, &ncc->parent_reset); cc->class_by_name = nios2_cpu_class_by_name; cc->has_work = nios2_cpu_has_work;target/openrisc/cpu.c +4
-4@@ -41,13 +41,13 @@ static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_or1k; } -/* CPUClass::reset() */ -static void openrisc_cpu_reset (CPUState *s) +static void openrisc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);OpenRISCCPU *cpu =OPENRISC_CPU (s);OpenRISCCPUClass *occ =OPENRISC_CPU_GET_CLASS (cpu); - occ->parent_reset (s); + occ->parent_reset (dev);memset (&cpu->env,0 , offsetof(CPUOpenRISCState , end_reset_fields));@@ -150,7 +150,7 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, openrisc_cpu_realizefn, &occ->parent_realize); -cpu_class_set_parent_reset (cc, openrisc_cpu_reset, &occ->parent_reset); +device_class_set_parent_reset (dc, openrisc_cpu_reset, &occ->parent_reset); cc->class_by_name = openrisc_cpu_class_by_name; cc->has_work = openrisc_cpu_has_work;target/ppc/translate_init.inc.c +4
-4@@ -10669,16 +10669,16 @@ static bool ppc_cpu_has_work(CPUState *cs)return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } -/* CPUClass::reset() */ -static void ppc_cpu_reset (CPUState *s) +static void ppc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);PowerPCCPU *cpu =POWERPC_CPU (s);PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu);CPUPPCState *env = &cpu->env;target_ulong msr;int i; - pcc->parent_reset (s); + pcc->parent_reset (dev); msr = (target_ulong )0 ; msr |= (target_ulong )MSR_HVB ;@@ -10885,7 +10885,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_always;device_class_set_props (dc, ppc_cpu_properties); -cpu_class_set_parent_reset (cc, ppc_cpu_reset, &pcc->parent_reset); +device_class_set_parent_reset (dc, ppc_cpu_reset, &pcc->parent_reset); cc->class_by_name = ppc_cpu_class_by_name; pcc->parent_parse_features = cc->parse_features;target/riscv/cpu.c +4
-3@@ -286,13 +286,14 @@ void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, env->pc = data[0 ]; } -static void riscv_cpu_reset (CPUState *cs) +static void riscv_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);RISCVCPU *cpu =RISCV_CPU (cs);RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (cpu);CPURISCVState *env = &cpu->env; - mcc->parent_reset (cs); + mcc->parent_reset (dev);#ifndef CONFIG_USER_ONLY env->priv =PRV_M ; env->mstatus &= ~(MSTATUS_MIE |MSTATUS_MPRV );@@ -462,7 +463,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, riscv_cpu_realize, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, riscv_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, riscv_cpu_reset, &mcc->parent_reset); cc->class_by_name = riscv_cpu_class_by_name; cc->has_work = riscv_cpu_has_work;target/s390x/cpu.c +5
-3@@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; +DeviceState *dev =DEVICE (s); - scc->parent_reset (s); + scc->parent_reset (dev); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu);@@ -450,8 +451,9 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; -static void s390_cpu_reset_full (CPUState *s) +static void s390_cpu_reset_full (DeviceState *dev) { +CPUState *s =CPU (dev);return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }@@ -466,7 +468,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, s390x_cpu_properties); dc->user_creatable = true; -cpu_class_set_parent_reset (cc, s390_cpu_reset_full, &scc->parent_reset); +device_class_set_parent_reset (dc, s390_cpu_reset_full, &scc->parent_reset);#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif target/sh4/cpu.c +4
-4@@ -47,14 +47,14 @@ static bool superh_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void superh_cpu_reset (CPUState *s) +static void superh_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SuperHCPU *cpu =SUPERH_CPU (s);SuperHCPUClass *scc =SUPERH_CPU_GET_CLASS (cpu);CPUSH4State *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSH4State , end_reset_fields));@@ -214,7 +214,7 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, superh_cpu_realizefn, &scc->parent_realize); -cpu_class_set_parent_reset (cc, superh_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, superh_cpu_reset, &scc->parent_reset); cc->class_by_name = superh_cpu_class_by_name; cc->has_work = superh_cpu_has_work;target/sparc/cpu.c +4
-4@@ -28,14 +28,14 @@//#define DEBUG_FEATURES -/* CPUClass::reset() */ -static void sparc_cpu_reset (CPUState *s) +static void sparc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SPARCCPU *cpu =SPARC_CPU (s);SPARCCPUClass *scc =SPARC_CPU_GET_CLASS (cpu);CPUSPARCState *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSPARCState , end_reset_fields)); env->cwp =0 ;@@ -859,7 +859,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_realize);device_class_set_props (dc, sparc_cpu_properties); -cpu_class_set_parent_reset (cc, sparc_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, sparc_cpu_reset, &scc->parent_reset); cc->class_by_name = sparc_cpu_class_by_name; cc->parse_features = sparc_cpu_parse_features;target/tilegx/cpu.c +4
-3@@ -68,13 +68,14 @@ static bool tilegx_cpu_has_work(CPUState *cs)return true; } -static void tilegx_cpu_reset (CPUState *s) +static void tilegx_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TileGXCPU *cpu =TILEGX_CPU (s);TileGXCPUClass *tcc =TILEGX_CPU_GET_CLASS (cpu);CPUTLGState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);memset (env,0 , offsetof(CPUTLGState , end_reset_fields)); }@@ -142,7 +143,7 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, tilegx_cpu_realizefn, &tcc->parent_realize); -cpu_class_set_parent_reset (cc, tilegx_cpu_reset, &tcc->parent_reset); +device_class_set_parent_reset (dc, tilegx_cpu_reset, &tcc->parent_reset); cc->class_by_name = tilegx_cpu_class_by_name; cc->has_work = tilegx_cpu_has_work;target/tricore/cpu.c +4
-3@@ -53,13 +53,14 @@ static void tricore_cpu_synchronize_from_tb(CPUState *cs, env->PC = tb->pc; } -static void tricore_cpu_reset (CPUState *s) +static void tricore_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TriCoreCPU *cpu =TRICORE_CPU (s);TriCoreCPUClass *tcc =TRICORE_CPU_GET_CLASS (cpu);CPUTriCoreState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);cpu_state_reset (env); }@@ -153,7 +154,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, tricore_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, tricore_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, tricore_cpu_reset, &mcc->parent_reset); cc->class_by_name = tricore_cpu_class_by_name; cc->has_work = tricore_cpu_has_work;target/xtensa/cpu.c +4
-4@@ -67,14 +67,14 @@ bool xtensa_abi_call0(void) }#endif -/* CPUClass::reset() */ -static void xtensa_cpu_reset (CPUState *s) +static void xtensa_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);XtensaCPU *cpu =XTENSA_CPU (s);XtensaCPUClass *xcc =XTENSA_CPU_GET_CLASS (cpu);CPUXtensaState *env = &cpu->env; - xcc->parent_reset (s); + xcc->parent_reset (dev); env->exception_taken =0 ; env->pc = env->config->exception_vector[EXC_RESET0 + env->static_vectors];@@ -184,7 +184,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, xtensa_cpu_realizefn, &xcc->parent_realize); -cpu_class_set_parent_reset (cc, xtensa_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, xtensa_cpu_reset, &xcc->parent_reset); cc->class_by_name = xtensa_cpu_class_by_name; cc->has_work = xtensa_cpu_has_work;scripts/coccinelle/cpu-reset.cocci new file +47
-0@@ -0,0 +1,47 @@ +// Convert targets using the old CPUState reset to DeviceState reset +// +// Copyright Linaro Ltd 2020 +// This work is licensed under the terms of the GNU GPLv2 or later. +// +// spatch --macro-file scripts/cocci-macro-file.h \ +// --sp-file scripts/coccinelle/cpu-reset.cocci \ +// --keep-comments --smpl-spacing --in-place --include-headers --dir target +// +// For simplicity we assume some things about the code we're modifying +// that happen to be true for all our targets: +// * all cpu_class_set_parent_reset() callsites have a 'DeviceClass *dc' local +// * the parent reset field in the target CPU class is 'parent_reset' +// * no reset function already has a 'dev' local + +@@ +identifier cpu, x; +typedef CPUState; +@@ +struct x { +... +- void (*parent_reset)(CPUState *cpu); ++ DeviceReset parent_reset; +... +}; +@ rule1 @ +identifier resetfn; +expression resetfield; +identifier cc; +@@ +- cpu_class_set_parent_reset(cc, resetfn, resetfield) ++ device_class_set_parent_reset(dc, resetfn, resetfield) +@@ +identifier rule1.resetfn; +identifier cpu, cc; +typedef CPUState, DeviceState; +@@ +-resetfn(CPUState *cpu) +-{ ++resetfn(DeviceState *dev) ++{ ++ CPUState *cpu = CPU(dev); +<... +- cc->parent_reset(cpu); ++ cc->parent_reset(dev); +...> +}
Quoted 60 lines · Philippe Mathieu-Daudé
Quoted 45 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit from TYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);Signed-off-by Peter Maydell <[email protected]>Quoted 8 lines
---
Testing was by 'make check' and 'make check-acceptance'.I need this patch as a preliminary to some arm stuff I'm doing, but I think it makes sense as a cleanup in its own right so I'm sending it out early for review. If it's not yet in master before I get round to finishing the stuff that depends on it I'll resend it as part of that series.
Nice cleanup, thanks.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
[...]
Quoted 41 lines
Quoted 41 lines
scripts/coccinelle/cpu-reset.cocci new file +12
-1@@ -0,0 +1,47 @@ +// Convert targets using the old CPUState reset to DeviceState reset +// +// Copyright Linaro Ltd 2020 +// This work is licensed under the terms of the GNU GPLv2 or later. +// +// spatch --macro-file scripts/cocci-macro-file.h \ +// --sp-file scripts/coccinelle/cpu-reset.cocci \ +// --keep-comments --smpl-spacing --in-place --include-headers --dir target +// +// For simplicity we assume some things about the code we're modifying +// that happen to be true for all our targets: +// * all cpu_class_set_parent_reset() callsites have a 'DeviceClass*dc' local
scripts/coccinelle/cpu-reset.cocci new file +21
-0+// * the parent reset field in the target CPU class is 'parent_reset' +// * no reset function already has a 'dev' local + +@@ +identifier cpu, x; +typedef CPUState; +@@ +struct x { +... +- void (*parent_reset)(CPUState *cpu); ++ DeviceReset parent_reset; +... +}; +@ rule1 @ +identifier resetfn; +expression resetfield; +identifier cc; +@@ +- cpu_class_set_parent_reset(cc, resetfn, resetfield) ++ device_class_set_parent_reset(dc, resetfn, resetfield) +@@
Quoted 8 lines
scripts/coccinelle/cpu-reset.cocci line 41
Quoted 8 lines
scripts/coccinelle/cpu-reset.cocci new file +8
-0+identifier rule1.resetfn; +identifier cpu, cc; +typedef CPUState, DeviceState; +@@ +-resetfn(CPUState *cpu) +-{ ++resetfn(DeviceState *dev) ++{
Nitpick: you don't need to include the bracket symbol in the diff:
@@
-resetfn(CPUState *cpu)
+resetfn(DeviceState *dev)
{(simply indent it with a space).
Quoted 8 lines
Quoted 7 lines
++ CPUState *cpu = CPU(dev);
+<...
+-cc->parent_reset(cpu);
++cc->parent_reset(dev);
+...>
+}
Quoted 8 lines · Philippe Mathieu-Daudé
Nitpick: you don't need to include the bracket symbol in the diff:
@@ -resetfn(CPUState *cpu) +resetfn(DeviceState *dev) {(simply indent it with a space).
I think this was probably leftover from trying to get Coccinelle to not rewrap the '{' onto the previous line, before I found --smpl-spacing.
In general I don't find it terribly useful to spend a great deal of time streamlining Coccinelle scripts -- I think they are basically one-shot uses almost all of the time, so once they're producing the right changes I prefer to move on.
thanks
-- PMM
Quoted 10 lines · Peter Maydell
Quoted 8 lines · Philippe Mathieu-Daudé
Nitpick: you don't need to include the bracket symbol in the diff:
@@ -resetfn(CPUState *cpu) +resetfn(DeviceState *dev) {(simply indent it with a space).
Quoted 8 lines
I think this was probably leftover from trying to get Coccinelle to not rewrap the '{' onto the previous line, before I found --smpl-spacing.
In general I don't find it terribly useful to spend a great deal of time streamlining Coccinelle scripts -- I think they are basically one-shot uses almost all of the time, so once they're producing the right changes I prefer to move on.
I agree in this case it is not useful to add the script to the repository as a file, because the cleanup is done (as you said, 'one-shot script'). The script is however valuable as in the commit description.
Cleaning it up is not for performance, but as the script is buried into the git repository, it can (and will) be used as reference/example by other developers.
Anyway this patch is queued now, so let's move on :)
Quoted 48 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit fromTYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);Signed-off-by Peter Maydell <[email protected]>---
Testing was by 'make check' and 'make check-acceptance'.
Quoted 6 lines
I need this patch as a preliminary to some arm stuff I'm doing, but I think it makes sense as a cleanup in its own right so I'm sending it out early for review. If it's not yet in master before I get round to finishing the stuff that depends on it I'll resend it as part of that series.
---
r~
Quoted 44 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit fromTYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
Quoted 1 line
Signed-off-by Peter Maydell <[email protected]>
Queued, thanks.
However, if you want to do additional arch-specific work on top of this patch, feel free to merge it through your tree.
Signature · 1 line
Eduardo
Quoted 44 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit fromTYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
Quoted 1 line
Signed-off-by Peter Maydell <[email protected]>
ppc parts
Quoted 1,016 lines
---
Testing was by 'make check' and 'make check-acceptance'.I need this patch as a preliminary to some arm stuff I'm doing, but I think it makes sense as a cleanup in its own right so I'm sending it out early for review. If it's not yet in master before I get round to finishing the stuff that depends on it I'll resend it as part of that series.
--- include/hw/core/cpu.h | 6 ---- target/alpha/cpu-qom.h | 2 +- target/arm/cpu-qom.h | 2 +- target/cris/cpu-qom.h | 2 +- target/hppa/cpu-qom.h | 2 +- target/i386/cpu-qom.h | 2 +- target/lm32/cpu-qom.h | 2 +- target/m68k/cpu-qom.h | 2 +- target/microblaze/cpu-qom.h | 2 +- target/mips/cpu-qom.h | 2 +- target/moxie/cpu.h | 2 +- target/nios2/cpu.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/riscv/cpu.h | 2 +- target/s390x/cpu-qom.h | 2 +- target/sh4/cpu-qom.h | 2 +- target/sparc/cpu-qom.h | 2 +- target/tilegx/cpu.h | 2 +- target/tricore/cpu-qom.h | 2 +- target/xtensa/cpu-qom.h | 2 +- hw/core/cpu.c | 19 +++--------- target/arm/cpu.c | 8 ++--- target/cris/cpu.c | 8 ++--- target/i386/cpu.c | 8 ++--- target/lm32/cpu.c | 8 ++--- target/m68k/cpu.c | 8 ++--- target/microblaze/cpu.c | 8 ++--- target/mips/cpu.c | 8 ++--- target/moxie/cpu.c | 7 +++-- target/nios2/cpu.c | 8 ++--- target/openrisc/cpu.c | 8 ++--- target/ppc/translate_init.inc.c | 8 ++--- target/riscv/cpu.c | 7 +++-- target/s390x/cpu.c | 8 +++-- target/sh4/cpu.c | 8 ++--- target/sparc/cpu.c | 8 ++--- target/tilegx/cpu.c | 7 +++-- target/tricore/cpu.c | 7 +++-- target/xtensa/cpu.c | 8 ++--- scripts/coccinelle/cpu-reset.cocci | 47 ++++++++++++++++++++++++++++++ 41 files changed, 144 insertions(+), 108 deletions(-) create mode 100644 scripts/coccinelle/cpu-reset.cocciinclude/hw/core/cpu.h +0
-6@@ -79,7 +79,6 @@ struct TranslationBlock;* @class_by_name: Callback to map -cpu command line model name to an * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. -* @reset: Callback to reset the #CPUState to its initial state. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @has_work: Callback for checking if there is work to do. * @do_interrupt: Callback for interrupt handling. @@ -165,7 +164,6 @@ typedef struct CPUClass {ObjectClass *(*class_by_name)(const char *cpu_model);void (*parse_features)(const char *typename,char *str,Error **errp); -void (*reset)(CPUState *cpu);int reset_dump_flags;bool (*has_work)(CPUState *cpu);void (*do_interrupt)(CPUState *cpu);@@ -1135,10 +1133,6 @@ void cpu_exec_unrealizefn(CPUState *cpu);*/ bool target_words_bigendian (void ); -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)); -#ifdef NEED_CPU_H #ifdef CONFIG_SOFTMMU target/alpha/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct AlphaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } AlphaCPUClass;typedef struct AlphaCPU AlphaCPU ;target/arm/cpu-qom.h +1
-1@@ -51,7 +51,7 @@ typedef struct ARMCPUClass {const ARMCPUInfo *info;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } ARMCPUClass;typedef struct ARMCPU ARMCPU ;target/cris/cpu-qom.h +1
-1@@ -45,7 +45,7 @@ typedef struct CRISCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t vr; } CRISCPUClass;target/hppa/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct HPPACPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } HPPACPUClass;typedef struct HPPACPU HPPACPU ;target/i386/cpu-qom.h +1
-1@@ -71,7 +71,7 @@ typedef struct X86CPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } X86CPUClass;typedef struct X86CPU X86CPU ;target/lm32/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct LM32CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } LM32CPUClass;typedef struct LM32CPU LM32CPU ;target/m68k/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct M68kCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } M68kCPUClass;typedef struct M68kCPU M68kCPU ;target/microblaze/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct MicroBlazeCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MicroBlazeCPUClass;typedef struct MicroBlazeCPU MicroBlazeCPU ;target/mips/cpu-qom.h +1
-1@@ -48,7 +48,7 @@ typedef struct MIPSCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const struct mips_def_t *cpu_def; } MIPSCPUClass;target/moxie/cpu.h +1
-1@@ -69,7 +69,7 @@ typedef struct MoxieCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MoxieCPUClass;/** target/nios2/cpu.h +1
-1@@ -50,7 +50,7 @@ typedef struct Nios2CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } Nios2CPUClass;#define TARGET_HAS_ICE 1target/openrisc/cpu.h +1
-1@@ -48,7 +48,7 @@ typedef struct OpenRISCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } OpenRISCCPUClass;#define TARGET_INSN_START_EXTRA_WORDS 1target/ppc/cpu-qom.h +1
-1@@ -166,7 +166,7 @@ typedef struct PowerPCCPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*parent_parse_features)(const char *type,char *str,Error **errp);uint32_t pvr;target/riscv/cpu.h +1
-1@@ -185,7 +185,7 @@ typedef struct RISCVCPUClass {CPUClass parent_class;/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } RISCVCPUClass;/** target/s390x/cpu-qom.h +1
-1@@ -61,7 +61,7 @@ typedef struct S390CPUClass {const char *desc;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*load_normal)(CPUState *cpu);void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;target/sh4/cpu-qom.h +1
-1@@ -51,7 +51,7 @@ typedef struct SuperHCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t pvr;uint32_t prr;target/sparc/cpu-qom.h +1
-1@@ -49,7 +49,7 @@ typedef struct SPARCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;sparc_def_t *cpu_def; } SPARCCPUClass;target/tilegx/cpu.h +1
-1@@ -118,7 +118,7 @@ typedef struct TileGXCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TileGXCPUClass;/** target/tricore/cpu-qom.h +1
-1@@ -36,7 +36,7 @@ typedef struct TriCoreCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TriCoreCPUClass;typedef struct TriCoreCPU TriCoreCPU ;target/xtensa/cpu-qom.h +1
-1@@ -56,7 +56,7 @@ typedef struct XtensaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const XtensaConfig *config; } XtensaCPUClass;hw/core/cpu.c +4
-15@@ -239,27 +239,16 @@ void cpu_dump_statistics(CPUState *cpu, int flags) } } -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)) -{ - *parent_reset = cc->reset; - cc->reset = child_reset; -} -void cpu_reset (CPUState *cpu) { -CPUClass *klass =CPU_GET_CLASS (cpu); - -if (klass->reset !=NULL ) { - (*klass->reset)(cpu); - } +device_cold_reset (DEVICE (cpu));trace_guest_cpu_reset (cpu); } -static void cpu_common_reset (CPUState *cpu) +static void cpu_common_reset (DeviceState *dev) { +CPUState *cpu =CPU (dev);CPUClass *cc =CPU_GET_CLASS (cpu);if (qemu_loglevel_mask (CPU_LOG_RESET )) {@@ -419,7 +408,6 @@ static void cpu_class_init(ObjectClass *klass, void *data)CPUClass *k =CPU_CLASS (klass); k->parse_features = cpu_common_parse_features; - k->reset = cpu_common_reset; k->get_arch_id = cpu_common_get_arch_id; k->has_work = cpu_common_has_work; k->get_paging_enabled = cpu_common_get_paging_enabled;@@ -440,6 +428,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_CPU , dc->categories); dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; + dc->reset = cpu_common_reset;device_class_set_props (dc, cpu_common_props);/* * Reason: CPUs still need special care by board code: wiring up target/arm/cpu.c +4
-4@@ -155,14 +155,14 @@ static void cp_reg_check_reset(gpointer key, gpointer value, gpointer opaque)assert (oldvalue == newvalue); } -/* CPUClass::reset() */ -static void arm_cpu_reset (CPUState *s) +static void arm_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);ARMCPU *cpu =ARM_CPU (s);ARMCPUClass *acc =ARM_CPU_GET_CLASS (cpu);CPUARMState *env = &cpu->env; - acc->parent_reset (s); + acc->parent_reset (dev);memset (env,0 , offsetof(CPUARMState , end_reset_fields));@@ -2804,7 +2804,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize);device_class_set_props (dc, arm_cpu_properties); -cpu_class_set_parent_reset (cc, arm_cpu_reset, &acc->parent_reset); +device_class_set_parent_reset (dc, arm_cpu_reset, &acc->parent_reset); cc->class_by_name = arm_cpu_class_by_name; cc->has_work = arm_cpu_has_work;target/cris/cpu.c +4
-4@@ -40,15 +40,15 @@ static bool cris_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void cris_cpu_reset (CPUState *s) +static void cris_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);CRISCPU *cpu =CRIS_CPU (s);CRISCPUClass *ccc =CRIS_CPU_GET_CLASS (cpu);CPUCRISState *env = &cpu->env;uint32_t vr; - ccc->parent_reset (s); + ccc->parent_reset (dev); vr = env->pregs[PR_VR ];memset (env,0 , offsetof(CPUCRISState , end_reset_fields));@@ -264,7 +264,7 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, cris_cpu_realizefn, &ccc->parent_realize); -cpu_class_set_parent_reset (cc, cris_cpu_reset, &ccc->parent_reset); +device_class_set_parent_reset (dc, cris_cpu_reset, &ccc->parent_reset); cc->class_by_name = cris_cpu_class_by_name; cc->has_work = cris_cpu_has_work;target/i386/cpu.c +4
-4@@ -5855,9 +5855,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, } } -/* CPUClass::reset() */ -static void x86_cpu_reset (CPUState *s) +static void x86_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);X86CPU *cpu =X86_CPU (s);X86CPUClass *xcc =X86_CPU_GET_CLASS (cpu);CPUX86State *env = &cpu->env;@@ -5865,7 +5865,7 @@ static void x86_cpu_reset(CPUState *s)uint64_t xcr0;int i; - xcc->parent_reset (s); + xcc->parent_reset (dev);memset (env,0 , offsetof(CPUX86State , end_reset_fields));@@ -7169,7 +7169,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) &xcc->parent_unrealize);device_class_set_props (dc, x86_cpu_properties); -cpu_class_set_parent_reset (cc, x86_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, x86_cpu_reset, &xcc->parent_reset); cc->reset_dump_flags =CPU_DUMP_FPU |CPU_DUMP_CCOP ; cc->class_by_name = x86_cpu_class_by_name;target/lm32/cpu.c +4
-4@@ -99,14 +99,14 @@ static bool lm32_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void lm32_cpu_reset (CPUState *s) +static void lm32_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);LM32CPU *cpu =LM32_CPU (s);LM32CPUClass *lcc =LM32_CPU_GET_CLASS (cpu);CPULM32State *env = &cpu->env; - lcc->parent_reset (s); + lcc->parent_reset (dev);/* reset cpu state */ memset (env,0 , offsetof(CPULM32State , end_reset_fields));@@ -218,7 +218,7 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, lm32_cpu_realizefn, &lcc->parent_realize); -cpu_class_set_parent_reset (cc, lm32_cpu_reset, &lcc->parent_reset); +device_class_set_parent_reset (dc, lm32_cpu_reset, &lcc->parent_reset); cc->class_by_name = lm32_cpu_class_by_name; cc->has_work = lm32_cpu_has_work;target/m68k/cpu.c +4
-4@@ -41,16 +41,16 @@ static void m68k_set_feature(CPUM68KState *env, int feature) env->features |= (1u << feature); } -/* CPUClass::reset() */ -static void m68k_cpu_reset (CPUState *s) +static void m68k_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);M68kCPU *cpu =M68K_CPU (s);M68kCPUClass *mcc =M68K_CPU_GET_CLASS (cpu);CPUM68KState *env = &cpu->env;floatx80 nan =floatx80_default_nan (NULL );int i; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUM68KState , end_reset_fields));#ifdef CONFIG_SOFTMMU @@ -273,7 +273,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, m68k_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, m68k_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, m68k_cpu_reset, &mcc->parent_reset); cc->class_by_name = m68k_cpu_class_by_name; cc->has_work = m68k_cpu_has_work;target/microblaze/cpu.c +4
-4@@ -102,14 +102,14 @@ static void microblaze_cpu_set_irq(void *opaque, int irq, int level) }#endif -/* CPUClass::reset() */ -static void mb_cpu_reset (CPUState *s) +static void mb_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MicroBlazeCPU *cpu =MICROBLAZE_CPU (s);MicroBlazeCPUClass *mcc =MICROBLAZE_CPU_GET_CLASS (cpu);CPUMBState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMBState , end_reset_fields)); env->res_addr =RES_ADDR_NONE ;@@ -292,7 +292,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, mb_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mb_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mb_cpu_reset, &mcc->parent_reset); cc->class_by_name = mb_cpu_class_by_name; cc->has_work = mb_cpu_has_work;target/mips/cpu.c +4
-4@@ -96,14 +96,14 @@ static bool mips_cpu_has_work(CPUState *cs)return has_work; } -/* CPUClass::reset() */ -static void mips_cpu_reset (CPUState *s) +static void mips_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MIPSCPU *cpu =MIPS_CPU (s);MIPSCPUClass *mcc =MIPS_CPU_GET_CLASS (cpu);CPUMIPSState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMIPSState , end_reset_fields));@@ -189,7 +189,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, mips_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mips_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mips_cpu_reset, &mcc->parent_reset); cc->class_by_name = mips_cpu_class_by_name; cc->has_work = mips_cpu_has_work;target/moxie/cpu.c +4
-3@@ -35,13 +35,14 @@ static bool moxie_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -static void moxie_cpu_reset (CPUState *s) +static void moxie_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MoxieCPU *cpu =MOXIE_CPU (s);MoxieCPUClass *mcc =MOXIE_CPU_GET_CLASS (cpu);CPUMoxieState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMoxieState , end_reset_fields)); env->pc =0x1000 ;@@ -101,7 +102,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, moxie_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, moxie_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, moxie_cpu_reset, &mcc->parent_reset); cc->class_by_name = moxie_cpu_class_by_name;target/nios2/cpu.c +4
-4@@ -39,9 +39,9 @@ static bool nios2_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void nios2_cpu_reset (CPUState *cs) +static void nios2_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);Nios2CPU *cpu =NIOS2_CPU (cs);Nios2CPUClass *ncc =NIOS2_CPU_GET_CLASS (cpu);CPUNios2State *env = &cpu->env;@@ -51,7 +51,7 @@ static void nios2_cpu_reset(CPUState *cs)log_cpu_state (cs,0 ); } - ncc->parent_reset (cs); + ncc->parent_reset (dev);memset (env->regs,0 ,sizeof (uint32_t ) *NUM_CORE_REGS ); env->regs[R_PC ] = cpu->reset_addr;@@ -188,7 +188,7 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, nios2_cpu_realizefn, &ncc->parent_realize);device_class_set_props (dc, nios2_properties); -cpu_class_set_parent_reset (cc, nios2_cpu_reset, &ncc->parent_reset); +device_class_set_parent_reset (dc, nios2_cpu_reset, &ncc->parent_reset); cc->class_by_name = nios2_cpu_class_by_name; cc->has_work = nios2_cpu_has_work;target/openrisc/cpu.c +4
-4@@ -41,13 +41,13 @@ static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_or1k; } -/* CPUClass::reset() */ -static void openrisc_cpu_reset (CPUState *s) +static void openrisc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);OpenRISCCPU *cpu =OPENRISC_CPU (s);OpenRISCCPUClass *occ =OPENRISC_CPU_GET_CLASS (cpu); - occ->parent_reset (s); + occ->parent_reset (dev);memset (&cpu->env,0 , offsetof(CPUOpenRISCState , end_reset_fields));@@ -150,7 +150,7 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, openrisc_cpu_realizefn, &occ->parent_realize); -cpu_class_set_parent_reset (cc, openrisc_cpu_reset, &occ->parent_reset); +device_class_set_parent_reset (dc, openrisc_cpu_reset, &occ->parent_reset); cc->class_by_name = openrisc_cpu_class_by_name; cc->has_work = openrisc_cpu_has_work;target/ppc/translate_init.inc.c +4
-4@@ -10669,16 +10669,16 @@ static bool ppc_cpu_has_work(CPUState *cs)return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } -/* CPUClass::reset() */ -static void ppc_cpu_reset (CPUState *s) +static void ppc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);PowerPCCPU *cpu =POWERPC_CPU (s);PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu);CPUPPCState *env = &cpu->env;target_ulong msr;int i; - pcc->parent_reset (s); + pcc->parent_reset (dev); msr = (target_ulong )0 ; msr |= (target_ulong )MSR_HVB ;@@ -10885,7 +10885,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_always;device_class_set_props (dc, ppc_cpu_properties); -cpu_class_set_parent_reset (cc, ppc_cpu_reset, &pcc->parent_reset); +device_class_set_parent_reset (dc, ppc_cpu_reset, &pcc->parent_reset); cc->class_by_name = ppc_cpu_class_by_name; pcc->parent_parse_features = cc->parse_features;target/riscv/cpu.c +4
-3@@ -286,13 +286,14 @@ void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, env->pc = data[0 ]; } -static void riscv_cpu_reset (CPUState *cs) +static void riscv_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);RISCVCPU *cpu =RISCV_CPU (cs);RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (cpu);CPURISCVState *env = &cpu->env; - mcc->parent_reset (cs); + mcc->parent_reset (dev);#ifndef CONFIG_USER_ONLY env->priv =PRV_M ; env->mstatus &= ~(MSTATUS_MIE |MSTATUS_MPRV );@@ -462,7 +463,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, riscv_cpu_realize, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, riscv_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, riscv_cpu_reset, &mcc->parent_reset); cc->class_by_name = riscv_cpu_class_by_name; cc->has_work = riscv_cpu_has_work;target/s390x/cpu.c +5
-3@@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; +DeviceState *dev =DEVICE (s); - scc->parent_reset (s); + scc->parent_reset (dev); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu);@@ -450,8 +451,9 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; -static void s390_cpu_reset_full (CPUState *s) +static void s390_cpu_reset_full (DeviceState *dev) { +CPUState *s =CPU (dev);return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }@@ -466,7 +468,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, s390x_cpu_properties); dc->user_creatable = true; -cpu_class_set_parent_reset (cc, s390_cpu_reset_full, &scc->parent_reset); +device_class_set_parent_reset (dc, s390_cpu_reset_full, &scc->parent_reset);#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif target/sh4/cpu.c +4
-4@@ -47,14 +47,14 @@ static bool superh_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void superh_cpu_reset (CPUState *s) +static void superh_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SuperHCPU *cpu =SUPERH_CPU (s);SuperHCPUClass *scc =SUPERH_CPU_GET_CLASS (cpu);CPUSH4State *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSH4State , end_reset_fields));@@ -214,7 +214,7 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, superh_cpu_realizefn, &scc->parent_realize); -cpu_class_set_parent_reset (cc, superh_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, superh_cpu_reset, &scc->parent_reset); cc->class_by_name = superh_cpu_class_by_name; cc->has_work = superh_cpu_has_work;target/sparc/cpu.c +4
-4@@ -28,14 +28,14 @@//#define DEBUG_FEATURES -/* CPUClass::reset() */ -static void sparc_cpu_reset (CPUState *s) +static void sparc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SPARCCPU *cpu =SPARC_CPU (s);SPARCCPUClass *scc =SPARC_CPU_GET_CLASS (cpu);CPUSPARCState *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSPARCState , end_reset_fields)); env->cwp =0 ;@@ -859,7 +859,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_realize);device_class_set_props (dc, sparc_cpu_properties); -cpu_class_set_parent_reset (cc, sparc_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, sparc_cpu_reset, &scc->parent_reset); cc->class_by_name = sparc_cpu_class_by_name; cc->parse_features = sparc_cpu_parse_features;target/tilegx/cpu.c +4
-3@@ -68,13 +68,14 @@ static bool tilegx_cpu_has_work(CPUState *cs)return true; } -static void tilegx_cpu_reset (CPUState *s) +static void tilegx_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TileGXCPU *cpu =TILEGX_CPU (s);TileGXCPUClass *tcc =TILEGX_CPU_GET_CLASS (cpu);CPUTLGState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);memset (env,0 , offsetof(CPUTLGState , end_reset_fields)); }@@ -142,7 +143,7 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, tilegx_cpu_realizefn, &tcc->parent_realize); -cpu_class_set_parent_reset (cc, tilegx_cpu_reset, &tcc->parent_reset); +device_class_set_parent_reset (dc, tilegx_cpu_reset, &tcc->parent_reset); cc->class_by_name = tilegx_cpu_class_by_name; cc->has_work = tilegx_cpu_has_work;target/tricore/cpu.c +4
-3@@ -53,13 +53,14 @@ static void tricore_cpu_synchronize_from_tb(CPUState *cs, env->PC = tb->pc; } -static void tricore_cpu_reset (CPUState *s) +static void tricore_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TriCoreCPU *cpu =TRICORE_CPU (s);TriCoreCPUClass *tcc =TRICORE_CPU_GET_CLASS (cpu);CPUTriCoreState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);cpu_state_reset (env); }@@ -153,7 +154,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, tricore_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, tricore_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, tricore_cpu_reset, &mcc->parent_reset); cc->class_by_name = tricore_cpu_class_by_name; cc->has_work = tricore_cpu_has_work;target/xtensa/cpu.c +4
-4@@ -67,14 +67,14 @@ bool xtensa_abi_call0(void) }#endif -/* CPUClass::reset() */ -static void xtensa_cpu_reset (CPUState *s) +static void xtensa_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);XtensaCPU *cpu =XTENSA_CPU (s);XtensaCPUClass *xcc =XTENSA_CPU_GET_CLASS (cpu);CPUXtensaState *env = &cpu->env; - xcc->parent_reset (s); + xcc->parent_reset (dev); env->exception_taken =0 ; env->pc = env->config->exception_vector[EXC_RESET0 + env->static_vectors];@@ -184,7 +184,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, xtensa_cpu_realizefn, &xcc->parent_realize); -cpu_class_set_parent_reset (cc, xtensa_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, xtensa_cpu_reset, &xcc->parent_reset); cc->class_by_name = xtensa_cpu_class_by_name; cc->has_work = xtensa_cpu_has_work;scripts/coccinelle/cpu-reset.cocci new file +47
-0@@ -0,0 +1,47 @@ +// Convert targets using the old CPUState reset to DeviceState reset +// +// Copyright Linaro Ltd 2020 +// This work is licensed under the terms of the GNU GPLv2 or later. +// +// spatch --macro-file scripts/cocci-macro-file.h \ +// --sp-file scripts/coccinelle/cpu-reset.cocci \ +// --keep-comments --smpl-spacing --in-place --include-headers --dir target +// +// For simplicity we assume some things about the code we're modifying +// that happen to be true for all our targets: +// * all cpu_class_set_parent_reset() callsites have a 'DeviceClass *dc' local +// * the parent reset field in the target CPU class is 'parent_reset' +// * no reset function already has a 'dev' local + +@@ +identifier cpu, x; +typedef CPUState; +@@ +struct x { +... +- void (*parent_reset)(CPUState *cpu); ++ DeviceReset parent_reset; +... +}; +@ rule1 @ +identifier resetfn; +expression resetfield; +identifier cc; +@@ +- cpu_class_set_parent_reset(cc, resetfn, resetfield) ++ device_class_set_parent_reset(dc, resetfn, resetfield) +@@ +identifier rule1.resetfn; +identifier cpu, cc; +typedef CPUState, DeviceState; +@@ +-resetfn(CPUState *cpu) +-{ ++resetfn(DeviceState *dev) ++{ ++ CPUState *cpu = CPU(dev); +<... +- cc->parent_reset(cpu); ++ cc->parent_reset(dev); +...> +}
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 33 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit fromTYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:
Quoted 11 lines
| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
s390 parts look sane.
ping?
Quoted 1,062 lines · Peter Maydell
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPUused not to inherit fromTYPE_DEVICE. We don't need it any more, as we can simply use theTYPE_DEVICEreset. The 'cpu_reset()' function is kept as the API which most places use to reset a CPU; it is now a wrapper which callsdevice_cold_reset()and then the tracepoint function.This change should not cause CPU objects to be reset more often than they are at the moment, because:
* nobody is directly callingdevice_cold_reset()orqdev_reset_all()on CPU objects
* no CPU object is on a qbus, so they will not be reset either by somebody calling qbus_reset_all()/bus_cold_reset(), or by the main "reset sysbus and everything in the qbus tree" reset that most devices are reset byNote that this does not change the need for each machine or whatever to use
qemu_register_reset()to arrange to callcpu_reset()-- that is necessary because CPU objects are not on any qbus, so they don't get reset when the qbus tree rooted at the sysbus bus is reset, and this isn't being changed here.All the changes to the files under target/ were made using the included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful "
CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c(2) this bit of the s390 change was done by hand, because the Coccinelle script is not sophisticated enough to handle the
parent_resetcall being inside another function:| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) | S390CPU *cpu = S390_CPU(s); | S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); | CPUS390XState *env = &cpu->env; |+ DeviceState *dev = DEVICE(s); | |- scc->parent_reset(s); |+ scc->parent_reset(dev); | cpu->env.sigp_order = 0; | s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);Signed-off-by Peter Maydell <[email protected]>---
Testing was by 'make check' and 'make check-acceptance'.I need this patch as a preliminary to some arm stuff I'm doing, but I think it makes sense as a cleanup in its own right so I'm sending it out early for review. If it's not yet in master before I get round to finishing the stuff that depends on it I'll resend it as part of that series.
--- include/hw/core/cpu.h | 6 ---- target/alpha/cpu-qom.h | 2 +- target/arm/cpu-qom.h | 2 +- target/cris/cpu-qom.h | 2 +- target/hppa/cpu-qom.h | 2 +- target/i386/cpu-qom.h | 2 +- target/lm32/cpu-qom.h | 2 +- target/m68k/cpu-qom.h | 2 +- target/microblaze/cpu-qom.h | 2 +- target/mips/cpu-qom.h | 2 +- target/moxie/cpu.h | 2 +- target/nios2/cpu.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/riscv/cpu.h | 2 +- target/s390x/cpu-qom.h | 2 +- target/sh4/cpu-qom.h | 2 +- target/sparc/cpu-qom.h | 2 +- target/tilegx/cpu.h | 2 +- target/tricore/cpu-qom.h | 2 +- target/xtensa/cpu-qom.h | 2 +- hw/core/cpu.c | 19 +++--------- target/arm/cpu.c | 8 ++--- target/cris/cpu.c | 8 ++--- target/i386/cpu.c | 8 ++--- target/lm32/cpu.c | 8 ++--- target/m68k/cpu.c | 8 ++--- target/microblaze/cpu.c | 8 ++--- target/mips/cpu.c | 8 ++--- target/moxie/cpu.c | 7 +++-- target/nios2/cpu.c | 8 ++--- target/openrisc/cpu.c | 8 ++--- target/ppc/translate_init.inc.c | 8 ++--- target/riscv/cpu.c | 7 +++-- target/s390x/cpu.c | 8 +++-- target/sh4/cpu.c | 8 ++--- target/sparc/cpu.c | 8 ++--- target/tilegx/cpu.c | 7 +++-- target/tricore/cpu.c | 7 +++-- target/xtensa/cpu.c | 8 ++--- scripts/coccinelle/cpu-reset.cocci | 47 ++++++++++++++++++++++++++++++ 41 files changed, 144 insertions(+), 108 deletions(-)create mode 100644
scripts/coccinelle/cpu-reset.cocciinclude/hw/core/cpu.h +0
-6@@ -79,7 +79,6 @@ struct TranslationBlock;* @class_by_name: Callback to map -cpu command line model name to an * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. -* @reset: Callback to reset the #CPUState to its initial state. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @has_work: Callback for checking if there is work to do. * @do_interrupt: Callback for interrupt handling. @@ -165,7 +164,6 @@ typedef struct CPUClass {ObjectClass *(*class_by_name)(const char *cpu_model);void (*parse_features)(const char *typename,char *str,Error **errp); -void (*reset)(CPUState *cpu);int reset_dump_flags;bool (*has_work)(CPUState *cpu);void (*do_interrupt)(CPUState *cpu);@@ -1135,10 +1133,6 @@ void cpu_exec_unrealizefn(CPUState *cpu);*/ bool target_words_bigendian (void ); -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)); -#ifdef NEED_CPU_H #ifdef CONFIG_SOFTMMU target/alpha/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct AlphaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } AlphaCPUClass;typedef struct AlphaCPU AlphaCPU ;target/arm/cpu-qom.h +1
-1@@ -51,7 +51,7 @@ typedef struct ARMCPUClass {const ARMCPUInfo *info;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } ARMCPUClass;typedef struct ARMCPU ARMCPU ;target/cris/cpu-qom.h +1
-1@@ -45,7 +45,7 @@ typedef struct CRISCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t vr; } CRISCPUClass;target/hppa/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct HPPACPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } HPPACPUClass;typedef struct HPPACPU HPPACPU ;target/i386/cpu-qom.h +1
-1@@ -71,7 +71,7 @@ typedef struct X86CPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } X86CPUClass;typedef struct X86CPU X86CPU ;target/lm32/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct LM32CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } LM32CPUClass;typedef struct LM32CPU LM32CPU ;target/m68k/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct M68kCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } M68kCPUClass;typedef struct M68kCPU M68kCPU ;target/microblaze/cpu-qom.h +1
-1@@ -44,7 +44,7 @@ typedef struct MicroBlazeCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MicroBlazeCPUClass;typedef struct MicroBlazeCPU MicroBlazeCPU ;target/mips/cpu-qom.h +1
-1@@ -48,7 +48,7 @@ typedef struct MIPSCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const struct mips_def_t *cpu_def; } MIPSCPUClass;target/moxie/cpu.h +1
-1@@ -69,7 +69,7 @@ typedef struct MoxieCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } MoxieCPUClass;/** target/nios2/cpu.h +1
-1@@ -50,7 +50,7 @@ typedef struct Nios2CPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } Nios2CPUClass;#define TARGET_HAS_ICE 1target/openrisc/cpu.h +1
-1@@ -48,7 +48,7 @@ typedef struct OpenRISCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } OpenRISCCPUClass;#define TARGET_INSN_START_EXTRA_WORDS 1target/ppc/cpu-qom.h +1
-1@@ -166,7 +166,7 @@ typedef struct PowerPCCPUClass {DeviceRealize parent_realize;DeviceUnrealize parent_unrealize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*parent_parse_features)(const char *type,char *str,Error **errp);uint32_t pvr;target/riscv/cpu.h +1
-1@@ -185,7 +185,7 @@ typedef struct RISCVCPUClass {CPUClass parent_class;/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } RISCVCPUClass;/** target/s390x/cpu-qom.h +1
-1@@ -61,7 +61,7 @@ typedef struct S390CPUClass {const char *desc;DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;void (*load_normal)(CPUState *cpu);void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;target/sh4/cpu-qom.h +1
-1@@ -51,7 +51,7 @@ typedef struct SuperHCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;uint32_t pvr;uint32_t prr;target/sparc/cpu-qom.h +1
-1@@ -49,7 +49,7 @@ typedef struct SPARCCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;sparc_def_t *cpu_def; } SPARCCPUClass;target/tilegx/cpu.h +1
-1@@ -118,7 +118,7 @@ typedef struct TileGXCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TileGXCPUClass;/** target/tricore/cpu-qom.h +1
-1@@ -36,7 +36,7 @@ typedef struct TriCoreCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset; } TriCoreCPUClass;typedef struct TriCoreCPU TriCoreCPU ;target/xtensa/cpu-qom.h +1
-1@@ -56,7 +56,7 @@ typedef struct XtensaCPUClass {/*< public >*/ DeviceRealize parent_realize; -void (*parent_reset)(CPUState *cpu); +DeviceReset parent_reset;const XtensaConfig *config; } XtensaCPUClass;hw/core/cpu.c +4
-15@@ -239,27 +239,16 @@ void cpu_dump_statistics(CPUState *cpu, int flags) } } -void cpu_class_set_parent_reset (CPUClass *cc, -void (*child_reset)(CPUState *cpu), -void (**parent_reset)(CPUState *cpu)) -{ - *parent_reset = cc->reset; - cc->reset = child_reset; -} -void cpu_reset (CPUState *cpu) { -CPUClass *klass =CPU_GET_CLASS (cpu); - -if (klass->reset !=NULL ) { - (*klass->reset)(cpu); - } +device_cold_reset (DEVICE (cpu));trace_guest_cpu_reset (cpu); } -static void cpu_common_reset (CPUState *cpu) +static void cpu_common_reset (DeviceState *dev) { +CPUState *cpu =CPU (dev);CPUClass *cc =CPU_GET_CLASS (cpu);if (qemu_loglevel_mask (CPU_LOG_RESET )) {@@ -419,7 +408,6 @@ static void cpu_class_init(ObjectClass *klass, void *data)CPUClass *k =CPU_CLASS (klass); k->parse_features = cpu_common_parse_features; - k->reset = cpu_common_reset; k->get_arch_id = cpu_common_get_arch_id; k->has_work = cpu_common_has_work; k->get_paging_enabled = cpu_common_get_paging_enabled;@@ -440,6 +428,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_CPU , dc->categories); dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; + dc->reset = cpu_common_reset;device_class_set_props (dc, cpu_common_props);/* * Reason: CPUs still need special care by board code: wiring up target/arm/cpu.c +4
-4@@ -155,14 +155,14 @@ static void cp_reg_check_reset(gpointer key, gpointer value, gpointer opaque)assert (oldvalue == newvalue); } -/* CPUClass::reset() */ -static void arm_cpu_reset (CPUState *s) +static void arm_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);ARMCPU *cpu =ARM_CPU (s);ARMCPUClass *acc =ARM_CPU_GET_CLASS (cpu);CPUARMState *env = &cpu->env; - acc->parent_reset (s); + acc->parent_reset (dev);memset (env,0 , offsetof(CPUARMState , end_reset_fields));@@ -2804,7 +2804,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize);device_class_set_props (dc, arm_cpu_properties); -cpu_class_set_parent_reset (cc, arm_cpu_reset, &acc->parent_reset); +device_class_set_parent_reset (dc, arm_cpu_reset, &acc->parent_reset); cc->class_by_name = arm_cpu_class_by_name; cc->has_work = arm_cpu_has_work;target/cris/cpu.c +4
-4@@ -40,15 +40,15 @@ static bool cris_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void cris_cpu_reset (CPUState *s) +static void cris_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);CRISCPU *cpu =CRIS_CPU (s);CRISCPUClass *ccc =CRIS_CPU_GET_CLASS (cpu);CPUCRISState *env = &cpu->env;uint32_t vr; - ccc->parent_reset (s); + ccc->parent_reset (dev); vr = env->pregs[PR_VR ];memset (env,0 , offsetof(CPUCRISState , end_reset_fields));@@ -264,7 +264,7 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, cris_cpu_realizefn, &ccc->parent_realize); -cpu_class_set_parent_reset (cc, cris_cpu_reset, &ccc->parent_reset); +device_class_set_parent_reset (dc, cris_cpu_reset, &ccc->parent_reset); cc->class_by_name = cris_cpu_class_by_name; cc->has_work = cris_cpu_has_work;target/i386/cpu.c +4
-4@@ -5855,9 +5855,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, } } -/* CPUClass::reset() */ -static void x86_cpu_reset (CPUState *s) +static void x86_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);X86CPU *cpu =X86_CPU (s);X86CPUClass *xcc =X86_CPU_GET_CLASS (cpu);CPUX86State *env = &cpu->env;@@ -5865,7 +5865,7 @@ static void x86_cpu_reset(CPUState *s)uint64_t xcr0;int i; - xcc->parent_reset (s); + xcc->parent_reset (dev);memset (env,0 , offsetof(CPUX86State , end_reset_fields));@@ -7169,7 +7169,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) &xcc->parent_unrealize);device_class_set_props (dc, x86_cpu_properties); -cpu_class_set_parent_reset (cc, x86_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, x86_cpu_reset, &xcc->parent_reset); cc->reset_dump_flags =CPU_DUMP_FPU |CPU_DUMP_CCOP ; cc->class_by_name = x86_cpu_class_by_name;target/lm32/cpu.c +4
-4@@ -99,14 +99,14 @@ static bool lm32_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void lm32_cpu_reset (CPUState *s) +static void lm32_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);LM32CPU *cpu =LM32_CPU (s);LM32CPUClass *lcc =LM32_CPU_GET_CLASS (cpu);CPULM32State *env = &cpu->env; - lcc->parent_reset (s); + lcc->parent_reset (dev);/* reset cpu state */ memset (env,0 , offsetof(CPULM32State , end_reset_fields));@@ -218,7 +218,7 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, lm32_cpu_realizefn, &lcc->parent_realize); -cpu_class_set_parent_reset (cc, lm32_cpu_reset, &lcc->parent_reset); +device_class_set_parent_reset (dc, lm32_cpu_reset, &lcc->parent_reset); cc->class_by_name = lm32_cpu_class_by_name; cc->has_work = lm32_cpu_has_work;target/m68k/cpu.c +4
-4@@ -41,16 +41,16 @@ static void m68k_set_feature(CPUM68KState *env, int feature) env->features |= (1u << feature); } -/* CPUClass::reset() */ -static void m68k_cpu_reset (CPUState *s) +static void m68k_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);M68kCPU *cpu =M68K_CPU (s);M68kCPUClass *mcc =M68K_CPU_GET_CLASS (cpu);CPUM68KState *env = &cpu->env;floatx80 nan =floatx80_default_nan (NULL );int i; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUM68KState , end_reset_fields));#ifdef CONFIG_SOFTMMU @@ -273,7 +273,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, m68k_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, m68k_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, m68k_cpu_reset, &mcc->parent_reset); cc->class_by_name = m68k_cpu_class_by_name; cc->has_work = m68k_cpu_has_work;target/microblaze/cpu.c +4
-4@@ -102,14 +102,14 @@ static void microblaze_cpu_set_irq(void *opaque, int irq, int level) }#endif -/* CPUClass::reset() */ -static void mb_cpu_reset (CPUState *s) +static void mb_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MicroBlazeCPU *cpu =MICROBLAZE_CPU (s);MicroBlazeCPUClass *mcc =MICROBLAZE_CPU_GET_CLASS (cpu);CPUMBState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMBState , end_reset_fields)); env->res_addr =RES_ADDR_NONE ;@@ -292,7 +292,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, mb_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mb_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mb_cpu_reset, &mcc->parent_reset); cc->class_by_name = mb_cpu_class_by_name; cc->has_work = mb_cpu_has_work;target/mips/cpu.c +4
-4@@ -96,14 +96,14 @@ static bool mips_cpu_has_work(CPUState *cs)return has_work; } -/* CPUClass::reset() */ -static void mips_cpu_reset (CPUState *s) +static void mips_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MIPSCPU *cpu =MIPS_CPU (s);MIPSCPUClass *mcc =MIPS_CPU_GET_CLASS (cpu);CPUMIPSState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMIPSState , end_reset_fields));@@ -189,7 +189,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, mips_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, mips_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, mips_cpu_reset, &mcc->parent_reset); cc->class_by_name = mips_cpu_class_by_name; cc->has_work = mips_cpu_has_work;target/moxie/cpu.c +4
-3@@ -35,13 +35,14 @@ static bool moxie_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -static void moxie_cpu_reset (CPUState *s) +static void moxie_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);MoxieCPU *cpu =MOXIE_CPU (s);MoxieCPUClass *mcc =MOXIE_CPU_GET_CLASS (cpu);CPUMoxieState *env = &cpu->env; - mcc->parent_reset (s); + mcc->parent_reset (dev);memset (env,0 , offsetof(CPUMoxieState , end_reset_fields)); env->pc =0x1000 ;@@ -101,7 +102,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, moxie_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, moxie_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, moxie_cpu_reset, &mcc->parent_reset); cc->class_by_name = moxie_cpu_class_by_name;target/nios2/cpu.c +4
-4@@ -39,9 +39,9 @@ static bool nios2_cpu_has_work(CPUState *cs)return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); } -/* CPUClass::reset() */ -static void nios2_cpu_reset (CPUState *cs) +static void nios2_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);Nios2CPU *cpu =NIOS2_CPU (cs);Nios2CPUClass *ncc =NIOS2_CPU_GET_CLASS (cpu);CPUNios2State *env = &cpu->env;@@ -51,7 +51,7 @@ static void nios2_cpu_reset(CPUState *cs)log_cpu_state (cs,0 ); } - ncc->parent_reset (cs); + ncc->parent_reset (dev);memset (env->regs,0 ,sizeof (uint32_t ) *NUM_CORE_REGS ); env->regs[R_PC ] = cpu->reset_addr;@@ -188,7 +188,7 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, nios2_cpu_realizefn, &ncc->parent_realize);device_class_set_props (dc, nios2_properties); -cpu_class_set_parent_reset (cc, nios2_cpu_reset, &ncc->parent_reset); +device_class_set_parent_reset (dc, nios2_cpu_reset, &ncc->parent_reset); cc->class_by_name = nios2_cpu_class_by_name; cc->has_work = nios2_cpu_has_work;target/openrisc/cpu.c +4
-4@@ -41,13 +41,13 @@ static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_or1k; } -/* CPUClass::reset() */ -static void openrisc_cpu_reset (CPUState *s) +static void openrisc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);OpenRISCCPU *cpu =OPENRISC_CPU (s);OpenRISCCPUClass *occ =OPENRISC_CPU_GET_CLASS (cpu); - occ->parent_reset (s); + occ->parent_reset (dev);memset (&cpu->env,0 , offsetof(CPUOpenRISCState , end_reset_fields));@@ -150,7 +150,7 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, openrisc_cpu_realizefn, &occ->parent_realize); -cpu_class_set_parent_reset (cc, openrisc_cpu_reset, &occ->parent_reset); +device_class_set_parent_reset (dc, openrisc_cpu_reset, &occ->parent_reset); cc->class_by_name = openrisc_cpu_class_by_name; cc->has_work = openrisc_cpu_has_work;target/ppc/translate_init.inc.c +4
-4@@ -10669,16 +10669,16 @@ static bool ppc_cpu_has_work(CPUState *cs)return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); } -/* CPUClass::reset() */ -static void ppc_cpu_reset (CPUState *s) +static void ppc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);PowerPCCPU *cpu =POWERPC_CPU (s);PowerPCCPUClass *pcc =POWERPC_CPU_GET_CLASS (cpu);CPUPPCState *env = &cpu->env;target_ulong msr;int i; - pcc->parent_reset (s); + pcc->parent_reset (dev); msr = (target_ulong )0 ; msr |= (target_ulong )MSR_HVB ;@@ -10885,7 +10885,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_always;device_class_set_props (dc, ppc_cpu_properties); -cpu_class_set_parent_reset (cc, ppc_cpu_reset, &pcc->parent_reset); +device_class_set_parent_reset (dc, ppc_cpu_reset, &pcc->parent_reset); cc->class_by_name = ppc_cpu_class_by_name; pcc->parent_parse_features = cc->parse_features;target/riscv/cpu.c +4
-3@@ -286,13 +286,14 @@ void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, env->pc = data[0 ]; } -static void riscv_cpu_reset (CPUState *cs) +static void riscv_cpu_reset (DeviceState *dev) { +CPUState *cs =CPU (dev);RISCVCPU *cpu =RISCV_CPU (cs);RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (cpu);CPURISCVState *env = &cpu->env; - mcc->parent_reset (cs); + mcc->parent_reset (dev);#ifndef CONFIG_USER_ONLY env->priv =PRV_M ; env->mstatus &= ~(MSTATUS_MIE |MSTATUS_MPRV );@@ -462,7 +463,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, riscv_cpu_realize, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, riscv_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, riscv_cpu_reset, &mcc->parent_reset); cc->class_by_name = riscv_cpu_class_by_name; cc->has_work = riscv_cpu_has_work;target/s390x/cpu.c +5
-3@@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; +DeviceState *dev =DEVICE (s); - scc->parent_reset (s); + scc->parent_reset (dev); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu);@@ -450,8 +451,9 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; -static void s390_cpu_reset_full (CPUState *s) +static void s390_cpu_reset_full (DeviceState *dev) { +CPUState *s =CPU (dev);return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }@@ -466,7 +468,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, s390x_cpu_properties); dc->user_creatable = true; -cpu_class_set_parent_reset (cc, s390_cpu_reset_full, &scc->parent_reset); +device_class_set_parent_reset (dc, s390_cpu_reset_full, &scc->parent_reset);#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif target/sh4/cpu.c +4
-4@@ -47,14 +47,14 @@ static bool superh_cpu_has_work(CPUState *cs)return cs->interrupt_request &CPU_INTERRUPT_HARD ; } -/* CPUClass::reset() */ -static void superh_cpu_reset (CPUState *s) +static void superh_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SuperHCPU *cpu =SUPERH_CPU (s);SuperHCPUClass *scc =SUPERH_CPU_GET_CLASS (cpu);CPUSH4State *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSH4State , end_reset_fields));@@ -214,7 +214,7 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, superh_cpu_realizefn, &scc->parent_realize); -cpu_class_set_parent_reset (cc, superh_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, superh_cpu_reset, &scc->parent_reset); cc->class_by_name = superh_cpu_class_by_name; cc->has_work = superh_cpu_has_work;target/sparc/cpu.c +4
-4@@ -28,14 +28,14 @@//#define DEBUG_FEATURES -/* CPUClass::reset() */ -static void sparc_cpu_reset (CPUState *s) +static void sparc_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);SPARCCPU *cpu =SPARC_CPU (s);SPARCCPUClass *scc =SPARC_CPU_GET_CLASS (cpu);CPUSPARCState *env = &cpu->env; - scc->parent_reset (s); + scc->parent_reset (dev);memset (env,0 , offsetof(CPUSPARCState , end_reset_fields)); env->cwp =0 ;@@ -859,7 +859,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_realize);device_class_set_props (dc, sparc_cpu_properties); -cpu_class_set_parent_reset (cc, sparc_cpu_reset, &scc->parent_reset); +device_class_set_parent_reset (dc, sparc_cpu_reset, &scc->parent_reset); cc->class_by_name = sparc_cpu_class_by_name; cc->parse_features = sparc_cpu_parse_features;target/tilegx/cpu.c +4
-3@@ -68,13 +68,14 @@ static bool tilegx_cpu_has_work(CPUState *cs)return true; } -static void tilegx_cpu_reset (CPUState *s) +static void tilegx_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TileGXCPU *cpu =TILEGX_CPU (s);TileGXCPUClass *tcc =TILEGX_CPU_GET_CLASS (cpu);CPUTLGState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);memset (env,0 , offsetof(CPUTLGState , end_reset_fields)); }@@ -142,7 +143,7 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, tilegx_cpu_realizefn, &tcc->parent_realize); -cpu_class_set_parent_reset (cc, tilegx_cpu_reset, &tcc->parent_reset); +device_class_set_parent_reset (dc, tilegx_cpu_reset, &tcc->parent_reset); cc->class_by_name = tilegx_cpu_class_by_name; cc->has_work = tilegx_cpu_has_work;target/tricore/cpu.c +4
-3@@ -53,13 +53,14 @@ static void tricore_cpu_synchronize_from_tb(CPUState *cs, env->PC = tb->pc; } -static void tricore_cpu_reset (CPUState *s) +static void tricore_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);TriCoreCPU *cpu =TRICORE_CPU (s);TriCoreCPUClass *tcc =TRICORE_CPU_GET_CLASS (cpu);CPUTriCoreState *env = &cpu->env; - tcc->parent_reset (s); + tcc->parent_reset (dev);cpu_state_reset (env); }@@ -153,7 +154,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data)device_class_set_parent_realize (dc, tricore_cpu_realizefn, &mcc->parent_realize); -cpu_class_set_parent_reset (cc, tricore_cpu_reset, &mcc->parent_reset); +device_class_set_parent_reset (dc, tricore_cpu_reset, &mcc->parent_reset); cc->class_by_name = tricore_cpu_class_by_name; cc->has_work = tricore_cpu_has_work;target/xtensa/cpu.c +4
-4@@ -67,14 +67,14 @@ bool xtensa_abi_call0(void) }#endif -/* CPUClass::reset() */ -static void xtensa_cpu_reset (CPUState *s) +static void xtensa_cpu_reset (DeviceState *dev) { +CPUState *s =CPU (dev);XtensaCPU *cpu =XTENSA_CPU (s);XtensaCPUClass *xcc =XTENSA_CPU_GET_CLASS (cpu);CPUXtensaState *env = &cpu->env; - xcc->parent_reset (s); + xcc->parent_reset (dev); env->exception_taken =0 ; env->pc = env->config->exception_vector[EXC_RESET0 + env->static_vectors];@@ -184,7 +184,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data)device_class_set_parent_realize (dc, xtensa_cpu_realizefn, &xcc->parent_realize); -cpu_class_set_parent_reset (cc, xtensa_cpu_reset, &xcc->parent_reset); +device_class_set_parent_reset (dc, xtensa_cpu_reset, &xcc->parent_reset); cc->class_by_name = xtensa_cpu_class_by_name; cc->has_work = xtensa_cpu_has_work;scripts/coccinelle/cpu-reset.cocci new file +47
-0@@ -0,0 +1,47 @@ +// Convert targets using the old CPUState reset to DeviceState reset +// +// Copyright Linaro Ltd 2020 +// This work is licensed under the terms of the GNU GPLv2 or later. +// +// spatch --macro-file scripts/cocci-macro-file.h \ +// --sp-file scripts/coccinelle/cpu-reset.cocci \ +// --keep-comments --smpl-spacing --in-place --include-headers --dir target +// +// For simplicity we assume some things about the code we're modifying +// that happen to be true for all our targets: +// * all cpu_class_set_parent_reset() callsites have a 'DeviceClass *dc' local +// * the parent reset field in the target CPU class is 'parent_reset' +// * no reset function already has a 'dev' local + +@@ +identifier cpu, x; +typedef CPUState; +@@ +struct x { +... +- void (*parent_reset)(CPUState *cpu); ++ DeviceReset parent_reset; +... +}; +@ rule1 @ +identifier resetfn; +expression resetfield; +identifier cc; +@@ +- cpu_class_set_parent_reset(cc, resetfn, resetfield) ++ device_class_set_parent_reset(dc, resetfn, resetfield) +@@ +identifier rule1.resetfn; +identifier cpu, cc; +typedef CPUState, DeviceState; +@@ +-resetfn(CPUState *cpu) +-{ ++resetfn(DeviceState *dev) ++{ ++ CPUState *cpu = CPU(dev); +<... +- cc->parent_reset(cpu); ++ cc->parent_reset(dev); +...> +}
Quoted 2 lines · Philippe Mathieu-Daudé
ping
Eduardo said he'd queued it -- I've been assuming he'll send a pullreq for it.
(The followup work I was planning to base on this turned out to have complications I hadn't expected, so I've put it on the shelf for the moment. But this is still a good bit of cleanup.)
thanks
-- PMM
Quoted 6 lines · Peter Maydell
Quoted 2 lines · Philippe Mathieu-Daudé
ping
Eduardo said he'd queued it -- I've been assuming he'll send a pullreq for it.
It will be on today's pull request, sorry for the delay.
Signature · 1 line
Eduardo