diff options
author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-09-17 20:28:42 -0300 |
---|---|---|
committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-10-09 23:21:52 -0300 |
commit | 8301ea444abb49f7b7fb939b09c1e23b22977f30 (patch) | |
tree | 22dc7963464b3615aa96e96d6d873f1fb072c74d /target | |
parent | 530049bc1dcc24c1178a29d99ca08b6dd08413e0 (diff) |
qom/cpu: move cpu_model null check to cpu_class_by_name()
and clean every implementation.
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170917232842.14544-1-f4bug@amsat.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target')
-rw-r--r-- | target/alpha/cpu.c | 6 | ||||
-rw-r--r-- | target/arm/cpu.c | 4 | ||||
-rw-r--r-- | target/cris/cpu.c | 4 | ||||
-rw-r--r-- | target/lm32/cpu.c | 4 | ||||
-rw-r--r-- | target/m68k/cpu.c | 4 | ||||
-rw-r--r-- | target/mips/cpu.c | 4 | ||||
-rw-r--r-- | target/moxie/cpu.c | 8 | ||||
-rw-r--r-- | target/openrisc/cpu.c | 4 | ||||
-rw-r--r-- | target/sh4/cpu.c | 3 | ||||
-rw-r--r-- | target/sparc/cpu.c | 4 | ||||
-rw-r--r-- | target/tricore/cpu.c | 4 | ||||
-rw-r--r-- | target/unicore32/cpu.c | 4 | ||||
-rw-r--r-- | target/xtensa/cpu.c | 4 |
13 files changed, 2 insertions, 55 deletions
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index e6c6aabdf0..b8a21f4e01 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -127,14 +127,10 @@ static const AlphaCPUAlias alpha_cpu_aliases[] = { static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model) { - ObjectClass *oc = NULL; + ObjectClass *oc; char *typename; int i; - if (cpu_model == NULL) { - return NULL; - } - oc = object_class_by_name(cpu_model); if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL && !object_class_is_abstract(oc)) { diff --git a/target/arm/cpu.c b/target/arm/cpu.c index f4f601f079..88578f360e 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -939,10 +939,6 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) char *typename; char **cpuname; - if (!cpu_model) { - return NULL; - } - cpuname = g_strsplit(cpu_model, ",", 1); typename = g_strdup_printf(ARM_CPU_TYPE_NAME("%s"), cpuname[0]); oc = object_class_by_name(typename); diff --git a/target/cris/cpu.c b/target/cris/cpu.c index ceebfed79b..88d93f2d11 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -69,10 +69,6 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - #if defined(CONFIG_USER_ONLY) if (strcasecmp(cpu_model, "any") == 0) { return object_class_by_name("crisv32-" TYPE_CRIS_CPU); diff --git a/target/lm32/cpu.c b/target/lm32/cpu.c index 2b8c36b6d0..bf081f56d2 100644 --- a/target/lm32/cpu.c +++ b/target/lm32/cpu.c @@ -246,10 +246,6 @@ static ObjectClass *lm32_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_LM32_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 55bf24bae6..8c70e0805c 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -87,10 +87,6 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_M68K_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 1a9a3ed94d..c15b894362 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -166,10 +166,6 @@ static ObjectClass *mips_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = mips_cpu_type_name(cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 748d02f29e..30bd44fcad 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -89,13 +89,7 @@ static void moxie_cpu_initfn(Object *obj) static ObjectClass *moxie_cpu_class_by_name(const char *cpu_model) { - ObjectClass *oc; - - if (cpu_model == NULL) { - return NULL; - } - - oc = object_class_by_name(cpu_model); + ObjectClass *oc = object_class_by_name(cpu_model); if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_MOXIE_CPU) || object_class_is_abstract(oc))) { return NULL; diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index a979f0bf8b..af9cdcc102 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -108,10 +108,6 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 6ce7cba5a9..252440e019 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -133,9 +133,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; GSList *list, *item; - if (cpu_model == NULL) { - return NULL; - } if (strcasecmp(cpu_model, "any") == 0) { return object_class_by_name(TYPE_SH7750R_CPU); } diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 0806d699e6..beab90f3e6 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -730,10 +730,6 @@ static ObjectClass *sparc_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = sparc_cpu_type_name(cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 5ab5b56454..871eb35453 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -120,10 +120,6 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (!cpu_model) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_TRICORE_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index c9b78ce68e..138acc9dd8 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -44,10 +44,6 @@ static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_UNICORE32_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 85897df0a8..dcdc765a86 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -83,10 +83,6 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (cpu_model == NULL) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_XTENSA_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); |