From nobody Fri Dec 19 15:57:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1567525936; cv=none; d=zoho.com; s=zohoarc; b=damwM5Iy33v9shtHleWT/JOwozkCHcxt92oOmPGRi0QojNG3mKdFkfM6On2bQ1J9UehT1fy8iFtm2u0CSIbLRW8QrkBmToLn5493yItq2Z+ISQ80wu/ZdtjFUuQtaQIC6botAFwGYDWZ9OY1JpYIuifScAB8CqcqhPyMjCpNQFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567525936; 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:ARC-Authentication-Results; bh=xlVfa4X6hgu0Qn72UxF4DtuCgLqcTN2WoNHXseq96d4=; b=NkcbOrnw4xsd2MfpjMS3b4oGDAOLQvL8gd1TwC9EQDYRlZnZE2F6LZ2Bk4tHhtWWob4mhobT7sBaLfvXnJcgdXG746+ToeA69j6a05j5ViuhAOnMPox9r5rO3ZJzCWT8Z9thlwVmVFfnN6Jtgz/DUK63ST1u5xL20jg1eJYToS4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 156752593662817.40060472532673; Tue, 3 Sep 2019 08:52:16 -0700 (PDT) Received: from localhost ([::1]:47882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5B6N-00009g-31 for importer@patchew.org; Tue, 03 Sep 2019 11:52:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59286) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5ArW-0002wh-2s for qemu-devel@nongnu.org; Tue, 03 Sep 2019 11:36:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5ArU-000604-FW for qemu-devel@nongnu.org; Tue, 03 Sep 2019 11:36:53 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:55772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5ArU-0005zX-7t for qemu-devel@nongnu.org; Tue, 03 Sep 2019 11:36:52 -0400 Received: by mail-wm1-x330.google.com with SMTP id g207so14752246wmg.5 for ; Tue, 03 Sep 2019 08:36:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a18sm24435188wrt.18.2019.09.03.08.36.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 08:36:50 -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=xlVfa4X6hgu0Qn72UxF4DtuCgLqcTN2WoNHXseq96d4=; b=ujKY9P2v5YCHnJzMvyPvXblDgaUyDasFclg/wwG2Er/Hsty0EXCSswXrE0eAfiKfTX mZS/JFWypyn/50URYp/xiRLqlt2pHfApU04QCLWoHnpjvImyXJkyZAAaz5PcHyKAJayU 3zQes/E2pAUOS/CpzRPvEbP+DhCqhaukDCexSTTvgrw3ZYGKXMPM7Ia5PVKdqAerwOL0 ZWYcpcib2wTp8lRQ9ulhTcNATbiTd5tzNGYND5ByhUdhsIDQ4XUkh/Vlal/IfXGa7u2u F+5lYhgIGUuw6Bw4MXPksxscoxNhQaN4mlEpPUt/yANRh+BBO9WJpchMu5CaxvnqB6+3 0KPQ== 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=xlVfa4X6hgu0Qn72UxF4DtuCgLqcTN2WoNHXseq96d4=; b=TMqswbo+aw52/yfOVXOrMQsTdVdCb8NDJUmEnYCSqhO1sO46I5rULCXetcf0fZIS93 /pCvKQ7bNHs8Wn9mx3mq9BhyFK3vvVXQKeY1jsrUUloBukztJekkyhvYUg58h2egFXmw ZeCvAgZ3SCeTZzvodO0EGCvjXAvrlJjK5vVcsAL0XVegEXADA38MdfhvXyLIQ3nvoZph lD6xOu8gsRjrEauh+y6m1eX30sp/AJSWxIHe1qn/BCy4/P+veayrHe3jGVFOdsWSVMeH Jk7HHv8WCuAG4wscvW3IU+Lu6ANWXhbXVCgiRxZT8oSlgjkWs0Ymq7OHk4CC83X39LHT Jdog== X-Gm-Message-State: APjAAAUzTGsgUl61eMPGddaJiuO3dE11xx2VBhfOqkJCWlk1PQKMx9dd lgSWBkudqnDEmfV2zE/CRIVqfGhorC/8lg== X-Google-Smtp-Source: APXvYqx8PpmJRf//JZ9GrCdTFZMzXhhVRG8+yR6+xTff1ifLIkttG0Cv2OJlz32rNAY/xZfqhwNVmQ== X-Received: by 2002:a1c:740b:: with SMTP id p11mr869715wmc.6.1567525011013; Tue, 03 Sep 2019 08:36:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2019 16:36:25 +0100 Message-Id: <20190903153633.6651-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903153633.6651-1-peter.maydell@linaro.org> References: <20190903153633.6651-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 13/21] hw/arm/fsl-imx: Add the cpu as child of the SoC object 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: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Child properties form the composition tree. All objects need to be a child of another object. Objects can only be a child of one object. Respect this with the i.MX SoC, to get a cleaner composition tree. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20190823143249.8096-5-philmd@redhat.com Signed-off-by: Peter Maydell --- hw/arm/fsl-imx25.c | 4 +++- hw/arm/fsl-imx31.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 2b2fdb203a2..3cb5a8fdfd7 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -36,7 +36,9 @@ static void fsl_imx25_init(Object *obj) FslIMX25State *s =3D FSL_IMX25(obj); int i; =20 - object_initialize(&s->cpu, sizeof(s->cpu), ARM_CPU_TYPE_NAME("arm926")= ); + object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu), + ARM_CPU_TYPE_NAME("arm926"), + &error_abort, NULL); =20 sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic), TYPE_IMX_AVIC); diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 6760de3c8c1..55e90d104bc 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -33,7 +33,9 @@ static void fsl_imx31_init(Object *obj) FslIMX31State *s =3D FSL_IMX31(obj); int i; =20 - object_initialize(&s->cpu, sizeof(s->cpu), ARM_CPU_TYPE_NAME("arm1136"= )); + object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu), + ARM_CPU_TYPE_NAME("arm1136"), + &error_abort, NULL); =20 sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic), TYPE_IMX_AVIC); --=20 2.20.1