From patchwork Wed Nov 8 22:57:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836055 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="hS+g5Rlg"; 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 3yXMYw0c5Nz9rvt for ; Thu, 9 Nov 2017 10:14:12 +1100 (AEDT) Received: from localhost ([::1]:34369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZXu-0001GE-0l for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:14:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLt-0008J1-10 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLp-0003KN-SH for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:45 -0500 Received: from mail-sn1nam02on0089.outbound.protection.outlook.com ([104.47.36.89]:53134 helo=NAM02-SN1-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 1eCZLp-0003K3-Jv for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:41 -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=AlTbxhbOQwjP4KUALWny0YEBnx2kIFdgJgnL77AsRGY=; b=hS+g5RlgAvaDyaXOEBiFrda5I8f806al2CPkystbxkSWqlkYnmhxkrfMt3RVql2xucbf4Bmsyv1btsA042HAGObnlcqsq0UoJcy2EBGMvfAzmiCXY2FkUYhWUIDZbP86F7hCVHZl/Q7N7bJ0nWDV3TOr1gMCTLImOs5PbIWrhx4= Received: from CY4PR02CA0001.namprd02.prod.outlook.com (10.169.188.11) 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.197.13; Wed, 8 Nov 2017 23:01:38 +0000 Received: from BL2NAM02FT042.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by CY4PR02CA0001.outlook.office365.com (2603:10b6:903:18::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:01:37 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; suse.de; dkim=none (message not signed) header.d=none;suse.de; 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 BL2NAM02FT042.mail.protection.outlook.com (10.152.76.193) 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:01:36 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:34895 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLk-0003xu-45; Wed, 08 Nov 2017 15:01:36 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLj-0002py-Qe; Wed, 08 Nov 2017 15:01:35 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N1NCr009531; Wed, 8 Nov 2017 15:01:23 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLV-0002k7-LX; Wed, 08 Nov 2017 15:01:23 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:23 -0800 Message-ID: <301f422d963bc19b9ee5f6ebbe6bc3450b18664b.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)(346002)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(6916009)(4326008)(478600001)(16586007)(63266004)(54906003)(106002)(47776003)(316002)(50466002)(48376002)(5003940100001)(2906002)(8676002)(2351001)(106466001)(189998001)(118296001)(9786002)(36386004)(50226002)(33646002)(2950100002)(5660300001)(36756003)(81166006)(8936002)(76176999)(81156014)(305945005)(50986999)(77096006)(39060400002)(356003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3385; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT042; 1:LqNVG4unjZFUY28vdjSqMr1vgVmOXPFg0GuHITOrTq1sypTKYaOQgQZYNd/+7mBoOLv35p5bvp1f4tj+/h3A6Cg8XSxEpoP03ggvQaVy5KVxi7JcX0OTxxPqLONQ2Yjd MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e261884a-1378-4231-81a9-08d526fcaa28 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 3:KndTDnP0fBNJ0uQX2Xb/B6kFlszPHNPxMhxAj/8nCa4UjFOKnpdt5jzWbVMsKS8sKB4KukDsRq8WoiX2GmyoubLA1mBIcmpH4hZx1G/5n+G95gwquZm/bfidx1iHfyZVEbH252voNXJKT4zi/xoqVGbjbprCY7Ka2BJQHSp3LtP+X7qEjsvCc8wl0nEAfk+ukvDFIRaMs3QpyFWDNHuE6FxX12T36kHgjjRFloKz/wb/1OmBVAOZFz2yDJJN9UswBhgDNfoM41gMs6diHEu+edoySO90D70ocFohga3Zl1d70Afcve75cECP6pU539XAIFlIPnN4REIGyxjtWfWUoznFBwW0zEbbWuCkuQk1Qmo=; 25:IwPBcXqTS2JonGz4NlanXIHCTQBgh7Dcsq8CLbVnFXPO+OAcQv/5KyMlrmvJvk89AZXbKzIca2py7XnTO6J9fA7NrWit/FmrqGVTM2y09cxQyo35kcg07LadngiDe/nLSrB7lfW498vnUZDqiRwra3SffcaLtyroiDeAbVJP7xZ5DfEMiOkRLH+N519PSdZRpjP00KSIiUBq29an07jiPZT3yV2bezfpNTAE5sMDLt/+jDt4zMK5aCYC7YuO0aeuIsgoW0Ubxyeygl/kKH3b0CVP6ZM33K5TtzNDuVsaHGTXBzinCFpv7PIkScgQkMLOUrbY/BvsTeaC2p2zbkWLIw== X-MS-TrafficTypeDiagnostic: DM5PR02MB3385: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 31:vH3pgE/zLgs/uQlIIeuJcp8TILhITvrIQN+x0TfNdANc6BU715/9QVrX/1ksMIGR5jpQM0obwUZp2sSuJswYG3Qp+ImnCag8QMAJkBE9hjgd1HXwOBsMNYY3K5b+VHI0cpgfvXgaodfXVdV4ppo9p0YV+QbuEObSEm8HkgMUKO8YaL/y+DoBJJtj0CAxYFL3HTyhsoZrFghmnb/qHmpnOupk+aZgz/yy1EaMiXBAjiA=; 20:U1D0f0V3iwsIFIclHlvL5xM8hkNQX95ADxIG52dez1MlLBkQYgiE9ffba2dTSWEduWsxXYTzuCocJ44PpDYq8nh8Uc9wraZIMZXHshU29CUC/uPXodfZMBnKOsErjIBdpX5E+0E4pLftBTkJaGzjusliPmkR0ZHNJmLOzfVQgHKZEd4gj5Ssl/nJjj17Tz4w8rQ7auU7wIMgdSjpsVaoZpOWwR9hHV7SuGZunYQom30muX5t8WlNKLOKNfzcLwL6/Q1fFzUU/JEjkJ+BRDt6+1ijX3qGUT2LpGCaAi/mxUdaYKmfM5ljopA5A3NgDAIuslGiNoVKAy2BpOyc4Mrr1wxAPkA4TxsaRx19OaeYtIqixTTIKeGcmP7yuxsPcg6dxMuJrkCjaMppnJvkduGrunETle0CE+99G3u6d4GepWTw0ECcxiLXFPy8JvYR0/K/eu7h04Gu3Jvh9g5a6w0uPZf61ILCApkeuXVhi4Dbnm8b9M7FBct+b5gw1L5rS9ie X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(190383065149520)(192813158149592)(104084551191319); 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)(93006095)(93004095)(100000703101)(100105400095)(3231021)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123558100)(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:tQXUnUFNIKmRBtz1u97CwHV63Lb/MMD2st5FM1NG6CHkPT69TnkkuWbd3Vgj27+tLI9DA9rSeup+SGhSKFlFsprRCGfod7MFCGvhrUzdU+W2FtLAi7gprPv4z8BvnlImt3Z3CFgh0WGDK8uz17/f5EI91t2ST7RgN3sgFE8Dm5ZFixjs9ygFYs7g8Ll6wB352H59Lki4o/ef8QEsBuq8qQ8S/24UKADEusb8GUEPuHj9OFhVdux4CbVQAr8mzBf3SnVpMYrHMOjlXUYR4Ed7ii5ue+G2r959wq11mHi6YjyXJwtm26HLTh8OGm0DK7FN+rQTApCXUjmOEZkeBpWzCUeq0meJnLHFNzsVNkc8eRUN6FUUfkqI/fn7njT2Bcb9lunPk/i0IMpJqqohyc61v1w8nAIhNvhoAbM6M3LzK/Y= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3385; 23:cK1gqtsFXh2BWtl1ZsLMuqyxm5ve4hf7xvuQ9Thjg?= 60Heb+LwyBNXcvzbdPVNbBS8nIBKT7i71kIlvI5CbG7v/3OESGYiUy1q6UsUa4Qq57+GlBniMMv0/yYJJsKcYiGdlbprYEItnN/1JKgIraJFD9fOy8vvcclwi/FVc7kIx2f9NJXWhCy/+waN73dJUjsLgjmmlXsFcN9k3shlkv1TZJK4krclG3iohWCeEXqMGqVP7AjurX7oOzN9TRp79bNbkUR+nWn4oLukIHdbxZp6MWSnw/POe8k+PG8BFfuGTEtrzhMbqQipLLh2SKmM7FmNHglkICUDLRQa1ZQo5jIDsPvpKSDK7WHWPDuIIxywtBZDbmi4CvffZ252OLqYAzaBetPBfdqnQBt5qhuvTZSQEA4zijPsJnn4JxN46Ra79vjhYOCYpjS6P911ueavbcFuqyxZpfy/bNckqE+Sj3Wfko8I1ne4f1iLQd4KR5IbKJ7aiQC1pCNeob7QII0GnnS2m5jnJsslTYvfXF9Vr/lkvU+XAZUlix2yWIyDJl8Gl9WQc1v8Sj+Qo6RT7bw20+3a8w9gVxmcpoAVyAj9XexigUb7nhO0DhMk9cZan1vLI9oC/8wVRauML2DIvdjfAJZUD4SZbCFztHb7YamK2f8eucsEgistVILv5czjoOJGAn15XxpSTF6V1VNyuBAsHdx5/HMIQFakkrHiZOw18QQ1s3p4WJ99rEMPplKjEuU2Avc8tA//Fr7CIF62atvH/7mdLcrRy8F7DjWvQvzeUUh/TNaGiMz0c3Kf9G9t2bl1cZT+VR3hsc2u6CJDqDYVCoyqWSMAQd88gdOsVJccYcI20KGRRGlGKE4i4SeLCeOPG7JfCFy0Rv0mxyb5hbzmbWWPfZymYV8IHg33+QK5VLPkhGqu8ZjnSe1wxeDiGAuveYUal4OZNA2wiBhZoXlOM8BuQM9f36YDXyuC0ovCj46+RwHDJPMUXyph+K/pZ+2WZrvw6EW2B/vRDi1uW1ae3bodW4uNmhyEz07yaGIOar0v/qTT1G9pTg0NR9uOjma4pg= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 6:vLfwShE3ap3qwTL3xrGPw2PKmVIQYtoC/zo5aAyzdiAz4Bai++I87/aUq+FjZpqI/8vxeIdflMEEJjc1Fc5XjtvZNrorNhOZVuA8xx3En9U3rNaqJEE2GVwpSdsaYF+nt/1OlcseLK4O8t0rO2a2fbSayjqYdYzOtPbTv4Xk7+u2l5QicwmwJnLck6gJjzmgmZbJdllwnZ+blqSnAskJn8UYuOWUQHaNhBekyFVir/gjOjHYC2q5SPesRgw+AvLZWX9NF6lfnV0Wr1rQK7GLYtc6P3Li2IK2meh6FSykOBdes2ZwCioIgk35V35PxMJKGzUpXdsWnXh/wqWzCYuNU/kPJ1ckvnwxrxT6d7MfAPA=; 5:kYcx8hkFpOMA71BG3GiYAzxS9xqLzMTFrdQhTbsoiJz3DvXb995bHlS0kM4oB3zqQtDgzSf/Od2S5y2JmiukwXWs53Y64KDNUmBQsqsgbC69UybMHq0FFh2JIvAatL/4EDSuFIawSTnCiA+0F6qrSseD3WICqfq31qpzZme17W8=; 24:TQsAe5TaTH+egfay5J6l2LhlesTfyEdFvbqdMRujYIScm6KPIvbs4AHNcDjIxLObG+NmGKL2dyI12uFmgJ22b+sugUPgenfIpZZRnAZDN2U=; 7:QKdz2fnCu+mu5AW8tmE/12EOszz19cEdGIsnf0sdsRNwEqSPDwlujmygVqMuEEKkNPh7m7cKwdIs7QctuHgYnmrUpi6jcaTkfYUmXSTCqfC8sSccdI+MSMVM8Qs9qnDLru/1AnSBXCIEWedmTPtpaf4zql9DeIYq8J8sQrkLZ2/MKw17/8WdMr8oy25cq/oaook8Xm0BqLeH3+k6IFyKHxBJJL2K0y/kULWKjIIYuD27eHUTzKY/Q4MoCT/neQjU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:36.8532 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e261884a-1378-4231-81a9-08d526fcaa28 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.36.89 Subject: [Qemu-devel] [PATCH v4 18/45] hw/intc: 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: Peter Maydell , Cornelia Huck , armbru@redhat.com, alistair.francis@xilinx.com, Christian Borntraeger , Alexander Graf , alistair23@gmail.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: Peter Maydell Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Alexander Graf Acked-by: Cornelia Huck (s390x part) Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/intc/arm_gic_kvm.c | 12 ++++++------ hw/intc/omap_intc.c | 4 ++-- hw/intc/openpic.c | 7 ++++--- hw/intc/openpic_kvm.c | 8 ++++---- hw/intc/s390_flic_kvm.c | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c index ae095d08a3..a5478d3e20 100644 --- a/hw/intc/arm_gic_kvm.c +++ b/hw/intc/arm_gic_kvm.c @@ -316,12 +316,12 @@ static void kvm_arm_gic_put(GICState *s) num_cpu = ((reg & 0xe0) >> 5) + 1; if (num_irq < s->num_irq) { - fprintf(stderr, "Restoring %u IRQs, but kernel supports max %d\n", - s->num_irq, num_irq); + error_report("Restoring %u IRQs, but kernel supports max %d", + s->num_irq, num_irq); abort(); } else if (num_cpu != s->num_cpu) { - fprintf(stderr, "Restoring %u CPU interfaces, kernel only has %d\n", - s->num_cpu, num_cpu); + error_report("Restoring %u CPU interfaces, kernel only has %d", + s->num_cpu, num_cpu); /* Did we not create the VCPUs in the kernel yet? */ abort(); } @@ -411,8 +411,8 @@ static void kvm_arm_gic_get(GICState *s) s->num_cpu = ((reg & 0xe0) >> 5) + 1; if (s->num_irq > GIC_MAXIRQ) { - fprintf(stderr, "Too many IRQs reported from the kernel: %d\n", - s->num_irq); + error_report("Too many IRQs reported from the kernel: %d", + s->num_irq); abort(); } diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 6844c1aa83..7fc239715a 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -539,8 +539,8 @@ static void omap2_inth_write(void *opaque, hwaddr addr, /* TODO: Make a bitmap (or sizeof(char)map) of access privileges * for every register, see Chapter 3 and 4 for privileged mode. */ if (value & 1) - fprintf(stderr, "%s: protection mode enable attempt\n", - __func__); + error_report("%s: protection mode enable attempt", + __func__); return; case 0x50: /* INTC_IDLE */ diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 10d6e871fb..7b1cafcc50 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -34,6 +34,7 @@ * */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" @@ -173,7 +174,7 @@ static int inttgt_to_output(int inttgt) } } - fprintf(stderr, "%s: unsupported inttgt %d\n", __func__, inttgt); + error_report("%s: unsupported inttgt %d", __func__, inttgt); return OPENPIC_OUTPUT_INT; } @@ -547,7 +548,7 @@ static void openpic_set_irq(void *opaque, int n_IRQ, int level) IRQSource *src; if (n_IRQ >= OPENPIC_MAX_IRQ) { - fprintf(stderr, "%s: IRQ %d out of range\n", __func__, n_IRQ); + error_report("%s: IRQ %d out of range", __func__, n_IRQ); abort(); } @@ -1221,7 +1222,7 @@ static uint32_t openpic_iack(OpenPICState *opp, IRQDest *dst, int cpu) src = &opp->src[irq]; if (!(src->ivpr & IVPR_ACTIVITY_MASK) || !(IVPR_PRIORITY(src->ivpr) > dst->ctpr)) { - fprintf(stderr, "%s: bad raised IRQ %d ctpr %d ivpr 0x%08x\n", + error_report("%s: bad raised IRQ %d ctpr %d ivpr 0x%08x", __func__, irq, dst->ctpr, src->ivpr); openpic_update_irq(opp, irq); retval = opp->spve; diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index fa83420254..60c784ae86 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -150,8 +150,8 @@ static void kvm_openpic_region_add(MemoryListener *listener, ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { - fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), reg_base); + error_report("%s: %s %" PRIx64 "", __func__, + strerror(errno), reg_base); } } @@ -184,8 +184,8 @@ static void kvm_openpic_region_del(MemoryListener *listener, ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { - fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), reg_base); + error_report("%s: %s %" PRIx64 "", __func__, + strerror(errno), reg_base); } } diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index d208cb81c4..e710bfdcda 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -83,7 +83,7 @@ static void flic_enable_pfault(KVMS390FLICState *flic) rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr); if (rc) { - fprintf(stderr, "flic: couldn't enable pfault\n"); + error_report("flic: couldn't enable pfault"); } } @@ -97,7 +97,7 @@ static void flic_disable_wait_pfault(KVMS390FLICState *flic) rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr); if (rc) { - fprintf(stderr, "flic: couldn't disable pfault\n"); + error_report("flic: couldn't disable pfault"); } }