From patchwork Wed Jul 18 22:27:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 945946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="BwAG2qns"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="mPqpyHt5"; 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 41WBhr6684z9s4r for ; Thu, 19 Jul 2018 08:31:56 +1000 (AEST) Received: from localhost ([::1]:38504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffuzC-0003xM-AC for incoming@patchwork.ozlabs.org; Wed, 18 Jul 2018 18:31:54 -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 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" 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 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; 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 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 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?q?1=3BBN6PR04MB0389=3B23=3AKycJ?= =?utf-8?q?dniaC2OguzIuPKEhNgvD4l1ye98kmy0OIkGNbe8ts04TYLtI6WliqdfH?= =?utf-8?q?On4q9njJdoc5vcHDZz2W46/H6qt+pCnRZFKd6xU2cYO2firrBfhoe1M/?= =?utf-8?q?LHbTI2uX3yNsciudmaJwbMmPMu6fuCfk5SNyLYlB5MKnG03BCp9dWlgh?= =?utf-8?q?iuYE31cGmTPA9AY1mJT0JvhBQYUyYv5hO/qO4yX+Bhd9ves3dufV3NB+?= =?utf-8?q?7sGNXlVRS0Nx4dPAxQNkQ9ysQe91YF/bjfU9eFUf0N4D1O3DF5oWBRsn?= =?utf-8?q?cRonevHuMJQ8rCnaUUZSR31TjApHZmz8S99h1P0cMtBI7vNhHuOoe5hJ?= =?utf-8?q?glC4qBBhgzxi3wX32TeVnDcPIsnDKAd/grdufjyHtO5kycksifwGnbfB?= =?utf-8?q?juB4NPETc5bXxYxB3zzp6PKr5KXMTjRlJa9K+MB4FXE8kzYoy4Sz8WWa?= =?utf-8?q?eUKPWmrLxpNib4FZ4dNhOgvAVHK5DraP7t0nGwtRrDmrwyTz3Um0agIG?= =?utf-8?q?mHzejFwxTruo8n3hMva3saW4qQ8uyg82ZwHWohvXp3qYo/nR6+BU2LIq?= =?utf-8?q?56qfgqmOcEIFMXSH3ANa2oWgApr/rN1ZjveRHxTT/cfOpgoNz5HshgBX?= =?utf-8?q?I2fa57jcQgC8LF0LV1QCw0xHP5dTScCR4D0UtHL9GMlfXqXt3dUNsNSb?= =?utf-8?q?N0QjxdR3ieRhicVilZJclgdijrmL7UwNG3dFMSmwDLSgFQg1/39gG4SK?= =?utf-8?q?S8yagRdBfix6SbUQT9vnlNQXqqP6V9hghYvMSiI6kbpCiGxco1UP5MKy?= =?utf-8?q?LmMm3kO6vRj1qrDiYuhF6N8R9QgMBmmO13vt7YXFXwkGNGcRGGE6IxHq?= =?utf-8?q?VOVe2HScPyjVjuSUiZXeR4qsqG5GWuh/4UYeLL/qEaEtu9Y1Ed5R637k?= =?utf-8?q?B5XvgzVOn9FU65RJuI1DKsUBhBZK1GbtJuJAKF/Dq/T0Jf+mOf9pWNpA?= =?utf-8?q?Q+iK2iDrSjQ10aZVHDnxzZmtoJKRbGWD9c5gdmPPAWrHBdq1Kknx+dqT?= =?utf-8?q?oDQvnpgA61RwTvwBL3v5EmqXR+aMLNvL9TuUYYv4tjVRZrwwTME8neLF?= =?utf-8?q?AwK6uatFku9Ey6dnFbPWu4Sfgfci2r7YQzUbJ32Kf6QT8sIJglQm6e02?= =?utf-8?q?xJJj3tI8+Ms/XASAtUHMCfsGcDbBUAY/3GTx2xKnld9jjrCWQHg4zeB5?= =?utf-8?q?Uqv0CZvx29gQm/SlrjvOc0xn9hijNN7b9PpftBPdQP9UU7LV2vESIUlr?= =?utf-8?q?0eSmF7GPs9AJ2U19frnqIQd0/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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Use the new object_initialize_child() and sysbus_init_child_obj() to fix the issue. Signed-off-by: Alistair Francis Suggested-by: Thomas Huth Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/riscv/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; /* 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",