From patchwork Wed Jul 18 22:27:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 945947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="bl2UTFBb"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="ZQfo7c/D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41WBhv732bz9s3x for ; Thu, 19 Jul 2018 08:31:59 +1000 (AEST) Received: from localhost ([::1]:38506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuzF-00040D-K2 for incoming@patchwork.ozlabs.org; Wed, 18 Jul 2018 18:31:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuvj-0001nP-RK for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffuvf-0002Gu-FE for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:19 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:16172) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffuvf-0002E6-2r for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:15 -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=1531952895; x=1563488895; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xpCNWr++wpxn2btbUHAPJvQyucBf//0/bDIA7agGLOI=; b=bl2UTFBbjXArScom4+sulNCgCveNp668KdBDkD8y+HzzI1r9/FwWLgb0 1Atjgqho9DqDb4H03XPliHloiZ7U09/s1RBtyAkG+r2Eca/h4aiqoQQFw K2r97jaoXaN0fYyFOFyqsTP2+fyrY1cREdMMYZ657kES6ywehTyxti+EX JveFAky3uVKYbxEAqdeUJDnsUygyi4zudRo9hFmZMevJWahhxzWH78xt+ t7OfU3yFdt1LN1i7wZI4OO96dqiZiS1VkDvM23llBuXStDqF1IFDUDjOG LnK1/jGw5IVgSzc7JmHQsEahbK3rWgl2FkMBBB5TPN++E/LvQGzy2KMCq Q==; X-IronPort-AV: E=Sophos;i="5.51,371,1526313600"; d="scan'208";a="187931693" Received: from mail-sn1nam01lp0117.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([207.46.163.117]) by ob1.hgst.iphmx.com with ESMTP; 19 Jul 2018 06:28:14 +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=X74zm9Ia93ctvJnvv6YLXqRj6UrQ3n73fy/VKkdwkWk=; b=ZQfo7c/DgHOOzaxR98wVvvnjnzoOZAFIdS4jkXELIdkc7FD/FY50LXJAzIRweSC1VfI1QRFSiDe01H/ywnuj65bSkhQIKxPwN/vZ5rz95rrZSwd+OcTp/ZqDWMB4F1gCnIbR5S+UwbVIWiqooWGyV9Jg0bIjW6b+0mfeRNNJSKo= 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:09 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2018 15:27:55 -0700 Message-Id: <20180718222755.9014-6-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: 86a90f4f-08a7-470e-ed7d-08d5ecfdc009 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:Fq08jGHaFkFLO43JzxHUXoPcliAKGHg47IDAg/XW0aAX1nHTQeOcdMwrHeADQQMkuCZWCFdfSjSCqFUy2CCaF4iWAnGYSjR2lbBN2dCBiyjsQT3+ZDRb6MXLXoDBe+WA/Q3lRUxB8xbPTzD0Z6W2NvesjnQ7CCxC40UOERLEVsqpwnB6pLoEVX+0P1qAmGIYJcj9PPCK8AbO41MCceOgJc/g3EyiAypi07a6To391H6PKiejIhFHdx5ya2DkijV7; 25:e4AiaRywP7MUT/ksLZD0QWoxNgksigipmJxCMmbQ5z23/u/Pb4OiKr7UOWFNCa6ulmmBM5BggRuOQtUriU+JDb8UMEXw8cStR0I6hQGbNyERtduxU/YyRP593u3IjrdBcQR+SwuUCLC/0vh1GNdlgqtN4RmCqfUeMXCXZUA/kIsAamfeEKiHQKjcWuJjzy9vjCsKcCHrpWFcWLG6yI562IHrFHVuX9jbMNavVg5UDkeaSEb5FLdKhBFnle4KxQDg5yZlf0KrYnrxs/rS4SGSJKS7W3PizVtsvgvG/t0qiGHJ1Gp5TvPbUvzPC3dsY+85HhbN1b5+l01HMvzr23IeLA==; 31:1oRGKm07wj8AVpm6vhhNt90ZxKNtHQrJU7DLJPcUiJcJ5RA748BNMbSAw9OFNZ3uFSzb4XXQiAibBvozxN+fXDqtwcXQdzv7FTX4i1RGA/TtrvO/ynt3ZU2VUyjbQ8Bv9JkWFW3apeybgF6cmLp4jnZrfQWejcWSyzSPuWKDIqti3oU9PamqsNjfN+jWSsZGB1gtnJHEL+MzdkxK0b3iqQ5/7C2jg9kN9K7QtM0ep18= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:dGbHn1xcv5XkwqSWnV7RgBxabUjAzTTApVXMKgArhMyD8ND210zs0h94DTluiwy+Fdg1KyZP6bvADNSeBgtQqHhFMl+s4G5Vv0izjEBc30qs7d7QGCWFCPdlm/eLoi4XPMqZsbOkwqfDc41BZKMQJmmfWg8AP8y5q+hJu9T2TUgr7WJkHjZEger1CTdDosYDssl3Sck0J4ir7jSbvLm229S6PQS6E6tij2cpRTMSmXJMUuWPrtzHKddTfhM60VW9pzHlD6bqDyIRThTipI1VKvTYrvs89hZY0EdHVqPdRk/Umx+Ea6zbWFQsHdyyDab27ayvb80QjAkfBHfhzOf1CPjhrLYMjRoW5wqYzuVfVArnFu7VtxwC2hJxyQKH2qD8jb/XKXsNqlYTt9YCRUByCAggm1HbhVI2u+7NwUKmTQRoaraEA2WY//+9wZiKvuA4CyQShG1cXwb5gSlMhs7UpZohAbDSJZVJQiLl0hzxI3u/pBMCM1JX3UglebuZWoB0; 4:Z+WPSwJGnFI16KBqUoakB/Hz1q5LdA7ZCOOuc6SJFD0Un3xemetAZB99wQJlE0bIAA6utyfYfbBxLnYduYforetHwa8N5hm9GDNt6S1dnMZSlxmWAkt3ggV5Xqug15SCWadvjx9k+WuyvPRms6DPfhrn5s+dhf7iu22l1AzOQVTZSqxWFv+BRVZnCJrZ0OMfh5dSWZn94Kx68oGSwqgRAldFCr9ZChi6EFL0khk0yLPAzxwgzyjjhLh0I7ciUQhxcLRx8fHAkYQVD9zw86mYWQ== 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)(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?q?1=3BBN6PR04MB0389=3B23=3Asb1s?= =?utf-8?q?NMPHmKMZRDZHITh/6jtCZSgpxLIdkYbyOIIgJ2dAow1NSutKY/cCiUIO?= =?utf-8?q?sKP1NpuhAebI28lf5CaAOFc3fYF0bdgqZStZghxV5XHQsamT/LI1MnJp?= =?utf-8?q?LkJWuYCczLSl69BAy25QMXak8alc7T5i6VY0ssZVswkErn68we9r88sq?= =?utf-8?q?e3L7H1dQdASdPpPTcSOC7vevzww17nnaz7MQsN8+h0LWNB8M/r124lsq?= =?utf-8?q?KQP23MPg8hSAnTsxHTv1+HWpdqMTmTyOT71U0ZGVzTZTEOUZ19XzicGq?= =?utf-8?q?yODXlDx0PEYJWpax2NpfkAbR7XVnz0gnuk1Dro4RTTU9gGhnYiEmpn+a?= =?utf-8?q?T17UYWfyCkDEGh9kPJwy4g9nYTyOucFkf+hShZqoizZrIe4DDOVnjFg8?= =?utf-8?q?fFT8AN0Fp3EHFUbXGmrUVYdMZo9EcAoMoO4d0TG9vDDPfyR+iJGu6EH0?= =?utf-8?q?WPUoGAynGnSH9D2VkLl7T9ErPE3CE+cfXVbGk9SNc/ezTIp658Fq/G9D?= =?utf-8?q?P+meepxy0wIrilLIkb+4RCs0XGjZVfhOF8FJfOldsiTC7trMm6y0Pn7d?= =?utf-8?q?+QxQCmICTjdgAyBJcs5mo/67IUbIMQqZ3PgQ3oilJcrdQCn58JFtz/sv?= =?utf-8?q?Zy/vfd1oC8k2xgODysbr0/A2LA12eEeSvgUEufsCzMJIiMkBMpScn1OU?= =?utf-8?q?C2iht8YP/9pQL9TTrMHGr/E1IvUb1Q5GQmyYY4LbTdFJxKCcfYaOil9+?= =?utf-8?q?ZdJjLssSIp4PYuGJ+ry51GZeJkGYpf9RnKDVvZZKPY1LtiBlMfxwChx3?= =?utf-8?q?npcPKvrfDgq8OEt2FpL8gE3Wq6TYk/hQX6Es/48jSaPy3KuUUN2geuX2?= =?utf-8?q?pfjYjlBzFjdTGXH9noC4glaSNB3skpcHC+tSLAHtJ+MY7tQRiUi5iam0?= =?utf-8?q?Jc4EBTe2L2reKQRItUZMsife3EG5EMoVowbPA6Qx1VDNlc8YMEgJzdU0?= =?utf-8?q?8Eyrk2AYt32ITnzhTgB1xig7CiE24g4BkEGkjE04GeDy3wdpsYhRNv4P?= =?utf-8?q?U6ZUKR0Y+QaY6+/nJFdJxF1qXa3MPoJ1CqpTGH/VRD0wrf/lNxDuCqta?= =?utf-8?q?1gNeo4WtqYItIHW2kvoNkCz22M8VYLS/sjobb1kRHsqGCk7jRvBXyo4K?= =?utf-8?q?yFVXW13tRgOWdlKPwsu4lLlk40f9eeFPxFUn2IkUOPwqou4/+FpkFMfw?= =?utf-8?q?P1pJ1+197bRgMWlhM4kBIZtM5mwlmR7GnprBEsCT6b65Us9/tu7Wt3gu?= =?utf-8?q?9vLJ4ROXxJfylE+oxYu4kW8/pNttkSyXCI3SVgsBXXWU?= X-Microsoft-Antispam-Message-Info: QP4jcJR4z/S0GCwztSN2bGnTjZRzQxkBUmu+eSmpjN3hQF+RaDpNvOQHHFqW9LIKWov/JFfQoKlX0wTG2j+SmkHE9bNlsg6REHAE4qyU9EZSbv7/pI++u6edq5k0i5VIC0408bd/OdnSu7I+0lCPf46GOChlUJbkDnhZpDftaL5qzl3RiCZ0MO6WlU91fciCWt8l6+aDxxJIidHSNuqMOH029sP+q0tfddD9026edOhlDyFF0a4ECjdhyU/gpjLX4gaUKyjGE8Ofw1usTQIpVR4ATtXUhe8KJ7XHMfObBuutTRZBiAxrebTqoik3SC7hqlbIkGQ2kIKYrPKoIcUCY9Bg1YiUKc7qCLb0d1fT4mU= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:pRrdQEvULfhXtfaA784r4ocOSoF37a6TQqJxFunjDlLQG6v9p/2xhDTGhmcTRQhHwSLPHzkrMyueKwNUzluqU0G/Z3YSS1zUD4ks0LbceFshIBNegCg8RF6FDtjE6u2GDq+yi+qRHBi29utCWKuHpwezmNKt1hndZQD/wdOWje3+uiq1us/nxJbiwP842yE6WstLKREThgLONMB8AykdLipRNlKqicp+wix/216nrCdL4sYoNKzsUNIRaS4g+gyBOfNzQAG17I0QxiIvoMNz0ERY6DpoFFoea/+XLuZFCNNh7SCOqMzWOnt0kM5WHg85V8K0VqEmhucUcb6u6kaJBHPovb05Fh92mHy3Ft1wq4ZuKLh5nywigyESzBgoqxtowBMC4UIGNMTOHCt51GJRZnb/ycU2wTOJ7q2Xbco/crvhZaMkrs6eCll607+d1zHulSlCeL46VbehLfYLdsuUtw==; 5:UxqapB4lM/eUjIbCh73+sO2LN+sfaEnzR1s9QYKa8EYRfrG2b6fMGRPRZcpBrXd4q9HIpwSelc3D53Bbq7y37dgBjPAEGeHAYvp8QBnRe6rwBF/qX8GQ5rdU2nVMxHdCJ6RuFx37VQymKYIAD3JZJ1LY7p4c2DrUKIttKSVhX6A=; 7:earT0u2ib7hPnu4kWA4IHACZrIqfv6sL7TzLSlWOf3xnjMb+Kfpzr+eVf+2plP1LkL35qV5xWriJ/VpM2ZCpDJutRFCilIzVYmBpFnp+XHvJJo5s1BVtLW78OGpxQxcBXQrpX0/01rjubHajjKZgj9TY0YJwjk5OAeFdg+iB0IEldMRjoqB4ytNhzWeGbtRfNUV/WEE4DrLU77zbtwFyhMdtzQL/oSp2soAYSIowGXd8w04owZK+Nj0FQYrIuk1y SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:kI7Y8sjGlETzOJ9dmP6uOAHmeh9HKo1BM8Kn6ASwvTYRXD64+hxHbF/Sz3UbxJaIORF4z6ulGa5Z6oaWQrHagfec0LNztkMB7cptzGq/fNS6Y6jOAGYdfxdxZlvb94CBwB/FAeGYiX1hdUqE71LH5AtURsdqXJ9tKFNja/bYip4= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 22:28:09.2194 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86a90f4f-08a7-470e-ed7d-08d5ecfdc009 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: 68.232.141.245 Subject: [Qemu-devel] [PULL 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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/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 *machine) int i; /* 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 *machine) int i; /* 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",