From nobody Mon Feb 9 17:07:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1510182711928898.5406270672814; Wed, 8 Nov 2017 15:11:51 -0800 (PST) Received: from localhost ([::1]:34356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZVP-0007Yp-M1 for importer@patchew.org; Wed, 08 Nov 2017 18:11:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLM-0007lu-EX for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLJ-00036F-7h for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:12 -0500 Received: from mail-dm3nam03on0087.outbound.protection.outlook.com ([104.47.41.87]:56096 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 1eCZLI-00035s-Ua for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:09 -0500 Received: from MWHPR02CA0052.namprd02.prod.outlook.com (10.164.133.41) by SN1PR02MB1341.namprd02.prod.outlook.com (10.162.0.147) 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:06 +0000 Received: from SN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by MWHPR02CA0052.outlook.office365.com (2603:10b6:301:60::41) 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:01:05 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT006.mail.protection.outlook.com (10.152.72.68) 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:04 +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 1eCZLD-0001LG-VY; Wed, 08 Nov 2017 15:01:03 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-Q8; Wed, 08 Nov 2017 15:01:03 -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 vA8N11vc008944; Wed, 8 Nov 2017 15:01:01 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLA-0002Uc-US; Wed, 08 Nov 2017 15:01:00 -0800 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=jO1Bph08tpoGIeQ6JiStAJzPAPw/goalNNAiSEL+Y8o=; b=0rCd6Dlo2ve8iS5LFmdpf8sOFuIYDzRJ2l/HH9egizougoCPLaMynjkY5fJSxCLWKOaGTckdiXXhKGvKLu+wcvD2/nFAuJVbcFZFk2jk2yVXxdjRyvF8YrQV6JmO2NXGO4QW7Df2xCwDA3IMSFTytC9nzqUQKAcLuoaBX80I0Lg= 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: temperror (zoho.com: Error in retrieving data from DNS) 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: Wed, 8 Nov 2017 14:57:02 -0800 Message-ID: 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.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(16586007)(36756003)(118296001)(63266004)(9786002)(50466002)(2351001)(48376002)(33646002)(2950100002)(50986999)(6916009)(47776003)(106466001)(77096006)(5660300001)(6306002)(76176999)(478600001)(54906003)(189998001)(8936002)(305945005)(36386004)(81166006)(2906002)(106002)(316002)(8676002)(81156014)(39060400002)(356003)(5003940100001)(50226002)(4326008)(107986001)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1341; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT006; 1:u8Wiy4rHSivnp0a1dwxu+SRY3EkiGQoMx0jT67PghIZyeEKwXy35NvAAn5YsljzJIkkMH+WbznXdQwZsKXXbUYXbvvl2/96uT9qy6FhkWj9oJ0Ch1ozo5lFY4wposNcl MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5ce28a2-09fb-4086-abb7-08d526fc96d1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:c/hHN2zHJEacSYh+KbdN+vqKQiLgOPIsVj/7USBRFYiNv6kZi4W5JanVm6JJK6Rw3gRLA7cD6B8LyS4qQliaxx+b9GMDWzK4oKZrhNNKIeneeJ7RGVt+kU1gt09rWkmBQhzAK2grfRA/4REOKazOJ2tzMHDlWqDCKooDYSLm5zm7mfPga0jvQqehIaMu3LeAWeA70bcezn93yXbkpDQ44l9ibTsZbIsoWzSQ1BQ2ya7tcqxUM0gi6GnaeKtFmwtBi8DWDhk0K9eEfVBdYTUKOSboQSYmH5Qosh2ryyf3DyjgXnKDfN3bovs5QOYpvCflwktbU4yW5/bsjfql6s40r/qiOjVs6PVz1caaEC585Js=; 25:8b5lIePOEyO5k7KVlszeb9YRxXqIGUkpbwYEC6d9CpDoK80Icoi0MPej80fybo2D2+BcozdmdRwvh4XxPMqZYfl5mh242QaoWHmPrm4e5vvk35WimQ43oTBIpsvJuhQL3RE+7US3qbK4y2dvdz/watbGtNYdKofGHQpe/H0M1xdBTS09P7aD/hDWzxJpwBQF0iGkB0TzuQSkhoRiZ+bc6nzpglYBL5+CA3+v5My68FH9xVll2uXsD1i2jtV45EwgOROVJl0Ns0YkhGwAqSXN1A7/kRhsqrXSRxJeamHu22NAGHgyk57PIBRK4tKSi5ThbWD7hbWS0XAzQIRJo2pNIgIN1w+xmakLIoLk0irKWcE= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:+AIhfBTLS07eW5kE+I7S8rB0lZyoywW1qhHMcg6HYGG8ZF7ZSxMeWZ3ONVe3VHXfZUwNhpdnRkZTfvsjenSnwWgW+IhZuejt0sZZNARwTwF/8jKqiHcl6v0GJVaSqH8kGkLoF4ZEoK8GJ4LLiSTm1gdUi3zek6kn0ZJfPAhYhEwAGPpNZMqu6ypZdAJwegLGLYxcTZ9vE3EmT9EzNeraQe4rUKm7PCWLvTwK62P3uDw=; 20:g10Cd/tzK8ToRMMTqvuH7LJUS9FWk0ZX6e6MH0NSsz7sL3JK2MePcmHt/fI/Vy10uajhLR222IvWfZKaeAdd7yl0CQle5BKAowjfNRwH1wHdMrF7AtFN0XDEr9gcKGsLwqYZhTLO8omFBegq3eOswwbFsrI44eSloQobBZ0iQrCU0YFD49kOV2NUduTCVmAVIkPU56GcJoxBsZZcHyyfXuyqTmS2Vkr+n41lKUOoi6mmt5dQF5f9OR4V+Ec9kU4a1/OczphBJMeeO1noVumS4RiypXe/FD12GgV54/qilMEtCMp2ZsM6kuFxTrOtS/uB7wYBXykB3W9MjSzMRS6fx0r/c6dPTvosEVUaclIFOEP53hqiYb1xQnuouRIu49paVYYo3MiBP7pFLWiEuTArYvrubVYJ1biQquHGs1ralRHoj6ySaW6QTY1h5CuwEuE8vnnmqRwObA+LP+WGUIr8QAu39UgRioe7XB9LGiiWwLwdSa4Pv5dzgTB903Iu004d 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)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1341; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 4:j83r329lWGQROw5m32pK5TgZlZK7JyUiSTkWhxwwhqR70Uacpr2JwkVb6B7RvRV7royMFlIDSOarwXx0ZkdOIXQJK/ltpD4POU7LEyYWMiuSWTis4JuCu56PdPhL/HdnYiJKd1WvDtfCRLjrYBXTVnN0oPu37ET7KrWOwuKjiBnLpX0LWU7gQ79EJbrYw3Q0OiW7tPqF2e/0EhZBtD179Xo08uLK8jPqDjJaTZ6L3YwmZyOq/KPpeKK7ITPOL8P5g9hOy6dlFzM4p+OGD/OUbrXGyZEK1GdmvDLGjLTRqnA6IOA59oesq3SectWukF0P7Sgjhn4gfzgLQzaP/0iX3aR4kyjIxpEs64vkH6y7qcllCPamCjEPKL/fm24LLoszCYmRfa3J8AsJKnkQFz90snZK+wMm/WWPuFIno05zQWw= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:Uj65r+4aZPXuhSBSBdLr1T+6DmXK2v5BSLBMGbEHt?= =?us-ascii?Q?Rrbhqo6n9Oo4OGEP9OymHSqNEb8Ay9SMmcXjlgjlcQkTpYzGEq7rLMKRuY0S?= =?us-ascii?Q?JuEXXTxjJXgQqoncPrke2LSvGCsWOTsN3Huk8lBTDr8sKK2lTHazLRcj8JaZ?= =?us-ascii?Q?G+ES8OFW/zz4fwcXu7jfSnGcw3aFYQjDcFQDV3Sxra2wB2cWlJFL+egdIjyY?= =?us-ascii?Q?MdaaGTm2RyswFaHmaj/9AjSvGpJ2aXol12TCg2bjm0ffJXNUdCpbAhtPmXdK?= =?us-ascii?Q?WkYapj7BDbI8/2iXtCgP6b3AsN8vveO+MdUXTvfKwUTDfiYSTYRFJkPy1LDL?= =?us-ascii?Q?WsCWuMggTKMu4j9U/nIn0W9AdrKYkWTNVSsUtVWpl84Fy4B2seDBqiAukOzq?= =?us-ascii?Q?gUPQVynqCJGXavl6FHtufBlovOsmYEe/GDq00IvfNQmP/3gg+VDpHAt6+KXe?= =?us-ascii?Q?hq16nP8jBy/N+vJNVPGWLQSCZkn2OOLY3fEfiP8wN37J5XlbSK3Cajehz291?= =?us-ascii?Q?PSHG8IZrUiHn2Gy84LCX1fe7uj0NUYQjyarUFhILQbcwhiSTK8icBpvLYDTe?= =?us-ascii?Q?eut17gt4APYL2KlC8U5uh1tp6tmF9aRsYF53O726yWqMf2Eg4QIJhz3wT7st?= =?us-ascii?Q?uPzAvai/UuV04SXieNG4pq8tskusbLpKIoEg2g/5ieqEkPuNCEw5Iteb6spj?= =?us-ascii?Q?pgZjQ9LBe/S5k4NoZKKQrzHUwjp7ccL+LAkoBiJ2moE3FrGFg9N//mwNq+Zs?= =?us-ascii?Q?TZmLi8h/FueiGzdBRazIhgC3gydOCt/0WYaaWLefhRNbxp2KvguoNE0eFFJ3?= =?us-ascii?Q?pxtFEqZbqQ84bKtrKkRBysjJCh/m668WTf2RyvlH5Y1ZhGhbCte8lRzrwf4A?= =?us-ascii?Q?N0363fTpBHSnIpJZ3EcZfvtfOzslW0o0FJkSTsmqWA0RyKC0HsWnMIurpFr1?= =?us-ascii?Q?OUqe7ca+S8aMQvMGiP+eLdvRIIvZUZ67mJb5WHyNVsxEygiZe/h1pX9MKsUw?= =?us-ascii?Q?Kl1EV/qWXBXGKKp/n5POZt4z1AcT3Rl2duyQP58j7521Zu3DcvLTDMA/Y9Zr?= =?us-ascii?Q?/JIcRriS2XaQe6nUcIEknxRmjgN?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:IlfxKX5nLyzTCulNKiLjWsbkfAnsOwg/oUCN702Zgm6bx59OZqOP4JyEdP6Lr08r7xeGUSBsWo2DO1+T+JM+pyUddQH5eEhmfM8jt2WeuAfjPyOkH3H3LU/gwpGcAMR/s7KU+1RUCOr4r4C33+iJnT5i7vNl7bvT2tBYw3mHn70vRF0n3GvaDb+rDPAjHR4xEFZrYfOwlYxlXfH5U8a/6PDoH1+EbfooLeljFlkmtkRMHIGw/T7Ci8O5jKzuO+Koly/IalSIPMlGh+HQ9PO9YcewUrYyEM26ZOQzlh45dtKIMIW2cONOtosjfLy7u6VC7Z2jC4l53NfnJIyac4Aj2YN8RkebNpIHhSwgSZK07sg=; 5:UpAvqrkkTuxcQjpkjZ7zxJd4VeTM35vXXGgCJB122O5/kZ8+q+EbSl5Bc6E1nIxmiFlOMXgup9a9Nsr5xvmKYye8BI/NKzI1nZXJ4H4ioLirgSGKhPHhzExmBi8foh2welS4fMwb+IWmJ97RRfIGGWIvMx1iCSI5ph61kaeVvIA=; 24:fl+/k4LwA5/nc2Qg4cOPSG8ZZC7b9jLejpVG1feLoi9aXa712NEaC/5B9I3HwwM8+j7j6DNxgezuVIHMBtCXm4M7s9RCFK/WDa7/BASHpv8=; 7:0+ciY9zoRz68kLGod236QEhx3iYu+mzHNlcRxwFCdE9CSbFQs4NWasCmmW/tFLg2oeBLQ4Ec6AaF0Sv4nb1C1nZ6kdOx16vwaYvlOk3ff34vOOBuCjh28+wOVkX7LrVaVt6YGXZvQ7bm+t5DlmmxsLcsHRtd+o5XcEYN13P1ntMpwSaX6Up6IUn/dzxS7yG6q6kSf91HfIIh+0MN2L+l/jlhwGW2KEo0HYTxvNtBI6EMOdN42w9Uwg8sFL41G0Z/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:04.4386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5ce28a2-09fb-4086-abb7-08d526fc96d1 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: SN1PR02MB1341 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.87 Subject: [Qemu-devel] [PATCH v4 12/45] 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_6 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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.14.1