From patchwork Mon Jan 21 15:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10773987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 97926746 for ; Mon, 21 Jan 2019 15:26:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8498029C7A for ; Mon, 21 Jan 2019 15:26:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7835D2A123; Mon, 21 Jan 2019 15:26:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C2AE29C7A for ; Mon, 21 Jan 2019 15:26:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:55230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glbSp-0002jz-FL for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Jan 2019 10:26:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glbPK-00080K-Ub for qemu-devel@nongnu.org; Mon, 21 Jan 2019 10:22:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glbPH-0003uu-2o for qemu-devel@nongnu.org; Mon, 21 Jan 2019 10:22:37 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:46986) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glbPF-0003qQ-En for qemu-devel@nongnu.org; Mon, 21 Jan 2019 10:22:33 -0500 Received: by mail-wr1-x444.google.com with SMTP id l9so23752329wrt.13 for ; Mon, 21 Jan 2019 07:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I8BvMLz1v72BoXMnzdr5sWeD9HZE5rwvOIP96mH0G5U=; b=iiDhCMoKeNNidNOWXJnccUItIuefMBxA3schLrFoSITltbKmSkVfodngubH9MmdAuy hBkmi9LkwzJFIXxpOnaMn8TAlX5w9iUDnFYu6Kb+nRM56bO1pSK5baCoj1hq3BlyUORB ZVI3hGzp9iPDCev1ow/AaIWjWLO96FGBaS8+E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I8BvMLz1v72BoXMnzdr5sWeD9HZE5rwvOIP96mH0G5U=; b=TSuXN9YXtZzLm6AJsth+/sTb1V0kRZWNEwpoel5Va/xknc4f5TN7FjaXWrHNIAQL1f 2mf4QaVTE7/nK5aCYN/JKLEcyTsfHRVI0u3bO23ZNT0Lgz/pcEqqa/EuI8mZliizTnIC fP6I+2+SRdQrDaVoqr1eQtpY4zoG9KAYIfc3Cm6sMpoWhZkvUwYfjyAIXNsYW5KlOD3R DRHoOqz35FJguJq859LkseA02h7OCFu+PrMeUgCKsIX+GYBDW3qs1AGYJyon72yjyk05 qFG+V29x1IJrvMyYBS/xAeppEFTHkTqcG/IcqIk0RZMvMlq9+t1Arm9mp+9wKKBesX8P xinA== X-Gm-Message-State: AJcUukceBNwT7Tg1mCwRHQnfO3GThErDI8HIWRXl31zDvVC045Gi1mfz m0jLBwQK+9CiA6KCQYvm66/Emw== X-Google-Smtp-Source: ALg8bN6wmA97bHEe2qYLHSQdachrk/MSYZWYOfOTYRXPp5cG91BLxDsiqjAF3GaIBa4qC7mTrx7GOA== X-Received: by 2002:adf:ef0d:: with SMTP id e13mr28224636wro.29.1548084142969; Mon, 21 Jan 2019 07:22:22 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o16sm128900134wrn.11.2019.01.21.07.22.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 07:22:22 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 15:22:15 +0000 Message-Id: <20190121152218.9592-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121152218.9592-1-peter.maydell@linaro.org> References: <20190121152218.9592-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v3 1/4] hw/arm/xlx-zynqmp: Realize cluster after putting RPUs in it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Crosthwaite , Alistair Francis , Richard Henderson , "Emilio G . Cota" , "Edgar E. Iglesias" , Paolo Bonzini , Aleksandar Markovic Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently the cluster implementation doesn't have any constraints on the ordering of realizing the TYPE_CPU_CLUSTER and populating it with child objects. We want to impose a constraint that realize must happen only after all the child objects are added, so move the realize of rpu_cluster. (The apu_cluster is already realized after child population.) Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Luc Michel Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- hw/arm/xlnx-zynqmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index c67ac2e64ac..370b0e44a38 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -183,8 +183,6 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, &error_abort, NULL); qdev_prop_set_uint32(DEVICE(&s->rpu_cluster), "cluster-id", 1); - qdev_init_nofail(DEVICE(&s->rpu_cluster)); - for (i = 0; i < num_rpus; i++) { char *name; @@ -212,6 +210,8 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, return; } } + + qdev_init_nofail(DEVICE(&s->rpu_cluster)); } static void xlnx_zynqmp_init(Object *obj)