Patchwork [qom-cpu,for-1.4,08/14] target-unicore32: Detect attempt to instantiate non-CPU type in cpu_init()

login
register
mail settings
Submitter Andreas Färber
Date Jan. 23, 2013, 12:07 p.m.
Message ID <1358942867-8612-9-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/214922/
State New
Headers show

Comments

Andreas Färber - Jan. 23, 2013, 12:07 p.m.
Consolidate model checking into a new uc32_cpu_class_by_name().

If the name matches an existing type, also check whether that type is
actually (a sub-type of) TYPE_UNICORE32_CPU.

This fixes, e.g., -cpu puv3_dma asserting.

Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-unicore32/cpu.c    |   23 +++++++++++++++++++++++
 target-unicore32/helper.c |    4 +++-
 2 Dateien geändert, 26 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
Andreas Färber - Jan. 26, 2013, 4:25 p.m.
Am 23.01.2013 13:07, schrieb Andreas Färber:
> Consolidate model checking into a new uc32_cpu_class_by_name().
> 
> If the name matches an existing type, also check whether that type is
> actually (a sub-type of) TYPE_UNICORE32_CPU.
> 
> This fixes, e.g., -cpu puv3_dma asserting.
> 
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  target-unicore32/cpu.c    |   23 +++++++++++++++++++++++
>  target-unicore32/helper.c |    4 +++-
>  2 Dateien geändert, 26 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
> 
> diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
> index a38fc4d..e9b9254 100644
> --- a/target-unicore32/cpu.c
> +++ b/target-unicore32/cpu.c
> @@ -22,6 +22,21 @@ static inline void set_feature(CPUUniCore32State *env, int feature)
>  
>  /* CPU models */
>  
> +static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model)
> +{
> +    ObjectClass *oc;
> +
> +    if (cpu_model == NULL) {
> +        return NULL;
> +    }
> +
> +    oc = object_class_by_name(cpu_model);
> +    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_UNICORE32_CPU)) {

== NULL missing. Fixed by adding ! operator.

Andreas

> +        oc = NULL;
> +    }
> +    return oc;
> +}
> +
>  typedef struct UniCore32CPUInfo {
>      const char *name;
>      void (*instance_init)(Object *obj);
> @@ -80,6 +95,13 @@ static void uc32_cpu_initfn(Object *obj)
>      tlb_flush(env, 1);
>  }
>  
> +static void uc32_cpu_class_init(ObjectClass *oc, void *data)
> +{
> +    CPUClass *cc = CPU_CLASS(oc);
> +
> +    cc->class_by_name = uc32_cpu_class_by_name;
> +}
> +
>  static void uc32_register_cpu_type(const UniCore32CPUInfo *info)
>  {
>      TypeInfo type_info = {
> @@ -98,6 +120,7 @@ static const TypeInfo uc32_cpu_type_info = {
>      .instance_init = uc32_cpu_initfn,
>      .abstract = true,
>      .class_size = sizeof(UniCore32CPUClass),
> +    .class_init = uc32_cpu_class_init,
>  };
>  
>  static void uc32_cpu_register_types(void)
> diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
> index 5359538..7ace68c 100644
> --- a/target-unicore32/helper.c
> +++ b/target-unicore32/helper.c
> @@ -29,9 +29,11 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
>  {
>      UniCore32CPU *cpu;
>      CPUUniCore32State *env;
> +    ObjectClass *oc;
>      static int inited = 1;
>  
> -    if (object_class_by_name(cpu_model) == NULL) {
> +    oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model);
> +    if (oc == NULL) {
>          return NULL;
>      }
>      cpu = UNICORE32_CPU(object_new(cpu_model));
>

Patch

diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
index a38fc4d..e9b9254 100644
--- a/target-unicore32/cpu.c
+++ b/target-unicore32/cpu.c
@@ -22,6 +22,21 @@  static inline void set_feature(CPUUniCore32State *env, int feature)
 
 /* CPU models */
 
+static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model)
+{
+    ObjectClass *oc;
+
+    if (cpu_model == NULL) {
+        return NULL;
+    }
+
+    oc = object_class_by_name(cpu_model);
+    if (oc != NULL && object_class_dynamic_cast(oc, TYPE_UNICORE32_CPU)) {
+        oc = NULL;
+    }
+    return oc;
+}
+
 typedef struct UniCore32CPUInfo {
     const char *name;
     void (*instance_init)(Object *obj);
@@ -80,6 +95,13 @@  static void uc32_cpu_initfn(Object *obj)
     tlb_flush(env, 1);
 }
 
+static void uc32_cpu_class_init(ObjectClass *oc, void *data)
+{
+    CPUClass *cc = CPU_CLASS(oc);
+
+    cc->class_by_name = uc32_cpu_class_by_name;
+}
+
 static void uc32_register_cpu_type(const UniCore32CPUInfo *info)
 {
     TypeInfo type_info = {
@@ -98,6 +120,7 @@  static const TypeInfo uc32_cpu_type_info = {
     .instance_init = uc32_cpu_initfn,
     .abstract = true,
     .class_size = sizeof(UniCore32CPUClass),
+    .class_init = uc32_cpu_class_init,
 };
 
 static void uc32_cpu_register_types(void)
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 5359538..7ace68c 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -29,9 +29,11 @@  CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
 {
     UniCore32CPU *cpu;
     CPUUniCore32State *env;
+    ObjectClass *oc;
     static int inited = 1;
 
-    if (object_class_by_name(cpu_model) == NULL) {
+    oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model);
+    if (oc == NULL) {
         return NULL;
     }
     cpu = UNICORE32_CPU(object_new(cpu_model));