From patchwork Tue Jul 17 20:28:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10530571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5630C6020A for ; Tue, 17 Jul 2018 20:32:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45575287AD for ; Tue, 17 Jul 2018 20:32:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3735A28AFB; Tue, 17 Jul 2018 20:32:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1B58287AD for ; Tue, 17 Jul 2018 20:32:25 +0000 (UTC) Received: from localhost ([::1]:33167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWe0-0003Ml-U4 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 Jul 2018 16:32:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWa3-0008Kh-Bi for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:28:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffWa0-0005Zu-5b for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:28:19 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:30194) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffWZz-0005Za-QB for qemu-devel@nongnu.org; Tue, 17 Jul 2018 16:28:16 -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=1531859295; x=1563395295; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=jDJLdIUeOKD7i7iiFffCsR0e5J3dHUow6GiKmrp7GHg=; b=g3QRpNOOGbsgZU0LY4tmHtYgbG2RPYdU8UfDDssasOmb9G+ygRXr9QJC eJ7BMbMZSYzbDtZCTvqes1jcnZZQPnoLUsZHFmWVHRM7raoRfg/lOkFeM ThKjCbpsFsNb8ew7q63e71RlwFoxJuFst7BqncXqSZCmApQfT/RRZUdql p7T4PKCCwupesbdwCFhQoZxycloiew7xWAuRvgfz3oAptcIVW6AjvleY1 PHe3pLTH5CtZ5nuRuFVVY2kGbRPxfJdGUrVtIlEpNofYq4turPBSLv+qx b8BQp8kf2jHXBUKpkEMX+gVV8TRpXHyiUwYrpsowE/gVs9qM0kPA3Trfj w==; X-IronPort-AV: E=Sophos;i="5.51,366,1526313600"; d="scan'208";a="84985451" Received: from mail-co1nam03lp0016.outbound.protection.outlook.com (HELO NAM03-CO1-obe.outbound.protection.outlook.com) ([216.32.181.16]) by ob1.hgst.iphmx.com with ESMTP; 18 Jul 2018 04:28:14 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pAQ5Ydm+BosiGpJbnAegorjRE5xxs9V5E+KUOpHoTJE=; b=KYqJVrKZggXsBnlvqjhLnSepj+q/bEu5clVdxMVsI4dMXW0epVVqplFG/6y9RBWz9pPnkbD/8LdhLlgEwQW3TOCEQTps95IsBMiAeg0Z5iLiu53nbpwtm9GXnnroiTVD2muUbHlV/BT0Pf4vmp1K31FJtyAz/BYfNDfDlDx8UVI= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.18; Tue, 17 Jul 2018 20:28:12 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 17 Jul 2018 13:28:02 -0700 Message-Id: <0f2b0a7a0b3565525a8683ac8fe65f44f734ab19.1531859179.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR01CA0021.prod.exchangelabs.com (2603:10b6:a02:80::34) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b231f19-3642-4541-2053-08d5ec23d177 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:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:DSOEDTs5o4Tm82zUQHjPJHujE4ovlQmTGNMCGVzuoqP1vNSp70Ivvy/gAPqCpTpfOPuoeLrgyN7FNFl8fvvzVw/V2WI5H5GeSD5sTJASfA8q81kc9G1unPmClwsu+VEix0K2aYxsPDgTMkK57IRoty0E7j9E/hxE00O3T2HFJMVoZM4MY3MYvPrlnfu8EC2VpXKRCPN4nM9zvUAjmKPaVqqbT3EO48FyRUnI4foNDDssLn3Vd6mygPV3o5Ft8OQC; 25:7nRT96nwaYpp0sCaivYr8K3l80m3yWlaEc1kwzbpo40GBkSU5fLAD7tmsbWyU9IDH///nJuVLszC5NcV56gd95Ld689qqFAyAHryt/H/mflI61YotMXf4ano5Q1w4WcAJQrw0sZKtFxlEqbIcK0gflURnAPKuFNjUia+3wlWMeSuocy8mmgxuY1Mip3W0lPTt4TQNZd9u/sws4X9TWkr7Zcni2QMU3K5fTdmOdKeQpXFZKWeGurnZi+sQJK1Rf2kx1VRAhH+IS3XbLo0rs2EX6PASLDI0axe9DaGmRquHBp9V3iH1fn1O4CefAY2cQ+PYBLuzab3REfwMm9HDYYQzA==; 31:/ECFwMQj/MepO8UTCl9v697SkwBiyPEsz6r8gYzlhy9dxJ9sej9ZPuMJkyQfbwcaElcnswLrgIr06YorrOq+Y4pxReC7t5sR6lxs2Mhp3onTi3iXIx/HJotDvPm4BmX530kL+h0yw7zHYXMsxP+6JGXpzfXOlCqEzRBLyu7+fX8Vda11T5GV7KQYQ60yIzS84UKKvbqRqPVAidxQ/6XWOpdOepCF9MIMHXFSdXT+SRA= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:fnUUkH61nqFYdhe5sQ1fJgR/2nMOPco9AfAYaDvZoNc/Q9toDKybeiGZmDiZ2kI+7cIlPOfUyH563C26ja1HEtK0H+BC/0jj53izhWhUqNwOgJccie3cNbyVgVz9MV38oTN6Y6mYntc+fu9TaXCK5cBh+yiu6ivbDDZTN8N7USa5bgKym//LoqxyCyYRm9IiFT/2jFXrlUT7cLIw5yjWgr6eOKd7MxrfwUaQcld6HZ57zhFSc5wCOyggWCFURi4En43y98fSVZti5hMGELHH4ErP+PRzmpB5584Wr4ls5Z6zSjcvGG/hlNDsKJmykvwVTBhqgASxH0R6gKLjko0NUascNKyuihPQbsY7YLf7shCvlptRe5a8WJWrF1YjoIwPa2gODSzlk7s68TnH1hE7gOD3J2A7U8eHp3Ot/wzR69//WX3EaqrgwJCjuzXGdn33JwE4rmLtKaXi/D/khmuAounGLjq5f6OU/mlJQwUBX6yFP0njpFFxTncJEHOVTIEH; 4:ttxGgEszfUKaO5IEvko41zI6ehMT7m+svtS1MQGkRf/kdxM1LNizfmqHzwNYLPzAYcFIe+6SE7dBZopd7Y6MVLAPxHISYIXi+mym4KU9sYq04TZF12oLSCZtRFIfD4269nn7db8CHWEtfsLcKg010augpkah7kBXi0KV136w3c8ijElqkJA8MBrYnRYyIGLcA9j6cNmTXW6l3t/wnR745weRUVhEF3AfusNtChqFt6qZ9oCTglkYdZOTAGSooSvvFwM6d4FgqrdQc+G/z1wc7w== 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)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 073631BD3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(136003)(396003)(376002)(366004)(346002)(189003)(199004)(8936002)(11346002)(8676002)(478600001)(66066001)(2361001)(486006)(446003)(48376002)(186003)(81156014)(97736004)(72206003)(50466002)(26005)(956004)(6486002)(25786009)(2616005)(476003)(47776003)(386003)(6506007)(4326008)(16526019)(81166006)(6512007)(6116002)(105586002)(50226002)(86362001)(51416003)(6916009)(106356001)(76176011)(36756003)(3846002)(7736002)(305945005)(44832011)(68736007)(5660300001)(52116002)(118296001)(2351001)(53936002)(2906002)(16586007)(316002)(6666003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:3BkbzJtaQqQipNB/VGcnux95XrM0hF/GajDkBz38u?= =?us-ascii?Q?7jEuk8rQZNwEdJD9VzyK6zwN6u+HRmdPWyjQfVVm4rIN+gJtElBscB5NzDz0?= =?us-ascii?Q?zqs13DriOZfRhQ6UAVjdDYXlCQzw9PndycFnGW/I7haTNdQgKPKi0kGeZ0tT?= =?us-ascii?Q?C3fsUOx2senH02BTOex892VuWrm4fsit2e+xkM0p6MQTXQGGaY3OK9JnfPNp?= =?us-ascii?Q?sRTRrbp/WJihqjMWofzNt5cENd96nzUyTL3zzpa4AlqBzYyajbrVv0p1fg9N?= =?us-ascii?Q?moAr4xajRPoZ4gRkQ7wVEldSloTwHZ3QBQ/Hlog7w+KYRNZx3oYoVQDkh9pH?= =?us-ascii?Q?MPyf04Rls/tGrQ88tQ9RZR26sWkj/kIgHHCXBXSq32fOuNaIRR2nXY1+Y6Mt?= =?us-ascii?Q?DwQQM90f3Et2ldR3urevOA4L9zxJ8SExL/H8xDaLDjFL249XvOUKG3Vkk7qS?= =?us-ascii?Q?n67gbz1thHr0PSkvDeNqCi0NEI5YF8bdIuZZg2xmminPJSvI8OxHp9pUs9sH?= =?us-ascii?Q?unjKA2RQNRo9UOo5C9kMYmYeL3PuVbrkluiFpdfYg46HI1ZhY9eh5BrvVsuH?= =?us-ascii?Q?qCv3cHjVa7WW85zppAFdHZUKi4AB0utG30liAiaQeK0ANB23VJbOaazOuDoT?= =?us-ascii?Q?9B13NQ0oc0A7FzeUoGEIEexQy6kXIr6gdWui4GWbNKvoq90EttxTrOU+wyNL?= =?us-ascii?Q?FlfzW3uO63/pWlTGOh83F+7ah/vhxZ6KCxkyLmc6y5tHKxEqiiVi1edqLZxb?= =?us-ascii?Q?262Ths7pRm+nuZSzHBG7lgawS9nGtsk2D1kyfUKxJ6fZ2I5Lx7XRhAFBiFAL?= =?us-ascii?Q?bqSAzEuo53WOGHQHdIoodCZTxIYI///57jrDWKq3FSmdOfXcKNyJF2HfHWt4?= =?us-ascii?Q?rb2ae4d7NNyu21wWjyQ4kR4qffV7YZR6VrfgB+NbE+ihcOa7vGw+O3zFuyPc?= =?us-ascii?Q?+U97n2vFpmXxx8mw32PO7oOeG5SyHlD7kF30ZkcAk40YKPj30vAnwCunVYF1?= =?us-ascii?Q?Qc076cVEbpZcrjbxJtKv1ztB9XONXAnK4tAbJS84FqkxnBVqWcL6cko7l764?= =?us-ascii?Q?zlixhUBvS40yIJ4JC7BgCbkbomgVZpvxgc355JUJHiL3PNmujUVuqzQOj6s3?= =?us-ascii?Q?wEd2ZpmNGl50p3UotwdfX3utBW+GBL9iJpEO27uO+kZStatUHxbiCGUbhRVZ?= =?us-ascii?Q?xLKat3AqqYrA8c0QnOPjka6zQeoHeJOX6CqEO47DpxOOr9HyfcwByETi5zKo?= =?us-ascii?Q?BTFQ/qVtt49LGdss2wQkZGEMyMAMedFP/ZkLxCX?= X-Microsoft-Antispam-Message-Info: fuN436gZXn/6nAwRDBuMQwHRG0CjqV0+DHIzZTWqCYUzI+AorjEXMM/NF6cWcRQqpcJxJqIdf9HeJs14UDZKFAdZ/H4DF8xATEtJJErbMATQ7rKO3CnhTzNueLwYHWcukVQmnEOp4l2M+jjDgTPBSZLZqndZf27SVSlaNO3CgfcGQpSG/eAOIlNUHofF7qr6EWXzJ1s5kjPwcL+WuNgvi7nr+7ZAKT4nlWzWoT6PLhQvrtB5wgy0/S0Bdl2Do+pmVyNwSyvRQi09eYzxb9VYjRL++jNWizeKKI/6Mw+pAg9XD93syhBYOYsvxSZky5VxQl09u1fmaH0e9iwhrMKOs4osHy65b69tZKvIQN4eccM= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:IGn2/tFsRrxGkPWBYT7B0TlL3g+mYYonZpye7isngSXjPnnBzNMTvPtkfKyM4fXUKtucyoob8zRarlRlP4Wg3GKIZY2vsGCpu+EEmKZWUUfgEH6jOSKXsvPEBEf5+5QZT36wGWyPedFxs3kTSpE6N4XHz9T0i8oIy9m4UuU0DTR44N8b0oIHUscUrrbrIkf8BppLRGJcKjk8gQQ6TZlepX+m3bh1dFvkarH3gj8WwSYFJoBaw5op3F/qk+GFfQcUPNqsjLLtOlVsgqlATl9BMWj/tkXn8KQiJLG8rHQT80o1Io6xixR7MEYeHoC+e+mIzB0fGwQ+b/rhEEpPQnB7E7z3DVU3hBonwZwVoij6iuzGA5VW4sQMIAQQnkR2U+Sj0dAU9TAJGZ1S6p7EU3t9gTLEifHwM45hEfc3Q9dUHNJey+2rj5F0MM0gj5POBviU42mWBGUkM3QLR3pQh1M/GQ==; 5:vHahx/xbtUT0IYCIULd45T2EJG5YK/4k2i+Dv/dTKjLBwKaL+/EgL4kYb4I/BCLt0+I8X6iog2vHQAVddr8z6oyzsylM8W9HOr0v7wA0Z1hpWjSudG9qXiNxLQQjVojoNYZ0tyeHK58qHgeWw9V5nPjBDI2Igam6jCvtBh9SvfY=; 24:tqGenCxTflxuUa5WENOxgRtNPDRyH6kkSlY2CouU5Xknn12SoxNTmdU0PSd1TwWhDnQvSYq6d108C4fplPQjoE+70OwtAkdR7W4L9wpH1aE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 7:gA/AtPgF8g2TT9mSYxaTHsy4fPK30m3VCr7nySH3Is0NdDfCFxlOqQRzfJOEwQknf/q4xnhUyODNdctgSJrI/r5puaP5lEbU+oL8tBuK77vwhyVo5FauNO9BcCWCHNlNWB+M9aU5Q37oDmCGYRF1AsFHtoK35dSjEuV+3nXvhCu6MJaDKKhRGNwDABXl7SvYzuREMIMgdxyZfK/d0k1/c/V2qvkxtLNQv0kbhAXFRreEeppSmYrCxCvMDijDEoZ5; 20:6KOmnbJgT7oKpUadX32JTJReqbuaR9kQ+dlaEytCDQvk9GjYMo3A9vttB/bmvD7Q0Y9aJW71d9QZT6dEKXmogjiqqT4o3NSZNcc/daq7SbswPzCPDn0y9J1p6G0rHTBLv+lvyEUlDXvgB9waHesKXgQ/T5OX04AImuJ2HW1Xv1A= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2018 20:28:12.1175 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b231f19-3642-4541-2053-08d5ec23d177 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v1 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: thuth@redhat.com, mjc@sifive.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the new object_initialize_child() and sysbus_init_child_obj() to fix the issue. Signed-off-by: Alistair Francis Reviewed-by: Michael Clark Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- 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; /* 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)