From patchwork Wed Nov 8 22:58:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836078 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="JXa76nrM"; 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 3yXN150ShSz9s4q for ; Thu, 9 Nov 2017 10:34:17 +1100 (AEDT) Received: from localhost ([::1]:34463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZrL-0000Kx-5w for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:34:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZN3-0000wa-IW for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZN0-0003na-CF for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:57 -0500 Received: from mail-cys01nam02on0085.outbound.protection.outlook.com ([104.47.37.85]:43670 helo=NAM02-CY1-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 1eCZN0-0003nP-39 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:54 -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=/O0IU2PRp3vQdfP2MEMiimaozIhOZMhixXhY72PmrUw=; b=JXa76nrMy51IHyYOHa97/SoWRFWcnJw8dck9wr9EmCYMpsPXH+0UQ/8N8NeWUCedoCctmtGKVThfDvkpQ2KKU4Fu3zFG5mOqfdMylT2uOepnrMKREZzHQp6ETi52Uk8ALsreKjB+MIzfDk8sOb3NKufmCPCFuSvNTAWmuSxhgNo= Received: from BN6PR02CA0043.namprd02.prod.outlook.com (10.173.146.157) by CY4PR02MB3384.namprd02.prod.outlook.com (10.165.89.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:02:50 +0000 Received: from BL2NAM02FT031.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::200) by BN6PR02CA0043.outlook.office365.com (2603:10b6:404:5f::29) 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:50 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.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 BL2NAM02FT031.mail.protection.outlook.com (10.152.77.173) 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:49 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36518 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMv-0003zC-1e; Wed, 08 Nov 2017 15:02:49 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMu-00039K-TZ; Wed, 08 Nov 2017 15:02:48 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2hD8010465; Wed, 8 Nov 2017 15:02:43 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMp-00038b-4x; Wed, 08 Nov 2017 15:02:43 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:45 -0800 Message-ID: <0dd38e3350c564a1a6ffc2ce48085877fa8c977a.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: MIME-Version: 1.0 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)(39860400002)(376002)(2980300002)(438002)(199003)(189002)(50466002)(189998001)(39060400002)(54906003)(47776003)(478600001)(23676003)(36386004)(6306002)(316002)(77096006)(50986999)(9786002)(356003)(6916009)(2950100002)(118296001)(76176999)(4326008)(106002)(50226002)(305945005)(5820100001)(5660300001)(106466001)(81166006)(2870700001)(8936002)(2351001)(8676002)(63266004)(2906002)(81156014)(33646002)(36756003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3384; 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; BL2NAM02FT031; 1:SSblFrGKgMFit5MMtCzwBNP+n48hUmDIBqryB9dX1ldepDf/gapFbf2F3fAZM1n93xZ+WAmSuLRrx3Zm9faBPE1PVIzWMzF7xbTVa+nttz+VrfuwxC64bOJsjQNuYkOi X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad1e5fa6-4261-42e6-9ba5-08d526fcd58c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY4PR02MB3384; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 3:Y22jNbyy57CRCcSmVLT30RNeIPBx52iauHOFevfCBzpg7M+zgvpO6MSsFkCKjHa6lbDMGuWZNN2ni+yEAU5I0wAdL80AeWjZ4yNPKkwQFGu5bXiU+KdjnRGpygM4DV1IwvSA2ixZZ4BCsDiNKPfNUfx4oHQv9Ik+Dp+Fi6eZFWv6Nicg/UUOAd6kRzYFPrtS4Ig/hnFBzw5gENdGUJhhkJPvnYYf54DOL4wNaFU3feW6LBH310m/BY79/QG0YGoz+dd/IwmX62tSolwIIqpTcfj6wZwrW3dAIcT6yScu78qBLpdiJdAjDzUh4Uz0Tx5ioMcH7gBMOnvEd4gGWHqTsEdTtKZPYvP8kB1oaiQcWZ0=; 25:GPLbPSOtH+tY/JQ45CtAT4EMxMImwGTSRkPg4ZYVkKQ10BAOtKdrcl9+3GnQzY/0N6xCfTfbiXgoUvUvC49ak5g0utPiGb/5EjiyUKjnMMoggdohhUAB7GSLcEfjqZouvOGStp2jo4ZWgpbnnBjOT6LWW87CawZrS6+cW8cOoKYTosCKgouAxnOsvhlV13gRvDtrLU7Pxfr0B8ekBJmg/+jme5XJb7DXy+KZwtL3v/bODZoHx/s14polI32s7iazp3qpsWG9W1d7Cnib+gmw/0GqTcOhrYoJHz4zUVoDnC6PxEuXmvLVCwDQ49Mm+qeG5x3ZkgWMNLg9uVhOpVwE8w== X-MS-TrafficTypeDiagnostic: CY4PR02MB3384: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 31:e87Zb+0hLlGEKNIK+l6stZDLFfIkYEe7jeVNJZV5SorJuo9gy7PTvN0wq2m+K8AGeGfAKYNPvMAnpugxPtOlG+vNZDY1utkxDKu0oaSF6nxsF/Lhv7ov623E6L1FHyaO0musY6Bnj9mYdg0/kffM8JITM804ZFmCIxDpyqXkWkMn+jx9U1MGMzP1nu12Rj4wUupls+5DzgT0COA6e8X1cf6Uiin7ITzaEqpgcTEwHeA=; 20:PAVMUWcZHe+Ox6KCRmkvlRSM/Mi+adPzKgph7HkobGueDo9fn2o7S77jjDQjt5llF9HGJ1Q/7MLi8ExP+C+cIo5cCH15V4PpuglXC/hpbk1+lBIv4TMjQWryBMXf+bE+eP1AecI7yVBV9GHp6Eu8/anYTLWUo0nsoZBBGyoGuilsqD/aOOxvE9JZt0ryZmMMwgicOor98cYAk84pCijnU03JzvjTZX66WSIvw1ufccx7w9jzVlOXS9ct6SbBrp7727KYJsOe7BVIRiaPevO2ebaRa0H3RHzb+P8sa5MguZpWV2K3Bq+fgC3VWZrsSSQi25dXkmD2Pp7RjJiLHQhn/m/Idblp50TFAFU4LL/xlUHg8mTDKulW8J1m5fgwAcE1b9Oszg1zilYvCRCbBjE97AdCdH9Mn43TaXf8OBZAexZDz0gaob3Ytaz7BiidmE2yVhafxCOU1FIziTtK0hK0FZ3VBbvN1E/XMrjJ9GTMwy39A2QgIyUsKyZws+54ZJS1 X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(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)(10201501046)(3231021)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3384; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3384; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 4:U6LD5N3Y94Fnto4imfEdSPwbxrQJyE/p9jQQ8q25EoEIfbQSq2vGqXRWzsrCzty7W3/jqt+7q3CSDAS9c2Pz3fNEB3QHP/r3zGg8rH1aab5Cwc5+m4ub3KzieHT9meWHo4eX+qUP+2erWdLhE6+2Bwu8o1qphaGMmOdLa+L5BE1GzcFsIn0116UmB5ZvQJRdOvH3W0qYejFBgEKJLnAOK7yvkfjy9IHNe6EzpNjSk3i6M6cXAiUXKukjdmR+P3iFsOdMkagXT/TvWgnH99qX2ojMVlexebPJADLpRlJS77UqpqoSwJq2wzJnW3+pBzjsPV8TL7pLKlLdgZoy9RZSzV6D6RQOt1R56Q32AY++KxukqzHNB6FNVwJYpfjeFVkil9X5L7MZjIvyiIzuo/ui+Oj4CTODGtt4VnNfmbhCKDg= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3384; 23:qVDe1TYlecFBE3c/t4yjCoMZxd1F0Qr/NZm2gC+Fl?= 58VH30k5VTPapi0vWctjL/JhO0QNmCowJcd0OYdXbmB74BlFnjhAM//sSz8HaLAppspgiMqUB6QoTNsaZTJ8aaAMdcpwEnPq9ISbXLcAMDsNABpaaI7gtco6F2exzoLFAI7SvDxuE7jQaS0zLQv2//Fbd+tODJAdSTda2FCjhB7FNdn4fwB9vz47wgeolSRFeJ2J1VCI8nMjNMpjp3ir9pvelpia7RjMw9flXxPbA+yqrY/1grXnbiN+PXaXbOtM6u7eYRAsW/Cr8OHrqxX5FI6fzVPGGbkUW64tZ0VUI5yIdqGMZ71+48oldoL9DqGdy9fRyRqOU9Q0B7MU3PBj/zYvT0mjyse5tuYlmN3SJWROevS0FtTRz1FIVroV3erA2kIbv3LSfOfe9pkONMIoIAr57lpjJMZIX4SldV7NiLY/RQ/NUVmg4WVUk5SJ3dKhosMZa6KQ3cOyxxuhwybNjfEsL+RpDfmjJy3OjiqWHKwGx7PnsptEyd2nmhpT3HvDrNksmzLfscl5tMxdkpsgY8YYymSWK6YjT3aoKTm4e7MJfPPzZ3bhQFExEMyHtDSYxnOk+xW98fu1eSY/JbGr6ls8A5tSNqM3SD2GQ2ru7u2n/tA7lYbMPR1L1az6xHYcXNhs8oXSMxhME8w4PspiTduiDnxj8h6aCRlpdrrMbby9WArzvp1VsOmQcXju61UnogAbFvbmbssfySiw7QAqWxnk1ffdLT38Vjx+IHrTadwKgoP+JPdZp4wP4gXIAEaERKVAmU90UwOTnJHmU0vIllJOHBpare58G4vcaO72XVvO3Z8tB8ITSrjT02Jtrn/mqi4YPlfvjupGuVyrS5B9qf+IJTd7rzakj5rmngztIqKwcsAmAP+r8hseYZyoITvLMurzBJDk3QDDcSIO7xrkmVfYtzBBK6Wimg4Klndsx/vZoThuMpfRmA3ivhdRWNMnvz3LeBvjqoYyhkej8Zcsf8yEUf+jmJFKtU8WsMjRnmCblNwWPely3PRrSKiOGu9hhVFcn7UUKyvyKjrm0FXWLAx X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 6:zq2eLdEwrtEqikmRnnyWzPqYH1a0HoXQGb6+sQvEfiVkbXrBR58IqFR7lTatMy8ckKpo0y9yfdkkTHxRa+xGHbAaUubJFdgEAKzEJaM0tllGI2RD1Gh/DH7a0yZcvh0lcsETfTSp+L+1fHg+kW8CKzB8ax+R6KveVzZPlSBfxbyKKmDCsoecz+jMxrSqUPhhW2A2sMsuv5cUbUeeONYlM3KhFLaZe3OcHbon+1bnhcdnsFRQx00UWLPMbxc9DtXZYdA4VMb0iJRL1lARievnUjWtOFOnvHh/IT0/bICgY+GJKIvWuJ25+u6a72BP51uznwcn0n+lA/GwJS1Ip4UPa5TnNOqu7lz6MP167Px1vHE=; 5:jESTyBDbRFmMpk0F77dUfcBWOmV9rNA5dHFfGeKq7W2U73+xIvoOMLw7qJ8QHWJZiGVicFz1uwwzuMBoVznVK7ZvkwH/6Kl4ZYSXKC9vSlo5wwPUhlW1vFZD2OucVDiGZ/FQj6UWONjh32x+A7gcOYoOOmYCXtG2mrU2U3SlCDE=; 24:GvmtCU4FZqUyn5nKIzVud0lbiC6jQCw9i4AgPXnJVsXy1whMaFOew6H0JghkCgZBaSMPn+fjjs4wT/PuNTQ+yo+TT5kRESrWDNauLW2BvOk=; 7:QqxGecb0FTX9gnvakUhGgsSAFU1qHzTsDS0W69y7+4XOB69LPvGi617Lli1gQflYF2xxyb4aplyzVy+eKLF0Usd8APWB3O08+hqCT0Z4hE6PAcC/iL1NhR9nuX6sSraJK8xrIo7iyy6KrKpxSblrs8WriVFu6y3Pp+mmoc6ElI9duteCJS3HgK4bHTnvaClZQkJzHxKUXqeW1enaG272fI/MPlqaw0+ooG/8dgdLpSbtq9n4+s1MZHepeArx2GXj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:49.6512 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad1e5fa6-4261-42e6-9ba5-08d526fcd58c 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: CY4PR02MB3384 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.85 Subject: [Qemu-devel] [PATCH v4 38/45] hw/timer: 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. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/timer/omap_gptimer.c | 11 ++++++----- hw/timer/twl92230.c | 2 +- hw/timer/xilinx_timer.c | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index ae2dc99832..0f064241d3 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/arm/omap.h" @@ -356,7 +357,7 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, case 0x10: /* TIOCP_CFG */ s->config = value & 0x33d; if (((value >> 3) & 3) == 3) /* IDLEMODE */ - fprintf(stderr, "%s: illegal IDLEMODE value in TIOCP_CFG\n", + error_report("%s: illegal IDLEMODE value in TIOCP_CFG", __func__); if (value & 2) /* SOFTRESET */ omap_gp_timer_reset(s); @@ -394,11 +395,11 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->ar = (value >> 1) & 1; s->st = (value >> 0) & 1; if (s->inout && s->trigger != gpt_trigger_none) - fprintf(stderr, "%s: GP timer pin must be an output " - "for this trigger mode\n", __func__); + error_report("%s: GP timer pin must be an output " + "for this trigger mode", __func__); if (!s->inout && s->capture != gpt_capture_none) - fprintf(stderr, "%s: GP timer pin must be an input " - "for this capture mode\n", __func__); + error_report("%s: GP timer pin must be an input " + "for this capture mode", __func__); if (s->trigger == gpt_trigger_none) omap_gp_timer_out(s, s->scpwm); /* TODO: make sure this doesn't overflow 32-bits */ diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index ef116c636c..18880884c6 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -614,7 +614,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value) break; rtc_badness: default: - fprintf(stderr, "%s: bad RTC_UPDATE value %02x\n", + error_report("%s: bad RTC_UPDATE value %02x", __func__, value); s->status |= 1 << 10; /* RTCERR */ menelaus_update(s); diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 59439c05be..a80bba846b 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -127,7 +127,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size) break; } - D(fprintf(stderr, "%s timer=%d %x=%x\n", __func__, timer, addr * 4, r)); + D(error_report("%s timer=%d %x=%x", __func__, timer, addr * 4, r)); return r; } @@ -135,7 +135,7 @@ static void timer_enable(struct xlx_timer *xt) { uint64_t count; - D(fprintf(stderr, "%s timer=%d down=%d\n", __func__, + D(error_report("%s timer=%d down=%d", __func__, xt->nr, xt->regs[R_TCSR] & TCSR_UDT)); ptimer_stop(xt->ptimer); @@ -160,7 +160,7 @@ timer_write(void *opaque, hwaddr addr, addr >>= 2; timer = timer_from_addr(addr); xt = &t->timers[timer]; - D(fprintf(stderr, "%s addr=%x val=%x (timer=%d off=%d)\n", + D(error_report("%s addr=%x val=%x (timer=%d off=%d)", __func__, addr * 4, value, timer, addr & 3)); /* Further decoding to address a specific timers reg. */ addr &= 3; @@ -197,7 +197,7 @@ static void timer_hit(void *opaque) { struct xlx_timer *xt = opaque; struct timerblock *t = xt->parent; - D(fprintf(stderr, "%s %d\n", __func__, xt->nr)); + D(error_report("%s %d", __func__, xt->nr)); xt->regs[R_TCSR] |= TCSR_TINT; if (xt->regs[R_TCSR] & TCSR_ARHT)