From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C045C433E0 for ; Tue, 23 Jun 2020 08:14:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12ECB20716 for ; Tue, 23 Jun 2020 08:14:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12ECB20716 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jne4X-0000fH-CN for qemu-devel@archiver.kernel.org; Tue, 23 Jun 2020 04:14:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jne38-0007ZQ-U7 for qemu-devel@nongnu.org; Tue, 23 Jun 2020 04:12:58 -0400 Received: from 1.mo177.mail-out.ovh.net ([178.33.107.143]:56532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jne37-0004zQ-6Z for qemu-devel@nongnu.org; Tue, 23 Jun 2020 04:12:58 -0400 Received: from player695.ha.ovh.net (unknown [10.108.42.174]) by mo177.mail-out.ovh.net (Postfix) with ESMTP id BD81E1393FE for ; Tue, 23 Jun 2020 10:12:54 +0200 (CEST) Received: from kaod.org (lfbn-tou-1-921-245.w86-210.abo.wanadoo.fr [86.210.152.245]) (Authenticated sender: clg@kaod.org) by player695.ha.ovh.net (Postfix) with ESMTPSA id 2F1191385D479; Tue, 23 Jun 2020 08:12:45 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003f3fa0fe8-cfa1-4f1e-ad7b-51eb12a15320,EED1DA90FC9B795DFFB5AB62ED4F19E3D36D96F8) smtp.auth=clg@kaod.org Subject: Re: [PATCH v2 3/3] hw/arm/aspeed: QOM'ify AspeedMachineState To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20200623072132.2868-1-f4bug@amsat.org> <20200623072132.2868-4-f4bug@amsat.org> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: <22e4dc69-03cb-9ba0-5d34-4fbef51dc29c@kaod.org> Date: Tue, 23 Jun 2020 10:12:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200623072132.2868-4-f4bug@amsat.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13368372545306266579 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduhedrudekgedgtdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepuffvfhfhkffffgggjggtgfesthekredttdefjeenucfhrhhomhepveorughrihgtpgfnvggpifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeefffdvtddugeeifeduuefghfejgfeigeeigeeltedthefgieeiveeuiefhgeefgfenucfkpheptddrtddrtddrtddpkeeirddvuddtrdduhedvrddvgeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrieelhedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhg Received-SPF: pass client-ip=178.33.107.143; envelope-from=clg@kaod.org; helo=1.mo177.mail-out.ovh.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 04:12:55 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , Peter Maydell , qemu-arm@nongnu.org, Joel Stanley Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 6/23/20 9:21 AM, Philippe Mathieu-Daudé wrote: > AspeedMachineState seems crippled. We use incorrectly 2 > different structures to do the same thing. Merge them > altogether: > - Move AspeedMachine fields to AspeedMachineState > - AspeedMachineState is now QOM > - Remove unused AspeedMachine structure > > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater > --- > include/hw/arm/aspeed.h | 8 +------- > hw/arm/aspeed.c | 11 +++++++---- > 2 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h > index 5114ba0bd4..09da9d9acc 100644 > --- a/include/hw/arm/aspeed.h > +++ b/include/hw/arm/aspeed.h > @@ -15,13 +15,7 @@ typedef struct AspeedMachineState AspeedMachineState; > > #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed") > #define ASPEED_MACHINE(obj) \ > - OBJECT_CHECK(AspeedMachine, (obj), TYPE_ASPEED_MACHINE) > - > -typedef struct AspeedMachine { > - MachineState parent_obj; > - > - bool mmio_exec; > -} AspeedMachine; > + OBJECT_CHECK(AspeedMachineState, (obj), TYPE_ASPEED_MACHINE) > > #define ASPEED_MAC0_ON (1 << 0) > #define ASPEED_MAC1_ON (1 << 1) > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 680345beca..ccf127b328 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -33,9 +33,14 @@ static struct arm_boot_info aspeed_board_binfo = { > }; > > struct AspeedMachineState { > + /* Private */ > + MachineState parent_obj; > + /* Public */ > + > AspeedSoCState soc; > MemoryRegion ram_container; > MemoryRegion max_ram; > + bool mmio_exec; > }; > > /* Palmetto hardware value: 0x120CE416 */ > @@ -253,7 +258,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo) > > static void aspeed_machine_init(MachineState *machine) > { > - AspeedMachineState *bmc; > + AspeedMachineState *bmc = ASPEED_MACHINE(machine); > AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine); > AspeedSoCClass *sc; > DriveInfo *drive0 = drive_get(IF_MTD, 0, 0); > @@ -261,8 +266,6 @@ static void aspeed_machine_init(MachineState *machine) > int i; > NICInfo *nd = &nd_table[0]; > > - bmc = g_new0(AspeedMachineState, 1); > - > memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container", > 4 * GiB); > memory_region_add_subregion(&bmc->ram_container, 0, machine->ram); > @@ -751,7 +754,7 @@ static const TypeInfo aspeed_machine_types[] = { > }, { > .name = TYPE_ASPEED_MACHINE, > .parent = TYPE_MACHINE, > - .instance_size = sizeof(AspeedMachine), > + .instance_size = sizeof(AspeedMachineState), > .instance_init = aspeed_machine_instance_init, > .class_size = sizeof(AspeedMachineClass), > .class_init = aspeed_machine_class_init, >