Commit 781c67ca authored by Peter Maydell's avatar Peter Maydell Committed by Eduardo Habkost
Browse files

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);

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-Id: <20200303100511.5498-1-peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 4ba59be1

hw/core/cpu.c

+4 −15
Original line number Diff line number Diff line
@@ -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

include/hw/core/cpu.h

+0 −6
Original line number Diff line number Diff line
@@ -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

scripts/coccinelle/cpu-reset.cocci

0 → 100644
+47 −0
Original line number Diff line number Diff line 
// 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);

...>

}

target/alpha/cpu-qom.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;