From patchwork Tue Aug 18 00:40:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 508326 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 D297F140293 for ; Tue, 18 Aug 2015 23:58:21 +1000 (AEST) Received: from localhost ([::1]:57270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRhP9-00058I-S6 for incoming@patchwork.ozlabs.org; Tue, 18 Aug 2015 09:58:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRUx6-0004tp-PB for qemu-devel@nongnu.org; Mon, 17 Aug 2015 20:40:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRUx0-0002qz-Mx for qemu-devel@nongnu.org; Mon, 17 Aug 2015 20:40:32 -0400 Received: from mail-bl2on0093.outbound.protection.outlook.com ([65.55.169.93]:48928 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRUx0-0002qv-IQ for qemu-devel@nongnu.org; Mon, 17 Aug 2015 20:40:26 -0400 Received: from BN1BFFO11FD017.protection.gbl (10.58.144.31) by BN1BFFO11HUB050.protection.gbl (10.58.144.197) with Microsoft SMTP Server (TLS) id 15.1.243.9; Tue, 18 Aug 2015 00:40:20 +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; 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 BN1BFFO11FD017.mail.protection.outlook.com (10.58.144.80) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Tue, 18 Aug 2015 00:40:19 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:46460 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZRUws-000896-UJ; Mon, 17 Aug 2015 17:40:18 -0700 Received: from [127.0.0.1] (port=35875 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZRUws-0000M5-Od; Mon, 17 Aug 2015 17:40:18 -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 t7I0ZYXX009299; Mon, 17 Aug 2015 17:35:34 -0700 Received: from [172.19.5.153] (port=51649 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZRUwq-0000M2-T6; Mon, 17 Aug 2015 17:40:16 -0700 From: Alistair Francis To: , , Date: Mon, 17 Aug 2015 17:40:16 -0700 Message-ID: <9f36541fcf61b8028621ccb4ca60c419578d1880.1439858176.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-21750.005 X-TM-AS-Result: No--4.703-7.0-31-10 X-imss-scan-details: No--4.703-7.0-31-10 X-TMASE-MatchedRID: LS8Ewxiu6Ud0tMeOizCSGqOuVibdZNTvN25XIDQLt3bfUZT83lbkELg2 PcpzvEciukX23s/r39vodhnAV44tnlxxDx5qbkR9FEUknJ/kEl7dB/CxWTRRuwihQpoXbuXFgwe rijLBPmCzkevE/NLJ9Oj9LJ1KNq4iy/Y0LbPA8bN2KMn4Mp28CXpkK1lRiK6hSTJILxOCnvMt1b k+hqd9nDC55ccuEQeSiB6mlDKe1V7S/yytHeCN9GXv4CQeNUk7G6qTOwq/n72eqD9WtJkSIw== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD017; 1:8LVqNqnRT9Ubykpw3z2BcQyMt6woTd9fPdWb6nXzIwZpSQnb8vkmLBM+RBhlaFk+ylZNCBz7ae5L+Dzqtmcw4cmTxcL2Hxnuh2TuwWGQZLy6Qw+z6ui1hQ8/Qv1i2yeeTVKLgn+zift0/nlmT/AvQJeZEZNYDX1Gj8GC2jrm5ob9sdeFnuSGIgEa0RR7qYrQltqe2HQr0syFLG+j5LwsQ/7qNfJnrHMKzjehfHP8cIyY5b4f1W9k2uIfeHop7pGrvwpCMHnd9cnYktw3mb6xcNNiemKCQJQHMRybbZpjmIpiwzrR6QKVC327pzHN9FhXlC+E9h4o28HbHmP3asSCOz9QhLcXTTPpCOkr+rbPcMn0DZGdhuTuEPBAnph3TmSs X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(3050300001)(339900001)(189002)(199003)(77096005)(5003940100001)(189998001)(64706001)(4001540100001)(71366001)(50226001)(77156002)(86362001)(92566002)(50986999)(47776003)(5003600100002)(76176999)(87936001)(46102003)(36756003)(48376002)(105606002)(19580395003)(64026002)(81156007)(229853001)(2950100001)(6806004)(5001770100001)(5001830100001)(5001860100001)(106466001)(19580405001)(118296001)(85426001)(33646002)(2201001)(5001960100002)(50466002)(62966003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1BFFO11HUB050; 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; BN1BFFO11HUB050; 2:y0mMdt3B3DyMbBZxBHZoRKnSDf97mDHkobR2jbgS+l8x2jT7GyhLGCtJ05YQGsdAhNZLzzzaX+jv4GW4EAC3W0wAiuSWXwc4glb33nyXjDl951Nvut1kWXY/uIa+3cx8c6b3sJ08aoOIsW43pqJytgxz9dXPQXcMknEPBwK8htw=; 3:bdhBZJsYZCvc04Bc8iP9w2DQSj8w/+dxIP7e14woMi9EwQmti/IHs3o71L7qV0Xti3vlj5P3VSOwWvF47Zw2OcCH5PZ5WbIBOA+90os8/20kgtQnEwyngUFLTjqaZiafLky1QUIG8oWkyhWPf6e15XAj3ylSEBeCJIzFNT1KVoP/darx9GAo/c7eQ8ELssAmSpfsddEB35uCqHvmB+cZa34BkuyZuUHQAnHlVTE6nZU=; 25:3tgIltoDB6hcQQeSxi5j3mIURG+aV8GlC9x500hKbXM+7aDy9qeQnAhJNhxVBRB/tkhjf/XlbmAKyfOrpy2iv9ukeumPvJOzUf+MmgYyPaLi+4uAfr999m2UB03kdm1JTN7k2elH1dlsR6D5zXN0PAk0GKEPfz2qgZN2ft3D0WCJr5fSAvAEdwRyazPZXEd8Y3l+UFsRecuk4LM0Cp0UB0h4FiARD/Q160EyssCOsfL1OEzJqnBDlCxE35qa6MdA X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1BFFO11HUB050; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB050; 20:UZXq2YP2peJ7jTY8TAsbkBXDocYPxqh92MPzY8nL5yq7CQPk1+nkWZtAzmnpJ3yoNMV2j4oN7+WAC8e2A/eRrA+wcAww3azxVZNs/e6ZPiXuXRNS4FSpa9+srPJFhM+Nud7FoXqRxBb5YKnZv6hwxIOXC2QhGz06DIiZ/Y2f4eWGZMKVxGS5X63SHH8QqsVrOmmnl7yHXhgEap6A9wIRwaIGZ+W5SnWinnQEsG2r1nGFybJ2nK/1aagwgQGpc+3Gum/GglpEmzYm5Gi9BzbJRXhg9UH6GEKyL2UB3Cs7k+2X7gJELDKyAo+OzyCu4IDLzI1e96/JxhqD3XrNNilt1pWx2ZLZm80UJ6u+IK4RCeZpDrGjEKHfxOpzOsnK7sJQTIi2s/V+tHMrnlTBKjWYdRqErgrwrishjY/Q9dpJ3Lez4c5/nKrIty5y5WKFGeLbHgp9ItXIo9S8uY+L5ERSvhNGNSqpHa4YP7eX+kC/YU1YSIQLRYJIsMNS5109vpH7; 4:hTahsNXbYlYI/hogtbbM315VAolA5k7xXiz9UTBAdfmBd8jf3ukltncOiWv/xQNCyZcXa/KaTpCsjNUmLcXA836BhEbhFLLlZ/LUEddrOiobkz8UhTnJVgNx4kw2TfjPm2cpQChRffhH+YDPAmU4EclahDcJcrMraU7Y4uUyZKOQvwGHtu3TKrMWPRlwBPR8Oou4euHAr55v4Bc8BUSZFzo2FdNUKqY4bhfwk5/UJygt3a05FhItn3ZYDws1Gbp99EHrJsSsX+waFryBqtj5cfPuGcyWrZLS+zVOxr9WAgL5/v4KU8VCRTTcDralrUOAuBFi0K+K8uRRNqJVzr2mrw4El0E5xeCgdVWBIACbeHTc92A5oSkkCTwDS1EXJjXx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(8121501027)(8121501016)(3002001); SRVR:BN1BFFO11HUB050; BCL:0; PCL:0; RULEID:; SRVR:BN1BFFO11HUB050; X-Forefront-PRVS: 067270ECAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11HUB050; 23:OjN/SwCCG45vglTQOI8IU9pwopK1FvbLKA9M77C?= =?us-ascii?Q?dir9nh6IsvwsZawnbZgbzygl+bkqJsHCGNUyAfXaIGGNxJtz6VB0OzFwq6NG?= =?us-ascii?Q?qgAJpiOD/XoqnvHc2tEbckv+3iVEFk3KHL3t+e38mVx7JdUfMmkz1OiSYaxD?= =?us-ascii?Q?jjjC+dbf9C3/t5OBXhnwueHJzIJXOpgFb+wgez3OD0fWbu7yH7/zifx/qTIs?= =?us-ascii?Q?boS7NQ/h8mDm6Q/zqJO2xFGeiLJME4fI+1B4myKnHPRPlZCwOhl6yMdXkbnr?= =?us-ascii?Q?AQGOiO173fZrMYKKz31Dma4yBJy+COy5dUF/qSV3Z3cm8lzpwwMMy4cbbdQv?= =?us-ascii?Q?rU4TO2tj3o37AwjovXWMcR+bjYPRg3nWJo7rxC58BzTHfemLXqlmQSe4xt5x?= =?us-ascii?Q?IIlRS2f5SGwinus7xt/VdnYKIBa9JS6I8MNv9ltWilZH0JDbIw2hedyfJ/5j?= =?us-ascii?Q?sHzItZcLRNfp/rnDs/C36uvYjORbgPTrsiWPR1TJPmYWS/QDzthoAYb4hmY+?= =?us-ascii?Q?bmVbP7bHmWAgCFlTb4KBVFsSN/zLlJ7KLq7oyAqtTcSzobtPhzT8doJBz2Ll?= =?us-ascii?Q?+hLbBlmLntDUf5YigAx2BFs+XgLuAYGXEB0NEs6vp0aElvw9OhneOike+ESL?= =?us-ascii?Q?kcEi0zpCQSyBBKPOeMocXK9ptZKGa2zUBfT2Kx77LWxsaHWp8HSvsNd+hdy/?= =?us-ascii?Q?h8XmBXlY450+c+wffnaj0LzbwtjjhC/WYvaiiNOj2P1ro2n6S8kiJcY6+mQy?= =?us-ascii?Q?/A6oZ5GR4Y6T1LjXL2fgVbM1nPSXtJ/t6mJd8EhTNd3OpMBaVeFsiDN1gN0A?= =?us-ascii?Q?gnrkBQdk9TU2vvED7tqrS4X8cQRxy2hSWS7jYHGdCf8QKfYagGS9f+agNqpb?= =?us-ascii?Q?cbCLVXqe2sIDv309X363AWgCHqywTh749ubGF2BCqzalguyvNkbkqErmLqWJ?= =?us-ascii?Q?UUoY3qeVH4f055xwlNSr1jUIkb+4PJfsjqQ3+HQ/3jeKlNfgJTzj9M+uZD1c?= =?us-ascii?Q?yt9hU20NPTbmiqiYTvxoarihcoTvsyF0zAihTeSaTEcPxq5ZsiCVToGruvYk?= =?us-ascii?Q?aj64R3tO3PI08zkoSXPKgAquRe1zZd7YDoES+QwHDIU5BSOUm8+UK7/Uyuyn?= =?us-ascii?Q?FXtn2Dokil6cVuv97Ey0i6LIeJIb+U3OslkQeQO/JVSudiAB0m6y+Dwtowgr?= =?us-ascii?Q?3OvKNWYKRCGEuKIQhOU7ajFJWlzQ/lMGlgF9T?= X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB050; 5:32FYw93ez4xH/+k5Urw/hEu3HyAhZQqYAde/siReQeGPJ7PR0QjfWZj0cAU/KOdSmDrHEv4bHQiijC5Qrx7pXO2vQ9SrJhxCtEsh2uDWFsXT2OkI4kmRdavc22uahGNFjkeAg4txf1GH3C8G0DuOWw==; 24:m4ostRSA/iGS1tl/rkyDIzgdX79LUIz4RDnqFxiUh0d7jOajNlvOAeTnEX5hwqOALCZmK7XN6c1C+h76oa6A6rMtOfzppgpvrToY5S44Qa8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2015 00:40:19.8536 (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: BN1BFFO11HUB050 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.93 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v2 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 --- 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 62ef4ce..24f37cf 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -147,12 +147,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) { @@ -185,12 +180,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) {