From nobody Fri Mar 27 05:06:08 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=1773657694; cv=none; d=zohomail.com; s=zohoarc; b=g+bLRljHH/5klo0LBJYOyjsC8es/TwlozAVyUF4XSu30ByOgO3Vv7YOJ9vQREh8C+q0ioeQZiQsevrY5qqOnNAkFfMpRKZ0kDSr7xLcCk4fCeFUo86P4tm0/tRGrjL+ltQBI14+gK9HKPUyayyAJxmrpcKdnIgi8osb+kWOnkPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773657694; 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=1U0px/8h2K2yke+1GtbBZtkfyxTjEycjbAMv+vfuGSQ=; b=PAOxPmTAW4yJrU0Bqc3Kz311X/DSwFCRArFwe+nuTUS1eVeBU8uv5SEWHHWtxvJZHP3orfbpHX2n8Rd5WQ/wMjn/rKJz36q1uUQFg2VgO2t5tucUsI0UuuCh0tKHBUn4TakNqytKXcHE98dlVgPaNXIhq7cU1fwgtcAr1wuWrb8= 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 1773657694963648.5943507179567; Mon, 16 Mar 2026 03:41:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w25Ne-0006Al-QX; Mon, 16 Mar 2026 06:41:03 -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 1w25Nb-00069x-Q6 for qemu-devel@nongnu.org; Mon, 16 Mar 2026 06:40:59 -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 1w25NZ-0003Ou-M5 for qemu-devel@nongnu.org; Mon, 16 Mar 2026 06:40:59 -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-381-cmiKthu8O56WRfQ9hTxPxg-1; Mon, 16 Mar 2026 06:40:52 -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 831B318005B2; Mon, 16 Mar 2026 10:40:51 +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 3828619560AB; Mon, 16 Mar 2026 10:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773657655; 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=1U0px/8h2K2yke+1GtbBZtkfyxTjEycjbAMv+vfuGSQ=; b=c1sd8etr0Pcl4NhoDyPtsooNVbL2mAwIz2vFixqb5pW645cEXkJmNBRZNvVAULdxPiHkUH KiWfkPJS+IL3Sy0qVYnZRmg10giSig53AeuTJNn6hb8E7+v1ttyjLwZWEOcRDPBkR5bBsc taZGkiLRveCQz01hJFd9ysy0CO9RT/k= X-MC-Unique: cmiKthu8O56WRfQ9hTxPxg-1 X-Mimecast-MFC-AGG-ID: cmiKthu8O56WRfQ9hTxPxg_1773657651 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, Alistair Francis , Markus Armbruster Subject: [PULL 03/14] hw/riscv: sifive_e: Don't call qdev_get_machine in soc init Date: Mon, 16 Mar 2026 11:40:28 +0100 Message-ID: <20260316104039.195960-4-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: 1773657697450158500 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 riscv.sifive.e.s= oc,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-2-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/sifive_e.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 4cb9c07ffbf..1acfea49668 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -178,12 +178,13 @@ type_init(sifive_e_machine_init_register_types) =20 static void sifive_e_soc_init(Object *obj) { - MachineState *ms =3D MACHINE(qdev_get_machine()); SiFiveESoCState *s =3D RISCV_E_SOC(obj); =20 object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY); - object_property_set_int(OBJECT(&s->cpus), "num-harts", ms->smp.cpus, - &error_abort); + /* + * Set the `num-harts` property later as the machine is potentially not + * created yet. + */ object_property_set_int(OBJECT(&s->cpus), "resetvec", 0x1004, &error_a= bort); object_initialize_child(obj, "riscv.sifive.e.gpio0", &s->gpio, TYPE_SIFIVE_GPIO); @@ -200,6 +201,8 @@ static void sifive_e_soc_realize(DeviceState *dev, Erro= r **errp) =20 object_property_set_str(OBJECT(&s->cpus), "cpu-type", ms->cpu_type, &error_abort); + object_property_set_int(OBJECT(&s->cpus), "num-harts", ms->smp.cpus, + &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_fatal); =20 /* Mask ROM */ --=20 2.53.0