From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:6512:3aa:0:0:0:0 with SMTP id v10csp6317417lfp; Tue, 18 Feb 2020 08:50:32 -0800 (PST) X-Google-Smtp-Source: APXvYqy4yMOyq2YsQMnAfg3FYEwZR1ItfZEBIp2n2e0KFuNfMgYSsSReZh7qRn077/8nz+qNx3eo X-Received: by 2002:ac8:3aa6:: with SMTP id x35mr1710328qte.38.1582044632366; Tue, 18 Feb 2020 08:50:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582044632; cv=none; d=google.com; s=arc-20160816; b=nTL9ePC2T7xA4Wg7eN2aiN3LzPYDKUseZUi2+TLkINb0qu5RhI8iye7jmwbw81/0sB eyyGAUTdkNnEusfZT7TyG1mIHvCO0O/VQr43Oujw75P6VX1E/EbuwvzWlPHzQGJzYFz2 efhnpR5Byd+XyPiepxu6sUOlT58D4fZhPiAa71EGgS86MH+jloepIKTsbg4+tNOt0xaQ Rfpc3ahIfUPG8fxPx5f1lpLwPX3YlYrDxI8Y9q1C1RYTbZYeFn4V7nXdOPtV3q7t/P/G usbaBPuy9PtxjQw7j3XkHcRUKwfz7ywLqHe4gQRLIyvhCG5MsieObPd9L5f0kY1F5wWZ 2mNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:subject:to:from:date :dkim-signature; bh=GvA+kR/R0ZYOPz3ZnYW9L0jbPp3JWJC9Ag7pXP6U9vM=; b=DWJK0t0jYGrk4Xtdr4GSemvuY8CZecQXMw8kI6foZAcjAAMBBfBrg6rlUCNakYbmH1 cfvb/wMvNvwI50sRAdpVazXVEn1YzTAYcHpZVLxWoHGEQksBKmlwhE4/Sv4eyGbMeO0a lrWxnogF4EmSA+wd7LE5kDrW8baFC1i+UrM8UEhh978b4RP0evjTWVUKwzZSL0l7dk4o QXXseBEfj0fs6JUhYOIucp15At+zmF8s19KxAqcP8YE8jSKBGgS2WOMpAb2m6TnQg2oB 68FZFO/W24jHQ5bjDwTN2r1RnzwklEPgNgalqRuqu5IEdijVDeGKLFKcCTENRA4T61o6 LP7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=T3b8y1uz; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g137si2107161qke.360.2020.02.18.08.50.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Feb 2020 08:50:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=T3b8y1uz; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j464t-0006MT-RH for alex.bennee@linaro.org; Tue, 18 Feb 2020 11:50:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47960) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j464j-0006IK-1m for qemu-arm@nongnu.org; Tue, 18 Feb 2020 11:50:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j464h-00008e-SP for qemu-arm@nongnu.org; Tue, 18 Feb 2020 11:50:20 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:48497 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j464h-00008I-OO for qemu-arm@nongnu.org; Tue, 18 Feb 2020 11:50:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582044619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GvA+kR/R0ZYOPz3ZnYW9L0jbPp3JWJC9Ag7pXP6U9vM=; b=T3b8y1uz0H8RpcnnPwW/73URMycfuhGYUnEnS7X6UwhhaMzVR6d11zomViBSFkOv8eA4Cr o2+2aobR4/ISzdqgvPTeJrKGxs8CiCzRLnbbp+cKwSxwOmKF6BgRx9woxiQdb3bxeJpfWW nyB0Rb+h1Aop3G/+ZUIKRzCzEYdv2+E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-297-HZj__YNoPaqXoJfyjXU17A-1; Tue, 18 Feb 2020 11:50:14 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84C731B2C9AD; Tue, 18 Feb 2020 16:50:12 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 090065C13C; Tue, 18 Feb 2020 16:50:07 +0000 (UTC) Date: Tue, 18 Feb 2020 17:50:07 +0100 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v2 02/13] hw/arm/raspi: Avoid using TypeInfo::class_data pointer Message-ID: <20200218175007.594c3a3a@redhat.com> In-Reply-To: <20200217114533.17779-3-f4bug@amsat.org> References: <20200217114533.17779-1-f4bug@amsat.org> <20200217114533.17779-3-f4bug@amsat.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: HZj__YNoPaqXoJfyjXU17A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , qemu-devel@nongnu.org, Andrew Baumann , qemu-arm@nongnu.org, Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Luc Michel Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: BxKvnPieIwQ8 On Mon, 17 Feb 2020 12:45:22 +0100 Philippe Mathieu-Daud=C3=A9 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. >=20 > 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. >=20 > This partly reverts commit a03bde3674e. >=20 > Suggested-by: Igor Mammedov > Reviewed-by: Richard Henderson > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov > --- > hw/arm/raspi.c | 34 ++++++++++++++++++++++++---------- > 1 file changed, 24 insertions(+), 10 deletions(-) >=20 > 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); > } > =20 > -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 =3D MACHINE_CLASS(oc); > - RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); > - uint32_t board_rev =3D (uint32_t)(uintptr_t)data; > - > - rmc->board_rev =3D board_rev; > mc->desc =3D g_strdup_printf("Raspberry Pi %s", board_type(board_rev= )); > mc->init =3D raspi_machine_init; > mc->block_default_type =3D IF_SD; > @@ -326,18 +322,36 @@ static void raspi_machine_class_init(ObjectClass *o= c, void *data) > mc->default_ram_size =3D board_ram_size(board_rev); > }; > =20 > +static void raspi2b_machine_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc =3D MACHINE_CLASS(oc); > + RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); > + > + rmc->board_rev =3D 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 =3D MACHINE_CLASS(oc); > + RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); > + > + rmc->board_rev =3D 0xa02082; > + raspi_machine_class_common_init(mc, rmc->board_rev); > +}; > +#endif /* TARGET_AARCH64 */ > + > static const TypeInfo raspi_machine_types[] =3D { > { > .name =3D MACHINE_TYPE_NAME("raspi2"), > .parent =3D TYPE_RASPI_MACHINE, > - .class_init =3D raspi_machine_class_init, > - .class_data =3D (void *)0xa21041, > + .class_init =3D raspi2b_machine_class_init, > #ifdef TARGET_AARCH64 > }, { > .name =3D MACHINE_TYPE_NAME("raspi3"), > .parent =3D TYPE_RASPI_MACHINE, > - .class_init =3D raspi_machine_class_init, > - .class_data =3D (void *)0xa02082, > + .class_init =3D raspi3b_machine_class_init, > #endif > }, { > .name =3D TYPE_RASPI_MACHINE,