Message ID | 20180719160721.18430-3-alistair.francis@wdc.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 64D81600D0 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 19 Jul 2018 16:12:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F73B29E38 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 19 Jul 2018 16:12:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4334229E4B; Thu, 19 Jul 2018 16:12:57 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5AFF629E38 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 19 Jul 2018 16:12:55 +0000 (UTC) Received: from localhost ([::1]:44077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1fgBXy-0003GA-G5 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Jul 2018 12:12:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSx-0008DS-IP for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSv-0001H4-Gm for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:43 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:57981) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSu-0001Fb-O9 for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1532016461; x=1563552461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J04sp5aoXvF5lYWWJwhB+6SPF0QMOuwK1pKufuK4vKI=; b=p0Yd4Fyqpoh/FD/m0d7uuIm7h6wmSXK8lUGV38o2aufQwagG/tS0m51+ m5eU5sgyyruI2Z045kmbqSXs4pr/nu+s+QObkgvvP6EP1EpUrgUDikOQC xiscbHY4LJ6O54Qpo2JWKrA0hJXmtAfrW3Ptn1beisMdkivTkiGUqMHJ6 6sVeHH799FO41ekAzEk+b9PSyxdM5Pc1/9dZ+gYtCKNGNZWbJ771v45BY J4X+4Ug8jHPZxb5/0S2yJPmR0uwBUTvhJ+p5xZ+AjGNmWUtyJhP2PBnga aULDdoU56/LJ6n4ARyozmZs8rK9WMtseUJPx88vUKqg4mv7ybwWNW927D g==; X-IronPort-AV: E=Sophos;i="5.51,375,1526313600"; d="scan'208";a="84429920" Received: from mail-dm3nam05lp0119.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([216.32.181.119]) by ob1.hgst.iphmx.com with ESMTP; 20 Jul 2018 00:07:37 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hbUNvSvXtWvhX8x/2rOI88EZxrMtqXPx5jns0kO8Nnw=; b=NZ1FCb72QiG80hAeHvk2V1oHQqNbXnwUjDofbPcjLiB/86y6qOnvJvAnzV7+C0CMPDYNaYv+juxxJ1KgH9+H4X11zjNWw4J9w+N5N9a2rVj7ZwIGkzvEZeK5kgygooBnAb1C4jZ/xgS7fOAiGEgNH3tvqRXoZ6WFpyevzo6O860= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0390.namprd04.prod.outlook.com (2603:10b6:903:b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.19; Thu, 19 Jul 2018 16:07:35 +0000 From: Alistair Francis <alistair.francis@wdc.com> To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2018 09:07:18 -0700 Message-Id: <20180719160721.18430-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180719160721.18430-1-alistair.francis@wdc.com> References: <20180719160721.18430-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0084.namprd15.prod.outlook.com (2603:10b6:101:20::28) To CY4PR04MB0390.namprd04.prod.outlook.com (2603:10b6:903:b1::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 012245ee-4f6f-4d7f-f8ee-08d5ed91be24 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0390; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 3:OKgvsqoF1wl1dEUFbdNR4qD0aTSOSHss92nCJ+bn75ORmi6DnLVfAboVdHlMm3slSdugSJJd151jbTU5RoMWkfdeddlFod45bb05axoFgtVocnsfHbVio+LYgXNGaQVwraIHwArW5C1qhqoIamz4YmdPuiw+LXXT/4Uh27Sh1x5VfTRlBViCE+gl05WJPwpCxYxqaMDLPFU8W8mmyGOvT2faJ+Ys9DhBgzqMnTIMyAE/V+81itTENOqq58+6pSi/; 25:hN1lDpiRW9YAHJeJIFFp8XNqdANA2ZRPSQvjzhbf4fF3Y0RsA9wjPFzjZ5lafETiqApOsz/B1DRMfsQ3bMr/zoq47xaslSjWsasQ7O57YHRseA4MXqAST9/IL3t2ejICHE4+/eWWkdfHVu/IkZaUA3S1rb/kmiPlRQahaYEc+HgtcJQLTZe4Z236herRC7BCqnbXk4wuShCBDogjWewKDJ+G4AXgan9870Ag/iaKfgB+H5N7uZwWUDDGvAc1az1mf9GLrHDTuf6U4xtx/Kkr3LGiizQvMdcVFzhWzXxHV7u+Tqyo/xv+d2nVCpjn4nKx8eXdKluVkVwjU9gVubY0qg==; 31:av6mrmruMn0iJIunCR7U4KTfIRPYNRY8dPDmF3s0S4t62sQpaT6LQZwdelCzea7UXXyuPeR8doVpRpZblJo9gUCrsR8+MTr66TmfyWkG6NGxIUrcBhBmm12Hm3fujU3ryywOlnj9prCHNU3LZVGmwLPKCMK+mdjILhzu/BgMYxDDQQUctuOiWg2ntq7LBn+lB1Ltmz/BWKNM5KKs88QT8Xj+DPy+b/kWV41B+k8cF64= X-MS-TrafficTypeDiagnostic: CY4PR04MB0390: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 20:hHKdkUnDGS0xgID3+kfU1VjvxohugcP7LzqdtBnUf0l67bWeUqme2lcI4NN8fQyuoDMo0hbc6i/ThPemsEvcwQZp7o+SfXF8Aou7nKq4bU7DANYaiIFq41B/ahU2AaDkc8D/RZ++baXI9mrprrX0BxKt3wSQP0+pQKaiMGBC3BChlPJaiheRsAFyHF3306cyf4ZO+t0/R0i3VXHWIwxHCY0FLvDI+cg7cU3slx+Sezpkf99WiNGmPajwjcOWiUF6+jmUddLHZ5kuIbkAVd/aZFdzJas03F95twt6RxUsPQHlaQWQt2Rhb+J+3UbjCHPZ403QS6Oi0GaW2W0myIKc/uNbBM2OpanWsm+79hu+51115YlaDa4brb4O+IQ67YhkQmhhXQ+B6lW9hz1bKZxcJV+/dZKxrSdAPcZhLT/+OefLtbqtRI2qKS5oM2WAYag5/1Y/0B2COVaFzR4ImIsH0hU6hIrlR/theYr3yMYYAY4TJAnTVn015VypAjoQQtjW; 4:/XgWplkia1dnJ0ZPxZzhfyLvGA+EUiUns4y+RCdeNfzZFQd4o486yCO6/h7dwfCUqrf+BzrDTQT/N7+Qv5JGDSmralzkhYaItoKKxNW/fBgEBVqgRH+FIxWaxMmrHrdUPLY3344EO5gOcWIZ9UoygiAslPedsi/BYFvm6m1qgClv9thKF3oBXCKmruptDgvWr3oY6xbeeuDpk1AacbLzvYLbNjEHSqHuEsu8D1XEbDYmXOB7LR6pgMBKbRsDJAKdm3qJbChIqTrsDdcn1qHz3g== X-Microsoft-Antispam-PRVS: <CY4PR04MB03903E82F4993EB5AFA3D69F90520@CY4PR04MB0390.namprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0390; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0390; X-Forefront-PRVS: 0738AF4208 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(346002)(39860400002)(396003)(376002)(189003)(199004)(7736002)(53936002)(2906002)(6512007)(476003)(16526019)(97736004)(486006)(26005)(2616005)(68736007)(956004)(186003)(39060400002)(11346002)(446003)(6116002)(1076002)(3846002)(305945005)(6506007)(76176011)(23676004)(386003)(47776003)(66066001)(2351001)(52116002)(6666003)(8676002)(105586002)(81156014)(106356001)(50226002)(6486002)(86362001)(316002)(2361001)(36756003)(25786009)(2870700001)(44832011)(4326008)(81166006)(50466002)(478600001)(5660300001)(72206003)(8936002)(6916009); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0390; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjA0TUIwMzkwOzIzOmFKczBUcERab0lBbjlHVVc1ZUxQVlNMRGJt?= =?utf-8?B?bk5SUTlBZXJ3cjdQOXlxNFpqekRkYWJxU1dqNDJCb3QyQXhES2VrQ1JHUEtB?= =?utf-8?B?RDNWL3QxM3FIOHltaTBnMy84UzZ2WDI4U2RiN3VwS3A4OUJkQ0M5MVhEa2Y1?= =?utf-8?B?U2IybmRCdXdrM3JQM3QxN0NHT1BxS2JRRk9PUlYrak9wOUtmenlGZGw4aEho?= =?utf-8?B?V2pDajFCMUpPSU85RGpwK01uMmpzTUM1Sy9pQ1RwSE13VEd0UjhjNjkrazI5?= =?utf-8?B?c2FQMkhrY2FDelI0NHNJOWluaHZNVWJLeCtnNGNFQ0h1VWZjYlJCSHpqZTNy?= =?utf-8?B?SFNMdG85WjVYaWMxNUFvU0NjSUNFUEdET2FlZE9iSFVPa0Q5YjI5RUc0ek5t?= =?utf-8?B?RGVqSHhCV2dpazRZQVRPb3F2dllGYkE2V0tnNndkdzFsdFdMUUFsTDJJaDhx?= =?utf-8?B?RmZsTVcwWWF3UXd4VUUrSHFIdGkrL3R0Y0x6aVpTU1NkWEhnUVBndnVTdzlT?= =?utf-8?B?MklQQmFuTjRHUW9URmpZUHE2MmhoRWhxMit6R2hYdHZVM25nSTR0dHR2YmFq?= =?utf-8?B?QlZ5N3hTYU4yc2FxdHkzSWZ3VG8zSitYbjgwRHozQ1BPZzF6Smo4Y2JIc2tJ?= =?utf-8?B?Z2ZFZURNTWRwRmJ5REJ0TTVFZGM1SnpFbjFIbUlWdWhyaHhWd0Q2QXNqZlNl?= =?utf-8?B?ZUNUUVlEOE8zSzhKTUhQd0hYY0RoZERKM0czZjR5VFNIVnhDTVV0UEEyMkNF?= =?utf-8?B?UzVUVTVJdWtRK0RYQ2t0VTBLazJmcjB3aU5tbmVyclZ0QjhnY281anBrRmlo?= =?utf-8?B?KzBYOUR5T1BrWmRyT092S1FRVEpQcmk3UGU0aC9nMTh5V3ZYeDMwV1RaYjBI?= =?utf-8?B?cHd3bU1zYktSTE1CK2lPNHMwQU1NcmVNSnAyOTkySWZqRkpnaEdEYklReWk1?= =?utf-8?B?RTBVbWZRcjRiTTc0Zm1IRURndzg3WGczVi9HdkJlcjR3R0lTV3FFZ256Rlpm?= =?utf-8?B?Z05MRlhTUTdBaDdwbmh5eUtPd09VQTBTbllxZHpTSkthWDd5VURwMFRZdGRH?= =?utf-8?B?d3pjL2MwNWJvRi9kRUtWTUZZMXorYVFWT1RzMTk0TytBSUF5Zmp4UGduL1oy?= =?utf-8?B?M1JlcytoT0tEREZVQ2Uxc205bFBhc1crMzMxZEpVTHNhbGdGQUdLcjJQL3NY?= =?utf-8?B?cng5WmM3THZJTnc3ME1jbWVid01IZkJ6ZmQyVk9lVlAyNFZZRnN1eld4U01l?= =?utf-8?B?TXFSUDhFclBwOHNSdHpEWmFhUmZSS0ZUU2t4OVBHRXdsYVpyV3F2eUFOc3VB?= =?utf-8?B?clRHOXBsVkhvRnlOZERTQllXVmgyVGlhRE5lUVB1L1hkZkM0OUlqRmplM3Nm?= =?utf-8?B?V2x2eDF3L3pMWm9heFBOd0YrVXQ2aWhLZ2ZMYUVKdWxrcjdhVVo2M0dWdlh6?= =?utf-8?B?eTcrNENCWTF6WVJ3VWVEckErTmh1Q2c3VVg2ZWZqZGRoUzR0N3JqZjduOHFt?= =?utf-8?B?Mzlpa1FXWXVwOTVGRXFBMUdIMnh2VDlvMGdIRUhvYzRFcGVTNzB5bkl0TzBj?= =?utf-8?B?dE9NZk9obWtiWjJBU0V5QURYZHdOZjI5andYZEp2SUgrMTlldzRrbzE0OWFi?= =?utf-8?B?azBRdmphc2E5YXRBZldpNTJEdmt6YmxHSmxGMFB1OUN2YzlCYktkb1R3VHZZ?= =?utf-8?Q?Ijm9EcahI0JSpHk0v9y42kocSbIerNdzEsGRPGT?= X-Microsoft-Antispam-Message-Info: FAQG4985R1OPBohZPPKKbkRszN5YAeVc/diJW5D7A+7pN2pL47JvC3hxF69DbfQ4K9nQfJ4WuN49cRZIDRLwZyRrKBognbGuczbHikHCmEx4ILwUUpNI4DDJ6/+PkPhbeNlZEbdw7OJqlFBqyDXtr643+dl/1sg3ENShawfAjG1dN/jdS6m9/l41QOQxYwGkOwW6TFoqPFHDZw9IJkoywGUjPUWSUmKQf7yVQfJXEvUIVTYSvaIoZAHY0Hv+9VUWQZ70oP3kOLycesMImBU4BYjA8wJoubCMZCsInwHAsDAlcYU+jiLJ3cJ7WkABQ8rljjDadty368igQW4rNigCygyFpguR+gmPRgJq8bEMONo= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 6:vg4+UophsZwHCK/H/xtjfUtibfwltdDzcjvdax9Z/4hPwXgLsynpWFhA3/XSmEmWW3ixpjENzBzqZkJDhd8C84ruvvvPiU9pf/XAMCs5+hpQkS8AW7g7N3pSsGN/voc9zodQl/85dPfsm0h+dF80wt0PPysu6nTh19IWyKonOjTv2T2Cg/0bjBe5hmUWD+1qP2qEZX753Ui6u1Gmf2koUmugvgnL8wuq3IuLxNFaDnDmGNLf4T3s4RbJ63N0rvexe63KVSRqi6vawqzmyhoiBWEspMEcRxXCpEGh6ClUmmkxenu5ife6HhRwnbfiIfhJ4MBGcfygbqWKRQwZcJtD0N7pByfaM5CRvEN7rzh4UfLOXTVmcdxVHiMwU/fCblKDLLdx+wrIvLsPuWrZtxGBap1TVUfegeaUqwlA+5NRDoE4YrAUPxYSF/tuVR8ChS4OT/30yBO5U3MauHf+UrwJ9Q==; 5:qAkrOkGONj2DcWbrHgLu3nrqSqnxG8SE5TbC1SRpuF0R7kSN/a6x4J+MqpP/56l6jc3bQq9Yq4X/GERbbuJCg0hklV//OHy/NaYXVPIVCleupUwr7y8pofx44O8mcsnGw17dyUm57te78U9PfshGuVSeueNr5LOtZgMu1n23Sb0=; 24:NhqzZWa+sMiiIoS72W9x9R2PbT6V3aLDW9X8aJU9cZybrS9aBy9qShO2RRdAgXqJiQh7jkWR7jxuA3/SViidxDwth7rhjQ7p1wMRqf8MtL4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 7:saz9QjtYskJnyxnNp9x/SlVl9mZE0RTlTtE7oUunR3ExGzvhSCnqIlsetna1H4w8jKs4ZASWUzg+4OvVRsHDwtPG3ywMGTewpD5RHK8F1FGDJhWSWm+5eUmdexsxim9xScxYT4d5gIsTHQK8PGfasIiKnTQMX/RxwHz7e49zAqlpLMH3G82D/98SKFFw6kOuBdTDePhD/4Z8tFs+Vfmj9fpCWiECLuQ15Sv9dnWSbWv7IeXyItzslQTCReygrvtw; 20:sdwCvutrBJkRhUa1vByU5obWjDLb90NiG7y70NzFAnuc3JFxvZ5IUwLNlrKpJ1QXkh8rGWgcSKeDV5R0DTIJHzFa0LR/xhDLjM2py4NVJKuO1NeAd1k/nUiRUo0qYOAw6ebSDF+GDsKk6ubr5DWV90bTxhRr2XazLdxpYxYd80k= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 16:07:35.5785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 012245ee-4f6f-4d7f-f8ee-08d5ed91be24 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0390 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PULL v2 for 3.0 2/5] sifive_u: Fix crash when introspecting the device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: peter.maydell@linaro.org, Alistair Francis <alistair.francis@wdc.com>, alistair23@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 3a6ffeb437..59ae1ce24a 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -244,9 +244,9 @@ static void riscv_sifive_u_init(MachineState *machine) int i; /* Initialize SoC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_U_SOC); - object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), - &error_abort); + object_initialize_child(OBJECT(machine), "soc", &s->soc, + sizeof(s->soc), TYPE_RISCV_U_SOC, + &error_abort, NULL); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); @@ -303,16 +303,15 @@ static void riscv_sifive_u_soc_init(Object *obj) { SiFiveUSoCState *s = RISCV_U_SOC(obj); - object_initialize(&s->cpus, sizeof(s->cpus), TYPE_RISCV_HART_ARRAY); - object_property_add_child(obj, "cpus", OBJECT(&s->cpus), - &error_abort); + object_initialize_child(obj, "cpus", &s->cpus, sizeof(s->cpus), + TYPE_RISCV_HART_ARRAY, &error_abort, NULL); object_property_set_str(OBJECT(&s->cpus), SIFIVE_U_CPU, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts", &error_abort); - object_initialize(&s->gem, sizeof(s->gem), TYPE_CADENCE_GEM); - qdev_set_parent_bus(DEVICE(&s->gem), sysbus_get_default()); + sysbus_init_child_obj(obj, "gem", &s->gem, sizeof(s->gem), + TYPE_CADENCE_GEM); } static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)