From nobody Thu Dec 18 22:25:40 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593184564; cv=none; d=zohomail.com; s=zohoarc; b=TfY5ioBZS9Q8UFpy0TkG9F8KH+wwxerb2FDt1J6krxlHINjTAjzBwn0pYRx9Rew4RtufuhnKwwmxEveBEy2yAAyfqXe8CXMaZyec3bKunoBH3VVYNz/InG0dsHvfRFwDogYRsXRTnsPzL2Ro49ty0+hhM3sxHrl7fTNowEEQHu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593184564; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wHkNxYOciTE2oOBZnE2EDvVEW4h7Fv9ILw3mBQCiruk=; b=KWEu98+JX1JJ2HvfBqngIUtfCDpC0TmdvohoR8hLwBSO5XiYPUrk5OeArcCzGMjEgjcUfB6Haex4XQ7HclnlCRqOCVkNMFkRSKrfgDjBKGXoD8eKncQNHWwJwmUVWqbC00dF9PzXvoYqKFnUCJ/FEVxGRU/89wvsciCc926Eqd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593184564582906.6640438640017; Fri, 26 Jun 2020 08:16:04 -0700 (PDT) Received: from localhost ([::1]:47926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joq5C-0003qd-NP for importer@patchew.org; Fri, 26 Jun 2020 11:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq3l-0001pI-1W for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:14:33 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:46448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq3j-0006BR-51 for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:14:32 -0400 Received: by mail-wr1-x430.google.com with SMTP id r12so9802804wrj.13 for ; Fri, 26 Jun 2020 08:14:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.14.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wHkNxYOciTE2oOBZnE2EDvVEW4h7Fv9ILw3mBQCiruk=; b=sdBPql90cqhGYGENmHlUwo5QO5juetB+MJX9MhPVMD+Bd+fMnFm765MOi2BT05pUQV ywSjgexzturKX7COf3C/Qdk+T52GKzAYwqVnjNCe89ToPJfBXtaEn9NGqcu/Np5Nk48/ nPXRP5t4fuY5tiAoqGveMN2OxgKv0YPhGiACTApDc4KCHVK2QM0lkRt6QTwgppDcSZf8 HvHBZ/3e3Y83CapsW4ekzlKaAoQQE2tB14wy2wAUyfNhcE/8XU47qZB77UKjGTu7xxQo CEsP+osCjpQASS28/8vCbOC9PPH4N7ZGxlbOatzRTSzB7lkuaHMkyWEIR/E2AcdA09bV ojUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wHkNxYOciTE2oOBZnE2EDvVEW4h7Fv9ILw3mBQCiruk=; b=n6jLMHu62Nzw/WV0HXXKa+RBv6Y86pLlOCm4j3vObrwLsAqfyd83MrbMLUSwrweLpc DzsxfiTRO2pDEoYhnY6Hjvy1eVyPDcq3I6w0ArzXfh1hHPe58q8u85pk+IhkotsRwU0p 8HTpb9hLpZJxGGHuCmKLmDjIfdrDPlaltlzx0HkR0/surqiQVSDGEmjm3eCnMxTri5D6 gqiXSZtNhM/z8DT03TbUcmD18gt3hAGomRkVqO/AoE+e1fhWFGu5inYvfR2VboIHT1lI I5ZNR8vbQJs/A7G3cybOPctZrcyshj0yHdW/l8hCNIZVYaEeW53rEAmdm5mxAq1lacZj 4HIw== X-Gm-Message-State: AOAM530SMUNGNotlP0hqCvwZPeQ+DxrAM9Li7ZqVoqFjILv62rW3yB2j aBoBLXSIgZ8hjDUJ9AAPFTvF2oQ/0GU2Ng== X-Google-Smtp-Source: ABdhPJyJ0vc48zedWYxR1Yu3dcPNurfI9wkJ4j5EMND/0MfIH08cQsaAGoukmQ+RwGDWcPZ4eaV7Uw== X-Received: by 2002:a5d:4a01:: with SMTP id m1mr4274396wrq.250.1593184469311; Fri, 26 Jun 2020 08:14:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/57] hw/arm/aspeed: Rename AspeedBoardState as AspeedMachineState Date: Fri, 26 Jun 2020 16:13:29 +0100 Message-Id: <20200626151424.30117-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 To have a more consistent naming, rename AspeedBoardState as AspeedMachineState. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Message-id: 20200623072132.2868-3-f4bug@amsat.org Signed-off-by: Peter Maydell --- include/hw/arm/aspeed.h | 4 ++-- hw/arm/aspeed.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index 95b4daece86..5114ba0bd4f 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -11,7 +11,7 @@ =20 #include "hw/boards.h" =20 -typedef struct AspeedBoardState AspeedBoardState; +typedef struct AspeedMachineState AspeedMachineState; =20 #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed") #define ASPEED_MACHINE(obj) \ @@ -45,7 +45,7 @@ typedef struct AspeedMachineClass { const char *spi_model; uint32_t num_cs; uint32_t macs_mask; - void (*i2c_init)(AspeedBoardState *bmc); + void (*i2c_init)(AspeedMachineState *bmc); } AspeedMachineClass; =20 =20 diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 167fd5ed1c7..a167b736970 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -32,7 +32,7 @@ static struct arm_boot_info aspeed_board_binfo =3D { .board_id =3D -1, /* device-tree-only board */ }; =20 -struct AspeedBoardState { +struct AspeedMachineState { AspeedSoCState soc; MemoryRegion ram_container; MemoryRegion max_ram; @@ -253,7 +253,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, Drive= Info *dinfo) =20 static void aspeed_machine_init(MachineState *machine) { - AspeedBoardState *bmc; + AspeedMachineState *bmc; AspeedMachineClass *amc =3D ASPEED_MACHINE_GET_CLASS(machine); AspeedSoCClass *sc; DriveInfo *drive0 =3D drive_get(IF_MTD, 0, 0); @@ -261,7 +261,7 @@ static void aspeed_machine_init(MachineState *machine) int i; NICInfo *nd =3D &nd_table[0]; =20 - bmc =3D g_new0(AspeedBoardState, 1); + bmc =3D g_new0(AspeedMachineState, 1); =20 memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container", 4 * GiB); @@ -374,7 +374,7 @@ static void aspeed_machine_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo); } =20 -static void palmetto_bmc_i2c_init(AspeedBoardState *bmc) +static void palmetto_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D &bmc->soc; DeviceState *dev; @@ -396,7 +396,7 @@ static void palmetto_bmc_i2c_init(AspeedBoardState *bmc) object_property_set_int(OBJECT(dev), 110000, "temperature3", &error_ab= ort); } =20 -static void ast2500_evb_i2c_init(AspeedBoardState *bmc) +static void ast2500_evb_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D &bmc->soc; uint8_t *eeprom_buf =3D g_malloc0(8 * 1024); @@ -413,13 +413,13 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bm= c) i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", = 0x32); } =20 -static void ast2600_evb_i2c_init(AspeedBoardState *bmc) +static void ast2600_evb_i2c_init(AspeedMachineState *bmc) { /* Start with some devices on our I2C busses */ ast2500_evb_i2c_init(bmc); } =20 -static void romulus_bmc_i2c_init(AspeedBoardState *bmc) +static void romulus_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D &bmc->soc; =20 @@ -428,7 +428,7 @@ static void romulus_bmc_i2c_init(AspeedBoardState *bmc) i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", = 0x32); } =20 -static void swift_bmc_i2c_init(AspeedBoardState *bmc) +static void swift_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D &bmc->soc; =20 @@ -457,7 +457,7 @@ static void swift_bmc_i2c_init(AspeedBoardState *bmc) i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", = 0x4a); } =20 -static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) +static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D &bmc->soc; =20 @@ -501,7 +501,7 @@ static void sonorapass_bmc_i2c_init(AspeedBoardState *b= mc) =20 } =20 -static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) +static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc =3D &bmc->soc; uint8_t *eeprom_buf =3D g_malloc0(8 * 1024); --=20 2.20.1