Message ID | ecf71a0778ac0444b4068aba08d70f70b53373a3.1440806502.git.alistair.francis@xilinx.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 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 7644C1401C7 for <incoming@patchwork.ozlabs.org>; Sat, 29 Aug 2015 10:06:51 +1000 (AEST) Received: from localhost ([::1]:50406 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 1ZVTfV-0002xd-Gw for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2015 20:06:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1ZVTdN-00089D-9S for qemu-devel@nongnu.org; Fri, 28 Aug 2015 20:04:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1ZVTdJ-0006pz-8R for qemu-devel@nongnu.org; Fri, 28 Aug 2015 20:04:37 -0400 Received: from mail-bl2on0073.outbound.protection.outlook.com ([65.55.169.73]:3424 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1ZVTdJ-0006pn-4K for qemu-devel@nongnu.org; Fri, 28 Aug 2015 20:04:33 -0400 Received: from BL2FFO11FD032.protection.gbl (10.173.160.31) by BL2FFO11HUB032.protection.gbl (10.173.161.56) with Microsoft SMTP Server (TLS) id 15.1.256.10; Sat, 29 Aug 2015 00:04:31 +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 BL2FFO11FD032.mail.protection.outlook.com (10.173.160.73) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Sat, 29 Aug 2015 00:04:31 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:32915 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1ZVTdG-0001Cn-8G; Fri, 28 Aug 2015 17:04:30 -0700 Received: from [127.0.0.1] (port=50562 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1ZVTdF-0003yu-VQ; Fri, 28 Aug 2015 17:04:30 -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 t7SNxheR010944; Fri, 28 Aug 2015 16:59:43 -0700 Received: from [172.19.5.100] (port=44014 helo=xsjengdev1.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1ZVTdE-0003yr-Bj; Fri, 28 Aug 2015 17:04:28 -0700 From: Alistair Francis <alistair.francis@xilinx.com> To: <qemu-devel@nongnu.org>, <peter.maydell@linaro.org>, <crosthwaitepeter@gmail.com> Date: Fri, 28 Aug 2015 17:04:28 -0700 Message-ID: <ecf71a0778ac0444b4068aba08d70f70b53373a3.1440806502.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <cover.1440806501.git.alistair.francis@xilinx.com> References: <cover.1440806501.git.alistair.francis@xilinx.com> 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; BL2FFO11FD032; 1:KdW9GVx+nUSByd38FFqap3IY6FE5rKQDcKesS1m7x2ZR7mDuTcixkMvxd6nZzzgvgjF/mR01Lg/VMnsSDFJrN3ZX2vG/iJ0io4rn7jjrNtgFXd4+DfsI1Sjo9QsdYTHi3z72/P0EuZzxtuinjSDjnorE2U0oMjFJmAASH3SfdR159vVq+Wo9U0TYbQ/xFy1bIOeM9ek9y57v6lsogSXdI7aQXJ7PTBaBRwRqhlolOgniiPgSlOh4wujcu9vSZYErlQeqHQ4J4Au4f2rhjp2oD+NUZexPbIN5PyzMnLd/7N2ujm1bwH5Y7aCSk2UBZ+y0gHdwZVdXCJnwONo7eyTTClsfzxPP56Dd19jvMz8qASckwfFWRSOG45ICk4swKDMUJdqFmOOaSo0mpQue+fgR/Q== 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)(71366001)(77156002)(229853001)(50226001)(2201001)(92566002)(47776003)(33646002)(85426001)(64026002)(87936001)(86362001)(106466001)(5007970100001)(62966003)(64706001)(19580395003)(6806004)(19580405001)(77096005)(105606002)(5003600100002)(48376002)(5001860100001)(118296001)(36756003)(5001960100002)(189998001)(5001830100001)(4001540100001)(5001770100001)(5003940100001)(50986999)(76176999)(46102003)(50466002)(81156007)(2950100001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB032; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; MX:1; A:1; LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB032; 2:IeVXixDH5wKnp6BS1oUkUADHGW6M4c6WeJkcVyO3BDsLOQTttCNiPkWpdLxDv0VSfRuMpCwIq+7hnyzd02XGIlvk4jVAcnF6jdSSUpZcx+bkv6Q0GOlYMTPHCA4VLslOsKWhWkDJSJVzsgF5yyrQoY3tag+L8cYV8g3XvuW20zs=; 3:XZ1T2O/u6LDEcY/IbhJOJX1DztIXrPfgl+FqVz6bbWy79LoWDExPehCJZtlPSEdemKE0lY/49O1FQHbpvVvpjyyDvH8856Ec7eo31k+V7nhFlRXIXcSA5rUh1/Z6E6fiewyncHzkMgITi7VgQ8Ckzu7318BXF/X4RM8Q1DmllkVQYs/2vbsduHExHvhbAldqdbaMjsRBhZmI6Y5GDZjh7W+P8SbbrBZfOHfkYCnHCYY=; 25:3/I77BR7SldK9HRY9PhKrrRNODd9UQtc33cP8VCHzaN5OeTLvo8LkRpojRB+sl10Q5kqrscoL2096ZVlcEPB5Ujpn3I1L332Ie1Dy2TMR8NwMTjgRdo5urb8virebhTI16b9qmSfZJJJKBHUNOfkT+Rl269uNoVhOtD8tH816NYIR/00HIMOdv5JUfptev4s5IQeH/Dnw4i0/wYDEU1Etx59HPkyeMP6SdVWY4fjVthXx+PSxQ0XsKrQP01p9h28 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2FFO11HUB032; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB032; 20:AppUbqt5GimHjifa48NEvpsP9V8/fkuWA1H01XvK+5E3FQZ2QBOpnAK2qwj1kaoX1edRGcSKQq/bH7Q5dsn+eGZtNkwzrASk+zVHyks1+EAevS/Z5FK9SRANZUannoisEIjzAqMfhbOpDG6hjCyEO/pPx18wWmFbUm5bZjD6xzjwgti6+lqPiWqZlv3Ov8KhCQGrE93gQbH8vsU9tzTr4N9sfDyR34CJvJ/ooo8FIYdL0t2vn6Wl6ijsuLsNJA6+j0yiwiUs2EKHKFBqf7meA2SrmqQnDr7oqrO1TRY9fDQOjcfA5QvuCO1dWisJ0HkO3UTtMtEepMyxA70VcjtenkfE7wcQPWkIcZ3PI/oAr236xvYvuw0qgv2AGtKXV25uMvTrnifUv0/cwUyJzeqals9B7vfGftgXJ6B20NUyC2KWCo0Ix2hJQw0Pc+kytl08ec4Pd2tf6wX/QI26Nu8F5T4FpN7Au6TkzmAwLw8IPRQzrQmPb0iJlu9bkw0SV1Dp; 4:gN4SBs/dI7x96MQ1MswNtZVg6vmhiupxzITzMHNtWOiAy/nnJfKuBRRHwYdGjnJp07C78hL3HoDjTOYl7TCR9XwSp95+NbkMVHyJFRsYvfNNnxd/hKKm533BMyUGj1YmVFX4/p78n10NsDo5JFo2MliDyqQxXE9yMsz+kiuTbbqyThHqZE4QWQpFNDARrsxHJz5T9Huyg0/uN7Lfm84Ng8EG/KD/1Viq3sKRJ6NX44f3M9KpYjDi26ltF4qgdo6gMYN0EuPUC1sbCrDnohMUDCbdx9XDRVfHAZOGNraPark+YE67x2oyZCv5D3b3WaYB X-Microsoft-Antispam-PRVS: <BL2FFO11HUB03283EB80A06BF3972DB1BEE26D0@BL2FFO11HUB032.protection.gbl> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BL2FFO11HUB032; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB032; X-Forefront-PRVS: 06833C6A67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11HUB032; 23:Y1aUokyRng//bKR+xkTTxz9tK3i9DbKxbECAIC1m?= =?us-ascii?Q?Lw8tcuterweDF0DpszQIgLBsrEH5eNkkvEicpkBVaRZ2MSxhkY0Erspaygf6?= =?us-ascii?Q?0Y2DHJLNErAi3936N57yXcYiFcMiIT57DwSNx8vqiH8KIB2Pe0bfSFYA746v?= =?us-ascii?Q?YbmXjI2a/cfJy71dPfpcoPvBQB10zD+0ohBqDYfFgoouc+203sC6IVr1NWAz?= =?us-ascii?Q?fdCe+Sysu3OBX+6OoLY8h3WZWEud5A5Db+O3YiwoKxAMoywIzlg8s9a7WB+X?= =?us-ascii?Q?QrPv0fSUOUPSdqjMGFdMauIYpQVv8Qz2m3DIP3hK/DnjS4b56P20gV9zAopR?= =?us-ascii?Q?zddif/IJQ9MsWpgEMEhO4b7RkDBY3TvywI005HnAJJfcCU760XfZBu8BaSCm?= =?us-ascii?Q?F4bjvQT2L+rz/09POBxl521UN4jgsOKRDcJXmE+EkrEuI0nt/65mUZfPfWbX?= =?us-ascii?Q?jIBdCJe4U02saKy2ZQ4DNNaO2dZTAtree0gOqW32/yQCSBDJBgnEjnwd/Ank?= =?us-ascii?Q?lw1CaIpaXfDNpz5YqbrCGd97tO2smhDxcHjwQd04SLFEtSvp7mHgcz/9PJ9g?= =?us-ascii?Q?hu5tmwU5m3TnqorPhdkHZ+hWQavK2hPZpt75ShSx6nnOBBczYB6j1Oj+y2I2?= =?us-ascii?Q?1GszspSTSFe4YNdyc43wqKNWYp8ozo15LfetwTU/E7AUSbMjnxPtofV1FuJC?= =?us-ascii?Q?hmHe6MPyD/gcTRl/YORVOPKO82lRxAhIKMO1PJpWeevxDVMuoLql7GDVB9tz?= =?us-ascii?Q?eC36KQbEkzifGW4O1D+ffgsRMCxSRl1YwKNLo62SMeDQauDnJm4jv4OyeAcz?= =?us-ascii?Q?UYMIpP91hsx1uImO7JqV3q8Jhbh6o8Q8jfnfwrRGwDQiIAqWkSrakrz/xAw4?= =?us-ascii?Q?XRWYUlGwguHuBCi0HkTIXHCWlixKV8+mGHITjw49xWcFPb/ZyeiZgXmiCAPh?= =?us-ascii?Q?Bvi7DktqNU2MzoU0jkMMsi88YQfGLAKO0Pf9SFPkjorBsLCFKqlX65/fNHZp?= =?us-ascii?Q?8ox8r0VuIYXbtXIMrXcnXuZsu3kEzldfNXIsx6ubjrtNjLYlg7YE/kn7RK0B?= =?us-ascii?Q?eUNpB9vcduXP57OW5knY3hc9TSVDTVOOM8vXlz0Jy2T4gGc3+bb5+oKGS1o8?= =?us-ascii?Q?/Tn8wTHpdRgqpKqSrL3oYmKcJhC8c6MyW2Ay15hcP/MsxC3lWxEIsuVux0nK?= =?us-ascii?Q?bbAI0z4k2UEV+9a74woK/Tyw9+mpKQE7iHierIy+TOUekNdGqziRtr8YjQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB032; 5:0xEHRErz09KQVnip+GYBlPR4jfmboeEcgJrdVzmkl+yCcQYUUa78mm9hvhvmYv6e+vu3hjUboKxRhbVkN+DbC8pzbpz4BAxSJGMgQWaADv3EL17FXDeifY2QNvxaNjkhQbCr3Pyzww4r5mOwshBZ2Q==; 24:OukcVzPvVQnpI9u4aIlb4mUc2evLIGwbrrJ3bi+c3MhNT/C3bDh0oCUvSxTQSA/pt7z/X+On+HqiNKurqzQX7fr41jt3vCore2D6GX5Drio= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2015 00:04:31.3519 (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: BL2FFO11HUB032 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.73 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v6 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: <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> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org |
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) {