From nobody Fri Mar 27 05:04:19 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=1773657849; cv=none; d=zohomail.com; s=zohoarc; b=cXxls32vPUBX6Rsq6ip955VLEeYkaeuirW1+rgdRKTSBb1Kiu8oLkYFw04SDAXYKZgsmTPdjfE2AAHNPv/6oZdT0eG/wAZ8075cHdlgh7sk8XWL+aXbrz8wQNkl+cj+HSE1qO4fMjtP3EZR58t50uSBH1t7MBHU1CFm3oKJYmB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773657849; 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=l0YG7IMsFrTBvRsWwNyhx32ATgEM7ENGPd8cRv9PZXE=; b=XGOBP6++n4OTiz6A9m+T8vUhoNSVaikz2y76D+Sl4J2wNScOWQQSlCJmqaPk8X8aomWm16/eycQ0Yg8lunodIZAMi4Aev6DNhjxyoZ9UEE7Jrnrn0XQqOHxL4QQN/IsbOhX8dFYHL4BOcYo42Ndxlki+3dpdAt1jwpMXxPw9jOA= 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 1773657849828118.87077608318566; Mon, 16 Mar 2026 03:44:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w25Ng-0006B7-Hc; Mon, 16 Mar 2026 06:41:04 -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 1w25Nc-0006AL-Bi for qemu-devel@nongnu.org; Mon, 16 Mar 2026 06:41:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w25Nb-0003PK-09 for qemu-devel@nongnu.org; Mon, 16 Mar 2026 06:41:00 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-465-_ljphtOEMay3NAhH1mC13Q-1; Mon, 16 Mar 2026 06:40:55 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1A9EB19560B1; Mon, 16 Mar 2026 10:40:54 +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 0919519560AB; Mon, 16 Mar 2026 10:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657658; 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=l0YG7IMsFrTBvRsWwNyhx32ATgEM7ENGPd8cRv9PZXE=; b=BAc/TkgqGV1hGPSpqEwBbxdab6LswcLQB1JrDMj2UZo+NnHXYdxsG0i/Gtf19BwrYU8xC/ nA5Y8IqQYl8G9nqswWifTOp3nZ8EWwYQHB1TYV65VmcZ/kfFzXGcEVpFuplb+k28n09GLW I0A8sSg2Q9LNLkvB4HSIZiU2i5gSfYI= X-MC-Unique: _ljphtOEMay3NAhH1mC13Q-1 X-Mimecast-MFC-AGG-ID: _ljphtOEMay3NAhH1mC13Q_1773657654 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, Alistair Francis , Markus Armbruster Subject: [PULL 04/14] hw/riscv: microchip_pfsoc: Don't call qdev_get_machine in soc init Date: Mon, 16 Mar 2026 11:40:29 +0100 Message-ID: <20260316104039.195960-5-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.129.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_H3=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: 1773657851813158500 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-riscv64 -S -display none -M virt -device microchip.pfsoc,= 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 setting the CPU num-harts in the init function let's set it in realise where the machine will exist. Signed-off-by: Alistair Francis Tested-by: Markus Armbruster Message-ID: <20260312043158.4191378-3-alistair.francis@wdc.com> [thuth: Fix a complaint from checkpatch.pl with regards to multi-line comme= nt] Signed-off-by: Thomas Huth --- hw/riscv/microchip_pfsoc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 4ff83e49403..743f31f0057 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -143,7 +143,6 @@ static const MemMapEntry microchip_pfsoc_memmap[] =3D { =20 static void microchip_pfsoc_soc_instance_init(Object *obj) { - MachineState *ms =3D MACHINE(qdev_get_machine()); MicrochipPFSoCState *s =3D MICROCHIP_PFSOC(obj); =20 object_initialize_child(obj, "e-cluster", &s->e_cluster, TYPE_CPU_CLUS= TER); @@ -162,7 +161,10 @@ static void microchip_pfsoc_soc_instance_init(Object *= obj) =20 object_initialize_child(OBJECT(&s->u_cluster), "u-cpus", &s->u_cpus, TYPE_RISCV_HART_ARRAY); - qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1= ); + /* + * Set the `num-harts` property later as the machine is potentially not + * created yet. + */ qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1); qdev_prop_set_string(DEVICE(&s->u_cpus), "cpu-type", TYPE_RISCV_CPU_SIFIVE_U54); @@ -204,6 +206,7 @@ static void microchip_pfsoc_soc_realize(DeviceState *de= v, Error **errp) int i; =20 sysbus_realize(SYS_BUS_DEVICE(&s->e_cpus), &error_abort); + qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1= ); sysbus_realize(SYS_BUS_DEVICE(&s->u_cpus), &error_abort); /* * The cluster must be realized after the RISC-V hart array container, --=20 2.53.0