From nobody Mon Feb 9 19:37:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506731465035271.02207163472576; Fri, 29 Sep 2017 17:31:05 -0700 (PDT) Received: from localhost ([::1]:37538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5g7-0005Cf-UY for importer@patchew.org; Fri, 29 Sep 2017 20:30:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5VP-00042e-E6 for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5VM-0004gI-4t for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:43 -0400 Received: from mail-dm3nam03on0087.outbound.protection.outlook.com ([104.47.41.87]:4192 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 1dy5VL-0004ds-QZ for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:40 -0400 Received: from SN4PR0201CA0059.namprd02.prod.outlook.com (10.171.31.149) by BY2PR0201MB1925.namprd02.prod.outlook.com (10.163.75.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sat, 30 Sep 2017 00:19:36 +0000 Received: from SN1NAM02FT018.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::206) by SN4PR0201CA0059.outlook.office365.com (2603:10b6:803:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Sat, 30 Sep 2017 00:19:36 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT018.mail.protection.outlook.com (10.152.72.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.56.11 via Frontend Transport; Sat, 30 Sep 2017 00:19:36 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:40523 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dy5VH-0000Dm-Ee; Fri, 29 Sep 2017 17:19:35 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5VH-00070T-AJ; Fri, 29 Sep 2017 17:19:35 -0700 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8U0JOV6030566; Fri, 29 Sep 2017 17:19:24 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5V6-0006vd-Ie; Fri, 29 Sep 2017 17:19:24 -0700 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=2g9Z06NZ/KFzAIu/2nwPLh55Kq9uN9u/RQOzdiL9b7E=; b=BXfHacj41YR+IJjM5r6ap2PezuCKIqlUDuN0Wvl+j6BPI1X/73bfn3TJp77eu0M+Tco4XdTkd9cVzkbU1QdxzWM+M37+8cT6R5ekPPgQrYhqkrAHYzYeWLw7rhrvg2vleM33mbbr2O1acRhky5pXyeqhZUfakDwrnTP3H1KE72U= 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 (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; 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; From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:15:37 -0700 Message-ID: <85d53cce03d155ea59564a2743e8eb4637b422f0.1506730372.git.alistair.francis@xilinx.com> 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-23358.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)(376002)(39860400002)(2980300002)(438002)(189002)(199003)(33646002)(8676002)(118296001)(81166006)(5660300001)(81156014)(77096006)(76176999)(50986999)(4326008)(50226002)(106466001)(6666003)(305945005)(63266004)(106002)(39060400002)(2351001)(8936002)(9786002)(2906002)(47776003)(316002)(6306002)(36386004)(36756003)(54906003)(356003)(189998001)(6916009)(478600001)(5003940100001)(16586007)(50466002)(2950100002)(48376002)(107986001)(21314002)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB1925; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT018; 1:1kGMGfAR8kCM8A8mFZCMGzBr95ny9dsaaJyBYJFzJ190z374vAwy3pU4w7h0LGSy5vrS9/mNLEgPJObfWoAGFSOnOlOZjfBy9U5uUnzJODpW9RgMZF6h3jJieDSCMxD2 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db1859c4-8d4b-4108-320b-08d50798eeae X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY2PR0201MB1925; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1925; 3:hyS+d2h9Hi2RgtV/KERRUHfOruC+E0ANqR9a+DJd3I4IyaNsVv8uhBnS41iEZyJnRvu0cn4wEJKXaulve7CzYlzz0qhjgPRCsCKC+B5ffbvgZbHurm/jX0UlhCDCIFgr4iJPfx5Y4fPAsQOxj9N40xsipVXI43TjZGLwnoBujnkHAmTtA67xHDvGFCwB1diG84KD+diO+s8MlRX0cqlNCy6PhHGBYNtwYHydhgyDw2nVwcLoH9gyDORq2l8dVAR6lB28wVfDihFhs3xw43XzjGHD+AM7GyrD0JoqMJSiuQe97gVECEgrs+RtCvIzGJvIh6ksMqpG8rRrw2urIMwTeePslJtI01O2P8jfsOh3SEY=; 25:L28WDoXu8wGstMUhhAg01lOGwSFDB3qwjTzPpwi7fQlIQ3L9twE0kGIb1bY46x/jxOcLEy1dO3CKO2pxJmZidhcoPLYpKx8wkwHL5G3nBCkMa9ri6xj9Jy+N941BSfW3xDyxaagjIJume7WhJ04eo88Oi0UhSWqT1ouB+yrj6mr0QkQnQe/Nff699wzIleJ//S9q+0CT59w5Kfig5XWE56930Fs8bN+SljRBefbRzHG+C2NUiwbm9IpuePJa8SCuMxFyI79/+W8oCxFy+j4MTlqghz6R6K1Y1GDWGQvZWBdhYohgUR09ZCR4grplcRcFJ/wUVnbhnjlPqNeEqeQADQ== X-MS-TrafficTypeDiagnostic: BY2PR0201MB1925: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1925; 31:BZ+xqCS2tHQR4ix66V8gBjDFdJy5nunv1mZ10egLITkvcWp2ti/J4u3m5auW9LtM7Q3A7XjxxKbi6ppjm08NRuD5Z6oJPCjyOBM4X/ImK+Pd06oWnGza3cOOqxJ9u0eUdwhQiYDP/kQeGUpoNBnYWmfHptF4YatzFziiXCnAsRz3rMtfb/uBlxKI1ndZ5lMpyZw5p7yUpaJi4ParTs7SN8AhwuiOXNN/idOt0oq4NKg=; 20:U8G86l8kCA+Zb2iTwXKNgZkk8hljMWrYuqKHeiYRLNFvtEZVQgPLl7zyoLbOWX4CsKoIrl+iBrJxlWNG+/n4o7+rus0gNzi/WZLMQ1wCRLW2QutpSkxZBsKYrc0XFS9f9bz8J/09XgAzbgFwdlLu+kOqESh3izs5+UoW/++2+zTeOhl6Wb5kdRu1Wx5I91qgS9mSSQveBunJ6MA9N7+YN1xzo5M/flRfpC2vOv+jP+ansYAWENZ2n82n06GicziOt0uwJMSFCwJm3YOL1nZ9aJFXveGY97655s3HWENPlzrSUyKvhx8xh2pbjhwxoJ3i0jnmVSRO5WN0QdoQfx5c5ZxAx7u5ih5Iq6vKI/DFckAPyt3cwRnZvRZsT8TbdjNu8aCl3F8vBUUBQsk/KVAn5kdaRQDD9TaElbLSVsSt4QtGQTekb87cCpkUu5g516is7XVVOA6rJv8RdTYSaqkpcEr3KjRg5NJhbzS/Q6L4h8fZwvfwLJE43nlf//yZgJ/U 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)(5005006)(8121501046)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0201MB1925; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0201MB1925; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1925; 4:ounIHqcZOcrt8fLscLeH0HsLHT89uY/heBpgAlpgKTVjcBT79HPDbRFzeLHelKKy/c6dUXE2Ox6EPgMZ/owuiQQ3ynaU4uPhxvEWAm8ErAg7y7w73vxxB9bWoUaEiygJ1fFHhBO8RNLzVub2lkLIYrDOzLyogJs7T2R6a0X/Y6RkZiKwfUpfpO1wB9xBq84h/RhdaghoUCqi/UxjXs4/V3SgCRZjFmu7uG1WkCMeTQPfgFtbnwHNE8VBF20WeB2HlK5FlT8gURwjtnleotY2Q64B9C/Nb+Rd6HgiE9mIU6zlWbBfipPaGuiM3dBmsOZidZjEorKCq5jfbNnn7jMIOpZ2EsQ6nJWappKWtd7SsIKZorCEhGvoc+JNf09iS3es7RX1EsmivFOwGrxRBWK48w== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0201MB1925; 23:EVJr7DLuEhJl8yvnEh1UjLryURqOJXwvvnBpG9P?= =?us-ascii?Q?s2vQEniGqth60QwtnFczC8sjLX9VpmS6SkEN9s+MG936i7CqgZBsP1anoOQZ?= =?us-ascii?Q?H0fnomQ53zpkJp0R5ckW2KRaiYZtYthaSqPw5e1iCAbvb/xc3NEiAsG3LGsN?= =?us-ascii?Q?w/RrWCP68N6bS7Qvx0KYJ5FH4qxSw7tJrkUCS92JNWhrNSWUm++yQH+ad2IR?= =?us-ascii?Q?pSTvnA4z1NzmsVY8DnHUcM2YPZ3lPhQ2PQdmeAx06dTOj9zs7NmOa6bUEQPR?= =?us-ascii?Q?v1XDnPwVBwMzxPJ4myr6Fbf9droxbaobN2KpABT3pCyspKCEt+WQSUv+FL1r?= =?us-ascii?Q?ikepmoAD7XQ+wOmy8lu2iWvSBVQS48n75weOkiIBRsn6bR/4OLVbxXd5CFvp?= =?us-ascii?Q?MkPI7wXmAJI8Fc3fOo5XYwX8xW9tkYwXND1nooNIxXtJea/JsMaH4vJiu/xb?= =?us-ascii?Q?2BsYoxwa3KTraxPyeOPN1LFtovV54gP4enfGwvryhtB5gSe/wOwLBwpphFJp?= =?us-ascii?Q?3gd31nM7zgCeH+0XDi8mEc8sQrjzSjsocNMlRQDvl7Jb0i/GrqYX2L6/gtln?= =?us-ascii?Q?aEGLtpdBJrxxkXqlfDcqAL/MqliTmGRgm7Wl92NZtFIGEASYnO/p4bG3WttM?= =?us-ascii?Q?6qFTmddsttwe8BTWMmwUW7e2+lS1GCUkD49rd1qcxA+hQQVKDIS4YeB/ZmVr?= =?us-ascii?Q?tE9+/EzBsT6wI/3dkHPAXsAaNJhhyCAVFXb41Jr7VtLUWlry5e1LuqSU3MTy?= =?us-ascii?Q?hUaqf7LQJoe5C9GGNFIHMWMXpMrFf2novU6kzs6fnPdgm3pUmY10DzeIxTlX?= =?us-ascii?Q?FPtCdTw4eOKVWvVmuZ+jpK82OBObtSY2jzwHkd4WDwUPZrSFm9sfL5N24s3l?= =?us-ascii?Q?olDh0SDFCYWlgbXmGQGpplVhCUMC3nXXizO7lS56zQSwCNyReP0kRbHI3P6L?= =?us-ascii?Q?goyE3gUh4ACiQVfb35X2RtcuICaJE8wSYXbhTjk60QGInBF2elE6D9fMVw8N?= =?us-ascii?Q?pm/bKO/FVmuqPb1CaXOMPtUs1fXioVFe/hZWkUX8h/jjWmXVyCIEm398eD/N?= =?us-ascii?Q?ZLkjxvhaKwxxDjpWjeSeFSQlAHD0G7yFjUSJY/YrhIBimdDnMzLyJkxHMmQi?= =?us-ascii?Q?994xBj8kREXI=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1925; 6:xw1K3gBozPU2Xjz215FYpLRbGAkpWImkJGex4q8Hb/U6L2576KSB3fNKCY+Bxc0X5ugouVLepPpAD3sxduflzIC+3z1fFA/CFyWB7ydrZvMiAwBxc0z5T/PurnlpQCrFO2i1MdH4nFyJDh8y2VTgRDxB/5pmGFwRVs6Y0ipwcIy3RqWxE3VkD8DUX8/2JagcSkG5fu2Klys8HQzSfji/dbBLSvI4oicrYCz+NkYNQwBlsmL/GZpG1lVcSMHnxDAXS9mj6IoeMSCtugJ+7HyEVALvFw5tOH3UdaoCXWfseXGA5Llb3YrjoiAmwwlg8RZ/az59DEuVFQ5wnqRsFmznjw==; 5:Ax2F0YbOqg/chMiwKxL/G+MeHGWskqdPpm1E4NoL+bsYbFlZluQvlQQk2wy1ZcdNc6CGs4DpLq/nuts3WIPk9zYUGMSSr/e79FscUKQT/sPCcm5LYRSMBeHuW85HOy74p4/jcjALOzxooXAp9O1mmroQBLifVf7giqCAyDv3rHA=; 24:peT39Kue2jM7HyKGhcvbLjFZRKzc5oNaCq7+ABGZqhoTrp/ftcja2I275CqP8fTDhaa5CQCgF/pdO1J1OxoKjTZGhlKF/04uTgd7947jqAg=; 7:nuSfnsnXTtVg0b8/MhVlDfUuF1w+2XeHdwDw9LDsLM2SjcBMapHjCaoA+A6Rjf121LifqoYCCu5XT4aIW5WL2JI1jXTiWGSeSOkvKfNbklwKKoSMABQKuxVvuI0JBXHQx7i3xpXSPBbMbRbeTKFwWVm9sQift6VThLUs5ydnTWBBlueWMP3CWm/MQUqlIrBjkkHi+E16yx9ymRbuCYS+r8JKzRlNIUJGW7p4f/XP3ss= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:19:36.1266 (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: BY2PR0201MB1925 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.87 Subject: [Qemu-devel] [PATCH v2 12/47] hw/dma: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@gnu.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+importer=patchew.org@gnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_re= port("\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 --- V2: - Split hw patch into individual directories hw/dma/omap_dma.c | 26 ++++++++++++++------------ hw/dma/soc_dma.c | 37 +++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index abd18c67ea..5d7fe06d98 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/omap.h" @@ -1898,13 +1899,13 @@ static void omap_dma4_write(void *opaque, hwaddr ad= dr, omap_dma_reset(s->dma); s->ocp =3D value & 0x3321; if (((s->ocp >> 12) & 3) =3D=3D 3) /* MIDLEMODE */ - fprintf(stderr, "%s: invalid DMA power mode\n", __func__); + error_report("%s: invalid DMA power mode", __func__); return; =20 case 0x78: /* DMA4_GCR */ s->gcr =3D value & 0x00ff00ff; if ((value & 0xff) =3D=3D 0x00) /* MAX_CHANNEL_FIFO_DEPTH */ - fprintf(stderr, "%s: wrong FIFO depth in GCR\n", __func__); + error_report("%s: wrong FIFO depth in GCR", __func__); return; =20 case 0x80 ... 0xfff: @@ -1934,8 +1935,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->buf_disable =3D (value >> 25) & 1; ch->src_sync =3D (value >> 24) & 1; /* XXX For CamDMA must be 1 */ if (ch->buf_disable && !ch->src_sync) - fprintf(stderr, "%s: Buffering disable is not allowed in " - "destination synchronised mode\n", __func__); + error_report("%s: Buffering disable is not allowed in " + "destination synchronised mode", __func__); ch->prefetch =3D (value >> 23) & 1; ch->bs =3D (value >> 18) & 1; ch->transparent_copy =3D (value >> 17) & 1; @@ -1946,8 +1947,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->priority =3D (value & 0x0040) >> 6; ch->fs =3D (value & 0x0020) >> 5; if (ch->fs && ch->bs && ch->mode[0] && ch->mode[1]) - fprintf(stderr, "%s: For a packet transfer at least one port " - "must be constant-addressed\n", __func__); + error_report("%s: For a packet transfer at least one port " + "must be constant-addressed", __func__); ch->sync =3D (value & 0x001f) | ((value >> 14) & 0x0060); /* XXX must be 0x01 for CamDMA */ =20 @@ -1977,8 +1978,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->endian[1] =3D(value >> 19) & 1; ch->endian_lock[1] =3D(value >> 18) & 1; if (ch->endian[0] !=3D ch->endian[1]) - fprintf(stderr, "%s: DMA endianness conversion enable attempt\= n", - __func__); + error_report("%s: DMA endianness conversion enable attempt", + __func__); ch->write_mode =3D (value >> 16) & 3; ch->burst[1] =3D (value & 0xc000) >> 14; ch->pack[1] =3D (value & 0x2000) >> 13; @@ -1986,12 +1987,13 @@ static void omap_dma4_write(void *opaque, hwaddr ad= dr, ch->burst[0] =3D (value & 0x0180) >> 7; ch->pack[0] =3D (value & 0x0040) >> 6; ch->translate[0] =3D (value & 0x003c) >> 2; - if (ch->translate[0] | ch->translate[1]) - fprintf(stderr, "%s: bad MReqAddressTranslate sideband signal\= n", - __func__); + if (ch->translate[0] | ch->translate[1]) { + error_report("%s: bad MReqAddressTranslate sideband signal", + __func__); + } ch->data_type =3D 1 << (value & 3); if ((value & 3) =3D=3D 3) { - printf("%s: bad data_type for DMA channel\n", __func__); + error_report("%s: bad data_type for DMA channel", __func__); ch->data_type >>=3D 1; } break; diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c index 9bb499bf9c..7339a3ec95 100644 --- a/hw/dma/soc_dma.c +++ b/hw/dma/soc_dma.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/soc_dma.h" @@ -270,11 +271,11 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwa= ddr virt_base, if (entry->type =3D=3D soc_dma_port_mem) { if (entry->addr <=3D virt_base && entry->addr + entry->u.mem.size > virt_base) { - fprintf(stderr, "%s: FIFO at %"PRIx64 - " collides with RAM region at %"PRIx64 - "-%"PRIx64 "\n", __func__, - virt_base, entry->addr, - (entry->addr + entry->u.mem.size)); + error_report("%s: FIFO at %"PRIx64 + " collides with RAM region at %"PRIx64 + "-%"PRIx64 "", __func__, + virt_base, entry->addr, + (entry->addr + entry->u.mem.size)); exit(-1); } =20 @@ -284,9 +285,9 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwadd= r virt_base, while (entry < dma->memmap + dma->memmap_size && entry->addr <=3D virt_base) { if (entry->addr =3D=3D virt_base && entry->u.fifo.out =3D= =3D out) { - fprintf(stderr, "%s: FIFO at %"PRIx64 - " collides FIFO at %"PRIx64 "\n", - __func__, virt_base, entry->addr); + error_report("%s: FIFO at %"PRIx64 + " collides FIFO at %"PRIx64 "", + __func__, virt_base, entry->addr); exit(-1); } =20 @@ -321,11 +322,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint= 8_t *phys_base, if ((entry->addr >=3D virt_base && entry->addr < virt_base + s= ize) || (entry->addr <=3D virt_base && entry->addr + entry->u.mem.size > virt_base))= { - fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64 - " collides with RAM region at %"PRIx64 - "-%"PRIx64 "\n", __func__, - virt_base, virt_base + size, - entry->addr, entry->addr + entry->u.mem.si= ze); + error_report("%s: RAM at %"PRIx64 "-%"PRIx64 + " collides with RAM region at %"PRIx64 + "-%"PRIx64 "", __func__, + virt_base, virt_base + size, + entry->addr, entry->addr + entry->u.mem.size); exit(-1); } =20 @@ -334,11 +335,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint= 8_t *phys_base, } else { if (entry->addr >=3D virt_base && entry->addr < virt_base + size) { - fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64 - " collides with FIFO at %"PRIx64 - "\n", __func__, - virt_base, virt_base + size, - entry->addr); + error_report("%s: RAM at %"PRIx64 "-%"PRIx64 + " collides with FIFO at %"PRIx64 + "", __func__, + virt_base, virt_base + size, + entry->addr); exit(-1); } =20 --=20 2.11.0