From nobody Sat May 4 16:38:28 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 153195302728617.417109656414482; Wed, 18 Jul 2018 15:30:27 -0700 (PDT) Received: from localhost ([::1]:38493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuxc-00030l-B1 for importer@patchew.org; Wed, 18 Jul 2018 18:30:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuvf-0001lz-Pr for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffuvb-0002F7-AS for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:15 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:15044) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffuva-0002EN-VM for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:11 -0400 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:07 +0800 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:05 +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=1531952891; x=1563488891; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tQ6wyA4KBFdQaFTRgJSx318HfuDynX1/ao6cUxz9TbE=; b=Kv5Rj8pcCyUxExvlCLrmXFxqrzLw/QBVqwoz8FTwSFDa61JX48Urr0IB NML+/t0L4I94bjgvWvd4xBVDGP76TgJzCokOkYm9WknnMexyc7AfZisiy cVGLKfIP2DyW13JI6/lNXdRpK4D+12CH+t3LXIKGQbo8hZUrh31zJm4nc GfOCaREqYCyN1IZc4EwTWdwTQtRWf9URhoMo5EI18sjgfiEENE5tv1Qfe DYq3iy/EOWMLQ+/EB3ShWecnOJlTqjMM7Zob7/rPKsVkO6kKgq1MWs7/E v5vCtcRp6x+tt7djVBp9Z0S85TkAxXRdRsnqWUH2mSc5zODCOZ2SQy5EE g==; X-IronPort-AV: E=Sophos;i="5.51,371,1526313600"; d="scan'208";a="85113746" 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=UxkuE1Wo0tsmH8fMoYw6EnJvjBhtD860D7zEoQi5Uis=; b=GFiUFeaQH0DiaPY2qrlfGKIvjBdHU5OyJwApOy/wAWf/nRfAfrPD2vJ5Yz3tZ9sNCEb3iIqMvqlhI7+l/8U0wMqEPX+yCfG++bWmhww97xt4H6k1rD77Ntc2MFuat4EF/dUzawdQ8rW17POa05/Omrn/YdVaCC8n8sYaB7M9c50= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2018 15:27:51 -0700 Message-Id: <20180718222755.9014-2-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: quoted-printable 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: b6f3b84d-0692-4566-064d-08d5ecfdbbc4 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:GC9EKbeaHc3wfNjLHOnQK6m3T4PniBQKz3RfS1I93LFVwEQVV8w9kmME5Di/964G2Rg7Nh9DgiO74zafomfs6wBqK6T5O23idyv0Z8B4hunDTMn01vGJaRyMnmutFJarv3SPpsvGKuSJSgCZaec97DYX6d1TBNhoZKVdefRESl3EYyaXX5gzlWzhtnc/5c/7P9fgF3pZJI+ogfJQ6z/0iEN8r++sA44Ho2nbU+Y6eTITXaeymRu3mH7abZzVr7wc; 25:sH85+dsy4qMSUA2DRl7H/sM1l8GGxMK3/O8ZJZ9f3wMyve3AIVWNBN0bqC1trR1N4nqyJc3t9F5Qvkk2zIi8pDXh+GccKZ3EtfXk6+5528MIExsDHXO0SIVoCeKW/cy50SDJgnLbBFzqeD3/TE9Royx4oUN4sORwsWV57FDx3dWEq7skmcXu6b4HgoHpkUpFql7CgxBCIS2BYLDThtGjTFICL4fgUWcLqeNaHFZMZ+lEBhiqX8XGJNfe2gYt2Tci/z91CuI/h5oDwja0+n9r0txn2xXIK/M7kCbfareAEWilsK/YMwcBv4gpJEJvDRimS2mT0EFdz6B1VJAHUCzBmA==; 31:bpZANHHY5vq9Sm4owZ68I437E0deC6fGPtj7ouTZOmgHeCJbhA7YrZzUU5PHSYCMckzcUjJVbwpY4VOqThnSzZDfqA5SPQyyLjcgHVUaGHJ2yUcbgXWK3eYYKrCYJp8kqNWyIZtLR2eu11LSR2TSYOPqFk3PoBMIWbJzKGs/tyjE7wqv/TDDZSiyTtmhI/k7ghJMB0SvGkDP7qKmMF1RJ4Dismh27eTJqtoaoHK+nq0= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:dVqtxR97/dXhAC/gape/VjYdopBWr2r0Ecjj60aYIGD/wSYwU/YqUfK9FPsyTH7uO/qVOxDTV3XAJCp6Viqy2EMW88T2sBRY1GoLJvVz6gAe3kyfnCBcZCmRXO6Ivw7eHHoNmq6QZ3Wb25jgeBZa/GxYp3zsfbldOffVOaDBUqCCEFXpZ9rS22s5mVn/7JPsAAMq+OJnIzuxQqQBDhRz1wuaYMn4ejYGsiDE+7MLqDiO8d2hyyME1TYsiMMFx0DPlDfaDX4IpXssUmWmG1/mueyyXQYVq5araU3/jPNWc5ibuNP6EUU11KINxZN3lmIAFgOnU7w1VmfJz+ZQZNyo+i6EUjOKuUTlypotzpz55VnCPWBBitkVJAQclxU30+oyV1bSWKSowev9JVBvUcSuX1bqlLJO0yg/skOLJR7/qm1wzJm7/vpX1fTtS3yFSasXbROsTi5iWhdd/PaYf+R0E7vwEHifO+D45PpnzRgtLrPk+39jE3aUXlHqSpxVbkft; 4:Z1Ipf47UNJBA8AUx+IK+OYhIPdqn29RmdibBUiHCHVxOqRkUplHA7DyFdAqJR1DIViwGt5XIng85n19VXjstKiLW+bQ2lKb3r27lufvOIQo0ubk5aXbrx7FcBQKrzWs3VoD4+0VbQYDB084EYxMao9ayg9IjdOjxk+R9ZFnm7ZS2Glx0ZSa4TdLbp7vjlHhFcwgJ4JMiISRKMqemF1TcDooHbx8q+4n9OwYPVEQ5iSTMJNgG50ClDlPTEkxdDxA6FxQRdzfBZyQClRMe6edePw== 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?B?MTtCTjZQUjA0TUIwMzg5OzIzOjBUVDFiZzJHUU5rRlF6T1BYYm54OFhiZFI4?= =?utf-8?B?ZlE4dmE1V0ltYWRjb3gvQUNMZE5wY1Q1V0pCWUd4dzArY0NJdWdMVlVxb0xt?= =?utf-8?B?YU9xOG50V0NoYnBCSTFkbUE5a3RxMHNYY3Z6aTBiUnB5eWlPeHZpcm5qQjQ5?= =?utf-8?B?QS9PV0x0d3IyQmppQUdYNjJXdk1NS3J0K3U1NjJOUWUrWW9kMTE5MXBiUEhE?= =?utf-8?B?b1M2QTJNeXErMjAvK1U4VlZ3NUlEQzBQVEovVVJ4T0kyaG5aYzY5UTN0R09K?= =?utf-8?B?RS9OMkk5YWY3bFY1a1l0U3hXOHA2bDh2M0xuM0pvVk1ZbWNwZGhESC9aYkdK?= =?utf-8?B?Qlo5UHNDbmFzd2IyTGg3cEZyVFc1S3NPRytGS1F2aXBlQzA5MmI3TWd0YmIy?= =?utf-8?B?bHAvV1BQRC9qNnZMbnljWThCcWt2Tk5jazZ0aHpOeWdWa3NESzdlZFZZMVBO?= =?utf-8?B?QXRQT2I0YnlXSnlLT1kyY0xFUzdKU3hteTRvVEYzTk1NWUpCQm9aaWoyRlQ2?= =?utf-8?B?NTlxZnZGM3ZRMDJ3L1BaTGV4Sk1hajJETm1adXRkMWhhanZrYm1QV3JoYWYz?= =?utf-8?B?RktxZFlVV1QvY0kzdENHNkY4dnF1TWJXMVN5dnNyc1dnNWxwMUYwVWpXNDdw?= =?utf-8?B?UzFUSmhocjlheU10b0cxUFBPSTkzTno5M1FseGY5bDZidHA5dy9CWW9yYVFU?= =?utf-8?B?ZjIyWElCdXZ4cDlVVTZ6WmlFUmpIUE5LNmtYcXFYdUpBV2V3MGk0R01wWjEx?= =?utf-8?B?VFN4YnR4WGtxVnduYXRtdjMrYVgyU3ZKdUlBYmI2MFlpMDcxL2VYYTN0Z1hl?= =?utf-8?B?T1JjNGJzV1FsUUVqQnRHSFBWaXd4SmlFaVFoNHBIQXk5Snh3VVJpc1BaZStq?= =?utf-8?B?MmZvMERMTHJIYThWMVdRbytvRndnbU5sUmJJVU9HUFplNUFTZmpOUnRuQ01W?= =?utf-8?B?RURBa0dNSmdMbDZ3WlBwalRNMkhkTUtuTkRmRzV3dEQyeGN2NHNCRHJiMlNp?= =?utf-8?B?ZWR2NjJqUEozc01wOFF3UE0wNERzNUNEUWxNakVmbEdGdnhCeXh0ZUJhcmh4?= =?utf-8?B?blZGaGZWTFRQR1dpeStZaW1SbGFGZHdXZ2JYNVlJZFM1WEVoYTBYc0V5UDNB?= =?utf-8?B?Qm4yZ3FkY1hKaTNEUDR0TXhSYlVpb2QrWGpjbzEvdDQ0amRmY0RaZ2JtKzBx?= =?utf-8?B?U293UG5RbVdQdGowVEx2ZURYSjV3OHdMaTBvMlJmQ3dzRHZDWmk0aGJhdTVQ?= =?utf-8?B?bnArTkJyMXh1OVVuQ3NaVWpDbjZTa01WWit0bEZnQU5GaU5WeUxyb0YzNmNz?= =?utf-8?B?WGxtUjB3RFB1K0tmS2JnQ3BiaEdpM1lqdXFORDJ6alY2TjB4VitSYW96U3V1?= =?utf-8?B?M0xJWnZGNkgxR2dJbnlPc2FNd0s0Vld3T1Z5UGlMc29KbkhsazZjSGJobGVi?= =?utf-8?B?ODBSekc2NS81ZGQxYUdqQjZPclNXemFZaWFFMHZpanBLQ2RWM1ZxcGxCbkQw?= =?utf-8?B?NldiU0NSM1hBaVlLSFB1TDRhWERsZm1qNFlpaWtvWmlTYXNkUmRHalBKdXUr?= =?utf-8?B?dmhPbDdVVWQrMFlrNVdnZ2prSUgrODlkMnluODV6VmNLS2R4OStWZllpVndp?= =?utf-8?B?cjE1eUZtQjRHN0lNV29MRzk0UUFQM3UvbDh4TnppTXpmSGxpSzQxQVZBcUkw?= =?utf-8?Q?ueZHsLTsSMFbHd6gc3LI0C3u1dhQVMp33oRLrrI?= X-Microsoft-Antispam-Message-Info: 17sbvqMCYd0DPlybvj0jqDICGyyMKBcAVuhnclQK4t/P5aoUKFcd8xo53cigXm7cZwD8QLl1VK5XMCLUBSfUG/hlA/kC5iVg+QVx3fWjyKd6QkEoajgSlVPh1MAuMF5ZpXGxwt52vVN5bgG1ZGX4uiVkd7uW9FGjB+TEwDzg9pG55Xj+r3oxocjDXddTNDsAYRqYpa18Uzksmbrif+CUFqFuJwQY2IfP78u7pIzdReGLvJByr2ngG8KoucmSe5OaRaTXViVkwERmnV1Gje1yy8sziMbbwdk4JjuZwLhR2WIRK3+HI3ESvLazTVikoapoQE9VLqPM8OdN1BE/Xz7ytjYbyTD31VM0BtVpjz2WVQw= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:S4T2F/FgVD6D459X8zoJnIc3+VbRxcNLaIxycyuFz8MKOdkOpFHmZVWIcmyrp5iQ5E9stmgJUabmF4IY89SIcTfltLvXYUwLYqtEl2a+K4sbSNll1qLeCi1DZ6Cvqv1+41yfAlvia0j2aXCTqg/jEyfmf6dIrnz0d6oOKRhWcyhYSiYm1uAdev3oQvNf4yai75NsYq+s7DRqNljWe0fp6iuob/evYvQlSVhLh9g5TeJ9yOOD2z8TO9EiTFrU9ev97v2OpID0i1E9HZcMpog/WfQ5lsZk2qWP2/U39UuU6bsCwB5GxZm9Kk8zvbl0zbfxZ6GuIuu3NPUz72y0rroQnIjJaZrZ5zZWS7UI2DqDZ0a5nlzui6pr9hWZONsyABjzzoJSYr1iMtvT+pTUE1B0ugKQ3LO3JgB+BULzF1BB0LhKIWeKQ9pXvXJuB2C970CwmT2ZvEQAe/JjyqkU8M+cGw==; 5:Mo0/+zTCfceIdzzf56LxLCaIIxyTfgcmzNoniLgDSsuI3Hw+SRbkmwloP/f6bJGJclU+JSU3JV/00DBYReIUeZw+Rr7RBWm8060shBeSkJGBBpUky59eN5ziUYH7qVIH5GvDeBoyuu4htCCCELAarLYhkwuzdkxM5473Q3N6noA=; 7:Kpn8TGGZJhpf5bQryK6fALDhJAaCwrfmtJR5CcohwfK1HUFw1wAt7xuiBF8kanqNdAfTQ4Mdbw/NcW//hqpCRmposQ7PxOSl/jShBBGJRezQ/Dxz/F/bGkuTwn6xKdHbcw8g1n26jyCTYi6ktfL/j+OUCH3sc9tjUQb8jzUOBvwCTtKAn4brL/hw4nfC7FwwCoOLWezDEnIXGWLAa+HlZgPIoDAIybLVXiVJSA2RyytQI3IX6cqxBeS1k2m6OamN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:m4UizJdEJt3PcPCijqC15gJj0UEodPE1huyAVHEkpfy/aXjhajPG7D/CmbArC8LCRmuDvm0C8BStHbUX8ePUFg9/2BVLg9qz2HcSR2+KiOf4kabGQNjnR+UU8bABbkWzxl9980lAVRVn3lKgEzqTlVR5p4v0QgQPM8rsMy+ITHE= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 22:28:05.9856 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b6f3b84d-0692-4566-064d-08d5ecfdbbc4 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 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: 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 16:38:28 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 15319530252171022.3170377678027; Wed, 18 Jul 2018 15:30:25 -0700 (PDT) Received: from localhost ([::1]:38494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuxf-000341-41 for importer@patchew.org; Wed, 18 Jul 2018 18:30:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) id 1ffuvb-0002Du-0y for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:11 -0400 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 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 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" 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; From: Alistair Francis 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: quoted-printable 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: 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?B?MTtCTjZQUjA0TUIwMzg5OzIzOjR6NUlPYm5ldjJvbHphYWZaT2wrcGlZMDZK?= =?utf-8?B?UEUyODFjL2RpOStlREJYZ0tMRElRUmhwQ09ldUlpVDZNZjd4NFpHbWhIRHUx?= =?utf-8?B?L2xobzIxTkgxMGt3RDJQVjB1MzNlelpvOHZBUDBXSEJ5VWlIcFZPNURidUdX?= =?utf-8?B?Vk93b3lnWXdxcVFRRy8rdUl5c2dlN1paa3ZQMWRoL2ZuNUlMNU5PYm4wV3Bj?= =?utf-8?B?bEFlRUp5VXNHdzZNLzhPRnJxY0E2OHkwdGdPazB6M0lLaDk4MVRXc25neUVN?= =?utf-8?B?UzBYQW9sbFp1eWZGMzVNSzYvdUdNOGM2ZFJLaEQzanM4Q2Npbzc0cmFya1Iz?= =?utf-8?B?WWtjYzJiYkhYUDJUMW9pcXV4ZHhRbzFnN25GVGlHYTE2dk5DRlllclNqS3pp?= =?utf-8?B?TzJncm5lb1I4N0FqdnIwdUYyc3RjSWJhdDJ6R3VkTkFOUm1tdnU4TUwvc1NY?= =?utf-8?B?Mk93ZVp5UUtleGlZeGUvV1NORVp5UmdlQWNvUnFQOER3TGJvaHQrdDRNT043?= =?utf-8?B?Y04zbnlRbHhpWEJRbFo1QTRBeHJsekpwNWw5SlA2YmVlNFZZbnR6ekxwdVJS?= =?utf-8?B?cExpMkNoNm1vNHlMYTNEOUlObVA4ZWNlT294MWxmTDJPS3NVcjRMSXJIMXZl?= =?utf-8?B?UmpPd0VIeWZpVWUvSVVPRncxUEZOam9VVmNUdTJhY1ZvQTlsNThTdEJ3RFNM?= =?utf-8?B?dWgyYTNCUys5NlRzV0w1aHFtSGNWdGt5b1AydXlkMGFhaXNLOEtJRXp4RVFN?= =?utf-8?B?UGFka0w5cnREU1BVNGVIQ2ZIK0FjeVphV2ErRDRVdFlVZTd6MEhhSU1WWnJR?= =?utf-8?B?UVFrTGRUZ0hKNExGTjNjRUwzNGJPYklUZjlGc0hVWDU2djV0cUZab2tQMzlu?= =?utf-8?B?SHR1RWhVRG5ZemM5Q2V4dU9UQTVEOWN1S3M2S3FUUDN3ZXdtZ1ZmemRIQVBY?= =?utf-8?B?T09hYVpiT0NuOW16RE56WVJYVjJrVDRQdkpwUkIxcDhoTUhjWnloQ0VMeldR?= =?utf-8?B?d3JqS0pXVUNHZ1B3RndRUGwvdDFHTXE0dzE3YTZnL1JCYTNCNXkvYkhwbjJL?= =?utf-8?B?d0NBN3VsUm14VjBiVm5OV2tySVdCR1MzT2w0MC9zY0ZlZUlPLzRHUjdBcUFa?= =?utf-8?B?bEM1bytYS0VkTVhSQ0tNSVArTHZwMjFDWWxpV0x6MVQxeDdWa1NQWnpHOXFz?= =?utf-8?B?R0VncEkwc2pyd0VqWkttdDBHV0JlSjhQNHVHa1pjbmhzZ25IYjRZQXVwQ1V3?= =?utf-8?B?Uk9LYWRYZnRKWmF0bkVmTFp2clJBMG1Rei83TTEwckczeTQ3RjhER2kyL0t0?= =?utf-8?B?M3pLZGR2UXZYYTVud1dBbWdXMENkazdpbE5pVy9lNnRsREwxbkZqekd3dzlr?= =?utf-8?B?L3JsdThPQ2Y5N0dBTGxoYmJlMXdrajlDU25PNDlmSlNhYnRISldxdm5MTW5u?= =?utf-8?B?a0ZFZWYxZ0pGZWVHNmZsNk41cGJLM3FxOXBET1kxQ3VwTXFBbjEraTRtUzNE?= =?utf-8?B?TGdLZHdUaWN0bU94eTBFOTl2c2cza3p0aTh2QWxZdnFuMHVrQkM5azA4MW9M?= =?utf-8?B?aEkrUnlxM0RnQUxIZUFJTVJOK1FKMmREZDJaZEFTUDVGY2ZWbnovUmdEN213?= =?utf-8?B?ZWNsUEhmeWxaYytaMUxMY1VGNW0wMW1ZWnNES1Q0MjU1N1F2NEczcXE0VURw?= =?utf-8?Q?RZrDBQM0mjnlc6VFjCqhRydspv/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: 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: 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 16:38:28 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 15319531974531003.4452636985204; Wed, 18 Jul 2018 15:33:17 -0700 (PDT) Received: from localhost ([::1]:38508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffv0W-0004p4-A1 for importer@patchew.org; Wed, 18 Jul 2018 18:33:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuvf-0001ly-Pt for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffuvb-0002Eq-0Z for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:15 -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 1ffuva-0002E6-J7 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:10 -0400 Received: from mail-sn1nam01lp0120.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([207.46.163.120]) by ob1.hgst.iphmx.com with ESMTP; 19 Jul 2018 06:28:08 +0800 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:07 +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=1531952890; x=1563488890; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SwiLVdN6t7KUlm5Mi9sC/Y0D9KCoHGa8hvvyIFHvkCY=; b=BwAG2qnsh+KHgqTC+nUsX3iz6Q2I2PBtRFXbe3gj4oGm3pCX0r9szmLa OZ5mg/uYxCqDyz5Kb9UfYz7V9qJOJSZZYo8aBPHaTsorzMunepzGP6j52 GgUAVZZ1a843mAGOJQUd488xFrGomV6Xi2kKAMMKsb1yqC5+HjuYnEIIP d29bUwrpzvuf9dPtvVsB0sA5fRGJDAU9bHLo1ZMBXeaOhIgFpHP4QLCoo vvJQGGRdYUfZjg63BekNNilDxCIXEcavHsK+APSJz71xUd20uYNXSqf+D yQwAb7qr/H0EjyKLh/HWdQBjG5fMVEaoNDXvmEwDvlDp4HwLNetgQb8GM g==; X-IronPort-AV: E=Sophos;i="5.51,371,1526313600"; d="scan'208";a="187931688" 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=cyV5YaFuxpxPwQIibDCaI+iYInWP67lxl30vC3QxOxY=; b=mPqpyHt5ug482tvHHKlMYLWaZanlvfoirnM4FE3CoDcn98w18EJQ+hORzYJB4ZADgvERgDSnuRAB6HyHPggMNY+Q6s/124nfB7vEPZVuiRn5W7lvjvPP0g3Gei+k2eD6Bw1X8c0fJA37+sfUhgqoIwsfVaMUr3zXZ77corzilO0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2018 15:27:53 -0700 Message-Id: <20180718222755.9014-4-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: quoted-printable 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: e32068e7-49b1-49e4-a7ab-08d5ecfdbca6 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:6CmzpOlBLzTg5JV4P29U1PwB9gadxVrvDXGnizZvgpwZkjzNasIkLb5wEl2uHyzkdv4AtmKKZF08pnKlU99MAWv/qtE4xlYrlj36JiPBldk35OQ/midCoj4xwUUC3MqpH7L5sOpz+BrhCnBQlhS6jseCeKDzBoKGBUaawlpSufDvBvIudhaMBnmgvIDWVlNIe9yXhYHjIHCxfvVaKunPWESVYetzhzv4jZZ3YHwSK2IfKBoVNaf0DXB2lHn9B1+A; 25:w8qEQ3edZuUlt7QCx2pOjkI424dM1sZYHeEWy8qU8kzWcjCdFAYDahIgaYj2NjqdFsF+56K30f+fuu1+hGJTTWJg7bRQa7zhhTAgPGZ7GSIlOI3S+0hxkW+ZiJVhBqbM7Jt27G+PjPbKnzt5KzgZXmW9F5BmggtFv/uL2iKyH/9XcU0Q+jiuo441uGaPCIkYr2Kmxm3vBHTLmyxQfgNFcNvKWYmM6ICrLPoDLvsx0XzwD0v2Mkpty9F88JcQ5SMfNiiOjvgGmCj57/+nhBBBX9FW1ELtkm4NLdQH8jrzT8ZYAIt+8Z5fP9Nr3PsKqYE1H7f15+3i+OxbYAKwyGS/pg==; 31:XjxAtXXxK1HvQrKtQo/LCetzbduRNz3vv7u9yq4YCyG6YsvXuja0USOurjw+uBXNLH+vvgS7Wo8J4RyLM5Avv2thI1Pr4SRQE3CEbWd7dC3h61YmHbbZfsNc9eUy6CM80RinJ7oZFefe7cKT0flVGh+SSFN+M6DxRxqdju6kZGyWoejAzVhErzL7ZSE7lBdc6QgbCCqP1qDpkd/vYKE+F3+5bl+4doIlGDlutxUt8rQ= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:72cAh8/Qm6Q6ZQFRdU5t/ncbAxmpD41R8tGoJHbcdeeSAiXx94SboyVw9IyQxS8xFg5W0lduDAcOtGOcA1wqlu/m4fzrQ0gqDEZ3OiNjsTxl0llc2RJ59ZOxk+CPdSV0E/4Q4fFOV0B9XAMrQaJDGTiNWSobLCJJsUY9X8lC40YDK2mHB4483+SeZS0NZGw7kgOqgcjZ8bWKPnpCYQ41PsXQzGD4x8lm1XpZt1rxAYg1vMT2qKMlOKK/jWE6Dz4ijG3PpMpjVZOf/YRsQQ1y9nkMrj9UAtFGInKj/8YPzHEAGyyA7eJXuPFZM3JOhCIPSJQz6DEV6WYqqhJvbcc0m7cDWMFF/ju1dl32yJnscRy/BTjkHPDESmh4Z11wwKua77DP4uLiVaxA4uuPm1qKr2mfJ7KYOX21Igg0t+RiM8yp6sXsDg28/WdX4jR90hj8RcjTc3Qe+S8/gBSZlPbHYnh5MIbbKmBWQgZGQIgmLwFvweStaNlj+RpUIZobsLBQ; 4:8i0cFxjxyGBB3Qjy56e+QZbG0X4W7AXbgNL5sdwPRs+jG1aGBT/b69WC0yiFlpYjFvXnD//MYJPPv1Y145RDOPxcENbUeTnnxxrJtAVNFhsjIN4WOpsPxVYfuA4J92WIMGBbKdXQXnNdPouQuyGgdRvjIZzQJZC4fyKRNAtyaSQ/W3APqwjsmkOFx11Y0IHyMDb65LYGG9HtRLQlV+CfI89Q/sg9ryoT9GGP998u92bBSFX6mlevxIaR40O7Sso63xfvAEBRNI7qr2caBWlu8w== 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?B?MTtCTjZQUjA0TUIwMzg5OzIzOkt5Y0pkbmlhQzJPZ3V6SXVQS0VoTmd2RDRs?= =?utf-8?B?MXllOThrbXkwT0lrR05iZTh0czA0VFlMdEk2V2xpcWRmSE9uNHE5bmpKZG9j?= =?utf-8?B?NXZjSERaejJXNDYvSDZxdCtwQ25SWkZLZDZ4VTJjWU8yZmlyckJmaG9lMU0v?= =?utf-8?B?TEhiVEkydVgzeU5zY2l1ZG1hSndiTW1QTXU2ZnVDZms1U055TFlsQjVNS25H?= =?utf-8?B?MDNCQ3A5ZFdsZ2hpdVlFMzFjR21UUEE5QVkxbUpUMEp2aEJRWVV5WXY1aE8v?= =?utf-8?B?cU80eVgrQmhkOXZlczNkdWZWM05CKzdzR05YbFZSUzBOeDRkUEF4UU5rUTl5?= =?utf-8?B?c1FlOTFZRi9iamZVOWVGVWYwTjREMU8zREY1b1dCUnNuY1JvbmV2SHVNSlE4?= =?utf-8?B?ckNuYVVVWlNSMzFUakFwSFptejhTOTloMVAwY010Qkk3dk5oSHVPb2U1aEpn?= =?utf-8?B?bEM0cUJCaGd6eGkzd1gzMlRlVm5EY1BJc25ES0FkL2dyZHVmanlIdE81a3lj?= =?utf-8?B?a3NpZndHbmJmQmp1QjROUEVUYzViWHhZeEIzenpwNlBLcjVLWE1UalJsSmE5?= =?utf-8?B?SytNQjRGWEU4a3pZb3k0U3o4V1dhZVVLUFdtckx4cE5pYjRGWjRkTmhPZ3ZB?= =?utf-8?B?VkhLNURyYVA3dDBuR3d0UnJEbXJ3eVR6M1VtMGFnSUdtSHplakZ3eFRydW84?= =?utf-8?B?bjNoTXZhM3NhVzRxUTh1eWc4Mlp3SFdvaHZYcDNxWW8vblI2K0JVMkxJcTU2?= =?utf-8?B?cWZncW1PY0VJRk1YU0gzQU5hMm9XZ0Fwci9yTjFaanZlUkh4VFQvY2ZPcGdv?= =?utf-8?B?Tno1SHNoZ0JYSTJmYTU3amNRZ0M4TEYwTFYxUUN3MHhIUDVkVFNjQ1I0RDBV?= =?utf-8?B?dEhMOUdNbGZYcVh0M2RVTnNOU2JOMFFqeGRSM2llUmhpY1ZpbFpKY2xnZGlq?= =?utf-8?B?cm1MN1V3TkczZEZNU213RExTZ0ZRZzEvMzlnRzRTS1M4eWFnUmRCZml4NlNi?= =?utf-8?B?VVFUOXZubE5RWHFxUDZWOWhnaFl2TVNpSTZrYnBDaUd4Y28xVVA1TUt5TG1N?= =?utf-8?B?bTNrTzZ2UmoxcXJEaVl1aEY2TjhSOVFnTUJtbU8xM3Z0N1lYRlh3a0dOR2NS?= =?utf-8?B?R0dFNkl4SHFWT1ZlMkhTY1B5alZqdVNVaVpYZVI0cXNxRzVHV3VoLzRVWWVM?= =?utf-8?B?TC9xRWFFdHU5WTFFZDVSNjM3a0I1WHZnelZPbjlGVTY1Ukp1STFES3NVQmhC?= =?utf-8?B?WksxR2J0SnVKQUtGL0RxL1QwSmYrbU9mOXBXTnBBUStpSzJpRHJTalExMGFa?= =?utf-8?B?VkhEbnh6Wm10b0pLUmJHV0Q5YzVnZG1QUEFXckhCZHExS2tueCtkcVRvRFF2?= =?utf-8?B?bnBnQTYxUndUdndCTDN2NUVtcVhSK2FNTE52TDlUdVVZWXY0dGpWUlpyd3dU?= =?utf-8?B?TUU4bmVMRkF3SzZ1YXRGa3U5RXk2ZG5GYlBXdTRTZmdmY2kycjdZUXpVYkoz?= =?utf-8?B?MktmNlFUOHNJSmdsUW02ZTAyeEpKajN0STgrTXMvWEFTQXRVSE1DZnNHY0Ri?= =?utf-8?B?QlVBWS8zR1R4MnhLbmxkOWpqckNXUUhnNHplQjVVcXYwQ1p2eDI5Z1FtL1Ns?= =?utf-8?B?cmp2T2MweG45aGlqTk43YjlQcGZ0QlBkUVA5VVU3TFYydkVTSVVscjBlU21G?= =?utf-8?Q?7GPs9AJ2U19frnqIQd0/xHKgxHtYqJG0qzO2f4h?= X-Microsoft-Antispam-Message-Info: ZH+r0zziMF+mCoJyZA4VIKDb42AILh4sEF1WDfJ15eWidsLdc/c1QE1Xg1a/v7ckJR3kPt8rwxLAhE23iogGZQsp1FYiI8wdGGfb+N5Ou6a8A//1STtnEk477NU5FHdZ67vVEDOLWX6FoouKXdLIEIa0KweTR7eL9fDfE+jfwYdlPwEtt+tbECliQeCLgFpsLM8D9pvDhKcpTUM4BAWlNk2gIXjLlfPIiPNOmLnOAPJN5vfNlJsxeQt/nthfqqD6oe25c8KsMJkL9kquX1MpnQeCHC8le3RVk/tCZNvR3H+IFXzs+DB/FOJ4jsYdxNYWdHXpD1/VAgnCf3UEFnfDP7krpO+fju4LSttdwUEZ8o0= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:10jz4i3SVZieCF+DD/RDaXQoPTERW9vPajQGgfhgXIlpr6+QD0GXMWcd+qsgRvpatqvEsvJBRI/PUAht7bAzgzVzvkOLgonT4Mjipb8BkGoS7UzoWlRsrdfqSntoTx/t9NOHDXHsLaYxgAGGNj4/e6W1FntJmrrJOui2imctedngof7iun8+0Ucn0j1iRmJzeXC/1KVR1e1OAgdsGzM3zPL3MLgnh3EpTRIwh/nafRb6yxSOZ0M0x9HpmecL8mQDogV1bDYno4H2NBikKPPHj7RDvBauEVoZCvqfFp6AiDmV+/YI9NNI2+GUqGHOh+1KRY+BLauth9bhGo2r4EqT0GtcpEwSzVh+mczEZ7iFpcRoWh99LPkN9iBZSyZ23HIm6MRKZyjKWsJy7QkcISSCi87nTvNibXddnan4oJw5+gStVGMHdfSbDQmiVuVAU7yMbp63GjGwg317gxn5B+lHeQ==; 5:R8ZJJ53+ZyPoj7UXRMtg5KGqSbEPmIqP9PJnVVHMXsN3umAQ9Q08xDtGGC6DjrUGNPUGTyI9VFPHCqZp929zFZGYlmKobUHibfZPM1+yfTuYBM4UXH3mEYdlhFp/Y/uQcsDQjDMIaAbKHAU1+aJ3qPeba+O4WEnGF9oRGrDXQBc=; 7:P+tqoOlU7Sj7xCBj7FmGHJW94GUNgb1mZvmZ3+14MJOOZdPqvBhfAN+qxqgitwjp2vTRoM+VvTGpXH9i85L7gSodwkkGYBps25jW5CkS2gq4RQhJ6Xmz5s7ZcYMrYhBPSzp2ldxwT21v/TR7yZoFm/wQ6hbfMj3bLXf6BGwP58W/JKJgmz36KjYGUlJBM7pgCl2FYieWzmXREcKaOLg+DQOD0fSiEA48CSWPJcUt+V5DvrZDmJlj2qnGiESneOvo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:Mwfx+SsCtcOi2W0Wen18Lt9jjZnVaU5VKpSu0HRg2chFZEySwMnJCws3INkggNOvh+JV2VczAmTbwnD/VzyFfyNxnpF7i/DpsHD7TiAY4hLtj/Wjl1D+NWYq0TT9JIMm1INkdbDMhzzDvP6i4JFhLhxXuXfHPnagEHNOS3QzyE4= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 22:28:07.4859 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e32068e7-49b1-49e4-a7ab-08d5ecfdbca6 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 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: 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 16:38:28 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 1531953196105883.8627551075682; Wed, 18 Jul 2018 15:33:16 -0700 (PDT) Received: from localhost ([::1]:38507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffv0U-0004oC-ID for importer@patchew.org; Wed, 18 Jul 2018 18:33:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuvg-0001m1-76 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffuvc-0002Fj-7j for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:16 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:59721) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffuvb-0002Du-Rl for qemu-devel@nongnu.org; Wed, 18 Jul 2018 18:28:12 -0400 Received: from mail-sn1nam01lp0112.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([207.46.163.112]) by ob1.hgst.iphmx.com with ESMTP; 19 Jul 2018 06:28:09 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.250) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Wed, 18 Jul 2018 22:28:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1531952892; x=1563488892; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=T6Zm0DlzjvQcgBdyKPOoYf42HOpFNdT4t1vcQcUxe10=; b=PpNVQn5l3Afro6QROEvaJQnhitTU2qPD6AtwyVsuSkiGbMu4nbGFgVEt TZ0yPdWM3WdejjYJbUMgfrDiiFZgGGqL/wtcNgLE+XzjwBqDYBI6phHZN F/NZHJIAs6OrQcFTMn5AJx775h1Ph/obFqkO2kulgDI4JcFc57rmOpPwr BS8vg2jShU6xztjBuvlufqc6ACWfUDT9GUOa52xnRRXb34Pogg3lpw7Aa gotCfclTOnitwhN46RekIs8MaSWzIEi73lYJXEc6f9R5bt94I74H0lI7f gRSsT4Z0h7s82pksJVAARevdJlFuR2v2b1yV4SSP0L9/PvgSb+st/6XuS g==; X-IronPort-AV: E=Sophos;i="5.51,371,1526313600"; d="scan'208";a="85113750" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N/puisSH6pVR1qO8vbYaBpxzlFUQxGm17iufVpc4uEs=; b=Kje16uPzk0yxbAgYdQiJCp4VQCKioN5qtkQFRa5qx7CLJyRimiF6hso4DDbCSnI8nobZQXvSDeSOueO7FOclJz7kXwm5dcOzxxeV5bLbBgaLd/JOxUNQOAPe/fS8ZC/ScMG00FB9zlDE1wXT3me9zVWRIMAlpzKlcc8w2sUp2W8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2018 15:27:54 -0700 Message-Id: <20180718222755.9014-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718222755.9014-1-alistair.francis@wdc.com> References: <20180718222755.9014-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [199.255.44.250] X-ClientProxiedBy: BYAPR04CA0012.namprd04.prod.outlook.com (2603:10b6:a03:40::25) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78f22e8a-889e-4da3-153c-08d5ecfdbd13 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:IVCZjpVIK2f5iRuhahFKfnA30V7RAeFVPuDs/CmFfiDTx6Q7kGbWkMsCA3zwztaZ0my2wztKSsn7B557akW+fJjhAKZg4oYXOcBFW1jqFRHTXkUTN0dtZTDfeF08p3vJF8v21bZZStRDlxgFF03MKJ7L7bZbzxpBkz7858V0KV5nDr5L1rtpDDyc6iY+xGkO42hnxKs2tqHPyZNMiUp4khd89wVebikR/bKjjEcOQCVAp5G0PJyisC3mH1AESMZS; 25:FMz9VBZZOM6Ap6OEtavxJvmRWfxMmK8RfQ8Iw3jjGV/MJ1FJBzvEv7f0Yjk/14mWGp2iHDHjZM69+8EAu3W95ZMtZueAi4V37t0ZRu8kiMzxlzKlH1/8D1ib9f5pUZTmTfh3nnZmOEqT1x/JeWtg2vzB5UBtvE9yzuyXSFT4sLjZj9imYynaIlxvjondh+eootSjq6mjlV5foNOPyvij7P7aiYJJ88vru2r/aQwEodRN+Z0gL8lIluExONOP192ru0Bj8+HRq4BOcMtGXUkXsWYzXwhP05FJwVDvyDMS0gMwecBRx+u3z8LUAi3W5wPE0wThevlDiIbGjbVOLR01jw==; 31:e9nvjMzW5CPbWoaL+45xVSVCzioNPPwNudZHcg0d01jSNkgFNpFP9HnGQt6boJKdmQDn2IfD+vw+3UjztXuijl0pDCttWM1bI7HLQinu7trziAb3LshGFDi7jh9VPMhkv0nev896CeZE20OFuMavQMIJiBPWAPR6gW47WITFAB2CpJyMA8rjdaKJzH/cImdOuBzOU12H1SzzgBre+h2MPfiWcF9kIEuGgElHjcOY8XE= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:7RKkAWJTJ+ZVzE/8Hk3Hjej9bbI3uHsyW69BZEWE/sF/NDKSkEfmG/a419Y4vxt1ILr83OFnpTmdKxAmSoiBCpiiOf1uP7GmLb9SvL6bdCu60Z3rkQCBppbbp6xjAM9Mgp1GAQT5QURebLMo//2sLg/5hZ1jD3qCMvbYenlD9CkooCttpxa2XEIv/Y2pCyXucsME7n9re6rmqWTLm5k61fh69ZccmzsMgA+tOC3W10HZOCDH/HjxYd29gDxmnb90VqJMwrXlivmK9rmcsexcVVjNwCE37Bo9BVtB1HoIzzvNi6VRbXnLFe9cRWlK25xuouT4yN4CC8S+fsdp16SgvAvBMHr6htUAVEKA8A9JctOczwMC9wV8WxLNggZGRhMtIwO91sMyim6F7QhMFpXY2gh0upmLZ4dFYUMOMEi/AuP0G2eZBpGOvo0Wt840vJ2he1ClwCk6F5v4MN8+09fau9B9h+FbhFJcV0V0Ewwi3rFTduugCFz1IuG2qi7arcFO; 4:D9FVhQPZp/F1OrRXrtBqppXKFiXLMwfoSSkiwfdLRq/S4vJ1ANcgoulmk8GQdA1znQv09+z9s9n+Jidd7bWSb7F1ew9FGs10NVrDs+1ard+yueai0/x74JoeEtWILO+mwlu0KIuPcK/0w++Nli3GJzfwPZzn9CKc5ogqjNWK5hcRqYXi0cel+LZtOwf7eLKYJSpr9JYRsZUKK6Bgu8Po54BIOPUj6Qdm2PcFULawskM6e3Y6uqU6GOK2JyPV3446steUYy6p3nlHMgrUmXndfA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0737B96801 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(136003)(39860400002)(396003)(199004)(189003)(39060400002)(11346002)(956004)(97736004)(2616005)(50226002)(476003)(5660300001)(486006)(446003)(66066001)(36756003)(4326008)(316002)(44832011)(106356001)(47776003)(2361001)(6486002)(2351001)(3846002)(6116002)(1076002)(8676002)(68736007)(6512007)(53936002)(81156014)(105586002)(50466002)(25786009)(7736002)(305945005)(6666003)(8936002)(81166006)(52116002)(2870700001)(23676004)(76176011)(72206003)(86362001)(386003)(6506007)(575784001)(2906002)(16526019)(26005)(186003)(6916009)(478600001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjA0TUIwMzg5OzIzOmJGLzNmajk1a2xnekVSd0FTYjRmTU1JQmtm?= =?utf-8?B?S0tDWjNsNWZreEIwbWU3NktjZnp4VUdGb1hRLzlwM21YOFcxRXIyVWdOMFZL?= =?utf-8?B?U1FPL1NUWGJOK2ZlSWxJNkxzSmF3Z0dhQ1EvVG9aeGZ6a3JNbWxaQ3FxUkR3?= =?utf-8?B?Z05vTzlmRzM2dnQvOStmSXpRczRQOTRhbEx6UmRzT0d6WHJScEFZSmFxbnBN?= =?utf-8?B?akExWnllR0VXaWFnK0o4L0Rua3hPTXRIMy9DSlhjdUFEZFU3RWVrYW1ENjhq?= =?utf-8?B?ZzhHTEIyeHNVTEFPOWo1ZVNKUjYyODJ5UER5dlRzdjFEWWkzZEZpWnZINFVa?= =?utf-8?B?U3Rob3FiSXJVaXgxYm5MNVE2SXdZUkVDa2F2d29MU3lsbEExb1RCQjdRdG9K?= =?utf-8?B?TVBGMlczZk1GYjVXVkJGb1llZHZ5L1V0QjVVRytUM1BwZmo1T2NPcWJWSjVJ?= =?utf-8?B?d0dLTXlwUkpjczlxRFkzNGtDNHMyeVBlU0VueS92a3JhVCtTa0RoQjVVelps?= =?utf-8?B?Sk13eFJlZkVhMnllWWZGRGVyWkFJYTFCLytwU2RYdGgweHIyTU14UkZ2N1ZW?= =?utf-8?B?SW41QTVkNVAyRDA1bVdGcTZSSTJrWTlralBaUWp6QnpGZTJMSTkvNFBHc1g2?= =?utf-8?B?NzlVb1RMRml1NlJzN01adDFNTlR1OXJGeG5QbFVzQ3Jvdmc5VFZleEJGV05z?= =?utf-8?B?N3ZQK0RkbEI3cTVxWDhDTG9Eb3k0elpOcFVDNzcvOU1DdWh4Vmc5eVNyZDlF?= =?utf-8?B?MUVCYzdqT1JqUThqVUR2RHVXVVZsT2RwMmh3cHRHaEVIYXZFQnh6OFJzYTU2?= =?utf-8?B?Q3ltbzhuOW9LNHlNMlJteVBaZzRsdnJGYnB2b1dZMVl2OUhEUmFnNHdGQWNW?= =?utf-8?B?b2RlczMrU21LM1Q4YkNaMmRJNk5jU0hPd28wUCs0OUxLdkQwN2NMSFhEazlq?= =?utf-8?B?RFZiV1JGNG1QdERBNmFnNWxPY0RDcDE3dGxpNVhPTHBjd0k5bFhYR0NNKzdC?= =?utf-8?B?VDVnUVZlZ3dwSDdGdzVQVml4U1VUc3pGL2dIb0cwRzBVSlZIdkpZbFo5THdV?= =?utf-8?B?ck5QVFpaQ21BSDJOSkRjNFlLMHFYSlVJTkdQV1FYb3kxVjRLdFczTU84cm14?= =?utf-8?B?d0ZVUHlXaWlqcDhpaHRGOWpraFhDdEt6WGJwLzN1bStoUkdsNkJKU0o5dWFv?= =?utf-8?B?aDJHSkhoajdKZnN0d25NTG9EVXhZMlZ1SUEvNGptWVNIbS9GSUtUcVBWbno2?= =?utf-8?B?dDVMdkVWNndTMXNUbDc5TnpkYmxaa0tjVnZ4NUFGWWFpanNhcnZ1NUpra0dI?= =?utf-8?B?dGhleFhOZzZnY2IxQkk5YzJxSHVjQ0R1TDlRZ0NyNW1TUWRZTXFkVWtyZ25s?= =?utf-8?B?WjJ2dGhiSmtCMFVnNmJCVGYyRENETWZzNjJCOTBmajVyVGdWQTJISHNyYXVQ?= =?utf-8?B?WXJCMzZxeWFTbk1ZWW5QbG15eDVjQlhTa2R3a1F5VzNoZ0hjVXR5bEo4c2Yz?= =?utf-8?B?d25CRGpJOGdUaVBKYnN6VUZBaUt4UHpPYkJNU1k5ZUhoTkp4NCtMRy9CQUpZ?= =?utf-8?B?VExsNkZUMHR4dEZreU1HOWRPcUVTSG8wajdMV1dIRVg1K2xGcWVtaVVDMitG?= =?utf-8?B?bVNaNzdINUxnT1QwV3AyZDBjaFFCeWpEN20zVXlURGxNTTR5clNXbjZiOVVX?= =?utf-8?B?VWw0a2ZDcjRhc2JlaDZrWGJBNXY1UlJJNjNsREVZWDZjS0tTOG9PU0c0c205?= =?utf-8?B?RUQyS0xqVlE4Y09ScVhTdz09?= X-Microsoft-Antispam-Message-Info: XY9o6hxm1K0cCGqxu3Ubt2JnVR/APaSSCkxShVhOHE0eimFTfzwGs8SPH3+zrKnBYvdZvtjgugsZvx3zEFtUsB/AcN85QZvi+Pl85dJk/v1kDPs9CKqCTbiOqMzfokxu7aj/9fLoFUm0qp05n/TYjslhRYc7tUZrdOiCItU2oZ4b8DgK5CqTjjUOi0E6LhjUruyPWC2oJT7QitElIWPGmzLjwOBmLyE52Gn3qDTbeqoTpRYuL1Bj0N5/LlDqJM/KjWXSg8iFGNnMwYZLXROV5oXvKnh2W6qq2l0QCuoHTEdOQfuF7IQBfPqd5rrCASdRHng4cX/9hroD2amsSri5CU+k3Mi3iYzW2UEfHZtHLt4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:XSBuOPPvZZZO+yObmhAR+yMpLEi1ZD24Mek+/4IXEmBKAztFQC4bvCs6nsi9Hcnph6O7z6UbpdCA9K5m+wRlPi+SaeH8bXxaT4q/VKLNGrVwHNI9OYm1qPD54zoxDDneK8q56WqD/rx6W3/dPKh5w098S+Gll5QmIOg4JI8i9RaI7O76FY2LIbPKT9YC7F6ogERzsEk6PjlltobzpHayYbDNsNqbKYgQXCQzkrztaRHoT0wNNzv8d/BD5Fyr/6BI0lNTcjTdXSd0kEBSCwUFKsmUk/JN2pL6gyd8NQKIFLmpDMEKZz3BKVZWR4hOHQX0iox6uqa4C59q7tgiPFLv2eMwBbYAnLyeRLGRK2qIVc7CGpVgHQ5ml+FHJ27Ew6aAJF3kqEJYoLpXghbDtjPJr2p8sgDGEEFHLUKGt9RNbG3WNWyHpyYoQy39G5lsaeGfelTkklOWsLVCVrnnvGeNEw==; 5:wgXWcvDOzDfOaZWz5Tveu1jrlZwlL4Qov0MSsAk24toIZQCVFPbupvXLA8eDm1p3v/QCL4aJPKBTdCvNbTCUr7IjY47E4TIyQlGX1AIy5263hAcYcJVYQ/OmZuU/DFNuemuMg3BnHlnDDclvmaD955wkqdv9auncIDRBRwbnvZw=; 7:DwjW3zvHaJNNaXQKKp09oDap8ZJzBTzVtsdVUAol6zFuI+pHGwcyBCreGbvKu0XgKDB1Fuf+kKLrn3RLSikEkYo+uBglrFG/OK6kvTQ81JQSsZ15Q3CvMgI+Vfpc2ZRUfg3zA/fJw/2/glXo7prAoo/w3FIWc86B+Yr1LX0GBA1FmHbSvN5dGpkJx3al1+XE3S96afV7ZtdKEKexN6joBsH0RZBpQzn05mCYPFywl5b+/IqiQkYVKTHuSp2WUZvs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:vb+DptQE3j6LFFYJwzl3XowKb9qtjaOCbzjHA/QQPCicf4lCLCMcM4XCu1TGdS56hu1h3aTzqjIz5qpnw1WJ3M/2yT2UNpOsYwpcZe0widU3hrP4+ON3QRD5bmj3/nLlKoWkXM+8k9NH2k25rYMfTH7XmeHIfvaKDfG4FnIwob4= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 22:28:08.1905 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78f22e8a-889e-4da3-153c-08d5ecfdbd13 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PULL 4/5] riscv_hart: Fix crash when introspecting the device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Alistair Francis , alistair23@gmail.com Errors-To: qemu-devel-bounces+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: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 16:38:28 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 1531953206310544.2229863027285; Wed, 18 Jul 2018 15:33:26 -0700 (PDT) Received: from localhost ([::1]:38509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffv0f-0004rk-6X for importer@patchew.org; Wed, 18 Jul 2018 18:33:25 -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 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 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 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" 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; 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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?B?MTtCTjZQUjA0TUIwMzg5OzIzOnNiMXNOTVBIbUtNWlJEWkhJVGgvNmp0Q1pT?= =?utf-8?B?Z3B4TElka1lieU9JSWdKMmRBb3cxTlN1dEtZL2NDaVVJT3NLUDFOcHVoQWVi?= =?utf-8?B?STI4bGY1Q2FBT0ZjM2ZZRjBiZGdxWlN0WmdoeFY1WEhRc2FtVC9MSTFNbkpw?= =?utf-8?B?TGtKV3VZQ2N6TFNsNjlCQXkyNVFNWGFrOGFsYzdUNWk2Vlkwc3NaVnN3a0Vy?= =?utf-8?B?bjY4d2U5cjg4c3FlM0w3SDFkUWRBU2RQcFBUY1NPQzd2ZXZ6d3cxN25uYXo3?= =?utf-8?B?TVFzTjgraDBMV05COE0vcjEyNGxzcUtRUDIzTVBnOGhTQW5Uc3hIVHYxK0hX?= =?utf-8?B?cGRxTVRtVHlPVDcxVTBaR1Z6VFpURU9VWjE5WHppY0dxeU9EWGxEeDBQRVlK?= =?utf-8?B?V3BheDJOcGZrQWJSN1hWbnowZ251azFEcm80UlRUVTlnR2huWWlFbXBuK2FU?= =?utf-8?B?MTdVWVdmeUNrREVHaDlrUEp3eTRnOW5ZVHlPdWNGa2YraFNoWnFvaXpackll?= =?utf-8?B?NERET1ZuakZnOGZGVDhBTjBGcDNFSEZVYlhHbXJVVllkTVpvOUVjQW9Nb080?= =?utf-8?B?ZDBURzl2RERQZnlSK2lKR3U2RUgwV1BVb0dBeW5HblNIOUQyVmtMbDdUOUVy?= =?utf-8?B?UEUzQ0UrY2ZYVmJHazlTTmMvZXpUSXA2NThGcS9HOURQK21lZXB4eTB3SXJp?= =?utf-8?B?bExJa2IrNFJDczBYR2paVmZoT0Y4RkpmT2xkc2lUQzd0ck1tNnkwUG43ZCtR?= =?utf-8?B?eFFDbUlDVGpkZ0F5QkpjczVtby82N0lVYklNUXFaM1BnUTNvaWxKY3JkUUNu?= =?utf-8?B?NThKRnR6L3N2WnkvdmZkMW9DOGsyeGdPRHlzYnIwL0EyTEExMmVFZVN2Z1VF?= =?utf-8?B?dWZzQ3pNSklpTWtCTXBTY24xT1VDMmlodDhZUC85cFFMOVRUck1IR3IvRTFJ?= =?utf-8?B?dlViMVE1R1FteVlZNExiVGRGSnhLQ2NmWWFPaWw5K1pkSmpMc3NTSXA0UFl1?= =?utf-8?B?R0orcnk1MUdaZUprR1lwZjlSbktEVnZaWktQWTFMdGlCbE1meHdDaHgzbnBj?= =?utf-8?B?UEt2cmZEZ3E4T0V0MkZwTDhnRTNXcTZUWWsvaFFYNkVzLzQ4alNhUHkzS3VV?= =?utf-8?B?VU4yZ2V1WDJwZmpZamxCekZqZFRHWEg5bm9DNGdsYVNOQjNza3BjSEMrdFNM?= =?utf-8?B?QUh0SitNWTd0UVJpVWk1aWFtMEpjNEVCVGUyTDJyZUtRUkl0VVpNc2lmZTNF?= =?utf-8?B?RzVFTW9Wb3diUEE2UXgxVkRObGM4WU1FZ0p6ZFUwOEV5cmsyQVl0MzJJVG56?= =?utf-8?B?aFRnQjF4aWc3Q2lFMjRnNEJrRUdrakUwNEdlRHkzd2Rwc1loUk52NFBVNlpV?= =?utf-8?B?S1IwWStRYVk2Ky9uSkZkSnhGMXFYYTNNUG9KMUNxcFRHSC9WUkQwd3JmL2xO?= =?utf-8?B?eER1Q3F0YTFnTmVvNFd0cVlJdElIVzJrdm9Oa0N6MjJNOFZZTFMvc2pvYmIx?= =?utf-8?B?a1JIc3FHQ2s3alJ2Qlh5bzRLeUZWWFcxM3RSZ09XZGxLUHdzdTRsTGxrNDBm?= =?utf-8?B?OWVlRlB4RlVuMklrVU9Qd3FvdTQvK0Zwa0ZNZndQMXBKMSsxOTdiUmdNV2xo?= =?utf-8?B?TTRrQkladE01bXdsbVI3R25wckJFc0NUNmI2NVVzOS90dTdXdDNndTl2TEo0?= =?utf-8?Q?ROXxJfylE+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+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: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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