From patchwork Tue Dec 12 16:29:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 753104 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c83:0:b0:333:3a04:f257 with SMTP id z3csp2012043wrs; Tue, 12 Dec 2023 08:34:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/shTCIIcTyWDls8l5nEb1nIaqYRVYn2oq6bjBBh6VIZwoL66kF/dvQ7FElL8B/hRbB0xD X-Received: by 2002:a0c:fc49:0:b0:67e:f200:f48e with SMTP id w9-20020a0cfc49000000b0067ef200f48emr410942qvp.89.1702398857973; Tue, 12 Dec 2023 08:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702398857; cv=none; d=google.com; s=arc-20160816; b=wDqXPfj7jjF09QQRX8a3q2CBXUQqDloEWwfEvmbjtZ+2RKavLDWA1TJ02/q0nPafQw uxD7SIvn/pNmIP+IKgNlnVYQZRTaHLpz0QVnjcyQAm6axfhLsCa3l65P4HFZYKCic0B6 XtMXknNvpff/dWgrN/MKeffGe25z57wZqcdgh9Kv2kVCvEAK2rjZZrzDYvtv/XZV92Dg 4m1h1z4C0RM0voFTlLYhAx/mLF9BmrYjvXVpCja4U4QwJcbtIwZLhgZYBoDFDdbITwz/ g+1GoFWtB15Ta003Y50FtoC15QTppoMy0pkZICPxjza2lHL76Z2RcItIh2aLubrMXZze DNjA== 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:cc:to :from:dkim-signature; bh=ejOqBltD1xTQKLI2FwnA20wzkl1UqkA3fAXzw/L3kFk=; fh=CkupYgn1Qmdh7jizui9HJgGegpqbRR5NXz1VyjRE1Hs=; b=qoMGdF99znsRd/IVr5N3nbpUjndYopUFejCt4MHejmkh1nFah/JWVKfIPio/ZUpQYs i5qQ8xujZnS6z4F7CBCCkxjjJPkCyi+j0NpXn5v4s4OQ61j6Wm1myBexti0bwfCfch6B x3xuVU8zXg4x8GDXlSt4v66fRPZXA9sa5bZoX+oLUd85Ykg9E4VraiNH1ifgugqzjKkg xri1q0bIWBViAW0dPidMnqdZ4QY83sJcRXGnlJMiFQCYZMwxCCOq9pECtho1l5WHqQHv Ot7c05kLrLO03BZYv2nvJGVgPNCKh2GnuVL1czvYusDabp6z835uZFS9TD67npTuuThn g6+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IaDBbg9e; 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 dk16-20020a056214093000b0067a9b8e407dsi10724262qvb.361.2023.12.12.08.34.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Dec 2023 08:34:17 -0800 (PST) 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=IaDBbg9e; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rD5hc-0003yc-Ly; Tue, 12 Dec 2023 11:33:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rD5hO-0003Sx-Vj for qemu-devel@nongnu.org; Tue, 12 Dec 2023 11:33:35 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rD5hN-00083C-2q for qemu-devel@nongnu.org; Tue, 12 Dec 2023 11:33:34 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40c2db2ee28so61951125e9.2 for ; Tue, 12 Dec 2023 08:33:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702398811; x=1703003611; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ejOqBltD1xTQKLI2FwnA20wzkl1UqkA3fAXzw/L3kFk=; b=IaDBbg9eRRzuqcShJfVqlY2iA+2LAv5oaGtY3JT6qqMGCPhQmyhgO5us9FCvDkTUk5 yRqxl88LccdB/Z+bgGk1tNp/J9IUE74JJ31tMEe/crVQOosEbVg/k+zJ4TYDcwmDhWxZ rUZ7cOodgJzDiosO1aHu7+5tja+nleu1+IzPfUi7RrhUYti88LpPqmGZzas6hgcyW7q8 Ob2LO5RPZnl7MKiMdadYMvwpxilsLmjt0LDHkcsmu7eVtMllHc9Y7tzWfwpDi1Bvw2Pj dFD1775b4ePgl+VDDybV2TDWt+lBCc7jpWibphiczeWHsLu4qX7soZWNaGaIXdHOHyL+ WLeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702398811; x=1703003611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ejOqBltD1xTQKLI2FwnA20wzkl1UqkA3fAXzw/L3kFk=; b=KIgXeiZLaLih+aXcUqDUE5ZXpCO4drZMJXdVAGNyYdFvIWSOBm7Z5aJCFscEpplAWp Zi5mb/SrTvyLK5ZUCtWip3adu1WppWJx2/WPB+V0aECjfuDbYBTkNIot8e9DhbeGYkUX rUKnoXAsDvSWbQPQ3XHGw/OoXv0vLTHwBfgKif2u9MPM1D0NmY2bCPqEIHJh4j1Y6Gy9 GbXyHv1WpgKnT11biTaiVMmQ3+UCSCN7HCLxwNrMGbwfDkLvJJtjTJFxrs3iyLB1EB4u z2yWhfafE0Js8CvCCdki615btgUn8IQ6cotoSXyPz3ten35DesBw6JQVs9nPqWx5+807 owKw== X-Gm-Message-State: AOJu0YwouJuC9vJJO7Pd+oDUYb9Ke2ph6j8bVvy1NiP8L/dsviofuj/J xLd9/m/sW0ZEQpSeSAKMGH5UQE/vo1/Mzeo4Kbc= X-Received: by 2002:a05:600c:3411:b0:40b:5e59:ccb2 with SMTP id y17-20020a05600c341100b0040b5e59ccb2mr3422703wmp.147.1702398811326; Tue, 12 Dec 2023 08:33:31 -0800 (PST) Received: from m1x-phil.lan ([176.176.175.193]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm19317706wms.33.2023.12.12.08.33.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Dec 2023 08:33:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Tyrone Ting , =?utf-8?q?Alex_Benn=C3=A9e?= , Manos Pitsidianakis , Eduardo Habkost , Joel Stanley , Alistair Francis , Anton Johansson , Andrey Smirnov , Peter Maydell , Hao Wu , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Jean-Christophe Dubois , Igor Mitsyanko , "Edgar E. Iglesias" , Andrew Jeffery , Rob Herring , qemu-arm@nongnu.org, Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 32/33] hw/cpu/arm: Remove 'num-cpu' property alias Date: Tue, 12 Dec 2023 17:29:32 +0100 Message-ID: <20231212162935.42910-33-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231212162935.42910-1-philmd@linaro.org> References: <20231212162935.42910-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org All callers access the 'num-cores' property. Signed-off-by: Philippe Mathieu-Daudé --- Better to squash earlier and replace in place, so no need for alias? --- hw/cpu/arm11mpcore.c | 1 - hw/cpu/cortex_mpcore.c | 2 -- hw/cpu/realview_mpcore.c | 1 - 3 files changed, 4 deletions(-) diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 67c96a3a7c..32756e05e9 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -133,7 +133,6 @@ static void mpcore_priv_initfn(Object *obj) static Property mpcore_priv_properties[] = { DEFINE_PROP_UINT32("num-cores", ARM11MPCorePriveState, num_cpu, 1), - DEFINE_PROP_UINT32("num-cpu", ARM11MPCorePriveState, num_cpu, 1), /* alias */ /* The ARM11 MPCORE TRM says the on-chip controller may have * anything from 0 to 224 external interrupt IRQ lines (with another * 32 internal). We default to 32+32, which is the number provided by diff --git a/hw/cpu/cortex_mpcore.c b/hw/cpu/cortex_mpcore.c index c5de6c3ae4..3cc9feef16 100644 --- a/hw/cpu/cortex_mpcore.c +++ b/hw/cpu/cortex_mpcore.c @@ -156,7 +156,6 @@ static void cortex_mpcore_priv_realize(DeviceState *dev, Error **errp) static Property cortex_mpcore_priv_properties[] = { DEFINE_PROP_UINT8("cluster-id", CortexMPPrivState, cluster_id, 0), DEFINE_PROP_UINT32("num-cores", CortexMPPrivState, num_cores, 1), - DEFINE_PROP_UINT32("num-cpu", CortexMPPrivState, num_cores, 1), /* alias */ DEFINE_PROP_STRING("cpu-type", CortexMPPrivState, cpu_type), DEFINE_PROP_BOOL("cpu-has-el3", CortexMPPrivState, cpu_has_el3, true), @@ -175,7 +174,6 @@ static Property cortex_mpcore_priv_properties[] = { TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_UINT32("gic-spi-num", CortexMPPrivState, gic_spi_num, 0), - DEFINE_PROP_UINT32("num-irq", CortexMPPrivState, gic_spi_num, 0), /* alias */ DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c index e985d230e0..4d4965126b 100644 --- a/hw/cpu/realview_mpcore.c +++ b/hw/cpu/realview_mpcore.c @@ -99,7 +99,6 @@ static void mpcore_rirq_init(Object *obj) object_initialize_child(obj, "a11priv", &s->priv, TYPE_ARM11MPCORE_PRIV); object_property_add_alias(obj, "num-cores", OBJECT(&s->priv), "num-cores"); - object_property_add_alias(obj, "num-cpu", OBJECT(&s->priv), "num-cores"); privbusdev = SYS_BUS_DEVICE(&s->priv); sysbus_init_mmio(sbd, sysbus_mmio_get_region(privbusdev, 0));