From patchwork Thu Jul 19 16:07:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10534891 Return-Path: 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 5CA75600F4 for ; Thu, 19 Jul 2018 16:08:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4759429D9B for ; Thu, 19 Jul 2018 16:08:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BEAC29DA5; Thu, 19 Jul 2018 16:08:55 +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 32F4B29D9B for ; Thu, 19 Jul 2018 16:08:53 +0000 (UTC) Received: from localhost ([::1]:44057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBU4-0000OI-Fp for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Jul 2018 12:08:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBSx-0008DR-ID 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 ) id 1fgBSv-0001Gt-2n for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:43 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:9871) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fgBSu-0001Ew-OC for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:40 -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=rtzfmreZqMH0H4DOW03+QW1gQJa1J5qdf7X5R0MOeqo=; b=hcAj6hu3SnJwckZLmaq8gAGC8AYlSCYh4YmW44LdGIewuQAyx6Wmr2Cw A0ggLg+b1iUbMJQvAA45I4Wcid/3NTX+0WRAiclwU/y3QVs2WyOF/wU0F HiHvzZz1yBu5clw/m2/EQ385GAEpe7gajhRhKxk73t8dSQfNTw0lyQD6A ObDV70GlxV3oH/pYW/1yuUNOHbpXcMWF8626kM+YzGcrQBLSeBYmJ14zw TmMA/J/h13g1huhF0HnY7TGl44s4L/LAZiCzGAVFhNZg5sC/LZcg/hW/V yT4PihR5GVQgk5TVHbxIiO/RBIRwELtvkD03tcEBQ9h52AmqQAD23CX3+ w==; X-IronPort-AV: E=Sophos;i="5.51,375,1526313600"; d="scan'208";a="84429922" 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:38 +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=xGRwiucHzgpq7+u+J3ozxIJJDMLfzUUJs4SptcrlAqQ=; b=RoqKPUsNzaop5X9NOVvRMwI8gUTyFDO6oaUgDMW9g54eK8dzxEABKmwKnBqLiOwU1NOyfqzWmKF+0qJTGrcaUwA6zii0CyajeVuZIQjqH3jhWuu6333BB1rGsCEuP5bYXm2Tfq4x1QLzIN0QSl0rlqE8GpuPkMnfN0yNLsKZxN4= 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:36 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2018 09:07:19 -0700 Message-Id: <20180719160721.18430-4-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 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: ce6aea94-39be-4391-3e1c-08d5ed91be7d 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:7GExldhcCAm2THOYYN1S215k+baxiFi5AD5ROwj3KY6tOUpgTar2xDWM087VNZ81QkgZlgPjfMKdIAr6EJajrgxDP/3aiihdy9upf7WCSR3M20mEKOLwewURzIKotvDsSai9chqCRZebeJAkHHNAzz3C7KskkM12sl9qjwfWlDHL8ZWSEKVsz/pHa840DvTJ8S3W5dJX2tGem0qobQtASG5ThHIVV8CFvKosJ9IQax55+KzdPc/L8tmIukUFxaeC; 25:z46uOmf+QjheUwBurA/YWe3J7lwdhqzjIN26BvvV9CvbHryuGbx7JWK1/Piyhi22X94ZeS+H7io1qtx+/NqyuZk7Epll6Mj6u2nvxFFt2JkBmpNjPsvV5O0c1MS4j02mgJBjH19ySqTPccOVVWDRBHb9Mu6GGlmon6qA2cvP51t9VAOrAGpWXb2Lh+eLgV2STVtJE6qzWDEsNvMu9PgXdJWu8eBTap3Ff2XftOZEyoNaLPkCrdC0xDCE/4Yex2SxsK56D7kOhBgYlQJUFrFe3/eWNqSKxWw4kwdXVJ/w1pNNRUC3LYkh+E7PzBK54W2FNFZezbsV1dV1ofQTEnMLUQ==; 31:eOCLgPXNQlB1lPH/fDb7WBfrfgS5xNpOrk08OKqgVAAxaJj/29ZX6kFBs3GTL0OgX1T0kN9R32SL/R60wZ9Fn/Ljl1lqlylq5fXDCazrAOqVE9XouZDl3DsGctFvI5PPXMGYUz+GFF3rNxUOmjtn1tawp8GXyfmKbz1I+t022yMbsu9RKXdX70IrxPa1McYxUAT1wcTM9QCUEPokIm6mpZTHl4L4lrpOl3QP2z1BDJ8= X-MS-TrafficTypeDiagnostic: CY4PR04MB0390: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 20:d0slMhlG4tAECSBM16kewwrwCFGZFIgxGCHX/Q6pUwM9WqVFurRNIFDn5PwKEA/wgm9hTaOi67F+opq2xHr+8BpPHfXZxZbM0IcPnspbUK15P/zCPSyU/doXsxj5kv7T/9mY1y085dqWt/u7XRPuPGxuQ4r9hW+VBIGK9TjoSG7YjZTGg05xKVB+m7pKZDCqRUgqaXSsdzNhCcjHJkeYfQKc+TJW/YKl10VSr+uV4d3rayxonFO1mfhA6PTn3KiUfceKEmp+KrYqf7m5NfD7T51D5YOJL7TKVQXjvIrPdMW5n7s7frt2NvCabd/aD7VH97g+aUu1mQB2dvWWAbYOcy4UHmHqLaHvRyiDNJijgpFTot0/6h/rZMzHm0dC9RnhSVOlSewnLPXHYmXxCMmPg5wGJ7G0QQbvyCQkgl+ksEVosqhfxmKKIlmoDwKFb59zGrH9pmYfFYUdpQ4R6Y0vPoP9322l3KdSStCLRL3ZKe7JpfpUnKxrzHOsuuU5CfDl; 4:WlfNUTiQNUMRyzLQ8vw6iK5rqDn3kyoXUDDyaQtouUQgVh0pSdZvoJaQbEfAzucmdMBYY1cSuoHIjvCa+DdRaMPBQAGSSRB9ASzdAQglHBUM9HGJ6Iw98rYn4093IXx8K+uYNdzKTxJWSGATyFkC9USbSZBBbjdSfDYh48ks4EBto9TdNs567mZOsMA99F8vjNcSvw1FaGtwNu+0t2PjN5cHGnCPTx7MQa/qFs9pH2zw2Aj+fyoI8WcbjVugHRGDDew8q8aH9Esh8ooMx9/Y/w== X-Microsoft-Antispam-PRVS: 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?MTtDWTRQUjA0TUIwMzkwOzIzOkg1bmVLMnVIdWNReHVRRExnU3dydDRyelZl?= =?utf-8?B?dUY4VW91ZCtMQjVlTk9Tbi96VTBCMm9VNmhNM2lTOUdVS2ZWZ0NJVGcyNTEy?= =?utf-8?B?bDJsdFFtdDdnUXErRnRNQWsyMm9jSmZpRUsyVGpzbXdHZWpLZ1dVWDJmNTVj?= =?utf-8?B?MWNVWnJlUXBTYk9DRkQ4SHpKU3RoUFRsYWswMDZQTnAvY2paNGdndG43WUJt?= =?utf-8?B?MTFnRjdSYm1tOWJxcW41Z0Z1SndVVy93NGxpNm16L1kwczExRzFDSzJLMFJy?= =?utf-8?B?bDUwRDBrMUxQMkFMVGZiVm05NWhpbEN0VEJMNEZrOXpnY2toTkZQOXFoTnVO?= =?utf-8?B?TjFodVV4ZXlFM09UT3o4dUJaM0UwcEZ5RDB6WGl4YkVndnBpQmpJQXNBU01D?= =?utf-8?B?Y2dVTFpOSStrTmg2RWZjSVVUUzR5aXIxMy9TV2pnalhqR1ZzV3ZBYVoxeFpQ?= =?utf-8?B?OWRCeGx3a0xxVW9OY2xsZkJWak5vR1JpY1QxUFExTHFYWlVBZmRNZER6M2dE?= =?utf-8?B?Zi83Wnd4cksvQldlTk52SkJkOHgrV0pxeU1PM0tzdlUxa0t3cW51QldzalVz?= =?utf-8?B?cUUzNTBJb1VYeVZXUDNmZ1p3bjdqVnR6QnRQWGVKb3dBWXpUcDVqbDJJRVJQ?= =?utf-8?B?Zjl0aG5zWkpaZmdQaWFTUmhobE95bXE2YWdMWlJFVmtsUXBZcVBZY0xtcy9x?= =?utf-8?B?SE5YdHJFdzFDWnh5SzgrK0tqcFBVNzlCSkVSekxTUktuWTdzWmlsUnV2TUV3?= =?utf-8?B?QjBGTWxNamhlRWpiSW43bWVzU2Z1UHdyd1dWVmZQaDQrWUtTMnhIWmRxdGZS?= =?utf-8?B?RWxWTkZPK3dPbTQ1ampzZFllTElrdGZjNlFXaW9ERzNsRDhWYzBHWXo1Mkp2?= =?utf-8?B?ZFVOOEpUUkdpVGlsNWFpbHpGSVRiTGx1dERCYlRXYWpRUExuOWgvenExY0pq?= =?utf-8?B?YTdWUS90TnBucDNBd2p0dC8xMC9Va3RPM0VLcDUrTU8wQTcxRlN6ZVBQLzFi?= =?utf-8?B?MkRVSWpjYlo2cHZmWmJQUmhDQndidnN1U1EzNWdSSGd5NnE5dHk3MjhqNTZt?= =?utf-8?B?bmNHRjFTNUlrK2FSVEM5U1h1OER1OHlZL05aQU0zcUJOVlRaYXNYRUhNc2tV?= =?utf-8?B?S2ZkRWRqcU8xemprT3FteW5XOEFhSU45czZ4eVlHZnJVVDNxYzZDaUVQTWRE?= =?utf-8?B?a1FObWJtOHJuN2RhWDRWMGJsMUUyWnRoTCtYczVGM0FjRHBJUnhtRVExcEF4?= =?utf-8?B?eFVsTXJIZHZvQ0pvOWdNQVlKN1VGOHhSYU1BTmpvMXZicUhEb3VBK0Y4T3Ev?= =?utf-8?B?RzZNQStsTE5FSGQ2cHh0Qktha2pJU0EzMGY0WWhDMTdIZ2RRekF4TDdCRXhj?= =?utf-8?B?aWdZWTc4M0FWMDZvWmhmMG5UZUxIS1diVkVLanY0NDBkTjZoVG5jWU43RUxZ?= =?utf-8?B?ZjNsTFpiTWVDQkljb3pjRVNOVERmd2E1dUc3dGZDbVIzbjJXZjVDeHZWME5a?= =?utf-8?B?bE91ZnRnWkhPVjJvNjRZUWtlaDQrRDR3NEs5bkkyRHlneVovOGNGdTVHY2ha?= =?utf-8?B?S09Ka2owTU9Rc3hoVEFOSDh1NENLY0R5amIxdDF5YWNQM0t6U1NIY094a1dV?= =?utf-8?B?NHJDUkV1OXhvUzFKTmVWRVZUTHdUMFlIWTlwMXhqdUtQK2lnMzIrYitDN2FU?= =?utf-8?Q?XsGUHVhKonOJdSaCZoBWd6vi0hOOhQXqN+5y7CC?= X-Microsoft-Antispam-Message-Info: egs3Wu29QETeW6Pvf4GyWOOr93YuxALOQf3Wje9PdiRltq15BAjOe+weK/05v+yWz7m/nrUAD5RYYyXu/kKiw1bL0sQQhmzuuuLJEJEB/PSI7LlRe68AThXktOPYVO0RGvPRvclvJQxJfd0zRVZN42yWWvkhHQExv9e7CvekVHnm/thoyKXDo8WBEWZMPP3KPCjt7oWylqKc//sAz2SlF6ci9T3jjrsbYbiCU2KsIteoU4e8E3+DGx/FA27d4B5tNZR0FXoCrNzUg9ibNCgAI26C4198tUMHd1tlgeRNxEZHEX3MWA/mkQZwIlGBXnE697pdk+iLRS+um7aqzgvwADmma+dPfvuaROX4WtmWc30= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 6:0quRSfLf5j47vPknDuoFqebadaHM4ePyvZ7AyLW8Lo87fxS/HbrrsVrIY5BpTPNY7m6TZAuclFc4GpicjR1KIFDfeMbF3f9qNTZFG5hAxPw1PhG6P3O5FrAp9mbYtVi0U/fPXP5u2UFQGpDZqPCHqQlpNYugEtu/UPDxgjRpquM3sy7YrItZFwJPdqNT7YR1kH0gD2Us+rchh3aLxtBEeKc6ToRKTozTKmEy01e8QDT5A9MkWsXJWHeXUz1YEtdOD4Eh0FYdYlOGcbUkxXNjpeNozOajIuKNmspHTISTjiv1tIIQ0+gp/kD8kkkh9UQGk0OY84cpPjQxfQpZQ4PJyWrFazUjXkPy3M/6qpJveiGXK/CvQVAV3ynHPkIxVrDg/YrIamvXYC4FWTCVPxj2tsui5EDg4AUDJivTr9vEKJ9H8XzpQcC7vpp0n1s1M24G61S/QzI33KUHMIpJlkc0bw==; 5:cyQ+XaSvWDSJYQKup3A+EB222p/+0YlRsL77ceJ4Tja1H+KLcruvbCakNM4h3RHnBsGChroBCDOMDRpOCBANMKLemb5kiVLWh4c0nMQTWmjJa2xw0vYF9LWrLepHYp44OxCm7Aaw1biCmrUFoN2boQtOitIYx2SQv9X5jZqXkD0=; 24:lixQeBCfShArrg/awL5NZhzmr3D7m2J8ccFguZBraROCFKf11tZolHN9IOXAxUHPlRm2eKVE4baVXb6pTdg6IBe8cfCK7qiOjanNZN/G9fQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 7:rV4EVSrXZIbm51IwsZIAt01FguR/FEUKkmH9kbbxrsqKdjMy/w2b7DMAbWkRDVdjemNlDlSOU5jcC2ZYo2fm1WIBaivAyuYvE83gRHP7Q1iUod4jAHiSO/mNuZ6je79auP+JqfmKx/3VwqsABMXsQPXe4gENG+HpRKwYbrNMqu/npnuFX1kRxv9eSdjcnajqvbdp1+o49G+sNikByQnUz4QeS5KpJBnG/kpmJ+jppL/hS7bEr++hhITtpTq5z/Jj; 20:B7spzfRg4pLPuDagq9uaQNEpRrpX1dUZBJSOl3ZjKsc0KdL9G46HJUVUUS59dGhh69v16kJ1RxLE4r3/H/qEYKTtHmn7F3AdCyI7vSej87vZM+9adADQyqf6nJ4KWJdwW2zMd4KDpuOr3Yx7FUoII8ejBVIpsbqFY7kZxGKDN4U= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 16:07:36.1870 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce6aea94-39be-4391-3e1c-08d5ed91be7d 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 3/5] virt: Fix crash when introspecting the device 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: peter.maydell@linaro.org, Alistair Francis , alistair23@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the new object_initialize_child() and sysbus_init_child_obj() to fix the issue. Signed-off-by: Alistair Francis Suggested-by: Thomas Huth Reviewed-by: Michael Clark Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/riscv/virt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index aeada2498d..248bbdffd3 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -274,9 +274,8 @@ static void riscv_virt_board_init(MachineState *machine) void *fdt; /* Initialize SOC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); - 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_HART_ARRAY, &error_abort, NULL); object_property_set_str(OBJECT(&s->soc), VIRT_CPU, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts",