Skip to content
Snippets Groups Projects
  • Peter Maydell's avatar
    781c67ca
    cpu: Use DeviceClass reset instead of a special CPUClass reset · 781c67ca
    Peter Maydell authored
    
    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>
    781c67ca
    History
    cpu: Use DeviceClass reset instead of a special CPUClass reset
    Peter Maydell authored
    
    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>