From patchwork Thu Oct 19 16:17:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 828241 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="kdA37n0f"; 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 3yHw0b4qppz9s72 for ; Fri, 20 Oct 2017 03:50:39 +1100 (AEDT) Received: from localhost ([::1]:50214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5E1l-0004bl-9Z for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 12:50:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DZo-0005aD-Jp for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DZl-0001zf-D0 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:44 -0400 Received: from mail-dm3nam03on0043.outbound.protection.outlook.com ([104.47.41.43]:3584 helo=NAM03-DM3-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 1e5DZl-0001zU-66 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:41 -0400 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=BQe5HYY7ofgy9s2ZqvgoZvLj+BQfS2Ir3xlaFrInMRs=; b=kdA37n0fTO4tCvnO46SO6FpVceJlRxcQ92n0qgFmQZSSL8dBKxrcqHICKVz4zhNpbPIu+5xdBoe7BwkWXLzfVmLFIt9p1l8l4HI7ooPxq2MpuLoeZSDdn7yaXMSSa28oIGkiB3DM0L27EXn3z//VS4bS9tSQo9P00IHwxURMv3k= Received: from SN4PR0201CA0043.namprd02.prod.outlook.com (10.162.76.29) by DM5PR02MB3385.namprd02.prod.outlook.com (10.164.152.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 19 Oct 2017 16:21:33 +0000 Received: from CY1NAM02FT025.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by SN4PR0201CA0043.outlook.office365.com (2603:10b6:803:2e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Thu, 19 Oct 2017 16:21:33 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT025.mail.protection.outlook.com (10.152.75.148) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Thu, 19 Oct 2017 16:21:33 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:38640 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZc-0007xZ-5r; Thu, 19 Oct 2017 09:21:32 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DZc-00037b-2p; Thu, 19 Oct 2017 09:21:32 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGLKPI018065; Thu, 19 Oct 2017 09:21:21 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZQ-00036D-ST; Thu, 19 Oct 2017 09:21:20 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:17:24 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23404.005 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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(8936002)(33646002)(106466001)(36756003)(5003940100001)(36386004)(5660300001)(189998001)(4326008)(118296001)(81166006)(47776003)(8676002)(81156014)(63266004)(16586007)(9786002)(2351001)(356003)(106002)(316002)(6916009)(77096006)(50226002)(50986999)(2950100002)(48376002)(76176999)(54906003)(2906002)(478600001)(305945005)(39060400002)(50466002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3385; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT025; 1:SDSi1Kk+v+Q4DEN4JVbmU2mW0ycfZIPf7rD1rjMyfP8nDEHIO4IqT2Kq9Pcq/rYBYjRBj7eOBuuKNJRF3caTnNITmQUgxNnrEwSNIQPwE4JfbwmKDHp5O8lbAXJxGlUl MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea1b426a-baea-423f-cbe4-08d5170d7692 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 3:0Xjs3bV/VnIo1xG1CkhtKN2U6mnSzKzh6pQOfMXCuEQkqNvzEl7rXTetTJ0G7zeyicciDvcRUSxfnRRxsRlmupisImv+YhPLI68NwJb4YAIU3ZFkMQUb8kPDQMlucfjOvewS64tLGYGIsap8zrFaQlzjwEEBjgT+f/FcwJts/e7wVPo7nw9m5FBGKjDuQO4Ohn15OFbkDBjFzYoYKjyUxt4c1oILbDREHKnN3LTvoH346YO6tOqzATJTwCKtsqL+VlSuE8pnl0TkEANpLOQQiac4z49NIxPJTmrhUf09RnEE64QXRe/a+EUU+wgTzZdRHoZc9yiGx0Sos5XhtPwOneud+LtDYTxCrUa9SxtOLrQ=; 25:UbAVyVMwXega7gK4Ocn8WaH3uO4ehAmyIS7OaGyuR9LiryyvuewbLBn+JP+Ih6luBcIYe1PbAELr7PvTE5/AoJyPN4U8M2e4Uw6mPjwkcuie/wI/FGIY480kycLKfthZO0gdkKI5pu15CuIM5R88vpLw88fRSnAdvUIPqqcnRPp+aJ2jUO4uLw2pbdMIUquhtppwzfbeVVbkyW0bzHULKPN5tWKQ2n2p7J/Vb33x3lr4tBv6utTISj4FpRC4kmJhCmaGQaD6aWZEx595oXvGGAQKim7M7nvFNajenwmVNWUvDszQfpWxpaEsY010do8A/63pzpVJvZFY2ea33V1rVQ== X-MS-TrafficTypeDiagnostic: DM5PR02MB3385: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 31:SBVmwfnjWL8OX38XwhF8e9QHnckybCzVQYSRG7bzKlNvLE5M7Xfb3Q2/7gQHjG5QVVfy7CM5qGV7D/aURUtBlRSyINfHcwOgpYVhTP+Y2ohdm89AjT463Qt5ob79sBsyPITHGuXUgd9JYnE2aA/3g/wicXHos/bAxdkB4Nor778le4X7rOuTSYzHjdXKsO7dWzpZN80KduCnT4HJgkFvVgBcFWqk455lATwxOTzOO6k=; 20:Qbd/9nMJjL98QbBqbWCmxZ3TvWzJ3HpLmQnqRGyuoPp8dGWHwkDZwKyPJAECkVncfs7jPaH7JMD2S3I6jw7hCVWXz5mDmqOGxBEgehBzvchxtVDdcEOmgLBXh4BAAQ2aff4YKaBEqVhKB+N5ule9DaUB4BZVymZPUx+iWiTs/t3TbxQUXLR47VdMmqs2DId/zAx4b/9iKIFxdFJ4iBl5dKNmSblHr0Nh2lcZ2pZPybukDb5dWAHbUNM0KF+Vzaa5sypGUs5dE32uMOt551aCqbU2Ya1xcEZG1RJy5vBARtkzBg7bOT7+71p2tTLf9JjMgyYLjjv854eiJXP6th8KaDys9VSMWDxcLYjFQq7Bd2919g8wGz2skHSTU4X4DaRa3YBumks1ROLDJFqNOlKnqUmHUJcW4Cu9QGPgcbFS93wEAiu4nCCIB49wnI++osqGb1tlbdIVR2yTO+ITxj+WTK97ebtcNfdkXu6HFmi/8+L+fo4z2kJISnepJWV6XqYo 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)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3385; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 4:DxMTNaKCKhadn6pg4V6bV6+r9eHqNQmAW/9IuTf5mRy3JSO31q60Y7HUQ1d/MDy5bdZCT0QvyPSNFIgaEMZgtS8qOY3bwH2Tx39qvYX5wgsU5rDx0S8UU2ImOAmOV2Sf3QptkGePqwgcVX82tD5c/v6EURRZLV1H07oFP4CBv/1r/23wq8HzdaWGgOhHm13xU06A4/RLqFUa4gRIDZ7BK0imSn0iRyhiSeM7mhhYMxF0p23pnLoTLFH7CRZTq7+Z3rcdkEnj4eMbuVb+WPcOJSUGkvtiqNMA0XqNdqMIKiyudVMD3djpMLWNpHGW9R00V0lk9c28h2T59BUA3h7PAA== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3385; 23:YfmGM1WcigdFXWW7JE6EoEjRbBiv77WFvng1XiEOu?= xLIaokEKaqBARnzaETwNLjwZmEFNZg/NAaAyKQkey9V9vfX3L8DW1EeFmT3dfPf0qaAA4M4DG+byH31sid1HNiPk30CrJZc8mPy8zkC0TcQPb+wkK1ocqKLdm06xumOzLu1JO9wBoiSApygyLJ12cTU8kPhbSpjhNJUx+RMCcek7faUsfnaQQBoRqoyYatWnmK9w17tEZE5ZcVzfANQCqNvTfgm8pPOIypq89GjLj6G09AMFchPHZV/k198UtoUz+ovsEwzlWsudb1MjiARrCEWJuRcytkrIDUAcx2oyH7ube7cEcWqBkOyUDH22uwZJaYi8eZi1Pn4/SYD2lDbp+yo07NK24g29SRr3wBlb7DrDoh/sKmnJWLsCNeR0F8o2tt2vg5Z7tjjZ6Iki3DcqWqXsRGHNUOgpdumeL3BbpbHW0F/7dL1HoyvlhSBPpnSROtULv3j3PVgfXhGW14ZFEsw4ZNJ6C9O6fVHp5Z6bTXXq0PiUB/Obn+f7FSn+DxY2YM8X+eeQ9Eyni6cQLZ4D5G1SGsX53aFeApr+gFcddTa6jTQyoiL1Di60GimaIQNU54PIIvoPRSdg66nlT9lcaQjyP6QMXbxaVIT5XQmXy2KtsX6aQgzFLpQehvf1wSjLWLB6zvQHuvyqLCSRGpOgDvoKJwJM2xZEI7dNv07ezgnyivYgwk9B9g+u6rAzS6ghoSBzuQTj7o+NadHVaNnEVEH/iNAXlx+deASAry3sNXaYR1ERzLHUQUgVB4MtHxR+eaSY2mv6Yxb1aT6JGHGD+mS5ZV8gWvYyGzXOxhHGsL64ZXTMmPgzcxNolxBP5VNd4twPenqIouL9vTbSC6dTeB2EkwCMPiM4p0+O+JjI3/RUrc36Mql8PMcCdzXSGxGBO1DlfGyNmPRTFvE+eMxeIku0rpl3xjT0A5Bu8DNt3YXg0glpiREVSsKzsRpsjt9znEGLwCnvKasaM9+Z1DZLQhxZjpqyRMAqxeODg0x58833OJGwQN+5iJN2mGYPpgFbp4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 6:2J7elllgV8foWb+HddhnOtNzWM2vqnSK6o7eneVGCZQXQkG14Zez+GdAVVCfQ2+3vPXidDXZElp9cgFieCviqMUg1zlGyJRnBVYxf2bmTqnIULybcfx4/vbrM41H7TvUwDqI2eSpV0OZ4AjPTu5FR8o3FEHZJfv2IkBprS6i/1ucmRwB8+xy/GvyrUWfeTUjwwV5gnIK0GoW+2WXX7/PkfZeHIm/N8MMkgKfqLND4Tfo1VjmxlFo862oKf6bmiYZbutiAxzYtQN/8A2ggXuxXraOp9Yz2TbwrmACry9TfFQMk5JZBWV/tLv3HYDN7z6J52UcsJwiITcpIkXO+Asf2w==; 5:u4VoLyAdZj/WihxDKhpFUBGS+eCsxUQs2CNvVZOkaPDPY4wVI84ia80g8PRGpT61WnnS8Nk7BkSmWaX/19wJl869iAYXEzmoEwSEm88UHTDA9S0YOCPFNVqlH/fFEIjaiQ226yBfbqbZh4nko6PgDw==; 24:MLnLyuMDbe1vrsJGNM+LlWo9ZCaq/NuKSZ3m9RLxnph4cQYW0qj8/FjqaK2KLMGoB5ZazDz6ZcT2p0gAhveGTfC1mxn4VdZ0e4k3HeSgAxM=; 7:3jRMCqsV8bRnCuDj9hYLaphMh34nZbKOcj+Tc4S6ZWcw7niXHRBn1GfFERvcxDm0fZK47J5bt9TBKEqMlBGMp3BCCdbcqyf0uqm4Pp5pazEMMuG03lEZ8+rhDzqJk6UaRfxzuyxybtf3N46zV17wC9LeaUAGc8auW3tw+qicsP7SG9Enkin74kPOi1MCSkjat8W0IRfvEONtdUys/t5jR/V9qB4E3MxNqw/we1KLEmo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:21:33.0232 (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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB3385 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.43 Subject: [Qemu-devel] [PATCH v3 29/46] hw/openrisc: 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, Stafford Horne , armbru@redhat.com, Jia Liu , 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. Signed-off-by: Alistair Francis Cc: Jia Liu Cc: Stafford Horne Acked-by: Stafford Horne --- V2: - Split hw patch into individual directories hw/openrisc/openrisc_sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 86bf2849c4..ba74e24e8a 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -87,8 +88,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size, } if (kernel_size < 0) { - fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n", - kernel_filename); + error_report("couldn't load the kernel '%s'", kernel_filename); exit(1); } cpu->env.pc = entry;