From nobody Fri Dec 19 20:16:43 2025 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@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508431063910275.93607797344; Thu, 19 Oct 2017 09:37:43 -0700 (PDT) Received: from localhost ([::1]:50145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DpC-0001sM-3f for importer@patchew.org; Thu, 19 Oct 2017 12:37:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DYZ-0004T3-AK for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DYV-0001CM-VW for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:27 -0400 Received: from mail-bn3nam01on0088.outbound.protection.outlook.com ([104.47.33.88]:3743 helo=NAM01-BN3-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 1e5DYV-0001Bf-J7 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:23 -0400 Received: from CY4PR02CA0033.namprd02.prod.outlook.com (10.175.57.147) by CY1PR02MB1334.namprd02.prod.outlook.com (10.161.170.25) 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:20:20 +0000 Received: from CY1NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by CY4PR02CA0033.outlook.office365.com (2603:10b6:903:117::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Thu, 19 Oct 2017 16:20:20 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT060.mail.protection.outlook.com (10.152.74.252) 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:20:20 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DYR-0008V4-DK; Thu, 19 Oct 2017 09:20:19 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DYR-0002va-Ad; Thu, 19 Oct 2017 09:20:19 -0700 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGKAEK005210; Thu, 19 Oct 2017 09:20:10 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DYH-0002lp-V0; Thu, 19 Oct 2017 09:20:10 -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=S0bz4HsrZXXN4P75In/lrEMhyjKxazKcUqnFhYS4iNk=; b=J5bSFBOlStmC5dFRKklCTUKdFPBOPDt6Ewq5gd7PiOs4zVZvo7DcCr+GHfLIkrebhEljEQUCDJ9QytxZYNFkARgo3SsMEW4QLhLC30N27+RcadjSJA4bIAu7xJV9i4CYHBuCPqqCcZ4+uvL/N4rdCZm0V3nEkAFO94/THni7lAU= Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:16:17 -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.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(81166006)(54906003)(4326008)(2950100002)(50226002)(478600001)(6306002)(47776003)(16586007)(106002)(316002)(6916009)(39060400002)(77096006)(5003940100001)(2351001)(81156014)(8936002)(106466001)(36756003)(33646002)(8676002)(63266004)(5660300001)(76176999)(50986999)(36386004)(50466002)(2906002)(9786002)(305945005)(118296001)(189998001)(356003)(48376002)(107986001)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1334; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT060; 1:1f8bzRAHudlzSj4Xcm5Bbq/JAuFVZjmSYZJSJpOlPegi+h8R++Uo6uXSXnrrIjm1qOOOfg2ax6TMINkOWk7/h4KG9wRGV7mkcILpsgzVamuL3Rk9TQ3eoP+vCyt55tC6 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8fa0843-b84e-422e-dff3-08d5170d4b14 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 3:70D6SlPVv8wgHuPCrtYI3O5Z9i+a21O9V+DaHlYsam3mTwafxnSlfH6/IKhPFP2qRjQGhczoclap6GBWleHsK0YyeHR3w/OnxQ/6ch57oYKb0GOyHgqrySldvAiBU70nMGWaSCxPci7Mvdxoek0Y6dBp3e2Lqf0zkkmaOjaTVifVhHBjSLx0sbJ/QBjT7tu/vxkgrw+YryE8g+JF1rr6e2+f3tv6v6C9F9hc1hnVSdOyqJR/YT+d6LW3VAGGEjjaDoueys7IyfBMmVUclobYnI1RkGNFj0ms+4Hf6UYn8R0I9l5DWgJAliYOB/oPFeLMBDMgNGI/OAfRSR5Bqaq7ypzrv2jFSNm4LfDgG2yUCpA=; 25:mRvpgqRnpDTq0gvxWMXihG2zrifPvNwl7ChqHC49Cl7Wwj+C29hEcjaYm8/L2jcWaA/ma8eF1kPtYY34ckm77gZ504d/Elrw2kdqvLYcRopgf8wsGx1epu/lOYcf2RYOpW8Qrryu4dZyOfkBLQ+EqVwN2qURMznRLGBsLJUa0LNSX6jQHhw6b6ZCaOd7FIRuu4wmI2eHpqtnernlCkZ/CsF558L4izZCJUcvRfSKxJkBRYzEDUjXRX16CrC2p5dcpI/wupM+HjhykEP2FFw/ELHJa/pi65gUZG7aADq97wXQ4nBS9k/24P2QqCqdttW7YGRhRBvGks62ph0S/uousQ== X-MS-TrafficTypeDiagnostic: CY1PR02MB1334: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 31:7lJJtjQizJmQIpxK1bVaRE4tjsUOrYppr1xson5aODDsNN2bd4hTTJ3vHdzwB33inBbm8yu5ubrTG4gnWHw2JkL2V+ZDxacz+gYsuVtBZh4wTjeSgevLKW3ikbPquAdCG9m7oFfJm3SHDFutO9iGHD59nKf1tAkUV4yr8G/4UJ5G8aODDTffR0diLIU4WXUsPrBNd2zES9mFhQCRL5WgtbgaDbqcDZwOkahwe0WHzsg=; 20:IIepGAbV+VsbxH/DPPyzPeVx4AaNm4mm8ryLFapekkXPONQxdGn43yXwOrbf6fPu7qywQRaVgWevOewS/PK0DFlU8HRmIPhMtGR4QNgCL6EzOGvZsVXLlitdhI+85l8Zz5rrgHOpA+0B7zr7JjrcWhcMgE9lGfgZLBY1i4dd/zWqoRm16Xb+PBGqZWMIz5EzBcIq242fFbGHTN04HwcmPKK19Vb1SBnEFccPHrL+CK81uU8BRXzjI7hIaxHDrANsfFkw2Heki0ZzgUeEaiyQfXw+rOQqYNXQ6sWYEv2Q2zuLHY34F/6JdGihQAZSfMFCOelwaz8+NyfrJlNXzK3dtjcwSjGKo6HO3fdJtPg3axcsRMSzZidG4AngkcDB0DisZZv3kd4qf8mMJzMf1pRU3LpHO5zbockkK40EJNS3tC9iKBPfQQcQxDF8pTAoJ//v2MC2FCwEG5h6DJvqCr020Kva5RuPNpSBqNaDn4NTSZOHSl8jnLgEIraNGcyeziYT 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)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1334; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 4:G8yzfNhJONhv4rZYAYJHYuZ98IUR07w9MSkJzjU6Cb3yGX/Rh46hXD9XAV2NZ1P38+Twypb9J/uHYcS+xeVDBp6I3bchHic9I05CxaVl2DrZ9PP4u0MKwBIokmEnAzXnwB8ReD1aym9VbpGAtoh3ZNTzVVMRcdlvWOO0smdR7iisqIGuz9AfJvRJ275vDYlMVLtokrfRCNLBC7xV64tZqqXvQyOfY+/kGyJvJcIVUlU2pTmq+lIrLfw/zy0HCGhi+0wfBhAjvtG+0C4Lp2IajEGIHaCKGpxP0tQZwmB30CEzPj219Zfcu/L9HUHbSrCTTvMDRrAER6Vcb6joFGO7BMxJDKaNiDHH9tbtkS0j8+SPSaYTUW19efiZDFRKpds5CmsKz5nJofddzz29jOlE4Q== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1334; 23:pjfHz5kpPVMx2j3KPfIxlTaQqVqKWxDzjfJ0w3CNr?= =?us-ascii?Q?rj2NhA/QzazjWAsZjQAw4LWlCPRlvncxwFfV8Xr6nazJiLoc7GGOQ3SnHR+5?= =?us-ascii?Q?iSuqr2mZ2yloP4hvnoravpaHSj9BPikx2BBP4xMu3Y2vcUFk67vUMpaJCd2L?= =?us-ascii?Q?BKtXeIsXCTc/CFOKebaYP1GOeXEMEtRdA/t2+FL0qNQEtIc/NpyHbN4b+tfK?= =?us-ascii?Q?H6M8GDFMIseTLNoauGdOeo0r2Rurj6nNRvJjOctlG2+aQ3G2FUit7K6UDeUM?= =?us-ascii?Q?zqq1mmLbri7PLPIPTztIDXe6uJA+5pPGCehmzVp+kY96l53gBWqIcFD5pHhJ?= =?us-ascii?Q?i6ESX8++LVlKzxmWYdMmPPhMO9JklnCSekrU4wd5+hIyD5VwND+T3zobYT69?= =?us-ascii?Q?L3Yk6lXnC5pia6pGw4Va0CbxCqCDcI4ToHNLHK/KbB3M48h+fNL1IXv0m+7p?= =?us-ascii?Q?vW8pNXu7a+4zHlZJQhgies6/KiUAP1wYRCyxeMEIRnj+uynJEK7iDXq7Wa2G?= =?us-ascii?Q?VPp0zbLHNaUgYkzvKLXju3Wn6cE6chWSn4dZnXQyxYvFmWpNfoQ4ttR7WvZ/?= =?us-ascii?Q?1YflZTjY7P4+rGQqVZVahhVJuXNkPIE0ERbz2XwRmJPK/DQAyC1+ionZ1VKi?= =?us-ascii?Q?BqxwVUCDEpYwgqhezjKVo3mJoQIPtlY38HMdPtyWjRvrC3YB2LqtgNgFFwlf?= =?us-ascii?Q?l9j52PF/XOUpsP2+O8h0aKC13rVII1+ddETtSLhzPHwU6359k260sAbXTtVb?= =?us-ascii?Q?UDeESIo+lB0HBvEk/uf9W36LQTkpLPLGiVSIqeMkNv3sB+OvRG7wbDaVo2hV?= =?us-ascii?Q?8+LocEq1+edKYI4u+D24AHtKARXksVv2uuQmQk8bs6uffW/plXU6XpRzA7TS?= =?us-ascii?Q?+Ao1IpagFzTyON0alsOSQD6RQvvWq80PYSLEdESuCM+MCYKCa7hETzNnu2yB?= =?us-ascii?Q?MfIjDF15p6/2CtHz6N+VQoj62w7KSv31mAh1bbPssfa8o1l0+kKVUifn54hj?= =?us-ascii?Q?hDuYM+41haNxVew31px94OQjhC9GujCRG4SIYuk7XldJhsqjE0vA9SAC8R7J?= =?us-ascii?Q?cn0GTlzd40eSQa+zWd21uaMQPXu?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 6:G0v3grEnK1IpGpSbFOUScwvqSpbzBw/YRIDAz/1dpDx8TZcFeqxcpPgQ+TeKUJ3lXigdUWXz2I/vud8g4lwJZKVaaN1HL/OUmrYHmzmFFPfuG6ttmYmdGWryQjxKS7GO8cyOT3+4RuzJe8zIy8kvuPDQJxj3swAQJvCMKUVeYz1/lDbMFkt/ms+3vdW+1Oop3XsS/6lvy8JQSK1OTppcts2VMNXzb+MJAPMs35g/TeH81S7kEAQ7OvjUdq3on87V8crhpY+5JCUbc8W3et9hzD25jYtfgJgPSCUPJ22C25X+LWbYQDZnQqetDG4uWjq6Ey71VMHzaNjhr8Zv+O3Vww==; 5:nwTrkxUuWWMQ4NjmwumbDw9zLquko1rgYbaNfiHA6g6ud6HxOjwWfK9rJi+lEt4G2T34DTTEzAjuIUWMv6j1pA4H+2cyOZdfOG8O0vFJPd8qfdnUX621fUsQ26QdEgEiiYhl3mii8JQucaGF9avW6Q==; 24:c7dH9+uNnEUuRYYLCzz1+xM0UQI7dra46ReXiX5PCvdSzWmGRkf1YRR/EklufsTHUM+EcubN6RsJRkZks1V/QuhqTc8oKkbpR3dff7BLgq0=; 7:5umCBnePm8LAWBBaQ2fBlpzDLsSzN7R6ua7QJ12Nci7ISdyR+5zqcP46hMejP8TReWJuSQP7cOOaJTm4OZ68A/9YDd5yhT/H4Tgu3AsW/LNUxB7ZNjktWpHmvWEkulIoV48Y1E4xPHuwDTMitl+piDMsGtNCTQTBsBN0j+bU4sKJNUspGtLJC/IplTPUjvT42UnVhaeh6ey6hJVr4aNrXNBE6s4tb+4vElKBkvaeq5k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:20:20.1184 (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.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1334 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.88 Subject: [Qemu-devel] [PATCH v3 12/46] hw/dma: 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+importer=patchew.org@nongnu.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 --- V3: - Remove ""s V2: - Split hw patch into individual directories hw/dma/omap_dma.c | 26 ++++++++++++++------------ hw/dma/soc_dma.c | 36 ++++++++++++++++++------------------ 2 files changed, 32 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..45516241c6 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,10 @@ 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