Patchwork [RFC,qom-cpu,v2,06/28] target-ppc: Update PowerPCCPU to QOM realizefn

login
register
mail settings
Submitter Andreas Färber
Date Jan. 20, 2013, 7:22 a.m.
Message ID <1358666571-1737-7-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/213931/
State New
Headers show

Comments

Andreas Färber - Jan. 20, 2013, 7:22 a.m.
Adapt ppc_cpu_realize() signature, hook it up to DeviceClass and set
realized = true in cpu_ppc_init().

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-ppc/cpu-qom.h        |    2 ++
 target-ppc/translate_init.c |   12 +++++++++---
 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
Eduardo Habkost - Feb. 7, 2013, 4:31 p.m.
On Sun, Jan 20, 2013 at 08:22:29AM +0100, Andreas Färber wrote:
> Adapt ppc_cpu_realize() signature, hook it up to DeviceClass and set
> realized = true in cpu_ppc_init().
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>


> ---
>  target-ppc/cpu-qom.h        |    2 ++
>  target-ppc/translate_init.c |   12 +++++++++---
>  2 Dateien geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
> 
> diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
> index b338f8f..2b82cdb 100644
> --- a/target-ppc/cpu-qom.h
> +++ b/target-ppc/cpu-qom.h
> @@ -40,6 +40,7 @@
>  
>  /**
>   * PowerPCCPUClass:
> + * @parent_realize: The parent class' realize handler.
>   * @parent_reset: The parent class' reset handler.
>   *
>   * A PowerPC CPU model.
> @@ -49,6 +50,7 @@ typedef struct PowerPCCPUClass {
>      CPUClass parent_class;
>      /*< public >*/
>  
> +    DeviceRealize parent_realize;
>      void (*parent_reset)(CPUState *cpu);
>  
>      /* TODO inline fields here */
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 2d78529..63ba4a5 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -10029,9 +10029,9 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu)
>      return 0;
>  }
>  
> -static void ppc_cpu_realize(Object *obj, Error **errp)
> +static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
>  {
> -    PowerPCCPU *cpu = POWERPC_CPU(obj);
> +    PowerPCCPU *cpu = POWERPC_CPU(dev);
>      CPUPPCState *env = &cpu->env;
>      PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
>      ppc_def_t *def = pcc->info;
> @@ -10071,6 +10071,8 @@ static void ppc_cpu_realize(Object *obj, Error **errp)
>  
>      qemu_init_vcpu(env);
>  
> +    pcc->parent_realize(dev, errp);
> +
>  #if defined(PPC_DUMP_CPU)
>      {
>          const char *mmu_model, *excp_model, *bus_model;
> @@ -10342,7 +10344,7 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model)
>  
>      env->cpu_model_str = cpu_model;
>  
> -    ppc_cpu_realize(OBJECT(cpu), &err);
> +    object_property_set_bool(OBJECT(cpu), true, "realized", &err);
>      if (err != NULL) {
>          fprintf(stderr, "%s\n", error_get_pretty(err));
>          error_free(err);
> @@ -10563,6 +10565,10 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
>  {
>      PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
>      CPUClass *cc = CPU_CLASS(oc);
> +    DeviceClass *dc = DEVICE_CLASS(oc);
> +
> +    pcc->parent_realize = dc->realize;
> +    dc->realize = ppc_cpu_realizefn;
>  
>      pcc->parent_reset = cc->reset;
>      cc->reset = ppc_cpu_reset;
> -- 
> 1.7.10.4
> 
>

Patch

diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
index b338f8f..2b82cdb 100644
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -40,6 +40,7 @@ 
 
 /**
  * PowerPCCPUClass:
+ * @parent_realize: The parent class' realize handler.
  * @parent_reset: The parent class' reset handler.
  *
  * A PowerPC CPU model.
@@ -49,6 +50,7 @@  typedef struct PowerPCCPUClass {
     CPUClass parent_class;
     /*< public >*/
 
+    DeviceRealize parent_realize;
     void (*parent_reset)(CPUState *cpu);
 
     /* TODO inline fields here */
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 2d78529..63ba4a5 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -10029,9 +10029,9 @@  static int ppc_fixup_cpu(PowerPCCPU *cpu)
     return 0;
 }
 
-static void ppc_cpu_realize(Object *obj, Error **errp)
+static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
 {
-    PowerPCCPU *cpu = POWERPC_CPU(obj);
+    PowerPCCPU *cpu = POWERPC_CPU(dev);
     CPUPPCState *env = &cpu->env;
     PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
     ppc_def_t *def = pcc->info;
@@ -10071,6 +10071,8 @@  static void ppc_cpu_realize(Object *obj, Error **errp)
 
     qemu_init_vcpu(env);
 
+    pcc->parent_realize(dev, errp);
+
 #if defined(PPC_DUMP_CPU)
     {
         const char *mmu_model, *excp_model, *bus_model;
@@ -10342,7 +10344,7 @@  PowerPCCPU *cpu_ppc_init(const char *cpu_model)
 
     env->cpu_model_str = cpu_model;
 
-    ppc_cpu_realize(OBJECT(cpu), &err);
+    object_property_set_bool(OBJECT(cpu), true, "realized", &err);
     if (err != NULL) {
         fprintf(stderr, "%s\n", error_get_pretty(err));
         error_free(err);
@@ -10563,6 +10565,10 @@  static void ppc_cpu_class_init(ObjectClass *oc, void *data)
 {
     PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
     CPUClass *cc = CPU_CLASS(oc);
+    DeviceClass *dc = DEVICE_CLASS(oc);
+
+    pcc->parent_realize = dc->realize;
+    dc->realize = ppc_cpu_realizefn;
 
     pcc->parent_reset = cc->reset;
     cc->reset = ppc_cpu_reset;