From patchwork Wed Jul 18 22:27:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10533389 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 C8993600D0 for ; Wed, 18 Jul 2018 22:32:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF0CB29A09 for ; Wed, 18 Jul 2018 22:32:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A345C29A0D; Wed, 18 Jul 2018 22:32:37 +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 2BCF829A09 for ; Wed, 18 Jul 2018 22:32:37 +0000 (UTC) Received: from localhost ([::1]:38503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuzs-0003xB-DH for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Jul 2018 18:32:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuvg-0001m1-76 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffuvc-0002Fj-7j for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:16 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:59721) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffuvb-0002Du-Rl for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:12 -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=1531952892; x=1563488892; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=T6Zm0DlzjvQcgBdyKPOoYf42HOpFNdT4t1vcQcUxe10=; b=PpNVQn5l3Afro6QROEvaJQnhitTU2qPD6AtwyVsuSkiGbMu4nbGFgVEt TZ0yPdWM3WdejjYJbUMgfrDiiFZgGGqL/wtcNgLE+XzjwBqDYBI6phHZN F/NZHJIAs6OrQcFTMn5AJx775h1Ph/obFqkO2kulgDI4JcFc57rmOpPwr BS8vg2jShU6xztjBuvlufqc6ACWfUDT9GUOa52xnRRXb34Pogg3lpw7Aa gotCfclTOnitwhN46RekIs8MaSWzIEi73lYJXEc6f9R5bt94I74H0lI7f gRSsT4Z0h7s82pksJVAARevdJlFuR2v2b1yV4SSP0L9/PvgSb+st/6XuS g==; X-IronPort-AV: E=Sophos;i="5.51,371,1526313600"; d="scan'208";a="85113750" Received: from mail-sn1nam01lp0112.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([207.46.163.112]) by ob1.hgst.iphmx.com with ESMTP; 19 Jul 2018 06:28:09 +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=N/puisSH6pVR1qO8vbYaBpxzlFUQxGm17iufVpc4uEs=; b=Kje16uPzk0yxbAgYdQiJCp4VQCKioN5qtkQFRa5qx7CLJyRimiF6hso4DDbCSnI8nobZQXvSDeSOueO7FOclJz7kXwm5dcOzxxeV5bLbBgaLd/JOxUNQOAPe/fS8ZC/ScMG00FB9zlDE1wXT3me9zVWRIMAlpzKlcc8w2sUp2W8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Wed, 18 Jul 2018 22:28:08 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2018 15:27:54 -0700 Message-Id: <20180718222755.9014-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718222755.9014-1-alistair.francis@wdc.com> References: <20180718222755.9014-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0012.namprd04.prod.outlook.com (2603:10b6:a03:40::25) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78f22e8a-889e-4da3-153c-08d5ecfdbd13 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:IVCZjpVIK2f5iRuhahFKfnA30V7RAeFVPuDs/CmFfiDTx6Q7kGbWkMsCA3zwztaZ0my2wztKSsn7B557akW+fJjhAKZg4oYXOcBFW1jqFRHTXkUTN0dtZTDfeF08p3vJF8v21bZZStRDlxgFF03MKJ7L7bZbzxpBkz7858V0KV5nDr5L1rtpDDyc6iY+xGkO42hnxKs2tqHPyZNMiUp4khd89wVebikR/bKjjEcOQCVAp5G0PJyisC3mH1AESMZS; 25:FMz9VBZZOM6Ap6OEtavxJvmRWfxMmK8RfQ8Iw3jjGV/MJ1FJBzvEv7f0Yjk/14mWGp2iHDHjZM69+8EAu3W95ZMtZueAi4V37t0ZRu8kiMzxlzKlH1/8D1ib9f5pUZTmTfh3nnZmOEqT1x/JeWtg2vzB5UBtvE9yzuyXSFT4sLjZj9imYynaIlxvjondh+eootSjq6mjlV5foNOPyvij7P7aiYJJ88vru2r/aQwEodRN+Z0gL8lIluExONOP192ru0Bj8+HRq4BOcMtGXUkXsWYzXwhP05FJwVDvyDMS0gMwecBRx+u3z8LUAi3W5wPE0wThevlDiIbGjbVOLR01jw==; 31:e9nvjMzW5CPbWoaL+45xVSVCzioNPPwNudZHcg0d01jSNkgFNpFP9HnGQt6boJKdmQDn2IfD+vw+3UjztXuijl0pDCttWM1bI7HLQinu7trziAb3LshGFDi7jh9VPMhkv0nev896CeZE20OFuMavQMIJiBPWAPR6gW47WITFAB2CpJyMA8rjdaKJzH/cImdOuBzOU12H1SzzgBre+h2MPfiWcF9kIEuGgElHjcOY8XE= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:7RKkAWJTJ+ZVzE/8Hk3Hjej9bbI3uHsyW69BZEWE/sF/NDKSkEfmG/a419Y4vxt1ILr83OFnpTmdKxAmSoiBCpiiOf1uP7GmLb9SvL6bdCu60Z3rkQCBppbbp6xjAM9Mgp1GAQT5QURebLMo//2sLg/5hZ1jD3qCMvbYenlD9CkooCttpxa2XEIv/Y2pCyXucsME7n9re6rmqWTLm5k61fh69ZccmzsMgA+tOC3W10HZOCDH/HjxYd29gDxmnb90VqJMwrXlivmK9rmcsexcVVjNwCE37Bo9BVtB1HoIzzvNi6VRbXnLFe9cRWlK25xuouT4yN4CC8S+fsdp16SgvAvBMHr6htUAVEKA8A9JctOczwMC9wV8WxLNggZGRhMtIwO91sMyim6F7QhMFpXY2gh0upmLZ4dFYUMOMEi/AuP0G2eZBpGOvo0Wt840vJ2he1ClwCk6F5v4MN8+09fau9B9h+FbhFJcV0V0Ewwi3rFTduugCFz1IuG2qi7arcFO; 4:D9FVhQPZp/F1OrRXrtBqppXKFiXLMwfoSSkiwfdLRq/S4vJ1ANcgoulmk8GQdA1znQv09+z9s9n+Jidd7bWSb7F1ew9FGs10NVrDs+1ard+yueai0/x74JoeEtWILO+mwlu0KIuPcK/0w++Nli3GJzfwPZzn9CKc5ogqjNWK5hcRqYXi0cel+LZtOwf7eLKYJSpr9JYRsZUKK6Bgu8Po54BIOPUj6Qdm2PcFULawskM6e3Y6uqU6GOK2JyPV3446steUYy6p3nlHMgrUmXndfA== 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)(8121501046)(5005006)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0737B96801 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(136003)(39860400002)(396003)(199004)(189003)(39060400002)(11346002)(956004)(97736004)(2616005)(50226002)(476003)(5660300001)(486006)(446003)(66066001)(36756003)(4326008)(316002)(44832011)(106356001)(47776003)(2361001)(6486002)(2351001)(3846002)(6116002)(1076002)(8676002)(68736007)(6512007)(53936002)(81156014)(105586002)(50466002)(25786009)(7736002)(305945005)(6666003)(8936002)(81166006)(52116002)(2870700001)(23676004)(76176011)(72206003)(86362001)(386003)(6506007)(575784001)(2906002)(16526019)(26005)(186003)(6916009)(478600001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjA0TUIwMzg5OzIzOmJGLzNmajk1a2xnekVSd0FTYjRmTU1JQmtm?= =?utf-8?B?S0tDWjNsNWZreEIwbWU3NktjZnp4VUdGb1hRLzlwM21YOFcxRXIyVWdOMFZL?= =?utf-8?B?U1FPL1NUWGJOK2ZlSWxJNkxzSmF3Z0dhQ1EvVG9aeGZ6a3JNbWxaQ3FxUkR3?= =?utf-8?B?Z05vTzlmRzM2dnQvOStmSXpRczRQOTRhbEx6UmRzT0d6WHJScEFZSmFxbnBN?= =?utf-8?B?akExWnllR0VXaWFnK0o4L0Rua3hPTXRIMy9DSlhjdUFEZFU3RWVrYW1ENjhq?= =?utf-8?B?ZzhHTEIyeHNVTEFPOWo1ZVNKUjYyODJ5UER5dlRzdjFEWWkzZEZpWnZINFVa?= =?utf-8?B?U3Rob3FiSXJVaXgxYm5MNVE2SXdZUkVDa2F2d29MU3lsbEExb1RCQjdRdG9K?= =?utf-8?B?TVBGMlczZk1GYjVXVkJGb1llZHZ5L1V0QjVVRytUM1BwZmo1T2NPcWJWSjVJ?= =?utf-8?B?d0dLTXlwUkpjczlxRFkzNGtDNHMyeVBlU0VueS92a3JhVCtTa0RoQjVVelps?= =?utf-8?B?Sk13eFJlZkVhMnllWWZGRGVyWkFJYTFCLytwU2RYdGgweHIyTU14UkZ2N1ZW?= =?utf-8?B?SW41QTVkNVAyRDA1bVdGcTZSSTJrWTlralBaUWp6QnpGZTJMSTkvNFBHc1g2?= =?utf-8?B?NzlVb1RMRml1NlJzN01adDFNTlR1OXJGeG5QbFVzQ3Jvdmc5VFZleEJGV05z?= =?utf-8?B?N3ZQK0RkbEI3cTVxWDhDTG9Eb3k0elpOcFVDNzcvOU1DdWh4Vmc5eVNyZDlF?= =?utf-8?B?MUVCYzdqT1JqUThqVUR2RHVXVVZsT2RwMmh3cHRHaEVIYXZFQnh6OFJzYTU2?= =?utf-8?B?Q3ltbzhuOW9LNHlNMlJteVBaZzRsdnJGYnB2b1dZMVl2OUhEUmFnNHdGQWNW?= =?utf-8?B?b2RlczMrU21LM1Q4YkNaMmRJNk5jU0hPd28wUCs0OUxLdkQwN2NMSFhEazlq?= =?utf-8?B?RFZiV1JGNG1QdERBNmFnNWxPY0RDcDE3dGxpNVhPTHBjd0k5bFhYR0NNKzdC?= =?utf-8?B?VDVnUVZlZ3dwSDdGdzVQVml4U1VUc3pGL2dIb0cwRzBVSlZIdkpZbFo5THdV?= =?utf-8?B?ck5QVFpaQ21BSDJOSkRjNFlLMHFYSlVJTkdQV1FYb3kxVjRLdFczTU84cm14?= =?utf-8?B?d0ZVUHlXaWlqcDhpaHRGOWpraFhDdEt6WGJwLzN1bStoUkdsNkJKU0o5dWFv?= =?utf-8?B?aDJHSkhoajdKZnN0d25NTG9EVXhZMlZ1SUEvNGptWVNIbS9GSUtUcVBWbno2?= =?utf-8?B?dDVMdkVWNndTMXNUbDc5TnpkYmxaa0tjVnZ4NUFGWWFpanNhcnZ1NUpra0dI?= =?utf-8?B?dGhleFhOZzZnY2IxQkk5YzJxSHVjQ0R1TDlRZ0NyNW1TUWRZTXFkVWtyZ25s?= =?utf-8?B?WjJ2dGhiSmtCMFVnNmJCVGYyRENETWZzNjJCOTBmajVyVGdWQTJISHNyYXVQ?= =?utf-8?B?WXJCMzZxeWFTbk1ZWW5QbG15eDVjQlhTa2R3a1F5VzNoZ0hjVXR5bEo4c2Yz?= =?utf-8?B?d25CRGpJOGdUaVBKYnN6VUZBaUt4UHpPYkJNU1k5ZUhoTkp4NCtMRy9CQUpZ?= =?utf-8?B?VExsNkZUMHR4dEZreU1HOWRPcUVTSG8wajdMV1dIRVg1K2xGcWVtaVVDMitG?= =?utf-8?B?bVNaNzdINUxnT1QwV3AyZDBjaFFCeWpEN20zVXlURGxNTTR5clNXbjZiOVVX?= =?utf-8?B?VWw0a2ZDcjRhc2JlaDZrWGJBNXY1UlJJNjNsREVZWDZjS0tTOG9PU0c0c205?= =?utf-8?B?RUQyS0xqVlE4Y09ScVhTdz09?= X-Microsoft-Antispam-Message-Info: XY9o6hxm1K0cCGqxu3Ubt2JnVR/APaSSCkxShVhOHE0eimFTfzwGs8SPH3+zrKnBYvdZvtjgugsZvx3zEFtUsB/AcN85QZvi+Pl85dJk/v1kDPs9CKqCTbiOqMzfokxu7aj/9fLoFUm0qp05n/TYjslhRYc7tUZrdOiCItU2oZ4b8DgK5CqTjjUOi0E6LhjUruyPWC2oJT7QitElIWPGmzLjwOBmLyE52Gn3qDTbeqoTpRYuL1Bj0N5/LlDqJM/KjWXSg8iFGNnMwYZLXROV5oXvKnh2W6qq2l0QCuoHTEdOQfuF7IQBfPqd5rrCASdRHng4cX/9hroD2amsSri5CU+k3Mi3iYzW2UEfHZtHLt4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:XSBuOPPvZZZO+yObmhAR+yMpLEi1ZD24Mek+/4IXEmBKAztFQC4bvCs6nsi9Hcnph6O7z6UbpdCA9K5m+wRlPi+SaeH8bXxaT4q/VKLNGrVwHNI9OYm1qPD54zoxDDneK8q56WqD/rx6W3/dPKh5w098S+Gll5QmIOg4JI8i9RaI7O76FY2LIbPKT9YC7F6ogERzsEk6PjlltobzpHayYbDNsNqbKYgQXCQzkrztaRHoT0wNNzv8d/BD5Fyr/6BI0lNTcjTdXSd0kEBSCwUFKsmUk/JN2pL6gyd8NQKIFLmpDMEKZz3BKVZWR4hOHQX0iox6uqa4C59q7tgiPFLv2eMwBbYAnLyeRLGRK2qIVc7CGpVgHQ5ml+FHJ27Ew6aAJF3kqEJYoLpXghbDtjPJr2p8sgDGEEFHLUKGt9RNbG3WNWyHpyYoQy39G5lsaeGfelTkklOWsLVCVrnnvGeNEw==; 5:wgXWcvDOzDfOaZWz5Tveu1jrlZwlL4Qov0MSsAk24toIZQCVFPbupvXLA8eDm1p3v/QCL4aJPKBTdCvNbTCUr7IjY47E4TIyQlGX1AIy5263hAcYcJVYQ/OmZuU/DFNuemuMg3BnHlnDDclvmaD955wkqdv9auncIDRBRwbnvZw=; 7:DwjW3zvHaJNNaXQKKp09oDap8ZJzBTzVtsdVUAol6zFuI+pHGwcyBCreGbvKu0XgKDB1Fuf+kKLrn3RLSikEkYo+uBglrFG/OK6kvTQ81JQSsZ15Q3CvMgI+Vfpc2ZRUfg3zA/fJw/2/glXo7prAoo/w3FIWc86B+Yr1LX0GBA1FmHbSvN5dGpkJx3al1+XE3S96afV7ZtdKEKexN6joBsH0RZBpQzn05mCYPFywl5b+/IqiQkYVKTHuSp2WUZvs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:vb+DptQE3j6LFFYJwzl3XowKb9qtjaOCbzjHA/QQPCicf4lCLCMcM4XCu1TGdS56hu1h3aTzqjIz5qpnw1WJ3M/2yT2UNpOsYwpcZe0widU3hrP4+ON3QRD5bmj3/nLlKoWkXM+8k9NH2k25rYMfTH7XmeHIfvaKDfG4FnIwob4= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 22:28:08.1905 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78f22e8a-889e-4da3-153c-08d5ecfdbd13 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PULL 4/5] riscv_hart: 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: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/riscv/riscv_hart.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 75ba7ed579..e34a26a0ef 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -45,11 +45,10 @@ static void riscv_harts_realize(DeviceState *dev, Error **errp) s->harts = g_new0(RISCVCPU, s->num_harts); for (n = 0; n < s->num_harts; n++) { - - object_initialize(&s->harts[n], sizeof(RISCVCPU), s->cpu_type); + object_initialize_child(OBJECT(s), "harts[*]", &s->harts[n], + sizeof(RISCVCPU), s->cpu_type, + &error_abort, NULL); s->harts[n].env.mhartid = n; - object_property_add_child(OBJECT(s), "harts[*]", OBJECT(&s->harts[n]), - &error_abort); qemu_register_reset(riscv_harts_cpu_reset, &s->harts[n]); object_property_set_bool(OBJECT(&s->harts[n]), true, "realized", &err);