motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-02 06:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

aspeed: Remove duplicate typename in AspeedSoCClass

Browse source 
The SoC type name is stored under AspeedSoCClass which is
redundant. Use object_get_typename() instead where needed.

Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Link: https://lore.kernel.org/qemu-devel/20250218073534.585066-1-clg@redhat.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Cédric Le Goater 2025-02-18 08:35:34 +01:00
parent 136367e567
commit a5b9621024
5 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/arm/aspeed_ast10x0.c
View file

@ -116,7 +116,7 @@ static void aspeed_soc_ast1030_init(Object *obj)
char typename[64]; char typename[64];
int i; int i;
if (sscanf(sc->name, "%7s", socname) != 1) { if (sscanf(object_get_typename(obj), "%7s", socname) != 1) {
g_assert_not_reached(); g_assert_not_reached();
} }
@ -428,7 +428,6 @@ static void aspeed_soc_ast1030_class_init(ObjectClass *klass, void *data)
dc->user_creatable = false; dc->user_creatable = false;
dc->realize = aspeed_soc_ast1030_realize; dc->realize = aspeed_soc_ast1030_realize;
sc->name = "ast1030-a1";
sc->valid_cpu_types = valid_cpu_types; sc->valid_cpu_types = valid_cpu_types;
sc->silicon_rev = AST1030_A1_SILICON_REV; sc->silicon_rev = AST1030_A1_SILICON_REV;
sc->sram_size = 0xc0000; sc->sram_size = 0xc0000;

4
hw/arm/aspeed_ast2400.c
View file

@ -151,7 +151,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
char socname[8]; char socname[8];
char typename[64]; char typename[64];
if (sscanf(sc->name, "%7s", socname) != 1) { if (sscanf(object_get_typename(obj), "%7s", socname) != 1) {
g_assert_not_reached(); g_assert_not_reached();
} }
@ -515,7 +515,6 @@ static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data)
/* Reason: Uses serial_hds and nd_table in realize() directly */ /* Reason: Uses serial_hds and nd_table in realize() directly */
dc->user_creatable = false; dc->user_creatable = false;
sc->name = "ast2400-a1";
sc->valid_cpu_types = valid_cpu_types; sc->valid_cpu_types = valid_cpu_types;
sc->silicon_rev = AST2400_A1_SILICON_REV; sc->silicon_rev = AST2400_A1_SILICON_REV;
sc->sram_size = 0x8000; sc->sram_size = 0x8000;
@ -544,7 +543,6 @@ static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data)
/* Reason: Uses serial_hds and nd_table in realize() directly */ /* Reason: Uses serial_hds and nd_table in realize() directly */
dc->user_creatable = false; dc->user_creatable = false;
sc->name = "ast2500-a1";
sc->valid_cpu_types = valid_cpu_types; sc->valid_cpu_types = valid_cpu_types;
sc->silicon_rev = AST2500_A1_SILICON_REV; sc->silicon_rev = AST2500_A1_SILICON_REV;
sc->sram_size = 0x9000; sc->sram_size = 0x9000;

3
hw/arm/aspeed_ast2600.c
View file

@ -157,7 +157,7 @@ static void aspeed_soc_ast2600_init(Object *obj)
char socname[8]; char socname[8];
char typename[64]; char typename[64];
if (sscanf(sc->name, "%7s", socname) != 1) { if (sscanf(object_get_typename(obj), "%7s", socname) != 1) {
g_assert_not_reached(); g_assert_not_reached();
} }
@ -666,7 +666,6 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
/* Reason: The Aspeed SoC can only be instantiated from a board */ /* Reason: The Aspeed SoC can only be instantiated from a board */
dc->user_creatable = false; dc->user_creatable = false;
sc->name = "ast2600-a3";
sc->valid_cpu_types = valid_cpu_types; sc->valid_cpu_types = valid_cpu_types;
sc->silicon_rev = AST2600_A3_SILICON_REV; sc->silicon_rev = AST2600_A3_SILICON_REV;
sc->sram_size = 0x16400; sc->sram_size = 0x16400;

3
hw/arm/aspeed_ast27x0.c
View file

@ -316,7 +316,7 @@ static void aspeed_soc_ast2700_init(Object *obj)
char socname[8]; char socname[8];
char typename[64]; char typename[64];
if (sscanf(sc->name, "%7s", socname) != 1) { if (sscanf(object_get_typename(obj), "%7s", socname) != 1) {
g_assert_not_reached(); g_assert_not_reached();
} }
@ -757,7 +757,6 @@ static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data)
dc->user_creatable = false; dc->user_creatable = false;
dc->realize = aspeed_soc_ast2700_realize; dc->realize = aspeed_soc_ast2700_realize;
sc->name = "ast2700-a0";
sc->valid_cpu_types = valid_cpu_types; sc->valid_cpu_types = valid_cpu_types;
sc->silicon_rev = AST2700_A0_SILICON_REV; sc->silicon_rev = AST2700_A0_SILICON_REV;
sc->sram_size = 0x20000; sc->sram_size = 0x20000;

1
include/hw/arm/aspeed_soc.h
View file

@ -148,7 +148,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(Aspeed10x0SoCState, ASPEED10X0_SOC)
struct AspeedSoCClass { struct AspeedSoCClass {
DeviceClass parent_class; DeviceClass parent_class;
const char *name;
/** valid_cpu_types: NULL terminated array of a single CPU type. */ /** valid_cpu_types: NULL terminated array of a single CPU type. */
const char * const *valid_cpu_types; const char * const *valid_cpu_types;
uint32_t silicon_rev; uint32_t silicon_rev;