From patchwork Fri Jun 26 15:13:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191814 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp579327ilg; Fri, 26 Jun 2020 08:15:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/ANjUKKuk2FF6d8s455ORlUyqaGeSnDY88IgzRPdq2diwAB/o14gHQvTbABCAHDOv1L/o X-Received: by 2002:a25:df83:: with SMTP id w125mr5898006ybg.354.1593184538248; Fri, 26 Jun 2020 08:15:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593184538; cv=none; d=google.com; s=arc-20160816; b=bsWGypNnED9MSXCvKFP5/N+xqKxf9vnE5j4fcchCBINzWcHb0A2zpakTw7GQKldkXW 29gykxSf7Cji+Ea6wYRlvh08JEKRkRRgfNHbce9BX6CceNeozePXMovB5aqGciVEGQEb XjOeIwyTr7fUge2Q0rhcNNebbsJClGRCzo+kTjwi6aQTkodbCa07sN5pWTKU3yEBZxXh l/ZuzPTnZUmg4Epu/nM/mr6QWw1BDn3f/yRxl+hVsvOu2HIIHbU9iPrpcYi4Soii6znc OsYEszmW+EQtU3AwosyXnLFNQthMaBH/U9gCeT3xB5LtPusUrpJ6lHlHC7oxwLUKF0yT /EPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wHkNxYOciTE2oOBZnE2EDvVEW4h7Fv9ILw3mBQCiruk=; b=xm1Xto4mqdT6Rs8HxGjPzwpW4Mn6umN88E6286Mi9ERJCsVN9Y1Z4Sf6rQ0Q+OEiLq w79pPCutzaRbllBpSZ5YGkyoyjK8dLfm7mwXMdTSueYoKGA/bi/nFHIZPFSKrkkEMckO T79BdR3kPGBBx4KLNYS3+G6yXSgsC1zdBa+8ctg1JYXQInuazwnzLIY/JohgFPI6ZYL3 9gTQaJhIFpVINeGVW5lR56klccMkGZBuEnqeDPrJwyHuxRInWGuCqbfq/5/eGTKyzu8S gLBOSs4Sg/2EjXa4gbwaOD2B+cl48g8xlS52RTlE7oDOJOAMhudGn/zrvQDlY4Ln7qM4 pgMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sdBPql90; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h185si14731857ybg.448.2020.06.26.08.15.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:15:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sdBPql90; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joq4n-0001rW-Em for patch@linaro.org; Fri, 26 Jun 2020 11:15:37 -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) 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-Received: by 2002:a5d:4a01:: with SMTP id m1mr4274396wrq.250.1593184469311; Fri, 26 Jun 2020 08:14:29 -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) 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé To have a more consistent naming, rename AspeedBoardState as AspeedMachineState. Suggested-by: Cédric Le Goater Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric 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(-) -- 2.20.1 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 @@ #include "hw/boards.h" -typedef struct AspeedBoardState AspeedBoardState; +typedef struct AspeedMachineState AspeedMachineState; #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; 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 = { .board_id = -1, /* device-tree-only board */ }; -struct AspeedBoardState { +struct AspeedMachineState { AspeedSoCState soc; MemoryRegion ram_container; MemoryRegion max_ram; @@ -253,7 +253,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo) static void aspeed_machine_init(MachineState *machine) { - AspeedBoardState *bmc; + AspeedMachineState *bmc; AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine); AspeedSoCClass *sc; DriveInfo *drive0 = drive_get(IF_MTD, 0, 0); @@ -261,7 +261,7 @@ static void aspeed_machine_init(MachineState *machine) int i; NICInfo *nd = &nd_table[0]; - bmc = g_new0(AspeedBoardState, 1); + bmc = g_new0(AspeedMachineState, 1); 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); } -static void palmetto_bmc_i2c_init(AspeedBoardState *bmc) +static void palmetto_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &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_abort); } -static void ast2500_evb_i2c_init(AspeedBoardState *bmc) +static void ast2500_evb_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc; uint8_t *eeprom_buf = g_malloc0(8 * 1024); @@ -413,13 +413,13 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc) i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32); } -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); } -static void romulus_bmc_i2c_init(AspeedBoardState *bmc) +static void romulus_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc; @@ -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); } -static void swift_bmc_i2c_init(AspeedBoardState *bmc) +static void swift_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc; @@ -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); } -static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) +static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc; @@ -501,7 +501,7 @@ static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) } -static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) +static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc; uint8_t *eeprom_buf = g_malloc0(8 * 1024);