From: Igor Mammedov <imammedo@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-devel@nongnu.org,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Luc Michel" <luc.michel@greensocs.com>
Subject: Re: [PATCH v2 02/13] hw/arm/raspi: Avoid using TypeInfo::class_data pointer
Date: Tue, 18 Feb 2020 17:50:07 +0100 [thread overview]
Message-ID: <20200218175007.594c3a3a@redhat.com> (raw)
In-Reply-To: <20200217114533.17779-3-f4bug@amsat.org>
On Mon, 17 Feb 2020 12:45:22 +0100
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Using class_data pointer to create a MachineClass is not
> the recommended way anymore. The correct way is to open-code
> the MachineClass::fields in the class_init() method.
>
> We can not use TYPE_RASPI_MACHINE::class_base_init() because
> it is called *before* each machine class_init(), therefore the
> board_rev field is not populated. We have to manually call
> raspi_machine_class_common_init() for each machine.
>
> This partly reverts commit a03bde3674e.
>
> Suggested-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/arm/raspi.c | 34 ++++++++++++++++++++++++----------
> 1 file changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index 221356933e..1a8c135dc6 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -309,13 +309,9 @@ static void raspi_machine_init(MachineState *machine)
> setup_boot(machine, version, machine->ram_size - vcram_size);
> }
>
> -static void raspi_machine_class_init(ObjectClass *oc, void *data)
> +static void raspi_machine_class_common_init(MachineClass *mc,
> + uint32_t board_rev)
> {
> - MachineClass *mc = MACHINE_CLASS(oc);
> - RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
> - uint32_t board_rev = (uint32_t)(uintptr_t)data;
> -
> - rmc->board_rev = board_rev;
> mc->desc = g_strdup_printf("Raspberry Pi %s", board_type(board_rev));
> mc->init = raspi_machine_init;
> mc->block_default_type = IF_SD;
> @@ -326,18 +322,36 @@ static void raspi_machine_class_init(ObjectClass *oc, void *data)
> mc->default_ram_size = board_ram_size(board_rev);
> };
>
> +static void raspi2b_machine_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
> +
> + rmc->board_rev = 0xa21041;
> + raspi_machine_class_common_init(mc, rmc->board_rev);
> +};
> +
> +#ifdef TARGET_AARCH64
> +static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
> +
> + rmc->board_rev = 0xa02082;
> + raspi_machine_class_common_init(mc, rmc->board_rev);
> +};
> +#endif /* TARGET_AARCH64 */
> +
> static const TypeInfo raspi_machine_types[] = {
> {
> .name = MACHINE_TYPE_NAME("raspi2"),
> .parent = TYPE_RASPI_MACHINE,
> - .class_init = raspi_machine_class_init,
> - .class_data = (void *)0xa21041,
> + .class_init = raspi2b_machine_class_init,
> #ifdef TARGET_AARCH64
> }, {
> .name = MACHINE_TYPE_NAME("raspi3"),
> .parent = TYPE_RASPI_MACHINE,
> - .class_init = raspi_machine_class_init,
> - .class_data = (void *)0xa02082,
> + .class_init = raspi3b_machine_class_init,
> #endif
> }, {
> .name = TYPE_RASPI_MACHINE,
next prev parent reply other threads:[~2020-02-18 16:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 11:45 [PATCH v2 00/13] hw/arm: Add raspi0 and raspi1 machines Philippe Mathieu-Daudé
2020-02-17 11:45 ` [PATCH v2 01/13] hw/arm/raspi: Remove ignore_memory_transaction_failures on the raspi2 Philippe Mathieu-Daudé
2020-02-18 9:07 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 02/13] hw/arm/raspi: Avoid using TypeInfo::class_data pointer Philippe Mathieu-Daudé
2020-02-18 16:50 ` Igor Mammedov [this message]
2020-02-17 11:45 ` [PATCH v2 03/13] hw/arm/raspi: Use more specific machine names Philippe Mathieu-Daudé
2020-02-18 9:07 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 04/13] hw/arm/raspi: Introduce RaspiProcessorId enum Philippe Mathieu-Daudé
2020-02-18 8:24 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 05/13] hw/arm/raspi: Remove use of the 'version' value in the board code Philippe Mathieu-Daudé
2020-02-18 8:35 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 06/13] hw/arm/bcm2836: Restrict BCM283XClass declaration to C source Philippe Mathieu-Daudé
2020-02-18 8:55 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 07/13] hw/arm/bcm2836: QOM'ify more by adding class_init() to each SoC type Philippe Mathieu-Daudé
2020-02-18 17:04 ` Igor Mammedov
2020-02-18 17:39 ` Philippe Mathieu-Daudé
2020-02-19 17:28 ` Igor Mammedov
2020-02-17 11:45 ` [PATCH v2 08/13] hw/arm/bcm2836: Introduce BCM283XClass::core_count Philippe Mathieu-Daudé
2020-02-18 9:00 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 09/13] hw/arm/bcm2836: Only provide "enabled-cpus" property to multicore SoCs Philippe Mathieu-Daudé
2020-02-18 9:01 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 10/13] hw/arm/bcm2836: Split out common realize() code Philippe Mathieu-Daudé
2020-02-18 9:03 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 11/13] hw/arm/bcm2836: Introduce the BCM2835 SoC Philippe Mathieu-Daudé
2020-02-18 9:04 ` Luc Michel
2020-02-17 11:45 ` [PATCH v2 12/13] hw/arm/raspi: Add the Raspberry Pi B+ machine Philippe Mathieu-Daudé
2020-02-18 8:48 ` Luc Michel
2020-02-18 9:35 ` Philippe Mathieu-Daudé
2020-02-18 16:48 ` Igor Mammedov
2020-02-21 18:30 ` Eduardo Habkost
2020-02-22 22:19 ` Niek Linnenbank
2020-02-24 8:55 ` Philippe Mathieu-Daudé
2020-09-21 16:45 ` Philippe Mathieu-Daudé
2020-02-17 11:45 ` [PATCH v2 13/13] hw/arm/raspi: Add the Raspberry Pi Zero machine Philippe Mathieu-Daudé
2020-02-18 8:49 ` Luc Michel
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=20200218175007.594c3a3a@redhat.com \
--to=imammedo@redhat.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=f4bug@amsat.org \
--cc=luc.michel@greensocs.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).