Message ID | 20180718222755.9014-3-alistair.francis@wdc.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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="J0gzxFAp"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="f7t9v6u9"; 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 41WBdb3XKYz9s4s for <incoming@patchwork.ozlabs.org>; Thu, 19 Jul 2018 08:29:07 +1000 (AEST) Received: from localhost ([::1]:38491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1ffuwT-0001o6-4V for incoming@patchwork.ozlabs.org; Wed, 18 Jul 2018 18:29:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <prvs=730c0c5bd=Alistair.Francis@wdc.com>) id 1ffuvf-0001m0-QU for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <prvs=730c0c5bd=Alistair.Francis@wdc.com>) id 1ffuvb-0002F6-Ag for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:15 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:59721) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from <prvs=730c0c5bd=Alistair.Francis@wdc.com>) id 1ffuvb-0002Du-0y for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:11 -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=1531952891; x=1563488891; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fduLWmqlk7sqqLQffrgkKmPtxwx9nkRmnB30QDxHEHA=; b=J0gzxFApHoskKQWMoXaxAHX5ECI/wptIuiebrKtGyQoKXc4tM9bjjclF fwvXiTztWCM1I0rBg3rr2PcQH/lpSKBg5DuMii2Vd7U27tLa4LmIXCYsC C47nRwME2p723Md2CopAGzA/odhQtG2A8QWDpLukMMfosK+GlahWiUyoy 2FSobwhhO+TMCNw3HZVGlQF2voFO+1YWyFMmo+M9ahImXmA4gknH8ZOsG stT2NNchENz89iusEQuSgIK3eCwFaJX7jx+FNmz1ZD3tjRG0ZQaQTCgOu izZE//TeKUv3P1HXlZUAi36zu2zE4f//JY8e6BXCydCf1Lm9u8JoqGRrp A==; X-IronPort-AV: E=Sophos;i="5.51,371,1526313600"; d="scan'208";a="85113747" Received: from mail-sn1nam01lp0113.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([207.46.163.113]) by ob1.hgst.iphmx.com with ESMTP; 19 Jul 2018 06:28:08 +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=M+nUM2vLCg+SGN/rpfoCF6pD/66aPGXnsfGF9HFV/t8=; b=f7t9v6u9tYH9VCX/V5A4D7x9SxOAtRO+wKw9dmXJbp+PIA/SvHr5J5pxQYonjCodcucL7Ip4QA6bmad6wXFytxR0AVe3vXOl26TBRdpXxZzIxDiasjPALdrKMhB80SkJKj+KeY4je5EP6u0hHh8Xqxgavg0Gxokm1LWvbZORX8U= 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:06 +0000 From: Alistair Francis <alistair.francis@wdc.com> To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2018 15:27:52 -0700 Message-Id: <20180718222755.9014-3-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: bbced919-4663-4774-3dcb-08d5ecfdbc38 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:M4g4atpGpejrUjMSVvJFEQQ81Ups2lEkFDxEzW6AkUDQ+PjuSIP5ZVF39t7dKZOyhE5cKZWjP070nYStnHKXsxLMSEyNUmJLvxaPQKV6khgLkCWo1k6NbUwCkSaSAlkUn6JBaCrzqueamG+XUXYW0QV4g7HQ4AFKSiuDEXmPK7XQwUYrFTimLctIOflbZodgcdipV9DFammOID47vOvz7c5xriBxhScbeaVmOegNF1XRpiGE8RoRpoJHRrvL3pdw; 25:H3cweCqxS5UsnBSPbuwDFHrRMztneJw2zY5ZAYSqLJ8xlAt8+0hsVvOm360Us4KEFyXfN+eRB3MAOh4Y7es1rH3+U/pKvLSkSI10UxS0dGWzQCJF35uQXqod67gep1Bnb5lfcZ0W5rCqFi0BD0BJfIfaPfbeeJTinNZc0pWP7K6SBGSz1Ki5HaA7Jy/7tMo70woclx7uxogfXvyK67jogoWWOtIX3aKQFACnk+isKoP3a3dxmXwA7fqiVSy5P0pHZNV2MxQFLiFK+lprz2xR18n2JkTTFLIDG0tfPuD2WM0jyWzJrXLUextFhYC1LqXMI2Gi6kSLBXyAqoADw1CgyA==; 31:gtBmqK97tJXIclVpPSo2ff0qdsTEw3IMwtXC2S9YNGlQXafwLse85pSxBU/Bp+zDMjkxrs/xGGWlPGOtwbDshDRzHjakXhpLZtWpZ99uPLj/ge1yIWyYjRD70JEs5uLm1lBhtm5fNh3I/nWKFb+o3pDQBUyecWL6SMreX5sxOwDG/idiOIrS+5GowG/TiKKZw/8QFbUNKW0AGek4Xp9zrKNnWRbBGIc6sN6EZZtP4lI= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:XAVZQBpZz0jgTXoniNWjuVC78nO4oLf8hvbgoHGGSFIwyNeSeslXoqUsd0eSHZ8nYAZc87sczjwl9SoDXnM3LYS6NzUKUv1TwBvZ+8kRq6EXePcTmY/k5+1tImXGZ4IY3pH0wA7tmh4cv+qPw48sq9v3mUv6RQky2Cu3yZ9i36JXPOV71EL+5KLn3XaS/n5nKBh36jLpIrb++VT09ZXi1luvwN8H8h8APb9+xlswASstBxaa6zJoZAqDltN1xW3LkL9rlPdEaddk1qo7Bt0KizrcxFivFGZResGCYEJRFNjljnz7sQPmaDBObBKG3NR5cEOBxwTTWTv5W6QVXcgiPDauF67WLfHrKHm4orXj30nR/nDg+91GXa7c/BrXXd0Rdwp+iIPWQBS5U5ERff0bZUKY546dWJ0v8tZwGIQVcRwhUp7yDfK77imTkRq2vxYDZi95qfx8uJlLMz9AEEyOKNA1IZEOUQvFl5ckgbg0SVJRNNPnyRanPhDeJ4qmm36s; 4:auOX803l4g74MWj8ivqh86mvEjiT+8cq/2TBXSUFyt7q1+dDc0Oad0Ihhb1deRjT4ACk7aM++k1yPdtghXlWqGAYR4mwe7aKfbAOkxHQydTyfPhqhZsSXSXT8bOyr9RcRrx8bTiYEFnxqoEYXDtLpEgUDYuSbboJldZz5CjTBE1ByXSkbAuRa2kyFr8LO1drG7dBcAQKu/AVkpRWKJDhdOjzuBci1ZdaZ9hOs/MGQCmxvJmtRszHiWUh7CBoynMH8hdz5HiT0RNUd18z4G54sA== X-Microsoft-Antispam-PRVS: <BN6PR04MB0389AAF50E57689119B7B27190530@BN6PR04MB0389.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)(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=3A4z5I?= =?utf-8?q?Obnev2olzaafZOl+piY06JPE281c/di9+eDBXgKLDIQRhpCOeuIiT6Mf?= =?utf-8?q?7x4ZGmhHDu1/lho21NH10kwD2PV0u33ezZo8vAP0WHByUiHpVO5DbuGW?= =?utf-8?q?VOwoygYwqqQQG/+uIysge7ZZkvP1dh/fn5IL5NObn0WpclAeEJyUsGw6?= =?utf-8?q?M/8OFrqcA68y0tgOk0z3IKh981TWsngyEMS0XAollZuyfF35MK6/uGM8?= =?utf-8?q?c6dRKhD3js8Ccio74rarkR3Ykcc2bbHXP2T1oiquxdxQo1g7nFTiGa16?= =?utf-8?q?vNCFYerSjKziO2grneoR87Ajvr0uF2stcIbat2zGudNANRmmvu8ML/sS?= =?utf-8?q?X2OweZyQKexiYxe/WSNEZyRgeAcoRqP8DwLboht+t4MON7cN3nyQlxiX?= =?utf-8?q?BQlZ5A4AxrlzJp5l9JP6bee4VYntzzLpuRRpLi2Ch6mo4yLa3D9INmP8?= =?utf-8?q?eceOox1lfL2OKsUr4LIrH1veRjOwEHyfiUe/IUOFw1PFNjoUVcTu2acV?= =?utf-8?q?oA9l58StBwDSLuh2a3BS+96TsWL5hqmHcVtkyoP2uyd0aaisK8KIEzxE?= =?utf-8?q?QMPadkL9rtDSPU4eHCfH+AcyZaWa+D4UtYUe7z0HaIMVZrQQQkLdTgHJ?= =?utf-8?q?4LFN3cEL34bObITf9FsHUX56v5tqFZokP39nHtuEhUDnYzc9CexuOTA5?= =?utf-8?q?D9cuKs6KqTP3wewmgVfzdHAPXOOaaZbOCn9mzDNzYRXV2kT4PvJpRB1p?= =?utf-8?q?8hMHcZyhCELzWQwrjKJWUCGgPwFwQPl/t1GMq4w17a6g/RBa3B5y/bHp?= =?utf-8?q?n2KwCA7ulRmxV0bVnNWkrIWBGS3Ol40/scFeeIO/4GR7AqAZlC5o+XKE?= =?utf-8?q?dMXRCKMIP+Lvp21CYliWLz1T1x7VkSPZzG9qsGEgpI0sjrwEjZKmt0GW?= =?utf-8?q?BeJ8P4uGkZcnhsgnHb4YAupCUwROKadXftJZatnEfLZvrRA0mQz/7M10?= =?utf-8?q?rG3y47F8DGi2/Kt3zKddvQvXa5nwWAmgW0Cdk7ilNiW/e6tlDL1nFjzG?= =?utf-8?q?ww9k/rlu8OCf97GALlhbbe1wkj9CSnO49fJSabtHJWqvnLMnnkFEef1g?= =?utf-8?q?JFeeG6fl6N5pbK3qq9pDOY1CupMqAn1+i4mS3DLgKdwTictmOxy0E99v?= =?utf-8?q?sg3kzti8vAlYvqn0ukBC9k081oLhI+Ryq3DgALHeAIMRN+QJ2dDd2ZdA?= =?utf-8?q?SP5FcfVnz/RgD7mweclPHfylZc+Z1LLcUF5m01mYZsDKT42557Qv4G3q?= =?utf-8?q?q4UDpRZrDBQM0mjnlc6VFjCqhRydspv/dRKr8zGLWpRp?= X-Microsoft-Antispam-Message-Info: XmRRFHJf02Am4uJB+1rIjaCvcBc5oFRsVVZL8aVgxYLEWkhwnYjhfUjSVnWyWYpTi5iOTfDQUsLOfrgMfhxHhgSH91Nv327mG7nwmS64pH2WbnP+Iw7wW5uh8tcZ4EzfYzzp19m/36KR0N4PFrMm/lYfYDGzlsoMAurB6Um8SaiD00Mwn4DsSqeIl7MlmyzA2uN6DLJ2FzvvYdCKVO6hONCyF2eJ+mFtVTEJ6zMnQHLv589Ywb99v5TxN1zrtKQ6QWQUECmYed+7YQvwNmeD6MmlTroopJVUVPhHqpR/gUVe19ylBCLpRBQFJH10nhyXG/i1K5gCdIWUWuHJFSrDGkZwLBQyPhlOE0rO3SuBC68= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:ZG0ucKrFEQhx0ahFUcCr+BdyCkHq7tE/ZI8ib0iE4E0ygfx8hD6XAz+vc13kdqK8/0/lfbcMCppPxL3hrLi20RvFjWlWfc77XU3aLfE0x/2iN3KvpQty8mfHPFjs8hEveaoumCjkVsw6SO2uCTpP70WaxpPGY3cmK0nZAvbvt/stm3In/aNTT7SORyWd+Uuu2MdTS8+DYCkqZ3/Sx/qd7SvvB/+CeaABRb+IADU5/JjUANjPCeBi8iMdDIwERIlX9w4cHZpvCwDkIPmIIcQE4c9NaYuiI9qThBMbdy/bIP4qZao8n4A9oQvyMOMX+/BqaDzWPyFDblSoquVSSEeEMwORYF1Ny4YU+NDhabhzk6RRYRobZACYUDBXJ5uKu/rQC6RqFxhUjZfxIJ9dvdljkP812F+y+d8xj54PIznZJbgX+u9DNKMZaxr2FxQt/usLagj2pbGElpsj1SZSsA7Smw==; 5:01AsBCF08oG49WNZoehapY6GPCD6fLjAWbUz2Tg+L0zD63saSXlol9uc5j8kNwWGlhLF/JLwAMd2F8hp7L70JqpoIOXpVXNcII/vEebjTbAfNw01vZ/1cJRKnTD9InPRs/JyM6Yp5lLhd3M/o74ZVFjudWmnL3HtV7F66G3TXH0=; 7:dVusGMUo+GjTqNJr9CnegVqXqZ7xhxIpTCF4wIHl4RWnYZyWYh1H+g324vt3RJ9fdFNOK7aXdiOk9DHsZB0jhLM5es4HkFUXtVKevoeokeQA1hMXM8MUnEq1PhE3fUHCAD8s6poqdx57GvGFzVWjFXiKozzNLbVAS/KOLyqdl4+tBK6vAk95B5f3VeRlpyNriAq/8NCUoC2FFF2g2psKFkLGaR3hvGphl0A0fmoOU9YE6HhRo4bOzhYoi7d7DoOC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:ALMushQyRR6eMIz85HfgjjsmdqDRKLRJS7MRpI6gjl50MA6facbyRKVbjWYaHKjEfgBDUQroZxSx/vVwAzfAItt9g+rcAHAZcrM8SwvMBaHLmHRHOp3wG7zHPBWbebhYyT8NCCgRKutGYLNj/9xBgycQVDjxDQYjviplRXwTOO0= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 22:28:06.7653 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bbced919-4663-4774-3dcb-08d5ecfdbc38 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PULL 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: <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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,1/5] sifive_e: Fix crash when introspecting the device
|
expand
|
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; /* 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); @@ -303,16 +303,15 @@ static void riscv_sifive_u_soc_init(Object *obj) { SiFiveUSoCState *s = RISCV_U_SOC(obj); - 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); - 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); } static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)