From nobody Fri Mar 27 05:05:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773657747; cv=none; d=zohomail.com; s=zohoarc; b=JsUTovg0qaaVERGjqmd3hvVxs091A1WMeKlGqbz0X6zeElJbWeQcVW0tIPwCgmhZvVrzIHkaW0jOKOwYzZk34nFB1nm1IF+olDlmFimXvFeTf1DdeID4tO5ikJ7hlt9otiXmOdzWG7NI3v+9Fwf+wUHkBmxh+iXrlIOogUeTc2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773657747; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/c8vfK1YOa9tqc0vbse7KYiD41/uet1cga50CfE7xJ0=; b=lqZv/wiw2/IHpIU13cthc2jTKKkDC7plYdQuSQYxCA5TY2d0K3q/CfImCMN0M8r6rOkqy9IOFG0mOmD9uir0d3R1U6qPPD/2c3jN5uN8rBUubSnUyhLf5JnRv6XiJXRxiYaB5BoTQjOMXQki7WE2b5tVfGIMxWIXznCW0z+ZfEs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773657747210492.6694556463657; Mon, 16 Mar 2026 03:42:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w25OO-0006ab-Pp; Mon, 16 Mar 2026 06:41:51 -0400 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 1w25Nr-0006LP-9w for qemu-devel@nongnu.org; Mon, 16 Mar 2026 06:41:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w25Np-0003W9-Sj for qemu-devel@nongnu.org; Mon, 16 Mar 2026 06:41:15 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-10-MaTp6CuMNkGIFzI-a8tn-w-1; Mon, 16 Mar 2026 06:41:09 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AADBF180060D; Mon, 16 Mar 2026 10:41:08 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.33.101]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 96BB319560AB; Mon, 16 Mar 2026 10:41:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/c8vfK1YOa9tqc0vbse7KYiD41/uet1cga50CfE7xJ0=; b=jHRjwbs6luoZDoYLVVK4QGRsoYYw5luahPqgMPde31z8wru90omDinnrL4xLIVAwAcT1t5 SyVCTBtEfYcvW9QKR8CoxHYizDo5xGzh99xBfQ4MIpcCsUOwLkJCxg+b2MPWlz4zI1+hr3 wWt8f25Sl+PCIkZ6iD0u+9N4dFwL98E= X-MC-Unique: MaTp6CuMNkGIFzI-a8tn-w-1 X-Mimecast-MFC-AGG-ID: MaTp6CuMNkGIFzI-a8tn-w_1773657668 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, Alistair Francis , Markus Armbruster Subject: [PULL 08/14] hw/arm: fsl-imx6: Don't call qdev_get_machine in soc init Date: Mon, 16 Mar 2026 11:40:33 +0100 Message-ID: <20260316104039.195960-9-thuth@redhat.com> In-Reply-To: <20260316104039.195960-1-thuth@redhat.com> References: <20260316104039.195960-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773657749358158500 Content-Type: text/plain; charset="utf-8" From: Alistair Francis Calling qdev_get_machine() in the soc_init function would result in the following assert ../hw/core/qdev.c:858: qdev_get_machine: Assertion `dev' failed. when trying to run ./qemu-system-aarch64 -S -display none -M virt -device fsl-imx6,help as the machine wasn't created yet. We call qdev_get_machine() to obtain the number of CPUs in the machine. So instead of initialising the CPUs in the SoC init let's instead do it in the realise where the machine will exist. Signed-off-by: Alistair Francis Tested-by: Markus Armbruster Message-ID: <20260312043158.4191378-7-alistair.francis@wdc.com> Signed-off-by: Thomas Huth --- hw/arm/fsl-imx6.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 39667c4a49a..f663ddbf0a4 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -38,17 +38,10 @@ =20 static void fsl_imx6_init(Object *obj) { - MachineState *ms =3D MACHINE(qdev_get_machine()); FslIMX6State *s =3D FSL_IMX6(obj); char name[NAME_SIZE]; int i; =20 - for (i =3D 0; i < MIN(ms->smp.cpus, FSL_IMX6_NUM_CPUS); i++) { - snprintf(name, NAME_SIZE, "cpu%d", i); - object_initialize_child(obj, name, &s->cpu[i], - ARM_CPU_TYPE_NAME("cortex-a9")); - } - object_initialize_child(obj, "a9mpcore", &s->a9mpcore, TYPE_A9MPCORE_P= RIV); =20 object_initialize_child(obj, "ccm", &s->ccm, TYPE_IMX6_CCM); @@ -119,6 +112,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) unsigned int smp_cpus =3D ms->smp.cpus; DeviceState *mpcore =3D DEVICE(&s->a9mpcore); DeviceState *gic; + char name[NAME_SIZE]; =20 if (smp_cpus > FSL_IMX6_NUM_CPUS) { error_setg(errp, "%s: Only %d CPUs are supported (%d requested)", @@ -126,6 +120,12 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) return; } =20 + for (i =3D 0; i < smp_cpus; i++) { + snprintf(name, NAME_SIZE, "cpu%d", i); + object_initialize_child(OBJECT(dev), name, &s->cpu[i], + ARM_CPU_TYPE_NAME("cortex-a9")); + } + for (i =3D 0; i < smp_cpus; i++) { =20 /* On uniprocessor, the CBAR is set to 0 */ --=20 2.53.0