From patchwork Mon Jan 21 18:50:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10774401 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 780B991E for ; Mon, 21 Jan 2019 18:53:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66A5A2A811 for ; Mon, 21 Jan 2019 18:53:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5ADE32A846; Mon, 21 Jan 2019 18:53:41 +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 1232B2A811 for ; Mon, 21 Jan 2019 18:53:41 +0000 (UTC) Received: from localhost ([127.0.0.1]:58086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glehY-0001UO-8h for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Jan 2019 13:53:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glefN-0000oe-Em for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:51:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glefM-0002X5-Nh for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:51:25 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glefL-0002Uu-U8 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:51:24 -0500 Received: by mail-wr1-x441.google.com with SMTP id t6so24556097wrr.12 for ; Mon, 21 Jan 2019 10:51: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=Riqos2VP4k1FpZGAuE3wK4J/sKpJkrJvi5DAGfdCgXc=; b=EvbakUOsiQn1dEFRXSf/ntddoYujwEmLJBVnqkFQFDYG04lBDchLWPq76KUWx6nRd3 b0J+2Oq7JRrChIcSdsT4WVYi889yEFogbROpRP8CW1goEQ/GZkwPXqqX2pNeg0MEsG/j slGuUfA+u/GcZbfHIfygPLW1s4Oz9hcClk2NQ= 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=Riqos2VP4k1FpZGAuE3wK4J/sKpJkrJvi5DAGfdCgXc=; b=hUWYkgoXi/gqp+r/+J1Kh4D7lIon+oEk3/nGKOQh55lYTzr6ar4qs8rnklNmPqvjw4 DeL94eGPUtmjq+U3CLQbKgsCe92Ip6h+o1tvWDsrk5H0IsZz2+JT7zpGRcY/8Cj/oXMa 0NFocaTraf35pcSp78hQDzwxR/Y7JV9PlpjEh6NwBbG123LtWU2e2H7m8bzOe8Q7Tb7U MViBr6hOwZrdmveFCDkCsGxkXN5rKdcf7Oqxpw2JEbNlfFedqNrz2PCLwabebA3FGC+5 sGMwHFFdJcpauD4VFKz2NosdrS9uv8RRz7RjecG5JJ+/09eLGETGb0y1wWx+P37HT6dq kdOg== X-Gm-Message-State: AJcUukeg1JcUocuKjm5StbYIhVLwfZqIRT3UWs8u220gHuRj1+0P+2Zg dZrCcjPrrZdi50iGdtXcKUUvTA== X-Google-Smtp-Source: ALg8bN6XNOdoDuJrYJCPwHdvi1b9dBWSYfEtimjlBPBKhP0ZqZFQYm72CM77rZnd/b0asqgx++EYag== X-Received: by 2002:a5d:42ce:: with SMTP id t14mr29775792wrr.51.1548096682643; Mon, 21 Jan 2019 10:51:22 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n82sm50386660wma.42.2019.01.21.10.51.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 10:51:22 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 18:50:57 +0000 Message-Id: <20190121185118.18550-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121185118.18550-1-peter.maydell@linaro.org> References: <20190121185118.18550-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::441 Subject: [Qemu-devel] [PATCH 02/23] armv7m: Make cpu object a child of the armv7m container 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: patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Rather than just creating the CPUs with object_new, make them child objects of the armv7m container. This will allow the cluster code to find the CPUs if an armv7m object is made a child of a cluster object. object_new_with_props() will do the parenting for us. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/arm/armv7m.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index f9aa83d20ef..0f2c8e066cf 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -158,7 +158,12 @@ static void armv7m_realize(DeviceState *dev, Error **errp) memory_region_add_subregion_overlap(&s->container, 0, s->board_memory, -1); - s->cpu = ARM_CPU(object_new(s->cpu_type)); + s->cpu = ARM_CPU(object_new_with_props(s->cpu_type, OBJECT(s), "cpu", + &err, NULL)); + if (err != NULL) { + error_propagate(errp, err); + return; + } object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory", &error_abort);