From patchwork Wed Sep 9 00:32:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 515654 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 4608B140342 for ; Wed, 9 Sep 2015 10:32:58 +1000 (AEST) Received: from localhost ([::1]:38700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZTJn-0000SC-VZ for incoming@patchwork.ozlabs.org; Tue, 08 Sep 2015 20:32:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZTJW-00009k-1V for qemu-devel@nongnu.org; Tue, 08 Sep 2015 20:32:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZTJS-0004x5-1F for qemu-devel@nongnu.org; Tue, 08 Sep 2015 20:32:37 -0400 Received: from mail-bn1bon0076.outbound.protection.outlook.com ([157.56.111.76]:23432 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZTJR-0004wm-Sm for qemu-devel@nongnu.org; Tue, 08 Sep 2015 20:32:33 -0400 Received: from BN1BFFO11FD011.protection.gbl (10.58.144.32) by BN1BFFO11HUB028.protection.gbl (10.58.144.175) with Microsoft SMTP Server (TLS) id 15.1.262.18; Wed, 9 Sep 2015 00:32:31 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.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 BN1BFFO11FD011.mail.protection.outlook.com (10.58.144.74) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Wed, 9 Sep 2015 00:32:30 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:49260 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZZTJN-00083l-Hs; Tue, 08 Sep 2015 17:32:29 -0700 Received: from [127.0.0.1] (port=38674 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZZTJN-0002Ys-BT; Tue, 08 Sep 2015 17:32:29 -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 t890Rda1019299; Tue, 8 Sep 2015 17:27:39 -0700 Received: from [172.19.5.102] (port=57396 helo=xsjengdev3.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZZTJL-0002Yp-JV; Tue, 08 Sep 2015 17:32:27 -0700 From: Alistair Francis To: , Date: Tue, 8 Sep 2015 17:32:27 -0700 Message-ID: <9900393572b63f2ec3d68785ca98193d81e0ac71.1441758563.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21802.000 X-TM-AS-Result: No--10.836-7.0-31-10 X-imss-scan-details: No--10.836-7.0-31-10 X-TMASE-MatchedRID: cJ5bkZO+T4jeG4FwcWqASxcanaCAqviGTJDl9FKHbrkKogmGusPLb1Un QAOplXiG1uNt11toaXs6gz4t0xTKhO0JlY1IlZlq8YGKGucXIE+d2Wz0X3OaLZsoi2XrUn/Jn6K dMrRsL14qtq5d3cxkNQFJ3oetKKrRRDRlCX3U+2r0yQ9yNTQ9KbnM0WRPyW1T3M8KJMYRbUg= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD011; 1:e5mQ+bQrVi4o1dOLxQ0q0MPf3cHDfB6u0QA/Z13+f7p9jJDwtaw+d89eqthRQJo/CNOgg30Y+IO471zZbvABNMAoVm6dGT5bDnJVx3Qbh4IT2PPrU8+zsUJGnotOejBubmc+/MjYEhoxYMhUN5dJM1C7vtZRStAFAvdZn0HS44utpt66hz/y/0mGIV4UKqLBdVxgULHCdGVp1gYRPOhkSwHpe0vteerQtVbxaCfSm4gRxJwA0VqhdviOMpQCcXoqD80Ef0KUnziGlxxwiu2XXxIIzEKulnNLRC+gUq6Sp9ZCQpejp2dggoR+/W5bTAhzHi85SFdfug2i6VmT5wEbJbgTdx90NJVr16TqcKWBvVCRLif0YIiQLdGbQeCgQeGrGtnaqTn0i0z8bkZlccWXaw== X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(339900001)(189002)(199003)(5003940100001)(4001540100001)(64706001)(106466001)(47776003)(105606002)(5001960100002)(5001770100001)(87936001)(118296001)(5001830100001)(5003600100002)(86362001)(71366001)(46102003)(5001860100001)(85426001)(64026002)(50226001)(33646002)(6806004)(50986999)(92566002)(5007970100001)(48376002)(189998001)(19580405001)(36756003)(19580395003)(50466002)(77096005)(77156002)(229853001)(62966003)(81156007)(11100500001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1BFFO11HUB028; 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; BN1BFFO11HUB028; 2:GJ03vPI9J3gfwhURac4zFbF/pjoQmVTbvPZASoUwujzaf/dRCGmVFZlNzmjKflTHo1L7hCcOn1P2oN2oLflkYbzo7jz1aTKjuJeHqhp+hLWifbTFEyhoW8qgDQ4m7RGI7lefIn2rAKUE0e82tqKuL7nokc7AtfaGCYPM8MSGezw=; 3:c+AnRS1QhWI83HZSLdWao77YmhehsyoaL8W6iWxfXiG/0Lox+kR+EFcaBi4q0pCNjgfXLtaOIsWel11UNF4KyGeeluPpan8UoSZFbinFWNWZXaJDdJ2jwLuG+SysJHC5iq0ogIh8/rKpiDPdqYymWS24/G5+iYmCJB7vObKIm6laI/Ge1gkiXMZOGTcSCZkKJ2g2udgHNFS7tosBLZEkxCma6/g7V7p0AXnrBpgwAmc=; 25:1CKdw+In/7HuiRcbO/CGZXtMnDnRgeJJZauS4+ErJUwRnNPvPEy4FoE1sSiQcTELEKJJfDW7NVGhgdIPXluarIeBBJfHUXEdh1FFcbegu+Zq8arfKvOcZ7AcoZpKAZoA7DRgrQ/r7K/AOhs4u5sp+QNlheg20ceFJegRIwfuzDn8EKbjKDf1/x7reu4nb01LjS1sgnxO6PXEWkeuISixx16DCGsUkxeOa5Z9IT95YgJyjLUGdQV4Y+Yw06VX0JQJySaVm4i32FdL/qG0D6sVNw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1BFFO11HUB028; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB028; 20:T9dju0X1nTzUNsGmQMDX7pQic3TWrl6hJFRYkFSINOHyZ/bR42/haL9MPynftG2C8VT5goN8nUyhoJMiazC8vg7kSWSLdJJzrMdaiIKEJUFuR0ZtL6jk+dawj+Wri0+TqDIjbfSEs+JrlXFWg4dALRE8N2PRHnKyre+AE9NQRiGYM4tup69Plb4btzbjccHf1N2loHYf6C950CDp1hjCBm3ZBUYAVURxpuPa3YKRNr51s4uohJuiApx2NuLrd0UfveFR3WBDTzueoDR8mJg8HJjvpCABIma9mZaaAz5VklTqEMZZ47qxIg6t/nb2Rx4LGzlZ1izOsIZW0ekQfOMSPasCmuxUFu9OCUBoje17u5BzXI9hY8Y0C9BC2Bqwj9DyFTR0VgRvbd8dIY/ZNyfRP+XC6STsHzhr8MhyNQXykD1buLXe9p/SV3s2jykxZZA5Ci2gyfjP1Zgh9z3nb+o3tFSTsZDJ4TISSeZkqvPdUbERoI84An0QKS0C50tj/Hix; 4:ToqgK6JOWp6FgJDAlE8KFXB8YDHpIe+7Zp14kIIW0+cZ6coG5i947FZIjcy7DmfT4A8ksRbdv5y9XKAmgROq1gU1GUbhUNnLdvjRMGAKKfgaYvDXQZJSJ3bqrgYY+civLuipVIZ/0iKYKUblT7pM7NReSFv+10A2yu29pUQ8jBhgr0FBqwX4zgxEBoqdMirPgEDmacn7Buss3gGZl8rrtYX/8CVclMymc6l3GR2sfmsYm6vbhPAdJPcf5PcRBBx3V9Oo56uOVfFDEKZDTX2+4Tzg1EnXHq0pQBXZDzI386jfTydg3lhEu7ahhjcBR693 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:BN1BFFO11HUB028; BCL:0; PCL:0; RULEID:; SRVR:BN1BFFO11HUB028; X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11HUB028; 23:fJ/YpVP/tXcFYQKUQd+xaLu1hzRBML8DIo2MzOy?= =?us-ascii?Q?FfySiBvzBcFtvdcUoetkEH1RAoegOMze+iFCAQYqhv2Z/7J0Xdj/bexBksmX?= =?us-ascii?Q?BGqAbDEedb4Y9/yWlGIraVRrdjwXu/mhFu7Ch3FENXJhxMkpnG568fzZAVNG?= =?us-ascii?Q?gLAz9ErYC9uyaEUW70jpHfj1KPsAO627mnpf8IEVUNegBkSqnoLp0ws+Ialv?= =?us-ascii?Q?N2aquwWYEHbYsk9zqFlhjqJ5eJLxpRHccErlWoI/OoK1nwxYbcTIw/y7Hn8q?= =?us-ascii?Q?lze4TgKEB4MvwwBsWPVqKkjOs8IMCDU5zRJormxvyGR86R31wxA4CqAAMFbi?= =?us-ascii?Q?weu/IMzi8EC4jhUlS/wAngLKCmB+G5tSMTLHRlHrUgaOYkhMdYOhSdXUZq8+?= =?us-ascii?Q?n0XXgpARxnSPH3CWBi0YgP8j3md+ZPRTbtz2ERiW4HQ1nilFSMsKzHJ6Kfm6?= =?us-ascii?Q?AtaLoqWkC6So0rrjc3HVvwhll1SMdEOOir94DER64Qz4j/tmT9/hE5K0+0m2?= =?us-ascii?Q?TGUoF+bvZwVF2RQqOoD7U+gAgvbLzTfUWPr2K9bJK2nIFxC6f5xQBgSVkpch?= =?us-ascii?Q?a+RX8GPlYcxvBAGSRGeKo656kDjYHLcevQVhfMmgJa88vKhk+q8+J+nrrgnv?= =?us-ascii?Q?sxBD9FW4d8WmC1886cUM/T/Mpe/7Rx8veyi5Neu0wA/PkoUKHts6c1OGWu8P?= =?us-ascii?Q?nHE7Rj6NsCmKY1QiSvmIjv2DGed6dddQO9ifDeDGqc2osy5whCnV68ON6T6a?= =?us-ascii?Q?bROIPUPO5/9vJUTwxTE7QmjZucW2cLt2quF+nzGTq0nwcFzGa3V2s5bcGitQ?= =?us-ascii?Q?ftWa2fQiJGqJuBA2+tS7/l748y80IvcYxoZYPfZhklWEqTU7ns4jSeexCmW7?= =?us-ascii?Q?q7sabxN5qvRU6jj7hUNkSCY+64Pgu1QVt+vYRYWujkbXVAwGBl6ayI41eITV?= =?us-ascii?Q?12UHCZ9oXUdQk6Eh5xpbw0YvumPyds55tbA6npu1iJoML96dnCm6cglFGO/L?= =?us-ascii?Q?08eOgsf0zH9z/B30oUUZWZl+CMUiUZCIvOPqRwOyY+PcRWI6VxZZ0eHyb/e6?= =?us-ascii?Q?oTRUDiAR81pBPY41VboxdtX+C7XI5X9M2cUQmC0krOsReEZsKuBL+TwiwKpM?= =?us-ascii?Q?ce3IJG0dxNd5pY0APzLbhZ3jgfURnbzCspyKW/YRa6vB6CRj8FUMGYiXrKN6?= =?us-ascii?Q?Zdt+4zXkJLUt/LsM=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB028; 5:/4rul7Tg32xEEIpb613mGse1g3lKNTJNIYEj2LBBxXKzIrqbpPm+4adjAbnebj3TM9Kdz84JWla80ZVCVMTpuBM5LAhVfybXoyhoeikmoTNu+gQsUuXRVqmTvn9s227j6FlPYGOTWpSvMjKYchtpcQ==; 24:O+cYIktEKzlNP2HSiZGGjJQApoW6OEiAZtNWy3lw5LXFjpyXQhegKWzTghgm2E2qCgksL86rcekUl+gW95Dr96HXi21I8rkgjtChgg+g2j4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2015 00:32:30.9436 (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: BN1BFFO11HUB028 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.111.76 Cc: edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com, crosthwaitepeter@gmail.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v1 1/1] xlnx-zynqmp: Remove unnecessary brackets around error messages 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 The errp and err variable have unnecessary brackets around them, so remove the brackets. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- hw/arm/xlnx-zynqmp.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 2955f3b..2185542 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -128,7 +128,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", XLNX_ZYNQMP_NUM_APU_CPUS); object_property_set_bool(OBJECT(&s->gic), true, "realized", &err); if (err) { - error_propagate((errp), (err)); + error_propagate(errp, err); return; } assert(ARRAY_SIZE(xlnx_zynqmp_gic_regions) == XLNX_ZYNQMP_GIC_REGIONS); @@ -173,7 +173,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", &err); if (err) { - error_propagate((errp), (err)); + error_propagate(errp, err); return; } @@ -206,7 +206,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized", &err); if (err) { - error_propagate((errp), (err)); + error_propagate(errp, err); return; } } @@ -229,7 +229,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) } object_property_set_bool(OBJECT(&s->gem[i]), true, "realized", &err); if (err) { - error_propagate((errp), (err)); + error_propagate(errp, err); return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem[i]), 0, gem_addr[i]); @@ -240,7 +240,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) for (i = 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) { object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err); if (err) { - error_propagate((errp), (err)); + error_propagate(errp, err); return; } sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, uart_addr[i]);