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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT 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 A357AC433E0 for ; Sat, 20 Jun 2020 16:30:10 +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 6DDE323ECF for ; Sat, 20 Jun 2020 16:30:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kwdui5Mb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DDE323ECF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmgNd-0007WN-O8 for qemu-devel@archiver.kernel.org; Sat, 20 Jun 2020 12:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmgLy-0005b6-WF; Sat, 20 Jun 2020 12:28:27 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmgLx-0004n3-Fs; Sat, 20 Jun 2020 12:28:26 -0400 Received: by mail-wr1-x441.google.com with SMTP id c3so12462134wru.12; Sat, 20 Jun 2020 09:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u4yRFTMIfw8y7sQmFgoqYccYslLAPaFsaIXuAO8HYDQ=; b=Kwdui5MbCtqx5khqlC045H8+moV3fuxP+1MTptHQYxdZguwIXsmR1EZu2RykwImSi8 jSOQgTOMx69uUZHaiVXQ+FjU1h97sb1bIykXFKrEGENe0d5o9B9m7xqfyIqS1v4qOQ2c FpSd/5dBUDqJzVgbBU2/eOsA5zDSgvEQ6533Mm825vqF/ouVYn76OqgCf8sPsxTvcy6A arP2IKY7yr3bbvJtC/DqYd95g+AwfKPWXMOL7J5q7s50Nzj9mUOf5adS96EUUjZPG1C+ Iv43J3Q0WAiM3mJ1N1EzpWbkVhQ6aYXFVZr+FwXb+m4BoEpGj25aTJFuJuvhf6ZG0lxp 0LCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u4yRFTMIfw8y7sQmFgoqYccYslLAPaFsaIXuAO8HYDQ=; b=ZBGqyaNk00UgMX1AnHrrN2DO36ih+1KjDIG1qXF49qesKg6VNAyQngdO54KJpCZIjM ssfhh5KzaCL6RHallUUzui54QNTnhUmbZmynHjnnoJYxTsOABq7InXyZh1NkpyBixNZb 36BBi9tUgNhT4vB54B2HodTLWPXEk3DRQvkdVZPb2u1+mu6MFl+7bNG4QD76W6N5Pc8H 3D/USGv1yUklttO3YdDTRV+OyRuvXK1PIALve3ICbbGda84ubrQZ7mUnfbOf6lcSIPHC y3IgNBtBS9UVLSzcLAQroMruOan1MeH9g00WQh9ArnVEyBsCzhp2iMJoSceZ4gaM6YAe gg1g== X-Gm-Message-State: AOAM532b9bI/bdNHPxNbYQUhXHY3BTxDAOhRhlBgO0MuHTS47in8Ec60 sPhqlOvMPt/scyXR4LfM8KElFB2W X-Google-Smtp-Source: ABdhPJzMB18CMPfAxIMBmY+805zUuDaBXMZI8IH8KNMtkTemKD6SCWuBLSt3ImvSRVwrYL3d5B1L+w== X-Received: by 2002:adf:edc8:: with SMTP id v8mr8528498wro.125.1592670503521; Sat, 20 Jun 2020 09:28:23 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id e8sm9240006wrv.24.2020.06.20.09.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jun 2020 09:28:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/arm/aspeed: QOM'ify AspeedBoardState Date: Sat, 20 Jun 2020 18:28:18 +0200 Message-Id: <20200620162818.22340-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200620162818.22340-1-f4bug@amsat.org> References: <20200620162818.22340-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Peter Maydell , Eduardo Habkost , Andrew Jeffery , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Joel Stanley Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" AspeedBoardState seems crippled. We use incorrectly 2 different structures to do the same thing. Merge them altogether: - Move AspeedMachine fields to AspeedBoardState - AspeedBoardState is now QOM - Remove unused AspeedMachine Signed-off-by: Philippe Mathieu-Daudé --- 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 95b4daece8..9c9bac1263 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -15,13 +15,7 @@ typedef struct AspeedBoardState AspeedBoardState; #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(AspeedBoardState, (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 31765792a2..6b7533aeee 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -33,9 +33,14 @@ static struct arm_boot_info aspeed_board_binfo = { }; struct AspeedBoardState { + /* 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) { - AspeedBoardState *bmc; + AspeedBoardState *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(AspeedBoardState, 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(AspeedBoardState), .instance_init = aspeed_machine_instance_init, .class_size = sizeof(AspeedMachineClass), .class_init = aspeed_machine_class_init, -- 2.21.3