From patchwork Mon Feb 10 15:49:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 863779 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1661572wrt; Mon, 10 Feb 2025 07:51:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWQJZVsoi6yZyd+DGJ/pAdw+bvxpI/en+pj6I/NK3e+zT5hgrTtJk+docs2qMMUe+POy2Xbjg==@linaro.org X-Google-Smtp-Source: AGHT+IFvagM+VaEaQJka2Morkjj1tVd2qLAa/i8zTxHN6R83AJ1g6WHx8gAjo+EKsdGz5Nh1gZwm X-Received: by 2002:a05:6214:2526:b0:6d9:3016:d10d with SMTP id 6a1803df08f44-6e445768078mr223334426d6.42.1739202702625; Mon, 10 Feb 2025 07:51:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739202702; cv=none; d=google.com; s=arc-20240605; b=TdrdmTHNnGDpO4dvoAovuoKHfvJLtCC9kEJPie/gmrGCJFSqgZMf10AyV4WcShmf4D 3kZRN29HNt2yTtevp7P3t3cv0ihNmIomWNfxeh5AI8gORCDDKoAxUjjYlTDlcmRQt2Rt UKAP0Bo6dUI1K+IPOuDFRxrYayuKzze6yIzgZFvFLIjFOfhR1Juend45wFMr6gJz82lp VMdGknxUeogI9jkISLa2Qb5eUryXNeBnRbXZqyf/iBotuexDmlEOn2elPreLjCvs7EJN w+qMf6nkh5JVS11iPnKhD652g6JCLN+oFhZ0Bl/aOeDuG70s/knF5ZElJ5nxeiBoLUnE H4pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=hU1IsAVO/zRvXWw+5IDT2Vye4Emk4sjMX3L4S35zVsM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=j/bKW68vFfLT3SIHBlScuiIWbAHw2CFvGn28iDQMQdVxxoTLtLJmYnJxYnpepvNRjw uZLWf/7bVN00+tkbW3w1Rpy/W3no6WCO8o5m6jPmJSpk5P74Fd5CeC6rqrmIDpqFEUmI znIQESuoCp8fX0hZLqvJwEvjiu/BDu6SHEYEsAEZstxvY5f6tCNf/e9skHrSlbF3igar 0mfA/q1ltqgX5koy+Z2gtL2zOPlbWyvxg/1xQ0yQ1DEt2fBgSDc9XSwOfsPYqsq8FnPG uw34uSDOh4P7/++B3z3typ8+B/Phpu4JZwxZEpmtMZEsnxh0BcBsGJCzH2fc/SxZjdp5 ZRaA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xmRlPSLe; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e45d06759csi31246396d6.151.2025.02.10.07.51.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 07:51:42 -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=xmRlPSLe; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thW3x-0008N8-Od; Mon, 10 Feb 2025 10:51:12 -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 1thW32-0007Ku-9X for qemu-devel@nongnu.org; Mon, 10 Feb 2025 10:50:15 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thW30-0004w1-9s for qemu-devel@nongnu.org; Mon, 10 Feb 2025 10:50:12 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5de6e26d4e4so3170947a12.1 for ; Mon, 10 Feb 2025 07:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739202605; x=1739807405; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hU1IsAVO/zRvXWw+5IDT2Vye4Emk4sjMX3L4S35zVsM=; b=xmRlPSLeJLuroASEw0T0EpxEh7WmC5+KabuqTynPQy5ThnWR8cGvxR+2fOFXqKRShc 7MWBykydOkueuJvnVQwDNBA1TQyJddJFv9kB65EW6kg6BGzoeqEWYngslxkX3UrM9mGo Ta6XyKOw82QgM3uPTrpObRFd6l8ycIARWJfVS6XTvWEcfw8mZsa4Q5mHE7D6QCf4Ov9C XcF1SRVbxmOPPlxTLMCxv3h6gRaLL5rpXueW4us+kNMV/j0mIh/maaPggzIAl+rGdGAv ruOeOQ4XIM0Ka4DsEgaaQVWwYaM5i3HYBm/DKJmDs/f9it1vJVyT76ZxRcf5brZW2HTd wpRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739202605; x=1739807405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hU1IsAVO/zRvXWw+5IDT2Vye4Emk4sjMX3L4S35zVsM=; b=FzR0s1js3HNlr30xB7LTB/kSzEDqLH7hoE8OAmUJnP4Vp90rspNU3lS+vHiH5ee+8e IvhAnfRnuGuqd1okVJtta2lUAWuMHpP31+Co3DaAPtTBUKoD7pV3I0w1XEDmoYrn5USz wa+YMML9cqFsftbGWx+3v3qglVmxB27UJqsMqm2KMShqG0HTsL+K8A7aNYaj7/e0oR7J mnjgQkJPez7jzGXS6bT2+wBGCw/mGbcSrr1u665+QnGfKbTVVLb3ffMHRDRirwcuOfbo oTSfLf6P5q889XKiYfBDlVFCi3TTKBxVk4+PUVc2RN6RI14mq6ony/+JEFjdQdsM4dQ6 BB2Q== X-Gm-Message-State: AOJu0YzhVsPI2xxajZHaCUvPsCYPTxcAVgcadrA2LtJdEw4cBlRkrD46 fnn6VkKpHrCEM8uHhccj5SMAXdy0IN1rGqvJzBcC5kLBGgpepGOUVKjgQZd2ICiAbXLqw7lY7pg F X-Gm-Gg: ASbGncshGthp7ZULqo8UiDG2MkjlRIR4uU/llyW516eX9/2kn+sSVNm29eli908lBtj rgpyaeKIaB9kPETh0M+Z3qHJJteDwetOKxtOn3OsDSsdFYUyMOzPLhosA0Ol2gw2cEntaQX6HQu mngRlKaHytBXtW4tQ2sFKpUWajdIDL0A8eTYhh9zIlThI37p+IcE9XiUJTA0DTncsdm1eTYmOpH /CkDHNYmVmnWJR9GyagItBI3Xka6WV3dySSeBU3wdd2FJG6VGLiM5vCbvHfxAlvvG0GV2l5QdlY yH0FpUxiQr2i/0lbsisv X-Received: by 2002:a05:600c:4f50:b0:436:ed50:4f8a with SMTP id 5b1f17b1804b1-439249841b4mr128940225e9.10.1739202593573; Mon, 10 Feb 2025 07:49:53 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4391dfd8448sm150612845e9.38.2025.02.10.07.49.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:49:52 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/12] hw/cpu/arm: Alias 'num-cpu' property on TYPE_REALVIEW_MPCORE Date: Mon, 10 Feb 2025 15:49:38 +0000 Message-Id: <20250210154942.3634878-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250210154942.3634878-1-peter.maydell@linaro.org> References: <20250210154942.3634878-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=peter.maydell@linaro.org; helo=mail-ed1-x533.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 autolearn=ham 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 From: Philippe Mathieu-Daudé No need to duplicate and forward the 'num-cpu' property from TYPE_ARM11MPCORE_PRIV to TYPE_REALVIEW_MPCORE, alias it with QOM object_property_add_alias(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Message-id: 20250130112615.3219-6-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/cpu/realview_mpcore.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c index 4268735e3a5..7480b38d1ab 100644 --- a/hw/cpu/realview_mpcore.c +++ b/hw/cpu/realview_mpcore.c @@ -14,7 +14,6 @@ #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" #include "hw/irq.h" -#include "hw/qdev-properties.h" #include "qom/object.h" #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore" @@ -68,7 +67,6 @@ static void realview_mpcore_realize(DeviceState *dev, Error **errp) int n; int i; - qdev_prop_set_uint32(priv, "num-cpu", s->num_cpu); if (!sysbus_realize(SYS_BUS_DEVICE(&s->priv), errp)) { return; } @@ -100,6 +98,7 @@ static void mpcore_rirq_init(Object *obj) int i; object_initialize_child(obj, "a11priv", &s->priv, TYPE_ARM11MPCORE_PRIV); + object_property_add_alias(obj, "num-cpu", OBJECT(&s->priv), "num-cpu"); privbusdev = SYS_BUS_DEVICE(&s->priv); sysbus_init_mmio(sbd, sysbus_mmio_get_region(privbusdev, 0)); @@ -108,16 +107,11 @@ static void mpcore_rirq_init(Object *obj) } } -static const Property mpcore_rirq_properties[] = { - DEFINE_PROP_UINT32("num-cpu", mpcore_rirq_state, num_cpu, 1), -}; - static void mpcore_rirq_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = realview_mpcore_realize; - device_class_set_props(dc, mpcore_rirq_properties); } static const TypeInfo mpcore_rirq_info = {