From patchwork Wed Nov 8 22:58:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836042 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="4vKgCu+S"; 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 3yXMQr5h5wz9rvt for ; Thu, 9 Nov 2017 10:08:04 +1100 (AEDT) Received: from localhost ([::1]:34335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZRy-0004Vm-Pt for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:08:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMY-0000W9-M0 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-0003ai-JM for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:26 -0500 Received: from mail-co1nam03on0051.outbound.protection.outlook.com ([104.47.40.51]:12352 helo=NAM03-CO1-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 1eCZMV-0003a8-9h 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=SOCnUdJo/1kpcBXRjfvStuvHxBYTEH8ZWoFMAehOlNE=; b=4vKgCu+SHgb/EAT5vO/7tvOyWyDSihAGEwtd7+09nw3Iy7RqKkz7SgTexFusKwO/7CVNnrorzFATALAC273SqeyCKyqIXG6Ks5Cf9IH/lKqLn+XMisQsl5ciwvX4no0BQmijZB7QzVc0hboDxj+R+V/BfSajI/JNiLuW9PDaHoQ= Received: from BN6PR02CA0097.namprd02.prod.outlook.com (10.161.158.38) by CY1PR02MB1333.namprd02.prod.outlook.com (10.161.170.24) 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 BL2NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by BN6PR02CA0097.outlook.office365.com (2603:10b6:405:60::38) 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 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 BL2NAM02FT024.mail.protection.outlook.com (10.152.77.62) 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:17 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35967 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMP-0003yV-Hz; 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-BJ; Wed, 08 Nov 2017 15:02:17 -0800 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2DZ4010230; Wed, 8 Nov 2017 15:02:14 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZML-000326-RG; Wed, 08 Nov 2017 15:02:13 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:15 -0800 Message-ID: <00918ed06283a21ab3ee032c02eb4662e306ff61.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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(356003)(76176999)(48376002)(478600001)(81166006)(9786002)(118296001)(8936002)(2950100002)(6916009)(47776003)(50226002)(77096006)(63266004)(106466001)(33646002)(81156014)(2351001)(50986999)(305945005)(54906003)(5660300001)(36386004)(106002)(5003940100001)(8676002)(16586007)(316002)(2906002)(189998001)(39060400002)(4326008)(50466002)(36756003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1333; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT024; 1:WofD4efiq8ipyH/fqrgkfj7IC2IKuuuLmpoEJYAO94J5gnV+iMgOFDsB/zp1eoAGXBe0iluhuG5uOPuuOnBlHfPIPCqiUWwRkUQHjt+K+iEpk/RzTpdwYyU2VhyaJb3Y MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd159f03-90fc-443b-b6f9-08d526fcc28e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 3:5LKxNkd2JrgwjZdvBZSYV6DTcH3qPViUNkT9rk+JlZkb0l4ycBN4LNnDZWqh8CZKRvNr5WDQu0grWMHsF/jcj1HPh0924vWiT0KRipEIyGGSMqqOf7UHMEgyFMWzDBrE7kcT5wZS9KQsYpMujMatNfQMQiV9jouQnmc56/mGfjkulQBFWQ5HLJpU9pyBzp9W3qOnE5b0tHj7u7hZeLloOyktqEvi6vAAt0CGABNfwpTh/lDW2HSMIdqSSlxjDipcV1NYpoUzqwsQ/Ehy+PyqCn26uK6vsfcY2UFnLcPztBgL+9803Yj7EaCL6EiJQW4I6LwKer5TVdtjnnGtc1SCUzGwTrEVrRTAtBweczJfgTA=; 25:WR3yWFbF8X1XQpohAJSYUpdJsSDzuafeiND74EfypvKJ/dgebNv9jTm4RSu7ckeAkmV7bdybFVbnjlL363M5i/HGkZF34KVPJh1aTU5r1UkjpbFFIOExm9Mk/+fzw67INQiCRebsh7KaDGe3Mp+G7fLZVbIs1awp8hKYttkaFKUkVaPRZwiJcqkWpDeTLof+SYlrYGMWUWQsf/c/9JZiHWGrdJY13BTSQHYAsJEetx64vRB9ZHR5hA2/wLwfw044gMAFd+1iGFp3XTMFNU+GeKkQpkD29XtEizTc7S29dtaZyW3iWdvVw0AVbntaNaw982DxAk05x9Dvuu89e07dM2lnxkKjezFmCEVL+48JClU= X-MS-TrafficTypeDiagnostic: CY1PR02MB1333: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 31:dASJbEC8MVLYrg9RtDtOnYQ5FWp53YRcnG1K4DigMf1TNRf1dXexUgvCBh59cNxuCT2MsI8Bw/OybkMGjvdFWx0Uvvov8PxLFzTLIPV89qu0PfsZKowM+I7MQCK4FQy2HkSLpEex+Y1xjTD2yajy6Vh4AnRQSAAr+37C0mOWjQtY2EB9MwtbzPBhHVCpj8XkmA4EE7GCPaZR/IdKKxwRYeEAjACBvLZKY2SxXdrLjxA=; 20:2FBtehlIuld/BvNtkKmdsKBkTx6sSgPUAnsWB8dNbHy9bJNN1edULw/+FqvYrLbBYkKjzD8SRz7uRa+f0f9CWD2MNTSW5Mp8bWz0d/GFTFp5SKcnCoeHuWz+R4eF/6r4TurxoPNr6vaKHR0WcldnmQT/hPKO3IOkfof92K7iat1OdI3WkOjfjB00np0fanTIgjLENAZexICnAtMMDFM23Bs1mScedLbcYo7VUPOa1+HIW22k3157To2tuRXv3AuwlgHf4fcTgk8O2FaXP6jaH/b9ggUqiZ40D86l2QzKms7wZNBTY4KhR7ZW80y0ITWd+aq2sBUqdm+TrHkevznDWdhvL17hDDZ5rL/mOcPjioEgGWdttOR158308s9Pqc0h+0O6OS4xmra1mAFz4C9Z5Yt5f5t/mm+OP/fpjPO0Srz6VqZF8Tmkrr4iIyDPGf6qe136H6Rn2WDM2oji7rK23mb0jKJKwxYWdhSJhVEZ0UgwPe2b2cuV61khMXycVIrV 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)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93004095)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1333; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 4:2JBnONF9dBGYKopQxOoHWzJd6i8IKLnfcTxxaOsRXslTsUdz73FYj5zdRbD3t0EmzIJOybELdZ6N+ZS/kl0qf/qqw1E28yUK7PxhDTzUrGgAo+2xsNrBH+4p8maiE+MrJl9vdgiENzdLOv8pvlPGlcTglot0YNoxAdZKNmgwv81QaQ/Jda7ieSXOobMtLx5rZix3sU4aIniN6/uvWwxqv1Lgq+57moGgdUD5iONCGlCwAYR47cAtxDx09KHq2xwqgPJn18pPwSjo8F4ivesyNzPsM6RO5gnsj6DHZwrTsyyg8odqRtK7trAYWSpL9HyqFSsIqCbYaglOgGpYOJKECg== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1333; 23:oLIRO0lPBrCACjauNX2tvPFG7TPA362mwwg+w18jg?= vKrR1K0fnJYLj2deI0XzWtQwMYlJn0jxi9HFAwx1sEnIfo8/CqwQaNfITMObo92Qm2WAD7Qawco2KnV1WkqsnkUC47FYDTTXVeIDdxKtLko+JcwPxFUiOT+XiizG0t7A2nLEkmJqIHLSyRHbUd4rOCeOzbZFb3WG+j2UfhWtHknT+m+oL7PB3xbDOXDKJmQ0p7r+MlIqf1sx34+MWRDsWoFlPTXKVkMVGf0czxXw9CJSQ8dfVjWh6Ye0Hz6Z/ucoTBrTS6udJMyTSMWRaNiix/9rFVNPcrw8fkzJm4pSqpP0rt/LcKhyW6rkzuruhExO5x0CUOJsBV/IwJj4KwG6kw0IYrwr7aAot77iC89cXLc0B7Jt+13zK1kpCDjDfWjoOye4F0J+dXBzMPeU6OViKtnA88Z4ezYAM99ja2UpVSjdDGEXyprkFfkoUWpkmQDOPa86R+ZRmc3910e8BoghERp1oIZiDsO6nzcqWa8QKxZAnDPowwrkwTZkbqgZUnGd/h2LFV6NWU8j/n7xGk3nSxiiQEoU2LCZB4ESGvC/qqlABne1+QcNiTyDtQHE3zO1Kn7xWqDzxFptUU6PGHb4NGtx1oNb2T9HT0ug5rxL6i4cZ0I5Vb3pedA5BpwrWMFvEMiishC271i7/6bwu7RXGK+9gXKJmsAnxXaVS4iu0E1tOxUwszG1xK8DiQ9YEqDoK7vIjpEl2/N7m6UNtiFc3strWrjhve2wskUv8v0efwvveVxaHvrugzWGEnummwvhHQ6j2Wbgo1HZqtedrvYXMdFiJDCRBx98tsAzS08qdf03Gu23ruN0yWkdJjqBP6kdCqbsfADQFEbaE/n+cjqeztACyH7F+/n5b9pC6CYiO1nS3EytWdfkxV3aWGVBpMrvHV1W7XLArkfyT10IqfLoq2P85IkZ5NXV+8R9/CijlZzsW0Gs0aberba/M8yOBvGWQLfGgbpu5rh1cmu5y8RbfPRjAzSi28VMh8XkUwJ2rAX/2fcLOMjICLy/Ynlu85ew9w= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 6:RRd87kOiWkFJLsNjWerW2jAkV2MOzSzbrPHfSMU9NwzKmUjv8eNbOyUfo8J68yLp4y4+G62ZXy3147ZHL9iOJCwhCNsLkGNvv5yw2ife4D3rn2fEKYFE+EKzwv3JFlPAJUB9EuARoSGlaJhD6oMGRN23X18uu3Q1ZWkcaMkWy0HoRsY41UkFLtK0xLzbf8IelG6tXPf24bsJ0H6MnzRFbz6QRNMJCqDmbm0FqS68F48j7Z48gXNreh5Exi0Yw4qdpyPdjhr0RNhmKo5oq58BzP59P9oLsFTEx7Rg2CEoWBgIBvkxMnCgps2gbNK6Zaxu1rdVVqxuoMFBmyeFCE6m7quQry+6Z5ab1lKXe9ku4sM=; 5:40/IJ4J9CS82Cib0RB8yLy3q3RPfKcXEzTfbl9pppcS3tJFJphMG12hH7inaP8xV/eXkPJKt/0FCjdnJ+RLh3uzRuezmNJAtYjjCyJHQVtkOLDTONO9u1WQSBoJguSL4Iv6V03MeoTEETbKiVphuNTAErNZ4cI5lB7F6h5BvR2A=; 24:V5O4ITbDRvhFOLWnBlFqc9Etg83nKwsV3pNfGuLG8XlZXaYCaq5BiHbHXMijCyVcX/FwZ2SE7qvOi4PqWC8ZaFQ73tXSrzGODpO1gKtZHgI=; 7:aI1MfTPwNLEuZ33GN79dZKLpxIq2o9tnJo93GXynRiPM6AFixvBwpobLJCrjxjLZiL8Qa1o0R72Q5cpo4YsVkGZrT/Pl3EKq8D2Bk93Opm9fwchkP2j8UGYqAY39AWIuAfWS7B3b704doejla26dx+PBmWzG9651qBbOFNYGSaxPDK+WliHLRJ9/xZZEG9g1vaKpqzm6hyrc8F9z1Qz3L9HVaVxOrCHm/VKlXOnRHFgTYet7E77nnAeHKYMTfLJL SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:17.7883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd159f03-90fc-443b-b6f9-08d526fcc28e 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: CY1PR02MB1333 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.51 Subject: [Qemu-devel] [PATCH v4 29/45] 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 e9558f1ca4..c755f11efd 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" @@ -114,8 +115,7 @@ static void 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); } boot_info.bootstrap_pc = entry;