@samitouri / QOSamiQemu / commits / 0f79dbc847

hw/misc:aspeed_sli: Convert to DEFINE_TYPES() with inlined TypeInfo

Replace the legacy type_register_static()/type_init() registration pattern with the modern DEFINE_TYPES() macro. Inline 3 standalone TypeInfo variables (aspeed_sli_info as abstract base, aspeed_2700_sli_info, aspeed_2700_sliio_info) directly into the 'aspeed_sli_types[]' array, removing the need for separate declarations. No functional change. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Link: https://lore.kernel.org/qemu-devel/20260601024959.2347639-9-jamin_lin@aspeedtech.com Signed-off-by: Cédric Le Goater <clg@redhat.com>

Jamin Lin committed Jun 1, 2026 at 02:50 UTC 0f79dbc847843daff3174d779f3dc74583ed1e0d
1 file changed +19 -25
hw/misc/aspeed_sli.c
+19 -25
@@ -132,13 +132,6 @@ static void aspeed_sli_class_init(ObjectClass *klass, const void *data)
132 dc->realize = aspeed_sli_realize;
133 }
134
135 -static const TypeInfo aspeed_sli_info = {
136 - .name = TYPE_ASPEED_SLI,
137 - .parent = TYPE_SYS_BUS_DEVICE,
138 - .instance_size = sizeof(AspeedSLIState),
139 - .class_init = aspeed_sli_class_init,
140 - .abstract = true,
141 -};
135
136 static void aspeed_2700_sli_class_init(ObjectClass *klass, const void *data)
137 {
@@ -155,23 +148,24 @@ static void aspeed_2700_sliio_class_init(ObjectClass *klass, const void *data)
148 dc->realize = aspeed_sliio_realize;
149 }
150
158 -static const TypeInfo aspeed_2700_sli_info = {
159 - .name = TYPE_ASPEED_2700_SLI,
160 - .parent = TYPE_ASPEED_SLI,
161 - .class_init = aspeed_2700_sli_class_init,
162 -};
163 -
164 -static const TypeInfo aspeed_2700_sliio_info = {
165 - .name = TYPE_ASPEED_2700_SLIIO,
166 - .parent = TYPE_ASPEED_SLI,
167 - .class_init = aspeed_2700_sliio_class_init,
151 +static const TypeInfo aspeed_sli_types[] = {
152 + {
153 + .name = TYPE_ASPEED_SLI,
154 + .parent = TYPE_SYS_BUS_DEVICE,
155 + .instance_size = sizeof(AspeedSLIState),
156 + .class_init = aspeed_sli_class_init,
157 + .abstract = true,
158 + },
159 + {
160 + .name = TYPE_ASPEED_2700_SLI,
161 + .parent = TYPE_ASPEED_SLI,
162 + .class_init = aspeed_2700_sli_class_init,
163 + },
164 + {
165 + .name = TYPE_ASPEED_2700_SLIIO,
166 + .parent = TYPE_ASPEED_SLI,
167 + .class_init = aspeed_2700_sliio_class_init,
168 + }
169 };
170
170 -static void aspeed_sli_register_types(void)
171 -{
172 - type_register_static(&aspeed_sli_info);
173 - type_register_static(&aspeed_2700_sli_info);
174 - type_register_static(&aspeed_2700_sliio_info);
175 -}
176 -
177 -type_init(aspeed_sli_register_types);
171 +DEFINE_TYPES(aspeed_sli_types)