| Message ID | 20241105130431.22564-6-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/microblaze: Allow running cross-endian vCPUs | expand |
On 05/11/24, Philippe Mathieu-Daudé wrote: > Replace DEFINE_MACHINE() by DEFINE_TYPES(), converting the > class_init() handler. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) Reviewed-by: Anton Johansson <anjo@rev.ng>
On Tue, Nov 5, 2024 at 11:05 PM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > Replace DEFINE_MACHINE() by DEFINE_TYPES(), converting the > class_init() handler. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c > index 581b0411e29..6c0f5c6c651 100644 > --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c > +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c > @@ -55,6 +55,9 @@ > #define ETHLITE_IRQ 1 > #define UARTLITE_IRQ 3 > > +#define TYPE_PETALOGIX_S3ADSP1800_MACHINE \ > + MACHINE_TYPE_NAME("petalogix-s3adsp1800") > + > static void > petalogix_s3adsp1800_init(MachineState *machine) > { > @@ -132,11 +135,21 @@ petalogix_s3adsp1800_init(MachineState *machine) > NULL); > } > > -static void petalogix_s3adsp1800_machine_init(MachineClass *mc) > +static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) > { > + MachineClass *mc = MACHINE_CLASS(oc); > + > mc->desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800"; > mc->init = petalogix_s3adsp1800_init; > mc->is_default = true; > } > > -DEFINE_MACHINE("petalogix-s3adsp1800", petalogix_s3adsp1800_machine_init) > +static const TypeInfo petalogix_s3adsp1800_machine_types[] = { > + { > + .name = TYPE_PETALOGIX_S3ADSP1800_MACHINE, > + .parent = TYPE_MACHINE, > + .class_init = petalogix_s3adsp1800_machine_class_init, > + }, > +}; > + > +DEFINE_TYPES(petalogix_s3adsp1800_machine_types) > -- > 2.45.2 > >
On Tue, Nov 05, 2024 at 02:04:17PM +0100, Philippe Mathieu-Daudé wrote: > Replace DEFINE_MACHINE() by DEFINE_TYPES(), converting the > class_init() handler. Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c > index 581b0411e29..6c0f5c6c651 100644 > --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c > +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c > @@ -55,6 +55,9 @@ > #define ETHLITE_IRQ 1 > #define UARTLITE_IRQ 3 > > +#define TYPE_PETALOGIX_S3ADSP1800_MACHINE \ > + MACHINE_TYPE_NAME("petalogix-s3adsp1800") > + > static void > petalogix_s3adsp1800_init(MachineState *machine) > { > @@ -132,11 +135,21 @@ petalogix_s3adsp1800_init(MachineState *machine) > NULL); > } > > -static void petalogix_s3adsp1800_machine_init(MachineClass *mc) > +static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) > { > + MachineClass *mc = MACHINE_CLASS(oc); > + > mc->desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800"; > mc->init = petalogix_s3adsp1800_init; > mc->is_default = true; > } > > -DEFINE_MACHINE("petalogix-s3adsp1800", petalogix_s3adsp1800_machine_init) > +static const TypeInfo petalogix_s3adsp1800_machine_types[] = { > + { > + .name = TYPE_PETALOGIX_S3ADSP1800_MACHINE, > + .parent = TYPE_MACHINE, > + .class_init = petalogix_s3adsp1800_machine_class_init, > + }, > +}; > + > +DEFINE_TYPES(petalogix_s3adsp1800_machine_types) > -- > 2.45.2 >
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 581b0411e29..6c0f5c6c651 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -55,6 +55,9 @@ #define ETHLITE_IRQ 1 #define UARTLITE_IRQ 3 +#define TYPE_PETALOGIX_S3ADSP1800_MACHINE \ + MACHINE_TYPE_NAME("petalogix-s3adsp1800") + static void petalogix_s3adsp1800_init(MachineState *machine) { @@ -132,11 +135,21 @@ petalogix_s3adsp1800_init(MachineState *machine) NULL); } -static void petalogix_s3adsp1800_machine_init(MachineClass *mc) +static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800"; mc->init = petalogix_s3adsp1800_init; mc->is_default = true; } -DEFINE_MACHINE("petalogix-s3adsp1800", petalogix_s3adsp1800_machine_init) +static const TypeInfo petalogix_s3adsp1800_machine_types[] = { + { + .name = TYPE_PETALOGIX_S3ADSP1800_MACHINE, + .parent = TYPE_MACHINE, + .class_init = petalogix_s3adsp1800_machine_class_init, + }, +}; + +DEFINE_TYPES(petalogix_s3adsp1800_machine_types)
Replace DEFINE_MACHINE() by DEFINE_TYPES(), converting the class_init() handler. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)