From patchwork Fri Aug 28 17:35:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 511988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 C4CFA140129 for ; Sat, 29 Aug 2015 03:38:00 +1000 (AEST) Received: from localhost ([::1]:49215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVNbC-0005jG-UA for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2015 13:37:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVNZN-00033C-PV for qemu-devel@nongnu.org; Fri, 28 Aug 2015 13:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVNZI-0008LY-PY for qemu-devel@nongnu.org; Fri, 28 Aug 2015 13:36:05 -0400 Received: from mail-bl2on0067.outbound.protection.outlook.com ([65.55.169.67]:51090 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVNZI-0008Kf-Cd for qemu-devel@nongnu.org; Fri, 28 Aug 2015 13:36:00 -0400 Received: from BY2FFO11OLC001.protection.gbl (10.1.14.33) by BY2FFO11HUB051.protection.gbl (10.1.15.229) with Microsoft SMTP Server (TLS) id 15.1.249.14; Fri, 28 Aug 2015 17:35:55 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BY2FFO11OLC001.mail.protection.outlook.com (10.1.15.185) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Fri, 28 Aug 2015 17:35:54 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:54559 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZVNZC-00019g-Nl; Fri, 28 Aug 2015 10:35:54 -0700 Received: from [127.0.0.1] (port=43974 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZVNZC-00057U-JE; Fri, 28 Aug 2015 10:35:54 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t7SHV7oH001666; Fri, 28 Aug 2015 10:31:08 -0700 Received: from [172.19.5.100] (port=43905 helo=xsjengdev1.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZVNZA-00057R-St; Fri, 28 Aug 2015 10:35:52 -0700 From: Alistair Francis To: , , Date: Fri, 28 Aug 2015 10:35:52 -0700 Message-ID: <9ce588e09e1c6f367c873d4b604d663f5e00b666.1440782773.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21776.005 X-TM-AS-Result: No--3.949-7.0-31-10 X-imss-scan-details: No--3.949-7.0-31-10 X-TMASE-MatchedRID: I1wtkSt6/wJ0tMeOizCSGqOuVibdZNTv6SXuwUgGH0i02sWkmh0nh9/9 N6lK9KH6ThbvLLI8RvO0aw4Pc//eXXzGpcYhTDdKyeVujmXuYYV9LQinZ4QefPcjNeVeWlqY+gt Hj7OwNO1/FUQjcNJIgzIFvGzfXayx7IyWTNuDyXAkoIRPXrXHO7NtxyJcM3zj6FUvr2dN1VqnOO cSQyiq8NFUOWyKttknU8A/i9U038uafTtJdKhUtPIMFg0InOPqz5gAnmajvOU4qCidlj1MU8GJF i6bkDvrwL6SxPpr1/I= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC001; 1:87FnWe8JZa6nMeNEhpPEaIx73g31K18msTY9Gtmn+8B0RwSGQhKtfzAN+EiFIAqWw9E0qj5JC55hZCiCJRwcJlWJGjDeHmy03jXjIsk4OXyEFseOFMf2ckZy6QfwPOWFSWBYU4RggnPyRBCIxSxHY7Kc/VhuzgDutoUNw06d8ACPaQFcrrHzmnn495sSu3cvZv9PWXlbl3ynP1KRqZu2kPM7QZbwHelgZ8UjtWmTf2pKWfBVY55au5TfKTAXoOqifrHYE7j6pF+rsstU/my9UO9RyUiT6MsoK4DkSMZpt1JgOzgQqauqZnM6sGKUNGWgZ66UCrfcIghNprn0SPdTHO9J/6G0rNonpHS5OG5BSaz6Jenhn5xTS0gypLEpYFFsx+QOBCP1BfJ0eV0LzQcyPUNjCle+G8VA6qT5I+QNxzjemeE5h2Gc4nUuc/reNeUGe7FxJzPKStZJ4Rj+dfvEsw== X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(3050300001)(189002)(199003)(189998001)(5007970100001)(5001860100001)(76176999)(50226001)(5001770100001)(2950100001)(5003600100002)(4001540100001)(5001830100001)(5001960100002)(92566002)(36756003)(50986999)(5003940100001)(77096005)(62966003)(77156002)(118296001)(85426001)(19580395003)(64026002)(19580405001)(6806004)(46102003)(2201001)(229853001)(48376002)(81156007)(50466002)(106466001)(47776003)(64706001)(33646002)(71366001)(86362001)(105606002)(87936001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB051; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB051; 2:fkXZZCJJbXVqHxLHPjgImPsZ4a6AgPyJA+YfgCTPw4id2ng7HFB6/GFg5uU7SAOCPko7KeBKD4ncw0uIPJKKkzNX2KRZkMU77/kSOBHImTCU8f2nXqFb8qdOn0MvcV07eERpvflQrV+mKPlqdGnTzU3zgeCokOrgMpz5tvq039Y=; 3:mS1Gw4UArK4xEEneA9nGRtJ0qjw1LXPloY7BM0S+aJkQctZT92+orsMj03Ncagy/OZgS1GE6xADFGlA2JeYoZKPIiPgItNviR9spYqNpXoz79SAGNg6bWVS8RDRRrFlDtPAgU8gArDmUbnXKSqYETCx4MuvuQ2ps7E+j169bA1+QNOtZUkO/IaNFuo1/xCSkTPmy2IJX1Ino7qbnlbMbza0FYdeWohI02p/TaqteXps=; 25:i+F3EgyjeN4wQR+K+DnyAoD30Ll87J8bj9a+8G1OtP1pcVnJYsbsYjtqgTSdLDAOcILZI99oWIeUV7LacWBquz6MKK32+AjCjy/cC1tcnbP4kurHCqCSe/5iUWFCdz0vPoQ1ZMiMvamPNAXrbVtsKSYfsvWRcLUam1oj9EWFaCGLjfPssKK+8B58ZgPrDObhIuIdGmtDO7hCxsmoHaMc9+ZyqhG01MF539QeULzyoo1kZwq1U5pLTgbkFvrBAgVQ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB051; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB051; 20:sBnnkHhKNjjxMkSihF1KeYiUuWHgGvg/ACy3OrSxLgXAnZtRqZgMPLfJ1ZYyC9vf9S/804YyhJEQWxcDWqXpd5DEr4Vx/qYOeIlTLLyVETUVCHMaHzzLOHZA/3JSwQoXszqFm13mIYllFmAVvfO1Q5XEAH1Su17e0hhGkwhVnYh+KBMXWuKwt+/m6HNUUIvg9pfrixW/Qc89gzzjWT+lRWa+X5QnbvX7NGrHfcn6caUPS5z4HUX+L0fcyuxJPIB7r6vgVAzzWS0KWFHWeksAMlR4FYDvhnM1WPujRwbs6Ud44CCI7bhp5g9jDrDCl7XqloSIKz8NX5Wz269ZNzGlJk0wVg9rvo1nVcKEUOP1s8sV/3l1Z5OYtAaowjXZFxiERKxdNZL50XayPaVITECxIyU9XBKBrfEpJA6QJYJsAY23xIssTe222z4tZIU74pt4G6kMw5+MPLKEPolchEr1la/3lYJiXv/7/EyUaG7QhJaGyVbgdu+3d76qRA4DTbL3; 4:A/VkKvIo46XrIZjbFlWhQOGbRx6xOAT/gK2RHgqLjFB9yQI+RGFUf803Vesgy20ZpZvIq6gcB9M0HiEZzR6VzC8AroIU3eh/TCdD0W/9PrgKEhEpxMDn23TxGNyrQQ3V9+n80LBJCCiznsY/Cld06DjYbxgHoAQxqjkB5tyO9FIz958IAiDFtspYcb5LcEvG9Axcb6r983nTQx1c7W/TkmJQu3VRzz0oNQTyraVwqYeITa3lakz4DPHnA6+fnSN5v+Bmq8LVWBI5FarkmMv8LtWmji+hQd/TMqVKLYjo8bzOQ/SSAnUejWO9cGi3PM20 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:BY2FFO11HUB051; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB051; X-Forefront-PRVS: 0682FC00E8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB051; 23:wBjiDbwawFXzI9KjlClyfxlG48kkvO/xZVxxrkqE?= =?us-ascii?Q?loREist3fv6MG40K/TXgYK7DJHRAAjhMksvPnSsdYucQqRLF3UEo7LHE2HcI?= =?us-ascii?Q?6batp7li1cAGLc+DBVnuYdHHDryYcKHuJSILddN3/XLZlQx7GgK/IbDhiBVJ?= =?us-ascii?Q?JxZuXp6qLQSm35w06MGB4dYGawngT+KrzHZ6syd3E1LZF7hhqJzC4If2TAcY?= =?us-ascii?Q?912gnaSlB2Wh2sMpbO+TJR/a6cOpvG8v52PjwgdEoiP5PgvF0gO2fhkvELVM?= =?us-ascii?Q?97xDdReow/xNsgF1iYc83wHfDD0zypG04XOpy0YWhrNg/N6jsYjTpVejRN2r?= =?us-ascii?Q?Mcf55jzeLjlAB02glKov5mDPOgZ3KymRIItzIE/pfIn0jjhW1nsUiIuHMwvg?= =?us-ascii?Q?Nr1AEzJ5f+Qvja5VtY3CQ+dUXuNTcTnBmmzJzcsX77ky4msknhrrCRksiojA?= =?us-ascii?Q?d2CxuXfZEtJi1+S9o4CBFRwgHKCV3sApTmJ5YgjTAabyXQvtdNKZgCjslsf/?= =?us-ascii?Q?ilBhDseZLMyihIFVF5GiqTNQp5g5y1x0bR9Tt73gWTSvT5odWSG6sAy3QNjx?= =?us-ascii?Q?HnpaVZ2PJCv8k28axYXNL6ArsAhXHRUOoQtnmncB3Dqye3oMwBgXYO7lDDrd?= =?us-ascii?Q?1ekKqZZJsCxLW0f8EJK6TkLwRodO4STib56tNlZVTuLVOh9P8Rk+KqtzH7Ct?= =?us-ascii?Q?PhRMGWMNOPWqaL2/6oaVYhQHE0xNPdmeLFL3FyI8OPhm46N6cMq3w+GjkiD2?= =?us-ascii?Q?2EjBVQX6gN9NMRHxHZetUMZ3dC8QTlh+fip5C/YmLY2k+/yOyi8h7zCO8aAG?= =?us-ascii?Q?Z5lIwmEKXl3wbaM+DNQJjMY2K1vXdu8aeh5yjAzKxcSONeWV1sYChFrL4E/c?= =?us-ascii?Q?+3kR2stDRUSfht7OHl1y3lFJA8rQzSstQAeW1VjZKRdF4cSY+2JvM5mIETp0?= =?us-ascii?Q?TrA0VBYKnRuZeeMYYZb0k4cBciMke3j07tZwvCrn/HMK4mL/wlgm6IqC5qUN?= =?us-ascii?Q?yju+gQZQRw+7LckSkOvzl+Gl0RX4IuQgKGwedGSh9e8P0a7Wt5aNzbgxSjuh?= =?us-ascii?Q?KTiQXyPLJ9cZA1/pU03SDrII4vAeQWmyoplxyXf1Lp+G5AbsWdK1W1A1cB9b?= =?us-ascii?Q?qBGJFfd2r3IrE+2X52BNl6clUNPBCnZwxs47p//0JIWI2NJlWwVn8Aqm86Mg?= =?us-ascii?Q?AaFoPS7Pp564J2uV/RnlCBFKjHzsgFtCyKDVy+b4to301hBsYsxG+cOKfQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB051; 5:oSeL1GY7oSUZVX3bvYS6KtrBF4KLA8s1Xzig/6MA34DxSSfRygWwouVEonUXiJAJ4uX9P55LhJCTHadxDbATxEG4bds9GaWGJZTD5NcI+O3HYqwYKAOLxHJzYWNwqL5/R3xr4cQg8UmS5L9O42AJrQ==; 24:3JzDCEvR8NheJaoMmRKNZ43coxrSsVuAvn9Wq9j1fLf8S2A741NRkrNVlL9ZlmmAtNoY/lmBzdhIMElyqajxOJNmY0r9UysefNwX/COpMTs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2015 17:35:54.9855 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2FFO11HUB051 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.67 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v5 3/4] xlnx-zynqmp.c: Convert some of the error_propagate() calls to error_abort X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Convert all of the non-realize error_propagate() calls into error_abort calls as they shouldn't be user visible failure cases. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- hw/arm/xlnx-zynqmp.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 388baef..6756c74 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -162,12 +162,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) g_free(name); object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, - "reset-cbar", &err); - if (err) { - error_propagate((errp), (err)); - return; - } - + "reset-cbar", &error_abort); object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", &err); if (err) { @@ -200,12 +195,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) g_free(name); object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "reset-hivecs", - &err); - if (err != NULL) { - error_propagate(errp, err); - return; - } - + &error_abort); object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized", &err); if (err) {