Message ID | 20180719160721.18430-6-alistair.francis@wdc.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4D3FA600F4 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 19 Jul 2018 16:10:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3406329E75 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 19 Jul 2018 16:10:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31F5029E67; Thu, 19 Jul 2018 16:10:59 +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=BAD_ENC_HEADER,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 7DCC029EB0 for <patchwork-qemu-devel@patchwork.kernel.org>; Thu, 19 Jul 2018 16:10:58 +0000 (UTC) Received: from localhost ([::1]:44071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1fgBW5-0001mx-PH for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Jul 2018 12:10:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) 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 <prvs=73156a1e4=Alistair.Francis@wdc.com>) 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 <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSv-0001Gl-CT for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=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" 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 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; 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 From: Alistair Francis <alistair.francis@wdc.com> 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 Content-Type: text/plain 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: <CY4PR04MB03902E6E0EE072EE87BC054D90520@CY4PR04MB0390.namprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0390; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0390; X-Forefront-PRVS: 0738AF4208 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(346002)(39860400002)(396003)(376002)(189003)(199004)(7736002)(53936002)(2906002)(6512007)(476003)(16526019)(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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: peter.maydell@linaro.org, Alistair Francis <alistair.francis@wdc.com>, alistair23@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/hw/riscv/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",