From: Igor Mammedov <imammedo@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Joaquin de Andres" <me@xcancerberox.com.ar>,
"Alistair Francis" <alistair@alistair23.me>,
qemu-devel@nongnu.org,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
"Esteban Bosse" <estebanbosse@gmail.com>,
"Niek Linnenbank" <nieklinnenbank@gmail.com>,
qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: Re: [PATCH v3 07/13] hw/arm/raspi: Make machines children of abstract RaspiMachineClass
Date: Mon, 10 Feb 2020 10:45:35 +0100 [thread overview]
Message-ID: <20200210104535.46c9bad7@redhat.com> (raw)
In-Reply-To: <20200208165645.15657-8-f4bug@amsat.org>
On Sat, 8 Feb 2020 17:56:39 +0100
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> QOM'ify RaspiMachineState. Now machines inherit of RaspiMachineClass.
>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3: Fixed typo in description (Zoltán)
> ---
> hw/arm/raspi.c | 56 +++++++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 49 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index b3e6f72b55..62b8df3c2e 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -34,10 +34,28 @@
> /* Registered machine type (matches RPi Foundation bootloader and U-Boot) */
> #define MACH_TYPE_BCM2708 3138
>
> -typedef struct RasPiState {
> +typedef struct RaspiMachineState {
> + /*< private >*/
> + MachineState parent_obj;
> + /*< public >*/
> BCM283XState soc;
> MemoryRegion ram;
> -} RasPiState;
> +} RaspiMachineState;
> +
> +typedef struct RaspiMachineClass {
> + /*< private >*/
> + MachineClass parent_obj;
> + /*< public >*/
> +} RaspiMachineClass;
> +
> +#define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common")
> +#define RASPI_MACHINE(obj) \
> + OBJECT_CHECK(RaspiMachineState, (obj), TYPE_RASPI_MACHINE)
> +
> +#define RASPI_MACHINE_CLASS(klass) \
> + OBJECT_CLASS_CHECK(RaspiMachineClass, (klass), TYPE_RASPI_MACHINE)
> +#define RASPI_MACHINE_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(RaspiMachineClass, (obj), TYPE_RASPI_MACHINE)
>
> /*
> * Board revision codes:
> @@ -211,7 +229,7 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
>
> static void raspi_init(MachineState *machine, uint32_t board_rev)
> {
> - RasPiState *s = g_new0(RasPiState, 1);
> + RaspiMachineState *s = RASPI_MACHINE(machine);
> int version = board_version(board_rev);
> uint64_t ram_size = board_ram_size(board_rev);
> uint32_t vcram_size;
> @@ -264,8 +282,10 @@ static void raspi2_init(MachineState *machine)
> raspi_init(machine, 0xa21041);
> }
>
> -static void raspi2_machine_init(MachineClass *mc)
> +static void raspi2_machine_class_init(ObjectClass *oc, void *data)
> {
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> mc->desc = "Raspberry Pi 2B";
> mc->init = raspi2_init;
> mc->block_default_type = IF_SD;
> @@ -278,7 +298,6 @@ static void raspi2_machine_init(MachineClass *mc)
> mc->default_ram_size = 1 * GiB;
> mc->ignore_memory_transaction_failures = true;
> };
> -DEFINE_MACHINE("raspi2", raspi2_machine_init)
>
> #ifdef TARGET_AARCH64
> static void raspi3_init(MachineState *machine)
> @@ -286,8 +305,10 @@ static void raspi3_init(MachineState *machine)
> raspi_init(machine, 0xa02082);
> }
>
> -static void raspi3_machine_init(MachineClass *mc)
> +static void raspi3_machine_class_init(ObjectClass *oc, void *data)
> {
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> mc->desc = "Raspberry Pi 3B";
> mc->init = raspi3_init;
> mc->block_default_type = IF_SD;
> @@ -299,5 +320,26 @@ static void raspi3_machine_init(MachineClass *mc)
> mc->default_cpus = BCM283X_NCPUS;
> mc->default_ram_size = 1 * GiB;
> }
> -DEFINE_MACHINE("raspi3", raspi3_machine_init)
> #endif
> +
> +static const TypeInfo raspi_machine_types[] = {
> + {
> + .name = MACHINE_TYPE_NAME("raspi2"),
> + .parent = TYPE_RASPI_MACHINE,
> + .class_init = raspi2_machine_class_init,
> +#ifdef TARGET_AARCH64
> + }, {
> + .name = MACHINE_TYPE_NAME("raspi3"),
> + .parent = TYPE_RASPI_MACHINE,
> + .class_init = raspi3_machine_class_init,
> +#endif
> + }, {
> + .name = TYPE_RASPI_MACHINE,
> + .parent = TYPE_MACHINE,
> + .instance_size = sizeof(RaspiMachineState),
> + .class_size = sizeof(RaspiMachineClass),
> + .abstract = true,
> + }
> +};
> +
> +DEFINE_TYPES(raspi_machine_types)
next prev parent reply other threads:[~2020-02-10 9:47 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-08 16:56 [PATCH v3 00/13] hw/arm/raspi: Dynamically create machines based on the board revision Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 01/13] hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-09 22:53 ` Niek Linnenbank
2020-02-08 16:56 ` [PATCH v3 02/13] hw/arm/raspi: Correct the board descriptions Philippe Mathieu-Daudé
2020-02-09 22:51 ` Niek Linnenbank
2020-02-09 22:51 ` Niek Linnenbank
2020-02-09 23:02 ` Philippe Mathieu-Daudé
2020-02-09 23:02 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 03/13] hw/arm/raspi: Extract the version from the board revision Philippe Mathieu-Daudé
2020-02-13 13:40 ` Peter Maydell
2020-02-13 13:40 ` Peter Maydell
2020-02-13 13:53 ` Philippe Mathieu-Daudé
2020-02-13 13:53 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 04/13] hw/arm/raspi: Extract the RAM size " Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 05/13] hw/arm/raspi: Extract the processor type " Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 06/13] hw/arm/raspi: Trivial code movement Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-10 9:58 ` Igor Mammedov
2020-02-10 9:58 ` Igor Mammedov
2020-02-08 16:56 ` [PATCH v3 07/13] hw/arm/raspi: Make machines children of abstract RaspiMachineClass Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-10 9:45 ` Igor Mammedov [this message]
2020-02-08 16:56 ` [PATCH v3 08/13] hw/arm/raspi: Make board_rev a field of RaspiMachineClass Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-10 9:50 ` Igor Mammedov
2020-02-10 9:50 ` Igor Mammedov
2020-02-10 10:03 ` Philippe Mathieu-Daudé
2020-02-10 10:03 ` Philippe Mathieu-Daudé
2020-02-10 13:09 ` Igor Mammedov
2020-02-10 13:09 ` Igor Mammedov
2020-02-08 16:56 ` [PATCH v3 09/13] hw/arm/raspi: Let class_init() directly call raspi_machine_init() Philippe Mathieu-Daudé
2020-02-10 9:55 ` Igor Mammedov
2020-02-10 9:55 ` Igor Mammedov
2020-02-08 16:56 ` [PATCH v3 10/13] hw/arm/raspi: Set default RAM size to size encoded in board revision Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 11/13] hw/arm/raspi: Extract the board model from the " Philippe Mathieu-Daudé
2020-02-08 16:56 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 12/13] hw/arm/raspi: Use a unique raspi_machine_class_init() method Philippe Mathieu-Daudé
2020-02-10 10:01 ` Igor Mammedov
2020-02-10 10:01 ` Igor Mammedov
2020-02-13 13:59 ` Peter Maydell
2020-02-13 14:15 ` Philippe Mathieu-Daudé
2020-02-13 14:15 ` Philippe Mathieu-Daudé
2020-02-13 14:32 ` Peter Maydell
2020-02-13 15:33 ` Philippe Mathieu-Daudé
2020-02-13 15:33 ` Philippe Mathieu-Daudé
2020-02-15 17:45 ` Philippe Mathieu-Daudé
2020-02-15 17:45 ` Philippe Mathieu-Daudé
2020-02-08 16:56 ` [PATCH v3 13/13] hw/arm/raspi: Extract the cores count from the board revision Philippe Mathieu-Daudé
2020-02-10 10:03 ` Igor Mammedov
2020-02-10 10:03 ` Igor Mammedov
2020-02-13 14:00 ` [PATCH v3 00/13] hw/arm/raspi: Dynamically create machines based on " Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200210104535.46c9bad7@redhat.com \
--to=imammedo@redhat.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=alistair@alistair23.me \
--cc=estebanbosse@gmail.com \
--cc=f4bug@amsat.org \
--cc=me@xcancerberox.com.ar \
--cc=nieklinnenbank@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.