Message ID | 20180719160721.18430-2-alistair.francis@wdc.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="KP4rHhn2"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="gHjLo0O4"; 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 41Wf7s0L4Gz9s4r for <incoming@patchwork.ozlabs.org>; Fri, 20 Jul 2018 02:08:23 +1000 (AEST) Received: from localhost ([::1]:44054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fgBTY-0008E2-Ao for incoming@patchwork.ozlabs.org; Thu, 19 Jul 2018 12:08:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSx-0008DT-IX for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSu-0001Gg-CX for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:43 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:9871) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from <prvs=73156a1e4=Alistair.Francis@wdc.com>) id 1fgBSt-0001Ew-Rq for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:07:40 -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=1532016461; x=1563552461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=klDnpqWCqWdYiCpBvGQh3Ar5vA3h1St9W278eAhHvc8=; b=KP4rHhn2h6DLSKAviG2Dz45lS3sUAzquLDt4gSzX9AkKU4wKwopuepIh P85ZkZMwG2+qduEzSpsxxyGcqRSwVsQ8jhv5USebJMjWogihg43836rqN uzNzlYWvAUc2DpK+zw0X8znLftLsdnHtyF6uR9nY8ZkDgjUxo3aUpqNks VYAV/ylx6kjtdVNIG6KKizgvCSeLZO9w1jn3+Q+NrMhkpRYKAJlr3KXx/ 7kO/oXSNkbQ0XKd+Mqn4/64sjBPXhVv287B8flMez2scg9O7oWfJcS5W/ vgACmpMLzy+SQxPeKp9jRdOLcgvHCvcuDKBy5QFLUn2ZZCyuXHFsfPYG1 Q==; X-IronPort-AV: E=Sophos;i="5.51,375,1526313600"; d="scan'208";a="84429919" Received: from mail-dm3nam05lp0119.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([216.32.181.119]) by ob1.hgst.iphmx.com with ESMTP; 20 Jul 2018 00:07:37 +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=ElkLkZKT3SwieL+jCLpVH5mX/tLRqz5u31wXxlHSn3I=; b=gHjLo0O4DqxFYmRQugvgFzCUikLwhrQt5hOHow8LkAN0VtjNqA8c/lm/9rmRJWLdVnoFiDKdLHjB5nS1BP0f4Ac7ZGiGfx5QsLPaFQ4uPdNijH2/ni5JmOUOq31ZqqaHLH9qp7bVRlunGyLrQDHXFxrC1P3QPA3XJuI2+9CAxho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by CY4PR04MB0390.namprd04.prod.outlook.com (2603:10b6:903:b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.19; Thu, 19 Jul 2018 16:07:35 +0000 From: Alistair Francis <alistair.francis@wdc.com> To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2018 09:07:17 -0700 Message-Id: <20180719160721.18430-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180719160721.18430-1-alistair.francis@wdc.com> References: <20180719160721.18430-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO1PR15CA0084.namprd15.prod.outlook.com (2603:10b6:101:20::28) To CY4PR04MB0390.namprd04.prod.outlook.com (2603:10b6:903:b1::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc3fc799-8f01-470a-92fc-08d5ed91bdd3 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CY4PR04MB0390; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 3:949qh5vnhv25K7kUKsZVEnLBZmUSzHLfLzbMPEx4unfZFG+lHV9BiYfz3jzhwMBPI9n98LtmBEf8B1gQjIJLRm4O8F8RaGQBKzQlfJfuIRd6fvYlDmE60/Jr5JJGGxoCTOxI9P63POV60Dr/0ziPgbpum/T5gvr6t5KD3IRkDEAuMEiClx04t2cgQzfDsybVYkwmnYzcTYxfXDSqfxPLD5sIq3HXeUtKn1TXLwwTB8lQLONCjhPw/Bs5vZuDiZPU; 25:Mh7pJITQqSPWL9yQUrhzfiQtOq9v7ahqmGU7XuXLrJOJ3fs6wN5xgs+J2eYgCPzTn58YiP/W1lsNE8CiUDms/2IWKSMTMYFXlsSj2cWI/gLn194YpSlL0vE2oufY2bseF518yI6dx6o+sUGFlp/ZwHZcULtBaviZL/vViQlpBgh1QE6gE+xfzLFA5v0i0yVHafXJSphAb5Ta0VbvhX8IphRXcw/gcaI8ZuqVwxwEOkGGjF3h/yLkoMSrMr8A3UP0JKogTzW6vDaVLja3Gf7RmpF/k4sLDShtldxWV0Oz+ZNq+6pvyD/4/v5QpqIxHXcPp+Rjn2y2Blm9GnlkbXYwtA==; 31:uE+xvPsdENDowFJyBJYWGvjmaLZzWdVUtzlvg9oYF79TfNQvCR2wZzODpceenn+5oubxsP4lHK02IosbChE3kVrI/kCkq/E38ilHSp0BuxGV8o9O3mDzd5Erd/Wz8mYEhK4hISWxehD6EMr0vWJIYk4Bh4xLDVdP1dA+YmLuqw8NNlRWnmgl1kfk4YKP0x5JfMb04D4r0MD14VMGPSAZf4jnQWvmvOhmRjhMKddO1Ng= X-MS-TrafficTypeDiagnostic: CY4PR04MB0390: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 20:B8r41BAtIb3+BydfGcxwP+fYMoM6QXrpAPH9kViAn0+UiQb2gfQ0u6oMeZu6OSWLjid6v6ldJrwOelndTpSH0+urokPUvTos4uSeYoTco9XjKRSwCoNXvK0GUY9RMZPjLCFPjBR2gEADhk1NlGut5Iu+tEWvJIVruxK9JMJOmCWG7wuGBnOT4Rstf7xljxa9d7mbn8b/S4xIrD/VQH8eylk2NlRwzmCgRlGMAYFFteCrJXkOjm0C39XsdD+IkaG3hJHvQY8HTPPTdYIUXf48XNDXFaeKF3RQzKirrzwydRei+fubqfZUINB/heRgC5LfzdA3fhNnXGhfF/UjzzbVdtFDlRUtzUVDHQaRg3AH/wDDsYgjByDP3cILtCrPHXMkWLUYNbKMJKMfRTFoUtvo9e3jCiew6rnWidJtQZNphJ/DOBLu2XkinSbOu4y0dfPtTAEmRB+FUKzewueBiO2nuVn5CXKlcw6hJod6jIYPwg4YupUSOCy2RmOPhIwFv/mx; 4:Bg3vI2Kw0Ig9Uncq5M9yFNstV2kkaaz8EMvsy+6SEKgmgg7MfrvYtMYvIvUF6Z2HY6djvdvvLBXCglpWjYtpHfZQFK+m4h8IJFrF5lszKIq06WtQXctiQwG0bLmrgFbWaP9O6jgJISW6l5+Amcm0uD2ELuDCwke01+UPkwujx4kHg6W6GYm7ykiVSjAtoBW88HuCUndep8YfZ/0N2/Teh3Eh2ykFIDai4Bq3fz6AzxMc2k9/TrG04wwJDfI2VhffnGyI1SB456gj8qXVHYosAQ== X-Microsoft-Antispam-PRVS: <CY4PR04MB039083D96C4A022F497F911B90520@CY4PR04MB0390.namprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:CY4PR04MB0390; BCL:0; PCL:0; RULEID:; SRVR:CY4PR04MB0390; X-Forefront-PRVS: 0738AF4208 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(346002)(39860400002)(396003)(376002)(189003)(199004)(7736002)(53936002)(2906002)(6512007)(476003)(16526019)(97736004)(486006)(26005)(2616005)(68736007)(956004)(186003)(39060400002)(11346002)(446003)(6116002)(1076002)(3846002)(305945005)(6506007)(76176011)(23676004)(386003)(47776003)(66066001)(2351001)(52116002)(6666003)(8676002)(105586002)(81156014)(106356001)(50226002)(6486002)(86362001)(316002)(2361001)(36756003)(25786009)(2870700001)(44832011)(4326008)(81166006)(50466002)(478600001)(5660300001)(72206003)(8936002)(6916009); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0390; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BCY4PR04MB0390=3B23=3AY2PG?= =?utf-8?q?6SJdo4v1q/NDlopPHfjj4PtyZnR1+qVvrO0fvJ6wJQ53YxE5uUrIAJ4y?= =?utf-8?q?PvHmjK7pi+B2sSJrEeUgypwF3pcVhRP+dhLsL81X2bN4JOQJJRt1UA7o?= =?utf-8?q?uO74+AM1U7pU4DrMqviMqBVkoY+shepmCoGyQXeS0RxVib+Mw0UnfJ3B?= =?utf-8?q?eMdg5EhIqN6JBp+8SYGPcqxQnH6OMVnp33V6KunC8iynYCHJm9QOrdeA?= =?utf-8?q?GfneIKqZ4XGNgyOrIxxbtXJK8hOkyKEOnshPG6l023secNeqPku0Ea6l?= =?utf-8?q?MPWKYxCKhujtEESrBqqinMV0jAXyVJXNFh/3jKxA/xMjbe0vKuvuxQBj?= =?utf-8?q?Z6dKj3AtcYVVEeAJ7jzYcSYPpZtSTNNM4DPZOhy7FdaEv22WGBC3QXws?= =?utf-8?q?o0t9FeRzGWWlYo8U2ck9txTARS3dlSBpuplGJOikpUpXhkFexnzEcAIb?= =?utf-8?q?rBivZy6Q6jjk8dJ1TwL7gOuQLUFZv3HgjvXiQ1z6HE+sc+I2YEAu/pbr?= =?utf-8?q?ep51zTsqNBZyh0VTdfkgPKx7msLTEoh2aANDjOz2QyTC5M7SIZ8QQz3M?= =?utf-8?q?SaXEvuorqR/Bbeo8xhnapSBE/o+z14zixHy7bYMLd0hYbc6VGjTxgqm8?= =?utf-8?q?21w5eb0uiQkgS2aO35SLinlHoN86IFKGzfnbwDYnUme1vC1CxKP+rnos?= =?utf-8?q?s53OOT6SlLp3BHcI+Ok3/vIqyURY2ldRF/vhI5CsakTvRdRJqVcrrAMT?= =?utf-8?q?qd3qmon+j2VS+sFfPZYCfzBfvvIgQzPVeIu0RONAbXMX5R6PurQZbBCh?= =?utf-8?q?hb88pwpnohQHhDMRXI8ffmQCnN336JNN8+3mLYKVPIPfV+7TNKMXsFWr?= =?utf-8?q?2oVzGAqtl/onjbQAc+q2/io4F1zj3FiKUnx3B5Wwn+H3Jn0+6xQ+QWpl?= =?utf-8?q?OpBS5NPcOL+BZiPa8fKAjTM75EiTfYem30Q9t+Reiqiwa3egjd/y2SGG?= =?utf-8?q?0J2qQO7Vh/tD+N7B/5AaDQx9XkI/0nRBI+zxSuvkStnDaJ+Gs8bfB3Nv?= =?utf-8?q?0tY10IvvhdNzLw7e9RLqNyvmvhNfXd5ZsF5a548i2xJEDH5VD58H1B+y?= =?utf-8?q?sjWZZbHY3mFdP8ccI5Y+DdgkdMaZtLUXg7ykpDTv2LI8ZvkeqZupPZFq?= =?utf-8?q?Tb14WLv2YiPjoyQVjypbgv5B8u1BfHstAHsa7o1iCN1U8rj1G5k3cVtU?= =?utf-8?q?IswOykKGqWRzQwF6IuZ8v0ZRuTK2TjYCcc9AEYRISNHTa9BBQL8F+IbP?= =?utf-8?q?JwBXJ2O0Edu2EN/nA15RriAqAlOjhIn9KMrLIX9fUBd8?= X-Microsoft-Antispam-Message-Info: RCbEDGqGW7HQMJBjjQ5qasQKERzmnpJWGqaq1RMkka2WTsLq+XCeDIXZXRI+4x8dy7bzMtNlsAXaD3VBouF1D5FjYU6F/BehrqJCV5PVl8r20CAd229iITmzLRHQYcLrhB8hZpPuvxDAA+7/iye7eTqGfNiQc/Or9aWnJvetULb1Em5Mu2SL/Lz1GZqfiHtXIVrKUeDxJACT3cwgOCq+ANNGldbZ91WdUPQhpgHTXBYdE/srXfPsZkFG1KSbwHcxKjQfE2UORFkm48C0H1lCov4i8XvKeH/DTTZqire0ZjwQguXWzE3vR/nxbRHiivlfcR5GrIwkMAcKQ9Y0ZcPT5eWAy8rTqoxRufwMN4z0tAw= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 6:N/ZcN4KEmPEJ/ECaflUYN5UgAnK/7CdL/NI1ADIHwrvlNEzI5kIltga5ycTgxpZQwGNvWjr7QnFdnwilHS6kyFNOb4koLumC2M7GXgzTeHzM09nH3ONx5AK6n+Ab91RJW8qoy+h+RfHAc3zh0gVdvRcQKJCpKOR8yDN9UbslP6S8p7RMlpHJWCDwP9ner/jkMHItWSKyP6Z/cTZ+BKOCpOPSrtgJWLp03BSW5zxWSZrnKTOXK6WYFxkk1ghkBkf0+GMbjBePGli6s1Yjqd7xXTyNP52Gs7zFX1Y2AxgzGeWE1Xt14GXTV0SKQ84LEptK8sz1ykM33by+IK/9BrG4rZnmUls3V73KuSNj1tijXlrCqv9D02xsTICyjxofSxh3W+oqeGsbfAfZ/bbrU1sKR8uHBoHOjjUcOnnTqe51bXz9oQkZ7z4ufdmX+GtpMhHTb+g9u/YAmdawq+nPUQRu9A==; 5:+jcjVgLbBRo1gMl47ABwa9bDIEQe7x7758+DvPujDmnBNIJRhY4Vtq+27NNYWManQM3kgvOEV0AW0W0TWzEylqAuat3LEKDFg2DOHEXIRNAWsiuwWSfyE1styMjyJDuS1mRCvQf+85noMwq+QG2KFcdPbDzgYqJ+9wOnUfkEFP8=; 24:uq+iR6muwHkRIWXwEXbxU7BT8k3+CciT3Ybvfcdwcc8IdjY69kUGv0v67K/Hkqm98fzwEBAvTJzUESERVsSg/BGfliT0iUbbUX6dTI22Q8k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0390; 7:2dLdum53F4UYvwgxcArYwJwUv3kjpAp8GG4sBhQoef76/xvok/Q09le2YZWiG6Z3vak1NuGAHLyWmUD+oYwGRvc2cEarYSTfToXbSJKTOs5kUMHwS1nSYf7mLyUFCfAm00sRlYCDGwzxkiSBzV/u7gQ7FKlkSHFi/dZvyDQhB7Eg0PXazjsBkm+TNyibK2FNVfNNNeNvKSqHumRFVmnsPK8t02+WtyY82uwhZfWwptIo6cqldQzwEwqL3E4U25o/; 20:yb+8Fgx4Nsgmdv24J+yUrIVkOm8ye8NnRfaVUiy+B3vsy2MZpZr6EOh+kaqouwUbx3Yj7Vn/OIJoWR8sy5xjdlNURdlKc9thUIXijMQ79dE9ROA3eGeiOSO6Jvt6PgvkTWRvK8QwpkKe/mL1A7YlICZMSBL2/y0O3MvhFQ4RlKQ= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2018 16:07:35.0711 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc3fc799-8f01-470a-92fc-08d5ed91bdd3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0390 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PULL v2 for 3.0 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: peter.maydell@linaro.org, Alistair Francis <alistair.francis@wdc.com>, alistair23@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
riscv-pull queue
|
expand
|
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; /* 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); @@ -139,9 +139,9 @@ static void riscv_sifive_e_soc_init(Object *obj) { SiFiveESoCState *s = RISCV_E_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_E_CPU, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts",