From patchwork Fri Aug 28 00:16:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 511728 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 2A83A14016A for ; Fri, 28 Aug 2015 10:18:41 +1000 (AEST) Received: from localhost ([::1]:45310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV7NP-0001N1-Dp for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2015 20:18:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV7Ln-0007Xv-9S for qemu-devel@nongnu.org; Thu, 27 Aug 2015 20:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZV7Lk-0004JN-0o for qemu-devel@nongnu.org; Thu, 27 Aug 2015 20:16:59 -0400 Received: from mail-bn1bon0055.outbound.protection.outlook.com ([157.56.111.55]:28224 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV7Lj-0004JI-KA for qemu-devel@nongnu.org; Thu, 27 Aug 2015 20:16:55 -0400 Received: from BL2FFO11FD045.protection.gbl (10.173.160.33) by BL2FFO11HUB041.protection.gbl (10.173.161.57) with Microsoft SMTP Server (TLS) id 15.1.256.10; Fri, 28 Aug 2015 00:16:54 +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 BL2FFO11FD045.mail.protection.outlook.com (10.173.161.207) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Fri, 28 Aug 2015 00:16:53 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:36774 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZV7Lg-0000Su-Vu; Thu, 27 Aug 2015 17:16:53 -0700 Received: from [127.0.0.1] (port=54421 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZV7Lg-0001fY-Qo; Thu, 27 Aug 2015 17:16:52 -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 t7S0C6e0020534; Thu, 27 Aug 2015 17:12:06 -0700 Received: from [172.19.5.100] (port=43606 helo=xsjengdev1.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZV7Lf-0001fV-Fa; Thu, 27 Aug 2015 17:16:51 -0700 From: Alistair Francis To: , , Date: Thu, 27 Aug 2015 17:16:51 -0700 Message-ID: <94087d3cf0ef7baab8547f7e62a84b4d73e8bc22.1440719554.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-21774.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; BL2FFO11FD045; 1:4ByEYpAFqAiaEMqXD8pX1ydZqy+qbnntvWSx8D8sUKh833dCOfEwR6rTo44dCmjRo93tFNFTd4dCwLSIaRXLfCvPee/F+OS3gGOcdsnK0UUp8lNSrzPvMMuKZbM4HhZWK92OhRlb7i4jSRanJTJTYoSc29xrbupTw8pHu6Zh2/kmmRhwo8Y6hYghBzamNNPSOmQOOykUA4HlIpjS1YjByJ9vo6rp3YBVFJ77jpO9qP+V+dITpqzMNBOWHH9XLPS5QTw4JugwjGVaf6DQ0Ur+eNMydD+oafGJaLouhhydK9vM9Qq9JpJDRKB/xMW3jp+YtiQvfKBBeWA4jo/dfpX1mtiD/ywUEW/nE/zK710+0LVj2x2tmB4aRAKrWSkCXhuf 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)(33646002)(77156002)(62966003)(77096005)(5003940100001)(71366001)(36756003)(5001960100002)(5007970100001)(5001830100001)(5001770100001)(50226001)(5001860100001)(189998001)(47776003)(64026002)(64706001)(2201001)(86362001)(85426001)(19580395003)(19580405001)(81156007)(4001540100001)(6806004)(2950100001)(87936001)(50986999)(118296001)(76176999)(5003600100002)(229853001)(106466001)(48376002)(92566002)(46102003)(105606002)(50466002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB041; 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; BL2FFO11HUB041; 2:8VZwo28Zbi6lyqz66qrAkJwO2r+PBGDmB2HP2IUVSII0Go4t5Uud5mp1fz+GzPB4JDhF0PeaoKlvp0PxYNWRW+5opg3TjQSZ15TMW8PJvsdEWrv5GyuG4oK7NM38ayne30hDqzIvw32w2jMvZqWjveaM2jHQmyChroB7/ION1e0=; 3:uqKxTHF3uBXJRR5sxBvV5nuQ+xIGdCvnQ+UePUtM+DX5pAknZuPfvddKGjsxNuHBsFyWFN/O7DAYQshjIGQw9BnxbNYfOlIJLU/M88gZW5+sMHIvY4QYewN4wP4XIwjWPPIaUQtRdT2sOfO+vWs5Y53cQ3yUnhcr3SLoX8PSTuh2AS3B/mYlx6qF/Aa/lOmcll80L0SOszmNhC3/Ql6OY532ZAWeRTQLB77Pvdog4Rg=; 25:/OV5YFTGlZOzi5ZUrQFg4rY62hxSqc019l91oWBm7Kas72P8P/CUcAdqelB0XYTO6jkUb+dtr2t1wAYH6RE9XYUyh+iFbIGnE0FXft6zGq6TYORRRxaGf6JL6l/dpt8UKw7pGbWvAUAFIHj7m5Uu+464LgWKSnxsPMVosKcQsTapbstVvdhaLUm88bf3VOq6DL/GbLGu+XNtKVXTqEDup3I/nHaF6iOjiaOIeYwkAOgxkmcWzMJTolLX7DW24Umm X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2FFO11HUB041; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB041; 20:MdaUSSCgmMmcn22LQmv8dO+l2E7w23kfDXwKKnXVTepBzzqzcAlzRPyhjwx48UI0zvKPKeMB7RCdXDCDAamKIEVZ24TFaHYhnSSEmYI0AWN2jSoLCjrYSe+50/n+nrXKJlK9foaWXf1+BuLw0c2CuUiTpdgbEuU7lM9PlyjF52tlOeJ/yfNAF4r7GmARbXpGRjmB9StTQoLCxMiBmQcx+ji/v1Sr92UZWlqOpPUEmu+ZK0Jil+dh0wyvQy7LiAEI0VHoMSwGLC5qXwFWFpOb65V54MQQImfJSav79DrVewCLtzIABORSvDTqjs3i5z8T8nI8zsAk+Jlt6gVDzypNHfRMvZk4mOsiYL1SuQMC2G+4/N+ucdxAl4GrUUHJrhgTq9IDg8AhLHQyNvJ+C96/qWz8qlYwtH5TnRzgKRhZ0vqUk+xAmx90QEQvmj/rQPFYeKmdG52YzcNCr48FBJv6UyzM+vACvfgjByQ+JTnGuC/0ULRn6uuHOOB5Cu+Nc+5o; 4:aI/6cWaLjbrlUDtstJ57LYxwO9d0eLsXmRVejJ77c83oO+uluXDcy6P1prakUO5aj11c22D5ccmUK83dCEaYjhDT1qECGqQIwCcmMMPc7KegYafW8Sh4Qs3yj5EOOrMaZgoC7hHojydmYGxR7+DyxZa/tu3ASqDw3BKGhcOYCu97AnadnF1ar/LSbb8T0sSyn4V2FMt/SZOUzOwsg1Vv5/oYeb+bSR+iWToK1mAd6JCBFAJm17ga86mHVkdSSx/XnNoOoS9WuojfiLcC7rEf8jET5Tyz9nbBQO5Ajzv5x6xgMdxxlrg2JizxtVMQ/G6J X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BL2FFO11HUB041; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB041; X-Forefront-PRVS: 0682FC00E8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11HUB041; 23:mihfezN/76jp6dakbQm9+W2u1JKr32wmRW6yPMtK?= =?us-ascii?Q?bUSpAQEgTborQh0IgWaxy5PsywOFYzZ9tW6BIVQu7jnbTtoFxUfQNYqIerad?= =?us-ascii?Q?nucceB8Qkm4X6RZJ9KFqzChZimFPb3rX0336QpuVY2rDYQPCqIpi1g1mk8rm?= =?us-ascii?Q?UR6Gd5pIFne9LYUDiOzkogDsrRmgej9un9tdiG1ezbN9WjzHulcHq8HqJOh7?= =?us-ascii?Q?XpQgeeGi0NL690QY/wFi4BXsn6TElJceYYeScbxPSF0RY/jWBy0vBlCDNork?= =?us-ascii?Q?6L7Wvunw0tfplqOuEFTUKtesSLFAeOczuWH1JUJKjszGqi8rIQqLYckv1pJz?= =?us-ascii?Q?uXb7HAzjCFSSVTSgoV4e221EKRQmKooUyPPBAZLfPwYe394URvtCVPBEcp0g?= =?us-ascii?Q?o8oQj1sEyTbSx7HPt2wcLsP6JJw8A4ikqySdfKUcVcIsZPWG9kNqWll6sFhv?= =?us-ascii?Q?ihlaxiFRqP/FlSnjD4/O//+UYSJzVlG4c54TIJmYuFsHQuygYRS5yd0tw6/x?= =?us-ascii?Q?AfTB0WuS1TPxjBeqUMDoXT9zCbbBEfNWuSBHjFb2xeaibkr6RZc8Gx4nq3bx?= =?us-ascii?Q?aKi69Qwwb8qEehVnGrxxvUYt9PIgNrGaQ8CK0pH2QiF4et/jTcdueLjuhHbq?= =?us-ascii?Q?o2V4uszCY2jJIz5mFU20I/DVYUCct7s7lG9yjKVbga7g+sGM3KxNWmKb3CLF?= =?us-ascii?Q?yiAKx5YkA9AfWbifE/VNqCYGIhsJfwD3zCilnhPEiPT4zXbl3qM89+HmqHSN?= =?us-ascii?Q?Lhs9rE6TObAsEmHW/L6kcCob0RYTH8m8oKnmHGoC3Be/dwok1qqdNyDunSco?= =?us-ascii?Q?c05ecymz9MxuHYBg3El4mCnCVmWutgw5Qx8MS8O4BWClG91TUpxShUK8xYu+?= =?us-ascii?Q?8Rxy1W9UHYU9Z4Er85EQNIT4YmD6uEjBOZv60ef8RiqBNP2xF5HUawD/1sqI?= =?us-ascii?Q?SN0yNGWOVky42hXPSgnazR1SoaOTkupJFZCqafhnLL0GCQQH9xNqjQsfPZ4u?= =?us-ascii?Q?oIGUQUiaYD3/I+O7pc7sqhXNBjhVREj97uUgVrorJUZgmW5nbBmJ/WaC1iR4?= =?us-ascii?Q?RcoDpfzjveJBdjyGiShd6ESySZYQG+J/8FXLy699mT+u3WzF78HSHXKmIlk+?= =?us-ascii?Q?TOR8gqJOSb+vT36x/7xVff2Wo4p2rXOYobGTVUxSD15YcX5x05eX5WeIzKBx?= =?us-ascii?Q?g380OrEFdEYn4Rb9N3AM7FW6T2uEwwH9NLP457J80ITxgX7bAKcHuQpXjw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB041; 5:TUAgRM1ZlIONNGqo71EOPNy+sb6FMfgjPf0CNu2nigiiZ5qT3L+EFogl/HdGg6rQ0JTAggAahKrlpO3RiWOQ3x9J/HoEpK/ve4XJJlkGBwkFdRNdsMXcCWAJwvAvmXqU3A0Tu/ylLuDGpXfqNcTDcQ==; 24:ck4lLrjw7zee/n8Tdue245GU8zyzZCbo4pPRbjILsLg4h3ElCI4+eLXt/ObII7jdJq19JoWcaxzMtF3oQoyZ7jEO5oCz8ftC5vqtPEWb4GA= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2015 00:16:53.7793 (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: BL2FFO11HUB041 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.111.55 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v4 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) {