From nobody Sat May 4 03:20:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532016567815471.8176670336469; Thu, 19 Jul 2018 09:09:27 -0700 (PDT) Received: from localhost ([::1]:44056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBUS-0000NE-V4 for importer@patchew.org; Thu, 19 Jul 2018 12:09:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBSx-0008DT-IX 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 1fgBSu-0001Gg-CX 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 1fgBSt-0001Ew-Rq for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:40 -0400 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 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 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=klDnpqWCqWdYiCpBvGQh3Ar5vA3h1St9W278eAhHvc8=; b=KP4rHhn2h6DLSKAviG2Dz45lS3sUAzquLDt4gSzX9AkKU4wKwopuepIh P85ZkZMwG2+qduEzSpsxxyGcqRSwVsQ8jhv5USebJMjWogihg43836rqN uzNzlYWvAUc2DpK+zw0X8znLftLsdnHtyF6uR9nY8ZkDgjUxo3aUpqNks VYAV/ylx6kjtdVNIG6KKizgvCSeLZO9w1jn3+Q+NrMhkpRYKAJlr3KXx/ 7kO/oXSNkbQ0XKd+Mqn4/64sjBPXhVv287B8flMez2scg9O7oWfJcS5W/ vgACmpMLzy+SQxPeKp9jRdOLcgvHCvcuDKBy5QFLUn2ZZCyuXHFsfPYG1 Q==; X-IronPort-AV: E=Sophos;i="5.51,375,1526313600"; d="scan'208";a="84429919" 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=ElkLkZKT3SwieL+jCLpVH5mX/tLRqz5u31wXxlHSn3I=; b=gHjLo0O4DqxFYmRQugvgFzCUikLwhrQt5hOHow8LkAN0VtjNqA8c/lm/9rmRJWLdVnoFiDKdLHjB5nS1BP0f4Ac7ZGiGfx5QsLPaFQ4uPdNijH2/ni5JmOUOq31ZqqaHLH9qp7bVRlunGyLrQDHXFxrC1P3QPA3XJuI2+9CAxho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2018 09:07:17 -0700 Message-Id: <20180719160721.18430-2-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: quoted-printable 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: dc3fc799-8f01-470a-92fc-08d5ed91bdd3 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:949qh5vnhv25K7kUKsZVEnLBZmUSzHLfLzbMPEx4unfZFG+lHV9BiYfz3jzhwMBPI9n98LtmBEf8B1gQjIJLRm4O8F8RaGQBKzQlfJfuIRd6fvYlDmE60/Jr5JJGGxoCTOxI9P63POV60Dr/0ziPgbpum/T5gvr6t5KD3IRkDEAuMEiClx04t2cgQzfDsybVYkwmnYzcTYxfXDSqfxPLD5sIq3HXeUtKn1TXLwwTB8lQLONCjhPw/Bs5vZuDiZPU; 25:Mh7pJITQqSPWL9yQUrhzfiQtOq9v7ahqmGU7XuXLrJOJ3fs6wN5xgs+J2eYgCPzTn58YiP/W1lsNE8CiUDms/2IWKSMTMYFXlsSj2cWI/gLn194YpSlL0vE2oufY2bseF518yI6dx6o+sUGFlp/ZwHZcULtBaviZL/vViQlpBgh1QE6gE+xfzLFA5v0i0yVHafXJSphAb5Ta0VbvhX8IphRXcw/gcaI8ZuqVwxwEOkGGjF3h/yLkoMSrMr8A3UP0JKogTzW6vDaVLja3Gf7RmpF/k4sLDShtldxWV0Oz+ZNq+6pvyD/4/v5QpqIxHXcPp+Rjn2y2Blm9GnlkbXYwtA==; 31:uE+xvPsdENDowFJyBJYWGvjmaLZzWdVUtzlvg9oYF79TfNQvCR2wZzODpceenn+5oubxsP4lHK02IosbChE3kVrI/kCkq/E38ilHSp0BuxGV8o9O3mDzd5Erd/Wz8mYEhK4hISWxehD6EMr0vWJIYk4Bh4xLDVdP1dA+YmLuqw8NNlRWnmgl1kfk4YKP0x5JfMb04D4r0MD14VMGPSAZf4jnQWvmvOhmRjhMKddO1Ng= X-MS-TrafficTypeDiagnostic: CY4PR04MB0390: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 20:B8r41BAtIb3+BydfGcxwP+fYMoM6QXrpAPH9kViAn0+UiQb2gfQ0u6oMeZu6OSWLjid6v6ldJrwOelndTpSH0+urokPUvTos4uSeYoTco9XjKRSwCoNXvK0GUY9RMZPjLCFPjBR2gEADhk1NlGut5Iu+tEWvJIVruxK9JMJOmCWG7wuGBnOT4Rstf7xljxa9d7mbn8b/S4xIrD/VQH8eylk2NlRwzmCgRlGMAYFFteCrJXkOjm0C39XsdD+IkaG3hJHvQY8HTPPTdYIUXf48XNDXFaeKF3RQzKirrzwydRei+fubqfZUINB/heRgC5LfzdA3fhNnXGhfF/UjzzbVdtFDlRUtzUVDHQaRg3AH/wDDsYgjByDP3cILtCrPHXMkWLUYNbKMJKMfRTFoUtvo9e3jCiew6rnWidJtQZNphJ/DOBLu2XkinSbOu4y0dfPtTAEmRB+FUKzewueBiO2nuVn5CXKlcw6hJod6jIYPwg4YupUSOCy2RmOPhIwFv/mx; 4:Bg3vI2Kw0Ig9Uncq5M9yFNstV2kkaaz8EMvsy+6SEKgmgg7MfrvYtMYvIvUF6Z2HY6djvdvvLBXCglpWjYtpHfZQFK+m4h8IJFrF5lszKIq06WtQXctiQwG0bLmrgFbWaP9O6jgJISW6l5+Amcm0uD2ELuDCwke01+UPkwujx4kHg6W6GYm7ykiVSjAtoBW88HuCUndep8YfZ/0N2/Teh3Eh2ykFIDai4Bq3fz6AzxMc2k9/TrG04wwJDfI2VhffnGyI1SB456gj8qXVHYosAQ== 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?MTtDWTRQUjA0TUIwMzkwOzIzOlkyUEc2U0pkbzR2MXEvTkRsb3BQSGZqajRQ?= =?utf-8?B?dHlablIxK3FWdnJPMGZ2SjZ3SlE1M1l4RTV1VXJJQUo0eVB2SG1qSzdwaStC?= =?utf-8?B?MnNTSnJFZVVneXB3RjNwY1ZoUlArZGhMc0w4MVgyYk40Sk9RSkpSdDFVQTdv?= =?utf-8?B?dU83NCtBTTFVN3BVNERyTXF2aU1xQlZrb1krc2hlcG1Db0d5UVhlUzBSeFZp?= =?utf-8?B?YitNdzBVbmZKM0JlTWRnNUVoSXFONkpCcCs4U1lHUGNxeFFuSDZPTVZucDMz?= =?utf-8?B?VjZLdW5DOGl5bllDSEptOVFPcmRlQUdmbmVJS3FaNFhHTmd5T3JJeHhidFhK?= =?utf-8?B?SzhoT2t5S0VPbnNoUEc2bDAyM3NlY05lcVBrdTBFYTZsTVBXS1l4Q0todWp0?= =?utf-8?B?RUVTckJxcWluTVYwakFYeVZKWE5GaC8zakt4QS94TWpiZTB2S3V2dXhRQmpa?= =?utf-8?B?NmRLajNBdGNZVlZFZUFKN2p6WWNTWVBwWnRTVE5OTTREUFpPaHk3RmRhRXYy?= =?utf-8?B?MldHQkMzUVh3c28wdDlGZVJ6R1dXbFlvOFUyY2s5dHhUQVJTM2RsU0JwdXBs?= =?utf-8?B?R0pPaWtwVXBYaGtGZXhuekVjQUlickJpdlp5NlE2amprOGRKMVR3TDdnT3VR?= =?utf-8?B?TFVGWnYzSGdqdlhpUTF6NkhFK3NjK0kyWUVBdS9wYnJlcDUxelRzcU5CWnlo?= =?utf-8?B?MFZUZGZrZ1BLeDdtc0xURW9oMmFBTkRqT3oyUXlUQzVNN1NJWjhRUXozTVNh?= =?utf-8?B?WEV2dW9ycVIvQmJlbzh4aG5hcFNCRS9vK3oxNHppeEh5N2JZTUxkMGhZYmM2?= =?utf-8?B?VkdqVHhncW04MjF3NWViMHVpUWtnUzJhTzM1U0xpbmxIb044NklGS0d6Zm5i?= =?utf-8?B?d0RZblVtZTF2QzFDeEtQK3Jub3NzNTNPT1Q2U2xMcDNCSGNJK09rMy92SXF5?= =?utf-8?B?VVJZMmxkUkYvdmhJNUNzYWtUdlJkUkpxVmNyckFNVHFkM3Ftb24rajJWUytz?= =?utf-8?B?RmZQWllDZnpCZnZ2SWdRelBWZUl1MFJPTkFiWE1YNVI2UHVyUVpiQkNoaGI4?= =?utf-8?B?OHB3cG5vaFFIaERNUlhJOGZmbVFDbk4zMzZKTk44KzNtTFlLVlBJUGZWKzdU?= =?utf-8?B?TktNWHNGV3Iyb1Z6R0FxdGwvb25qYlFBYytxMi9pbzRGMXpqM0ZpS1VueDNC?= =?utf-8?B?NVd3bitIM0puMCs2eFErUVdwbE9wQlM1TlBjT0wrQlppUGE4ZktBalRNNzVF?= =?utf-8?B?aVRmWWVtMzBROXQrUmVpcWl3YTNlZ2pkL3kyU0dHMEoycVFPN1ZoL3REK043?= =?utf-8?B?Qi81QWFEUXg5WGtJLzBuUkJJK3p4U3V2a1N0bkRhSitHczhiZkIzTnYwdFkx?= =?utf-8?B?MEl2dmhkTnpMdzdlOVJMcU55dm12aE5mWGQ1WnNGNWE1NDhpMnhKRURINVZE?= =?utf-8?B?NThIMUIreXNqV1paYkhZM21GZFA4Y2NJNVkrRGRna2RNYVp0TFVYZzd5a3BE?= =?utf-8?B?VHYyTEk4WnZrZXFadXBQWkZxVGIxNFdMdjJZaVBqb3lRVmp5cGJndjVCOHUx?= =?utf-8?B?QmZIc3RBSHNhN28xaUNOMVU4cmoxRzVrM2NWdFVJc3dPeWtLR3FXUnpRd0Y2?= =?utf-8?B?SXVaOHYwWlJ1VEsyVGpZQ2NjOUFFWVJJU05IVGE5QkJRTDhGK0liUEp3QlhK?= =?utf-8?Q?2O0Edu2EN/nA15RriAqAlOjhIn9KMrLIX9fUBd8?= X-Microsoft-Antispam-Message-Info: RCbEDGqGW7HQMJBjjQ5qasQKERzmnpJWGqaq1RMkka2WTsLq+XCeDIXZXRI+4x8dy7bzMtNlsAXaD3VBouF1D5FjYU6F/BehrqJCV5PVl8r20CAd229iITmzLRHQYcLrhB8hZpPuvxDAA+7/iye7eTqGfNiQc/Or9aWnJvetULb1Em5Mu2SL/Lz1GZqfiHtXIVrKUeDxJACT3cwgOCq+ANNGldbZ91WdUPQhpgHTXBYdE/srXfPsZkFG1KSbwHcxKjQfE2UORFkm48C0H1lCov4i8XvKeH/DTTZqire0ZjwQguXWzE3vR/nxbRHiivlfcR5GrIwkMAcKQ9Y0ZcPT5eWAy8rTqoxRufwMN4z0tAw= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 6:N/ZcN4KEmPEJ/ECaflUYN5UgAnK/7CdL/NI1ADIHwrvlNEzI5kIltga5ycTgxpZQwGNvWjr7QnFdnwilHS6kyFNOb4koLumC2M7GXgzTeHzM09nH3ONx5AK6n+Ab91RJW8qoy+h+RfHAc3zh0gVdvRcQKJCpKOR8yDN9UbslP6S8p7RMlpHJWCDwP9ner/jkMHItWSKyP6Z/cTZ+BKOCpOPSrtgJWLp03BSW5zxWSZrnKTOXK6WYFxkk1ghkBkf0+GMbjBePGli6s1Yjqd7xXTyNP52Gs7zFX1Y2AxgzGeWE1Xt14GXTV0SKQ84LEptK8sz1ykM33by+IK/9BrG4rZnmUls3V73KuSNj1tijXlrCqv9D02xsTICyjxofSxh3W+oqeGsbfAfZ/bbrU1sKR8uHBoHOjjUcOnnTqe51bXz9oQkZ7z4ufdmX+GtpMhHTb+g9u/YAmdawq+nPUQRu9A==; 5:+jcjVgLbBRo1gMl47ABwa9bDIEQe7x7758+DvPujDmnBNIJRhY4Vtq+27NNYWManQM3kgvOEV0AW0W0TWzEylqAuat3LEKDFg2DOHEXIRNAWsiuwWSfyE1styMjyJDuS1mRCvQf+85noMwq+QG2KFcdPbDzgYqJ+9wOnUfkEFP8=; 24:uq+iR6muwHkRIWXwEXbxU7BT8k3+CciT3Ybvfcdwcc8IdjY69kUGv0v67K/Hkqm98fzwEBAvTJzUESERVsSg/BGfliT0iUbbUX6dTI22Q8k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 7:2dLdum53F4UYvwgxcArYwJwUv3kjpAp8GG4sBhQoef76/xvok/Q09le2YZWiG6Z3vak1NuGAHLyWmUD+oYwGRvc2cEarYSTfToXbSJKTOs5kUMHwS1nSYf7mLyUFCfAm00sRlYCDGwzxkiSBzV/u7gQ7FKlkSHFi/dZvyDQhB7Eg0PXazjsBkm+TNyibK2FNVfNNNeNvKSqHumRFVmnsPK8t02+WtyY82uwhZfWwptIo6cqldQzwEwqL3E4U25o/; 20:yb+8Fgx4Nsgmdv24J+yUrIVkOm8ye8NnRfaVUiy+B3vsy2MZpZr6EOh+kaqouwUbx3Yj7Vn/OIJoWR8sy5xjdlNURdlKc9thUIXijMQ79dE9ROA3eGeiOSO6Jvt6PgvkTWRvK8QwpkKe/mL1A7YlICZMSBL2/y0O3MvhFQ4RlKQ= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 16:07:35.0711 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc3fc799-8f01-470a-92fc-08d5ed91bdd3 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 1/5] sifive_e: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/sifive_e.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 8a8dbe1c00..4577d72037 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -105,9 +105,9 @@ static void riscv_sifive_e_init(MachineState *machine) int i; =20 /* Initialize SoC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_E_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_E_SOC, + &error_abort, NULL); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); =20 @@ -139,9 +139,9 @@ static void riscv_sifive_e_soc_init(Object *obj) { SiFiveESoCState *s =3D RISCV_E_SOC(obj); =20 - 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_E_CPU, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts", --=20 2.17.1 From nobody Sat May 4 03:20:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532016803885138.58239780978352; Thu, 19 Jul 2018 09:13:23 -0700 (PDT) Received: from localhost ([::1]:44077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBYM-0003GA-W3 for importer@patchew.org; Thu, 19 Jul 2018 12:13:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) id 1fgBSu-0001Fb-O9 for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:41 -0400 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 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 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" 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; From: Alistair Francis 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: quoted-printable 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: 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: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/sifive_u.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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; =20 /* 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); =20 @@ -303,16 +303,15 @@ static void riscv_sifive_u_soc_init(Object *obj) { SiFiveUSoCState *s =3D RISCV_U_SOC(obj); =20 - 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); =20 - 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); } =20 static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) --=20 2.17.1 From nobody Sat May 4 03:20:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532016565835322.26670590454887; Thu, 19 Jul 2018 09:09:25 -0700 (PDT) Received: from localhost ([::1]:44057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBUU-0000OI-Dy for importer@patchew.org; Thu, 19 Jul 2018 12:09:18 -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 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 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 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" 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; 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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; =20 /* 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", --=20 2.17.1 From nobody Sat May 4 03:20:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532016803934621.4060068350552; Thu, 19 Jul 2018 09:13:23 -0700 (PDT) Received: from localhost ([::1]:44078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBYM-0003GL-Rs for importer@patchew.org; Thu, 19 Jul 2018 12:13:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBSz-0008Dm-KV for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgBSv-0001HC-J6 for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:45 -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 1fgBSv-0001Ew-92 for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:41 -0400 Received: from mail-dm3nam05lp0120.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([216.32.181.120]) by ob1.hgst.iphmx.com with ESMTP; 20 Jul 2018 00:07:38 +0800 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 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1532016462; x=1563552462; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=TseTdVAF2iJzoGA+8qtiiKqCD4vIYwke7zEqx8nDzsA=; b=IUoUndLKlyUjazfrwAcFe89o3xpJjXodoh5D6E/qZXY3i/eIHYMYN6YT r6CWA7xQOPvAZ7U8L8nRlP20Tg8hFBj1+cvM85A0/DlSvxOy73oTyVZaK 7vvt2ygZucUGac0TXfgcwbFfgYjmguCABIfuna9pNJ2lrpp9DOSPmKbkk ileodxKEHR2Igw8nIjAfleRCIYrbWAsrz4bqk56JYbMH5mrHguDXUQ37F mEvJOrMsymp6HXex/Xz7qKVNmCPJFBoatdVhssN0thxNM2sn5fKzDLulL 6WTentu0dNbjpdaqvMYLe9tSIEKJzQAF10UBnhm3a97zW5LXS819zGWBI Q==; X-IronPort-AV: E=Sophos;i="5.51,375,1526313600"; d="scan'208";a="84429923" 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=8eWMrPhMdHO40sfUvoX4RiIUtGX7LFi6xs1qTLabPEA=; b=iuoN2yfJTjZhiEgMv0eRsj6Nt/FloFO4H0KHHaEzfn4cr+H/cD3N4UEQy2VVhe2KhoFZRnycrOcYN1LPWl6UXPPVoDuct14R2UusBCGEQugyDgcvtqIZ01w+izX1PF0NIITBKiwYsKR50ll8CtFxlwjT+PoPucf3CWrKnVGerIE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2018 09:07:20 -0700 Message-Id: <20180719160721.18430-5-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: 52daa999-9afd-48b3-079b-08d5ed91bece 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:WTLr2U2hju7dXobe0pla26nh/WobYfYcBsRkQZeOX7WvPIC73qiPUCPoVhWcAknETkmnJzLxvgjocj3/qGkfqmc0i68ELdo63wELlKpGIr/FWKEvYmLGiNAN1pmE0MITOdKxQC5/vPHnp5ZDf3SNpSZ5+y3R32DhXFOFmp4HFmI0A67f0NjvvwlHxRM7BoEosCyx1Ym/MARTm8T/V1kQWbWh+PH+JoW+nvlQCBluv4GyXvTVwGn9XdytsEAkoSo1; 25:XC5KMoz5FxkOm4FrFyF/YwO3PDRf1WqhzxbzmXpvH/zH3wigcNMF/jgsDA9EY+lxelfDQWiIwpbf3g/wNShTNNW4TyspUIMc0SzMARfk+/VPimB8SKiVlNe0sQRb3x1hAwIB/VvVyFpxJiVHNNrvcOuGcCZzqxLJsYyJe/6zr1tEqBN7voU+xxa35sh2nVCYwgRgdcmuDvZl4bVkj5Y8MVi9hkOBqr8jbLRIQPTVERAUqyrMHHfaqa56i3HVOFf1tm5V4Boxxya2mNEX6Xdp+ijXf1ZrcuEDmujS/BvXcJuN06AV8cT8cAyPUlZTYdm0Z0hV/l6HyCuE6WM248vjNA==; 31:PxUN+2yzFYQ+p0PcSEA2V9hpRZfnEi7zUmhwfKfYFkofWI4UXz75tWprPeFAlGEBZqTCyAsZPWEwtZ9FRvFn4T++Psy/ShSZQNjIy5zqSEFuqY8ceiWZCbheu/SdVHHccv/wASN3p71NQy4YQ2deSKQaYlL5DU8QcomOoTcCK8uLn6ht2V8ZBJhsbu0zxukssYfgvT6yrOF9vma0R2HVEVQes0gUAa8wPUv3GyIat1s= X-MS-TrafficTypeDiagnostic: CY4PR04MB0390: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 20:FQZTHAnoz3jTH3W6tlIWuidbQIS0VSTwPP/zG5Cn3ThcAK9MtZDUdFpufLS2I5TuO/a72qD2Ad0JJaiFOK3GgRVbOOaOIyln0QaEFn0Ee0NCmMJSbT6Cn4MGYify8R+67PyJK/u4lc3tak4oXJDD7LTXu7N9pwt7uRYAwaBP/eXZUbigDEEPZaJKg6xI9yotz3V2byU4i4vNfHuvzJ4/9hbcm390HQDePFMaJmRpnQ3Y6gCJg+H9KOdcdLEt6C2xhOmox1Fq0Kg5E3Urs8qzMwXyJMUIw+VTPLdIXUYnrUullk04HGYW40nvTv/8TpkhqA0jBaAeMgmRZs4wClRRT9cjTR5EnSPGFcfUGDy1I/QNDbKH2dHsf41ONWsrHnRXs1UzgPCaep/rmyvpNicyUHLJ0RLmlXd6QUXItoT1gAD3smGTYfVKgLo148AqoFXaeiWJiM8Dsxus0UX4Wylo/uUXJVChuWXKrnQHToOm/i+RiXDxN/0C5+ovDDuLaVD6; 4:xwFCvcPuIG+kkpo8qoVh4uOprLp/SFml6eUofQJLOMG60UQ5RgI4gfvf0iFrYb9H2dCPp5jdxzdZlpMvHM+IQMZDPAoiqz/gZLYnJ9+PT5cHwy1xgokALM/uOjqf0dAhxZBOOSr9k3F95QvAQ2EI0wZqzGgkjUuxECzDCstSzgK03wC6Xwd0tqPkcNSShq7JenJOfHWLKdO13k0wX029k1M50GrzUaegQF86Du87uHUOQ25voUOyv+V8Obw5L6v/HGqoglqr6SKe+kncZYbIpQ== 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)(51416003)(97736004)(486006)(26005)(2616005)(68736007)(956004)(186003)(39060400002)(11346002)(446003)(6116002)(1076002)(3846002)(305945005)(6506007)(76176011)(386003)(47776003)(66066001)(2351001)(52116002)(6666003)(575784001)(8676002)(16586007)(105586002)(81156014)(106356001)(50226002)(6486002)(48376002)(86362001)(316002)(2361001)(36756003)(25786009)(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: =?us-ascii?Q?1; CY4PR04MB0390; 23:7tVwHxZGoiodnLgo4ctZPsVcTePA0garrBU+6tTkI?= =?us-ascii?Q?ODbqztTYZl2QU321C1zHVaUsXm1nHtY4dDAyTeOqWMnsvj6dcLh+3lzOLxEu?= =?us-ascii?Q?A/kCOYHq9wLLfUS0dmiXFEvYySpevs1nDpA+HZb8MSDiUGzNGHtikOfQAGpw?= =?us-ascii?Q?c0vAC0hhmyFKBp602rzVbQAhTiXvnZjFWWuZI8745tX+opu+M2EFs3+VTVgM?= =?us-ascii?Q?OadOHUhVHevGDah76v1o9Mtt5rU9LLiVwMhXW4V7bcNiHbc1DO050zQf0mNZ?= =?us-ascii?Q?o9Ofc1QWcNi7CDxy8XcRHoYDZKXw61Ruzl/W1xwrVEHvCp+CzBmO7i3A2QeC?= =?us-ascii?Q?kEO3IfQt6Kdaqd78s0MXFjoWnnqmTAAUqzivtAMVKvRavmVUcVrR6e94lzSY?= =?us-ascii?Q?bpZbMcT3ZUSCNamOnZlFSKhekCSNIxU2DNYHZbrXZYiCPfJ+OP8x+MX0oaqK?= =?us-ascii?Q?eZESpeX4qUgSKdbqDvaRcEuFS9xTccBjH7FsUuQUzWcUtzakvC75Uko8e6qR?= =?us-ascii?Q?P78tUPgv5UO0+JXejJaWSgheBOIaOqhiKAJmErVcR393HxbsZJpD5Lvy9pJj?= =?us-ascii?Q?p8JCcYN9rGYLDx7D9EDbk27zzHqbqWrsLwb5evUitdP/Ve+xDMPv0JkXrvyG?= =?us-ascii?Q?5+3s8DtTPvwoNY9S18AtkUKMPpNdpOSw/Ptlz8H0JbqVsBce+V4P6drDGwmo?= =?us-ascii?Q?3pRMVWsoOCu2vorCfxSFyLdvPimg7KpLsEWG4uEHh+HjzacjaGfJrmDz3RRJ?= =?us-ascii?Q?ku04MPwRFiD6GAazyhNWGs4G1uqXDrPMOVVc99CJJ6tWc0r/Pgr9s7gL2m2a?= =?us-ascii?Q?Vj0r4ZguNYqIWu3Y0JiWg1g+/jRY0GroKSCo3D/0RbLiTaw5B1gZ3T5hdWr+?= =?us-ascii?Q?2PHtgm8qO0uJIV1Z1Qi7oqPv9RPoqGTQ80rgZHV2zQac8BE4SMCRlPcbKi2u?= =?us-ascii?Q?zjSXdJN3myB9TufVNKlojPXwTChhnNmFZU1b1zYsDh8O1157DddQqnvY/rNl?= =?us-ascii?Q?7OrcdGM7mEvVhnuJKxRWCLj4vazlKtFpy2m3rUtZ7Shxl1q7oeG26GxDdV5e?= =?us-ascii?Q?nbamqe4itPWaLbsOOPR/Bl637BkL6V+9WggFBoCyZzxVQNDrW1dhmL+g9gPA?= =?us-ascii?Q?Ao44cIdAEEboh9anwbG2JV3G28xaolzBYwYWhZ7F65Nyzqbki24rGEwrh9CP?= =?us-ascii?Q?CL3hEIcs9E+ifq6IlviN6Z/KnPh3FwTRdvNE36ltFae0dO5IIjf3jFjwmiF/?= =?us-ascii?Q?Jk4uUuJiMXV0afcjgRbKAIQvyeDqsCz/ZUI3wvWTCMuXFDeUqBUktjvZCUos?= =?us-ascii?Q?B9g8lVIKX0boAeIuIVHpoU=3D?= X-Microsoft-Antispam-Message-Info: Hj07GVgxHtZVZBER1DwP0uyVmxhrZq0lL0EyErZOCfOcrk89rmwObmHYT8OIP40OvFVqsuHSIIye0YEbWg2YC3dW30gTmQZjR0VUCFc1xqvt+TezYNgYomcDrFERGU0t/p+sGR2mgwwykBkxkKBQAChGL7LJOQhAPZG6kQlJoMZZGi3sNQUQ78ORGZ1wk/wGV++oNPLo/bK8NGsP1vQ5Fn2gMFtx9TRtC/TAQXrUUpVFXUeURtDCWbf0+itUdSa8lzSrwMZZRcrTlizQ99iwBPXXyaysYJKk+M45yYnT7g5FDHAhHlzB8dJzN0qrfyDnWD/tYIn1RO1UfSNcEyW4nlhmVsX9KWsMS34RILOtdyQ= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 6:y0dNRASy4qmVNjASdV/N/ZDu8bCqTOeR6/mhIzd6UWSpPxFfgb7eqFH4yx8+JjQ4V+CmxZWuqrsGjQe0xlp3gYtk21ur90AGzhMutpRH7mwZ2dwAQE5QJg7My6S7UrYrLcnsMCyrVAg/ayk2/hV1eTwU/9OJ+gNLYFuIcfPi3Kuz/cPALTVU3xc7k2JqEk5ZU7MHNeyLfR99HppHXQtcFbxCFq+0cKeI1bI/ZqdiQfZAiHOSxdFTDJT98WFV6sXX8wMy8jMVOZRemHc2mSFfmwfhrc2maYzcSFZGCxnn2gYbSuFX2REdI7nS5uKMJ6LPLK4AGBjt2hFnA1ju7SLqlod+5HNszuTV8r2OdU2xCpxWn/DMGM6NwcTkOvsaM3mq6ru5ivQIHdb/L8h2Z3Mq7yYyP23LpjRi0eOGm/NvRwHR7crzK1kek9kf4hn7Oxf1eOPWXznoaoDLWT4bRuqvWA==; 5:Q5A2MaDiHobv2FZ/m5K06g4l4bFKHinvAGUtXFmBSNKRH1JY8vrbgO9FLEKu8nx4qe/Ss1/tHqsHF4WblNupVRa0tUyunSDHqmLPLHcitNuK8MOBXrGjkyLOx+e+lRrn8aaY/XIngqGWLBKLtbs8p0oAba5z6h26F/Hl1kXaCe0=; 24:sVkaCwwwMUK+r8Q5tOHoYb8AhDNzXbXClgEJ7u+PPvUhpqRQp0uFhbipS6CRD47bCFbS/72Ts6zsY6Epu8PCJzLt+4tlfk7SNHW8fufF5Ew= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 7:i2go/v7V5psIU0MsNtG7F4Ik+pQnR0HfU9Ao5nX41/d4fSLwrIS7py4WmKwF4ykVjO82u+gB1geEcru2nTLa9Ndj6DEaIIcNR1hd2/FGI5nkSnM1HAKsJSeIm2CGPpYj4KsvBWiSqw7FSv4zp8liIiSF0gV7MZayRBqqq4RnRTq7OeSrEmFlyTtr6+MMDN9fw1iGFMyL45EqAjvr5A20roznl/HZzrHZ0lUD8KyX4K0wjOTnHRd5MVfFK0/R+Q9D; 20:is2OWvt0B3oRCwma4uPZOPChCgLKM5WOvCOm0gMReqfOT4MHGZMl/L9OuUGPJV5sSuXOb+aTEAiVVAUkRWOMHf7trxlVcjHrlLbq8L8ruwfy8hmL19LOZOTYYc5OMu/zdu7UuKihBApsi2Z5VGX9rKby7HoGUftVSfxlzF7BaHg= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 16:07:36.7165 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52daa999-9afd-48b3-079b-08d5ed91bece 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 =3D g_new0(RISCVCPU, s->num_harts); =20 for (n =3D 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 =3D 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); --=20 2.17.1 From nobody Sat May 4 03:20:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532016681134189.9453286055799; Thu, 19 Jul 2018 09:11:21 -0700 (PDT) Received: from localhost ([::1]:44071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBWS-0001mx-0E for importer@patchew.org; Thu, 19 Jul 2018 12:11:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBSy-0008DZ-OT for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgBSv-0001HK-Ou for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:44 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:18683) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fgBSv-0001Gl-CT for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:41 -0400 Received: from mail-dm3nam05lp0120.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([216.32.181.120]) by ob1.hgst.iphmx.com with ESMTP; 20 Jul 2018 00:07:39 +0800 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:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1532016462; x=1563552462; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=R/YSwXufx7EER2slE9h4SwBFOQ8ecWEN76flJyi+s0w=; b=cRP353QiPHGaUis0trSVVlAQ+1k7393/fJOSkqGUyybZJEpxi34C0rZJ 8V6v100G0KPyNCtZ13jf6Q1eKzHq+T0gMHC2CUXXc6R2im4GSh0OpSeZA 6xB2/Teh3b9mNUGbt7XjkDR12Be9t6IywtJlqCU3Hb39MVbrEewdCWdS9 9rY5KL8aNBobER4WZqszLzxvvOdTOOG/5dKJXXWDvwkfkCVAF3S04OBLK nyI8/BH+2RIA1/nif3xe8g0YZ33JOkMXoe/4R0YzU8VotHKExeCo342lI LOdwhs7e4JUjczeazp76GzvtdK5WrHrqitTtrVHGwjCc9ORW7FxOhk7wz w==; X-IronPort-AV: E=Sophos;i="5.51,375,1526313600"; d="scan'208";a="84429927" 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=dw3av9cE9QoPNIJcuZlSgADnYbHw9T009GIeYx+fbr4=; b=lt77R+o7Uqb9rJspAG+y9dojxnqhXTm9cvuuQ5cWuoE5ChhNr4SO1G+rjSbLhC5lu0j0i4huD1txADix+eszZFZhkdfCbcxKGB0IlWDoYk/9Ob1tnhjKLpvEPAUUu6vEeymqWpiw4yzVBa2CRNGu9okJCFr3GqltewMwlsHi3IA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2018 09:07:21 -0700 Message-Id: <20180719160721.18430-6-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: b206bd24-0b1f-472c-9b07-08d5ed91bf26 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:xjghPzZ6mARb8qsbZ+mLIZ5m08q7MudGsWHIJoG0N3C9yB7GBlNdfzqgT1ZZ1CL8rFubC0EBwhZbg326iIAjaRP5O8b+2S4TkP/NwlAxw8rAbxCkYpRdVurfsWpN3njbIJoxl8uptwr92Cxu7kvKuEZl+y71ja4d2SHxfWFu1rV+xrlexM8Q0rqmJkJWmcX047PAxJtMzQpnx++u/dL39m5vkMC0QWHZM5kfnmxoSMxky5yS33EbXHvQfeVUfiqk; 25:JwVOo0LsAgTYEfJdtIKknP5akCIln94BBxyU7uj+afF9Q0ScuihwAg5Eu/tT746yOr0BmT75x5pCN266S3+b/rA6+nDJNJ93mBvNg0tLtqf5KBOlPaQXE2R7QVX2tn/0bXvEgsII2BV0oOjuEzhhQuRHJWbuBHm33c7MGgPgr/Wnf1d6+nWaho0K49XmxwLYPHicu5X854IyqY++P4egs8LfhOPGBWGh6BaBj0vs2XCcnIteXdTJfIdd+PcX/bPvl4Ai5spHNKmrhKaa2JKiaxYUbdN0uJh0bG0875Yd9/N2W2WrWE4ICObcFbzIbqd0y79Qotc7/ou0SYSv/rg+lA==; 31:pBRwM+FMyOovwQtZ708bveMjkYmXiD6CEBPiPpIzzkFwZiRI1renKNGs/jP72eMfKbwi/PGWeYQVeuBgYrkURNZP9qhBWQvijmwP7JQRwI9LoZ6620+C+CtcAAS9jHIbCpfTf8pBOxs73XDsz39JsnX0BYMmrwYXxaAKeWq4xVqhjkVuhG7gekpmqAe+ur+uWf/OtyWtq5VIhpgpACiLhVbCn6DD0XGBQ2CSzJdz+cY= X-MS-TrafficTypeDiagnostic: CY4PR04MB0390: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 20:oXSvKSDhAWpTier+ib8WE+L0mrzGJNaTdKBWQ+lgpe9926wYxLvo2Ytkire35Em8514ia+h5/voJMF3nO521OASYHbtOsUjfqn1aT315kC499v6IRgElWLzP4dCupYB8b3LsbKGGRFt+k6IxWptqt3gu8FBYUpOOq07TIFSPI0NJZ12mkrZQZUSEObN/gVgrudJtN+t6a2UcfeLm3Rzon/cQZs5MlvA605TU1T0wg2C/9sSkntbe9Ndm73O13/qLR0ZTcIWzWPFAW/9smy9YBQLhbQ/9LxfnjDGaqtxVZ9OOLjUo6EqFaWo+/WgUsIerr00CQ1mJ4uB5PdXlbYgrWxMQw7XanLRNjEwT8S4LhGBeZnhJ08OdIfIOfXSCC7IFEPp5Rs+08a39dhDKu6q5srDjfe891XOstUI4z1mi4+UQaSxWW7ZKveb7IrvKiloCfMoRYeQ4qzeEMi7Js0Ma4sWrRH8ZnoCOoZPYyq5Af0J4llATpGMZXHD1900Kto5V; 4:Fu3l5MixTm3Xjyl+Rs2nNkA7X+wMrXk1BIrLkGFanxkrOlO2W+M8HYVJfJpbtxsFzKNWsNOqmncx9uCgAooQOWTjaMjp7/DUGj/HpUyJYx/akH1aQ0bpIjfS+qzpVj4L59ei6H9tbHZ/5rRulx4mxNTGb0Ux5K081zoy8jexaAOoXW0/+Ne4RhEpQp6Rde7l1UIseFJA/pvyVe0vUEED618fGr1FA6dUowHRHUfwJFnzp/0qkuNOz6szDu+/JtJHg0tmy9p4HfbLfIHFtxsesw== 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)(51416003)(97736004)(486006)(26005)(2616005)(68736007)(956004)(186003)(39060400002)(11346002)(446003)(6116002)(1076002)(3846002)(305945005)(6506007)(76176011)(386003)(47776003)(66066001)(2351001)(52116002)(6666003)(8676002)(16586007)(105586002)(81156014)(106356001)(50226002)(6486002)(48376002)(86362001)(316002)(2361001)(36756003)(25786009)(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: =?us-ascii?Q?1; CY4PR04MB0390; 23:OJdlwCOCPGjY7I+wqd+Zy9SVR3oQsOTfs/Qt21W48?= =?us-ascii?Q?n8MxgFcVdOdtyUGs/p6EfGKSFQ+Gbcwp+/ZELg9yeIdgNNxLjr/ihGVAGYkG?= =?us-ascii?Q?5L3hcVpqoJFDW0PZYCrpUSRDozTX+kYuUOiIZ55xcc17stQBc7pJjTY169Gb?= =?us-ascii?Q?CA1AUVSpGe28QqxU7SBBG2Fd5b+LvLpzCJkIafPiHsu0puyBHkv64mktMnvd?= =?us-ascii?Q?8wv2n+fo85kbgA217sRTVkvAzMA8Kgo57GNF3Cm0pHMfFGWst3MPN7ssUhBI?= =?us-ascii?Q?KZE1VDP5dyg/Y5+pFMbbpplGHahewOCv96j5ZodiQKMptXG1uHxH31pFrvxD?= =?us-ascii?Q?xcuXcJeugkCaEVMEmroHiQFBdY+llL/vmeyNTv1Lnj0W9fDE97nd2gzCP8oT?= =?us-ascii?Q?gA08La0VkVwA2UEJ3Sn42PrsWctYUlnMrXx94pUeHgXLitvrUQVnLW6tdU85?= =?us-ascii?Q?m8EvDUUXJEr3FGA5iKNTw2l2WqBNfQyMQm9Rj2ZhaAv4mq/al3yy1fjFhSJq?= =?us-ascii?Q?Is60q6qk7HH9Bu3ref7CE1Edeo/rXF15gDyjtyvQ5J2hrQco8ORDAQY/EdA7?= =?us-ascii?Q?XeekkL0B4yhYFEtBsAgaY0USYfNZO7pyOrYxyWeDAaKZM3EGJRkIxgURwveT?= =?us-ascii?Q?lV/dEQzV5oTsOP7ecTtB2PwC+PECgVy85/zslpJKpG0O3YaKD9nmDEeVdZ5h?= =?us-ascii?Q?vHe+HQ8UDeuexKK2/VvJKk/moC9isoGgitTggYznpz4xk8IXLsE1wuH5I2DF?= =?us-ascii?Q?ADkbNGVZ5TG6gm4hBAS5NiTd5q8T2CqNiywx50d+pFVv/KrQ36o4pn1eWpsS?= =?us-ascii?Q?uxra064fSG+EGIKr661dPoFa5lpBZhiWuy0R9hDaw7iGRXfr4+Z7BZb4eiT4?= =?us-ascii?Q?BNPy6J/0mjeqJJiBicosgDd6DrzMlNjuOanG37HFvsRV12GSLOOuVEZcXQpv?= =?us-ascii?Q?EACW1inzdRDQlFE0KzHvngSheY3QmgzL7eV/R98ADwe8bTlJrL08SDrpMlm1?= =?us-ascii?Q?q/SuDu99TK0THKswK/ICAzgoP00ENuTWq/ygLXMr8/UN3WnK2/XRD9aivng4?= =?us-ascii?Q?R1Pjn40wto5SBO+DKI4tSV/6xuxyfqZ681+sqkDOY0o9Qz5xPr8XZA9VnWse?= =?us-ascii?Q?wyZN8n9ekbsisbnef9JLI/Iuo2YSpzN+6z0lDvdXRJ4cbGygCXGIFmS5J8U9?= =?us-ascii?Q?MvT8EcYKoD9KkDPbXBAjHNFTj2cXoq/CavZvEHSu5wKUxb2V/p9yP50pX1+9?= =?us-ascii?Q?XPJn+whtmDtsd1CRYrHRRBtQni2TkrsN5Omaf1WvUvYPI2+tf8YR0He9AH6Q?= =?us-ascii?B?dz09?= X-Microsoft-Antispam-Message-Info: kdXo6en3LJ7J/jKTfL91mQLMskedqjRgpZRmjTtvb38gPaqFQZXFcCb0QRnxD8FcZyAumN9mnKLPPe6y3IxRcAalHLkjSpPqtv/CLvzPE16vnH7vB/xF3WN2X6eBt9C7F3Q0YDZ3cX75SqshlJK27H0NTj/Dy21wjF2Zp6C9VjMc/ucmgkZrz+dH2QCtHyIPvCgqWBF3YEcJIVBhbpNe3F5d6fI9/HiJWDUCzvKu2d6a/lmrZCE1d1ncrjinUvcwcWZYxvGH2952ED4R86fjZXHdYS/PyjaSkttnUQGf0EcVGKlARXvR2evOn171NN3Mpw/b6b8bL5FRgcrMUfjF+edjaLjIQO6Q8baIkZBTChw= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 6:Qtzlr/DCEEb0z1E4BCjr1djRZ1aDPRkZh2Bj+VGgJJxi6/kTy35wpTUxocU7Tu8Tw5o9Waxfmlnjg75NmZStA7WVkQHAzUjRnnrtPmgK8gDsgtdgezeFz5jBPCZ8VfMMlv2foVjZzCCO343+r41lSFrDg3290xIFyEf7C+KKqxC7T/6NLQcTy0DjSrXw60RaeqkoXpHfsnvyfE/vKXgJbjaOVt5wG/uafHmVLt2Gi+vNqCjfywOrtvc83DPrg4PSQVLV340q7ssqLsKvkIfxJSwHUEo3makRvJOSD0s8Li+UMlLj67X+wqSn161ppNBsT5H4d83GM3kYjtOZfi/hAohGatTtDr67U8c86HLQI6o5ejz/BZYbbNCJI09KXLt8ZeKmssMmdyfqDvw+fWk8WDWJTp4ttqO9d7WrZ7bwRbHnrJPxf7cNUqRse02SEoSwqUf8pl8Qw+fBFiqUmKVNWw==; 5:ukrl9qLoDtnTmko+u/Kf/bMW2KectSXQtMDKGbTGb5C5jfWG/a8JgCxljkS4d+4ed2DyATdVV4m5kHc+eMKL/zo+LXK3o6e+Jzwwl9zMql7FOgNldfGdnk+Hg8CUy2h5QERVcyuwgcxTcGGrlqgpdHHtloIRuKL1TpSY86W5gGA=; 24:NqlVbtUnEDpelZlkmqbmPnyYkQXTY7CS2gaoKNQ2LVg9lTXo9CJe556dqXftYvqaOSyuyJ+HbQrH+lhaIbifQo6FeF2evEJdOGfWLTwUxG8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 7:GoAEBfeJvdQJC6/w16/77UDuPxW1vH/VB2JBGGwOir8qr2/evCjfBCftyjqU5GUd8R9eTAyw9haqUivpEXEo+98284tsb4Brf3YNAIIM0uU8m8B59fnvTfP4zzdSp9R0ohUIC1PbHDOsm4msCv7e/kxhpPA089ZihzNwjnukTt9KcSCgV8slb+pmHrj+EQRBsagjbxE2hU1hlaWxfA2G/p02LoDKHtfy2XRigXGUVco7LIk4zEtarp2rV9tYC+iR; 20:6HBXZjjSQr9dcvRLbJmSoIn3cgPzosyj16iqXgQuuiEnvFUdgAu/kzCe/u8qq5gA30lXy86hNpUYXF3kt8QS42U0wCUG8WBZ0s9sZfNK/L1Tkl5/c4peArVhhmKTdgFsXVJ7/PyDUUnfQ9uWmREgVdK9eYYB6jue6gYnWzKy2fQ= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 16:07:37.2969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b206bd24-0b1f-472c-9b07-08d5ed91bf26 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 5/5] spike: 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- hw/riscv/spike.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index f94e2b6707..c8c056c50b 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -171,9 +171,8 @@ static void spike_v1_10_0_board_init(MachineState *mach= ine) int i; =20 /* 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), SPIKE_V1_10_0_CPU, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", @@ -254,9 +253,8 @@ static void spike_v1_09_1_board_init(MachineState *mach= ine) int i; =20 /* 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), SPIKE_V1_09_1_CPU, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", --=20 2.17.1