From patchwork Wed Nov 8 22:58:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="jYvb/gHI"; dkim-atps=neutral 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 3yXMp22BQrz9s4q for ; Thu, 9 Nov 2017 10:24:42 +1100 (AEDT) Received: from localhost ([::1]:34419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZi4-0001WT-7l for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:24:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMY-0000Vp-99 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMV-0003aZ-7c for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:26 -0500 Received: from mail-by2nam01on0082.outbound.protection.outlook.com ([104.47.34.82]:44277 helo=NAM01-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCZMU-0003Za-So for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=d+URxuRMjAdYXLWDBRMSbwz1g+J13f2q+iie0JAAVQQ=; b=jYvb/gHIqzjWVWBpEDMzWrg1aquyf4y0mvRh7C9ZWGQz97Khlqr4VXnw7ylw6a1IP8TrMa2c5ABYLoaZs4np9Iv9o0kyixdsCTocsMYCLXOsXC8fe2Po/I5SOvKa9d4nZcsDIhV17vDtZ32z6N/A22cLawj2Ld4F5SYyRIriLoc= Received: from BN6PR02CA0083.namprd02.prod.outlook.com (10.161.158.24) by DM5PR02MB3276.namprd02.prod.outlook.com (10.164.148.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:19 +0000 Received: from CY1NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by BN6PR02CA0083.outlook.office365.com (2603:10b6:405:60::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:18 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT024.mail.protection.outlook.com (10.152.74.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:18 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMP-0001N2-GH; Wed, 08 Nov 2017 15:02:17 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMP-00032X-9c; Wed, 08 Nov 2017 15:02:17 -0800 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2BiU010184; Wed, 8 Nov 2017 15:02:11 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMJ-00030w-0k; Wed, 08 Nov 2017 15:02:11 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:13 -0800 Message-ID: <1dc70f25d82fc829cf85b9be45cb77d88d8f3af9.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(16586007)(36386004)(81156014)(2351001)(81166006)(50986999)(76176999)(305945005)(8936002)(36756003)(316002)(2906002)(77096006)(54906003)(4326008)(106002)(2950100002)(6916009)(106466001)(8676002)(356003)(575784001)(478600001)(39060400002)(5003940100001)(189998001)(9786002)(5660300001)(50226002)(47776003)(63266004)(48376002)(33646002)(118296001)(50466002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3276; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT024; 1:v6Hyffs/g6RS5LuY0aBIc1h9Ft7mbIu/yhuGAPkw6QUEVb25N+ExKHSXYWZphRVRyYBR0Q83t69LBHHhp55Mi0sopR5aXENqtCzFAppvbTMQdxYKPxom7cAP4wNk8zHO MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09606051-6eb5-4980-89bb-08d526fcc2f5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3276; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 3:enp5PvM0CNJtwon36KRZvy6ii/7FihuwO4Njj5dhJw+Gn0F1RVAGO5HBAJK1ztvcheCOK4FeEDAz5cb3eYJvyCjFJcdNMeyVkrjwaxFWRWhnMFpW5wg58w/5H4L0FY/9I89HeXGIqMqxvGcmcbCqo5NmEpsI6SSeslMzRMYNyxDHzIawW3gNtkv53V8x7Jcp6b+u+/IFNX8eSAcaDVfjrXWQs03Xu/tA3lv3Qzf4JDKkvtWV1MJuluMjQ7vykDoBHbdL14QgxDdadVOO3F02FI5cVAo38U1agGgmd5+yVXIDhv5TF1CuePynRNmNBd1Ac75djtr+3LEqRafih9/cjqTyWrCsC3gdu4tMIRpZCkE=; 25:XkJOaCwxy3dT86eZEImQ+pzdEPHedVrQH8mXp9L7kpk7YjQjNFTyRImxlnSofQtonOCapEFB1c6VT7/gnu2p0ljhX0LgYZYQB/sqyHqBHqpaGALfT44//dKsF+L373zElAoLL59vcKHaFktCAvKqhCCLdNN7niIGtciJ/Q4Tm90HWzQbZ3vvxGrHxyTlqSr353t1Uw7qgWcAddH5c41iTBEl8FUixFRKGf3R/Pybw0ULkoqKrrk0lKbH+femq2Wnv+3u76wQLkC7IkjXswzKfzp6gRinv42aCW25sUKwHzxpAxwJjIWLJWQJXNOFGqpHGNHZdAf6BWG+egxgo0Atzw== X-MS-TrafficTypeDiagnostic: DM5PR02MB3276: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 31:yYY0yziggTt4bb9Uaaw7mhcK1HZqSCE3x6JwqFXN19x3TdiD8u2HV87DZ27Qb+9Kd3P7h3zhSjVvGwS+xflmJldp6MsTLzC2FegaSZCUz9gAgk9mLHYc+AYTLqr6xrc4lY2yYo8YjEtEaWj39BTwUCmTw4IAMTwep1AC9KA5cJeCVbhVmMqgsLbshRLpDYf5u7jtamjn0juFwK1hpLBBFkgHlCMop6FUd3BsFYQoi/g=; 20:K55GAnXldOCXCTUWJV/vlcqDJzjGKr1Kr8wi9TV/PQRILBsiJZiDtqDq/Zf22OeLDIK04IBx82W9fDqUvP1RPwuxYsH+D4g8FVi/cGajImxl6XJ6jOliATf8gpz0QgzSqT6z9MIYaFyB98ztKdyLEM54nU4OCZr0WGgwYlmMaO7HtjLUqfF+VtcLGBT5paeOyNUcqQaG2c8npfiiym4UW0W46HFoOgc6ojB0Z8PrFKLaYN/iU5V2+PuvPpejTVH0WPRBgqa5GETUitpCw0u9Pf4j5LfHNfQz80aQ2y8Xah1HSPzqt46i2BMTk1ZbJgIP42uKxkbp4DuVpIT28k/pTdJIuGjpC+L3jOxlrgos6xuHNMVdezXMa3+DKA91XwpPzQlrGekpx7u4lt+ht9YGb4ZWA5JrNGf2kx28njpEh2+SokeanBJezIoLdQl9mNwOTlp7eC9TRGzi+28UGLDe/VOQNaYnHFdRjrNjjHfKTjddDiewyg2WKjhh5DGPXrrd X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(3002001)(3231021)(6055026)(6041248)(20161123562025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3276; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3276; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 4:aMr7tulGDCE3Wo6UMkza7iuZ4JolzqBEoobTdI+ybFan+l79c3O7ht8yhV9sds3geVcc39WIWK1Apxlzqe3hXMaKBGa+JEUH+t6VVAIipkiE5h4tJtLoFxlU3ivTzRum0oLkBdP6lUyXcZImjQTbkEuxmniACkBmdasYhb/u7GdnhDoCiiLuOPEG7XDtuO1WFAGoAXH3p1wDwOlEvLBK8PTUK83FMsXktMhXz1kXJqfnrM5QWEPgGz0DgqxDJqCJ7DLD8bHK6dpTqWRbgWoTtPTIfWdM1KvSI41Tr2czwE+TwnEe8lGcry8p5hVJsT9O3s3+kGJ0G2lax3OAnHh/ew== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3276; 23:MYTEj0UcTtGAn9YYUrj02mt2gxh+zVmyOdixiO7ZM?= zY2jsypEBzuPHsgD9KasV00top5bAW1dM3SxZJ9hvc2Tsn1s7U6WTUCHgP1GWgwgCjRFbH+uc1BLbYEZ4W/yNIJiOZRiVdrcBS9TUlwWgcWmJYQDwYpy/L6uck+uMGbHlG0sL3AEhWpuaLXFF9h8rQaUuhlkwhshOJK8rO9oLM16l3BhXKn1xCYw0mIsZMWZxnP9w+2HmgyjefmcJTd0SJ5mSRdypxYal20JJi27c/o1tuVmB7rMkXOpBGBiSlHDyDp0x/hBsOSK4omXMIV3SCvJqmr7CUvif4DXa6MwNeIFxYLg9g/YPFTiD6XtALwyy1AAG5fIbQRdNcEl3xoVKaKa75sW4fXZEc3DQ/sYXzGS0Vj0i4RPqsUnA+L35AElfF74mOMG+PS6Tq1IQ4ikfjkvWN8ZkVVIXI3e0UiT5HicPLproMVnZ+D7ZWWtR/H1PRGVmMfldgU0+2AgMYZRJHxBoPSF9Tz7azuPnU3v15pOeo3Ij1d1ihIBGZkv4DNh6MOcGjLSWP/9kjLjpSdelejs+hBXRd13AqYBMy/Uv861FdD8nL392PQ/6ezfGThXLKBpqyvXb3fh8vQxgstH9mRuy8KWJ7+54YJ4PdQnRQ8re/NpHsd7f99PaK7QIOR3u1ChLH+7JSs7bf3JRz6pDaQvOTDyZrEXgthSF9y/PhAIVHX2JDJ1rCKC+OJeW1t02TbuevJ1sKWO/yCVDuyeVUmo+oilQjlnf1isAaqQpTBvftno/3KVKt/SrdcZC1sXi/yJQuz8XPP3jbcxKlXTrbdi/8tLJDEPE2GdZ77UvDII0kkj/qgRLZfQAPjYHrJVyNRfsO9/XakYSKAUUcMqGbmyioPtg+SL52kUaitGExwiaWMOrxEGG4VC4BgJOafLUZ2nP2/agAXVttLrPL3Ri1bobKJoLh+7IUFBWc4/BcgYDyykE1isRR0RF3imH6kEsR9MxIPyWF85XOUOp8rEV1WmBC6UK59UAb4JxizAOzGObp8Mz/lr+Vbs+2caUopKM4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 6:x+WdrV5j0Juq3Y0/MJhcfO0XTQO/LiPVmjRpy2n75pOSBkgsCUh/oLoscr2JxNs872YvSAi+IApLFZqzgDjOL6ffHZjAM5UvnzQhnVMlLuoKBbWjfZYdugutXDJmQHcrqp8fCgAw+hX2m2H2kE2bePZzTMnJmejRMpAixTUu1LEO7alxpAY37hFmhmIzoCRR7xGJp2rKUCApHkYe635VffHdYiZhc8DtCPt3+iJzt9cw6wNdWU4qztdn77cFsXFgIkntNjh1trPWnG41d8lEvDu7a2hO+kTikQksjUZHtEVXRm7Oq4RDCZVlUnqUB7yYc1HkxI8VWj4ZA+40d97jF1vw3wYGagKvaoROiVRrsPw=; 5:+lYPXlA8+ddW/QgdoNk+qH9Ocj7FE7hs5V+v8PPEVv6X0y8MKoTkHazu8bgJu3cccrXJrafL1vrDN4nZeqIgT7BXzYstR3MBB/kZZvBlgq1Vk6T8hGastP0SIOyVB/Y2/2x6/e5I1pTUhufvYN5dESuGXR6lGmUnZUeFpMBRhCk=; 24:Vp0qQnV1uUyrSvdkPDwOnWacUTQyIamlJp5rbSs8htim1rInl7Gu6ka4YCubZBLZlqG4h5t1wnpFzjgQhELUMHCamZBaHpzhnMv/uc1D4cY=; 7:cuzn5ZwFdZe1r5YLfExpCSuIM8CaqS8TYvk+ExsPcgFQGeVYC5mXZoLoc9xFMzaxoeLvajn0ETfaBfC/y/5eH9Df2OwH5C//tvBtV30DPqSOSk/pjTjMRpbzdtD/8zkkfdir9keHrxI8+tFEyP7TyFDWDQrHOeHT84Q0HCUENqTww58P29O+6S40oJFXDrSY/+cSSfv4fB3Q3Tkn3D6AKazY3oHV2N/CATvUov2E8zJdk1WBIcr01j2uKjbtGBIg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:18.4309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09606051-6eb5-4980-89bb-08d526fcc2f5 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.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB3276 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.82 Subject: [Qemu-devel] [PATCH v4 28/45] hw/nvram: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + Some lines where then manually tweaked to pass checkpatch. Some of the message in put_unused() was removed and replaced with g_assert_not_reached(). Signed-off-by: Alistair Francis --- V3: - Add g_assert_not_reached() in unused function V2: - Split hw patch into individual directories hw/nvram/eeprom93xx.c | 5 +++-- hw/nvram/fw_cfg.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2fd0e3c29f..5cad031eba 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -36,6 +36,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" @@ -105,8 +106,8 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, QJSON *vmdesc) { - fprintf(stderr, "uint16_from_uint8 is used only for backwards compatibility.\n"); - fprintf(stderr, "Never should be used to write a new state.\n"); + error_report("uint16_from_uint8 is used only for backwards compatibility."); + error_report("Never should be used to write a new state."); exit(0); return 0; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 753ac0e4ea..1c66052f1f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -518,8 +518,9 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, QJSON *vmdesc) { - fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n"); - fprintf(stderr, "This functions shouldn't be called.\n"); + error_report("uint32_as_uint16 is only used for backward compatibility."); + + g_assert_not_reached(); return 0; }