From nobody Tue Feb 10 03:38:00 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 1506731125534594.0845560972831; Fri, 29 Sep 2017 17:25:25 -0700 (PDT) Received: from localhost ([::1]:37503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5aq-0000DQ-NQ for importer@patchew.org; Fri, 29 Sep 2017 20:25:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5V8-0003pQ-4Z for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5V6-0004ME-Oh for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:26 -0400 Received: from mail-by2nam03on0087.outbound.protection.outlook.com ([104.47.42.87]:31678 helo=NAM03-BY2-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 1dy5V1-0004Hy-EN; Fri, 29 Sep 2017 20:19:19 -0400 Received: from SN4PR0201CA0016.namprd02.prod.outlook.com (10.161.238.154) by SN1PR0201MB1933.namprd02.prod.outlook.com (10.163.87.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:16 +0000 Received: from SN1NAM02FT049.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::208) by SN4PR0201CA0016.outlook.office365.com (2603:10b6:803:2b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Sat, 30 Sep 2017 00:19:15 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT049.mail.protection.outlook.com (10.152.72.166) 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:15 +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 1dy5Uw-00082B-M7; Fri, 29 Sep 2017 17:19:14 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5Uw-0006u8-Io; Fri, 29 Sep 2017 17:19:14 -0700 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8U0J6ke000358; Fri, 29 Sep 2017 17:19:06 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5Un-0006t9-V6; Fri, 29 Sep 2017 17:19:06 -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=tTCdr0ObcIb5CkQ9d2GYztDmQ+mG5GKX47dRZ7lDL6U=; b=qGKyjSCiZtnUUBFhu5dfk7UWKvOlbFQ7j6+1uP9FTsnrimLX1hKK244gH0+R3IsQgqBxoJOXyJ/ICfggfjyfN2znFYcn0Qq6jGd/AUHGfGTPwkhEsBxewSXv9C2YLJCpsDt5SxAq0D2wkTOI1oJgutgh2/f28sUkmQGYBuOA/28= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; 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.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:15:18 -0700 Message-ID: <43cff6f912d471a43ece166aca0b49481c123048.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.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(2980300002)(438002)(199003)(189002)(39060400002)(9786002)(356003)(81156014)(63266004)(6666003)(16586007)(4326008)(118296001)(81166006)(8936002)(8676002)(2351001)(106466001)(106002)(36386004)(189998001)(77096006)(54906003)(33646002)(5003940100001)(50226002)(76176999)(50986999)(2950100002)(48376002)(6916009)(50466002)(5660300001)(305945005)(478600001)(575784001)(2906002)(47776003)(316002)(36756003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0201MB1933; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT049; 1:fuPdlxta/xosC5MDfjB/6fERR7v98cnGSstHf/AE/JnQgO9PVyGYLpCEw2r32iWDMJjZ6cgEQ2dD9qesM41K6KzWIDjPK9EHHDZDRlWrsCz5OeiRx3za3vPNqlmTWRVS MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0758971e-3c49-43c5-3765-08d50798e237 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:SN1PR0201MB1933; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1933; 3:ZVU/Pz3F8P0zuSIGv3pS1ZZc8+h9N9cvAwjTqgpY1gs61l7LvUF98+uXrVX+Gl0QuhHgeUuUoo8hT9DTW6myXySk4Dql8M1coMtJLCJ4J85TtwHtdUkynfGuDTmdGID7TDujDfaOTT82qo5wFf+t2xNFxb4dbZy22py2RkYqLY9O0AGuBHkdAH821MpH7hBpB2RqBm+FOfbGtYX1sBpXI7RNr6xnQ97mUNYzH6s39co3WZy1YMaOL5buWVsKOY6tpycApZJVZLakDmcBt3S57RVaCAiX1NsYAkzXUuexHeROuqBwbKNniydhrmfyL7BAw3i3dUjvNRejB0Ps69v9QpYnRku10UXD1Ne5VmO7qrE=; 25:M++ZYWy5+wSA3gBuV4DfGt/fOyWFxHx8aj4QbuGwmX+QgXq356AE4FOjqq0Q9LaNit0GjyPCjalAS+1zTC3yZRt9fzRGLXxu6w3cpaaS1e/tU1V/ebVJ7ujTYKGnC+f8kBww+rZoiAXjv/jFZqTmDsRfXyIshbV+IGX4k+Yq2ozPbWOlJMNYIasOEmEh3e7WIziHrWpbiW1PhE2c+a6W2u8VbkQCTcY4nyhrqbig/bR2rdMccrXKkFIr0W4lyUxtPX2wn0D0oocfJLeMRWjeonZZ8VL5u5Z6G/2xcmjCP8glRz7056UXcBSOKv2AZSIt7srFOHp4tmz/n2mGZnGydA== X-MS-TrafficTypeDiagnostic: SN1PR0201MB1933: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1933; 31:NAIdkAPUzHPjWRfl+WrdTwBn3j2OarU22TX2bwISgnmIq1PXqT0tOsEnL3IdY88Wz7sesKq+2RvsBg7vNA1O5L3h9xVkFdlcIvR3aPbq4tey03Tb9PPSDy1iOQITooIZyKboS5qXlaFjSsIpoqh2GXdXJXXZe2zn7tZkfS/7f0nSCxaK1Geh9Cpj5d7AOb++AoHluVPHAeNcq8z79KYbC7istqhXQKTUVYb/s6bXenQ=; 20:1CGEqxCrmDlu8s+1KeFPzwiJEPXdQHccN7Sa3+DCT5kf76SF/fsHPhUvF3JYvz73bRB4HxQMJPvpzxsMyNfMdi4XNQ+6E1Tcn1BQ4UTsAvYQaijWets0XUjmmpYUofW2h+vN4YYak8wVatjdi8eU4n/TTCOlIQypLq/vs/bcam15vyG+7BFPf/p/Le9jCbd/lHBvZtEaCG4ZDHUSPNWdw6OgwpB0bdG5SpEQ77Axkpwn5kPVZz2nh8BvrYVkkfnpdlro/uOPPMrdR21cOn/jRgQBhtdqxVOZNoWrBmBr5VxETK59OdBC05cg67Ix/lbrnWnFZ7JjwNlm9p68IvKSBuWJ8d9YD6ZVCxP+rMKavyyh4Eh8rjPMWqxenZG7gq9Mym6Uu2XVEVzakBjWwCboGjmAIQ0qmVb1dphsUYQCvchpw8+qq/dCWxKrSP41+E90poyYdvs28eoEV7YWwtPeqPdpXTnK6kFUa1Bp/zLghQLHmXjJyoA0uWt13DJZ7Lp+ X-Exchange-Antispam-Report-Test: UriScan:(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)(100000703101)(100105400095)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR0201MB1933; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR0201MB1933; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1933; 4:d/1DIa0pSqVuYPLxuCnMcev9GbAXOOGPFJVZV/qIPE2QPdwEZPU4JuMNwC+qUnEvW+sCnnszOVOpAkjhzJag9MJ4yJEnoiyzv9+cshI5A038BoUcD7sSG6D286h8WCdaOJw9B3ZkXWmPDM81LDaJfgK0vIUNa3yBKG8KMoPin+jsFaUvLPM4gxd5OSm+EuH6PPxZHxBdDsM+783bSli0EEqqxw0U8SvB7QHQF/JjE8FsopCM4fzitRyws6ewJKX/PlgsOUnpShs2l2pJr6VHSCZOpN5NqmNvXc3S4sTWyVsRHTBH+vMNSCXtEDKGlf+vZPRIvRrKNceP+WBzzJD8eg== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0201MB1933; 23:A1/tvtJGXhQW0+NSCtVNqQum4cS//VP0Rsyw1gK?= =?us-ascii?Q?qi8y88r86pZlA9uyX85bihyRcrVppGGfpRb3FYmaoGwReTkAfmG7yor5ng2g?= =?us-ascii?Q?VbPtxMqvldorldd1qYOUkc8d1gSeCvvdIh71KFmWLyeE6ggrwPFd90Saaoxh?= =?us-ascii?Q?sq2/hIxOF333PnDP1dnvmYmvrcY4I2w6VEckeaRglAPKly4xu2WsHgoD0i4W?= =?us-ascii?Q?+lPDw1lO3clqZdqDbiC8Wz2OX1WNbG3Df5kskc4wBGjijHlhKWuacjsg+Gzg?= =?us-ascii?Q?TYW8SJv4h8JYdooTUNpxFJnzJE8G6sqrtsUgnGkz4r9zHoCsMcDmvUMeQLXc?= =?us-ascii?Q?FOcfFSmFdq2wsKK31jI0AyflI3zVUagNQjunEe2xIQ3Q4Yi4lNByN2h/IDRp?= =?us-ascii?Q?fS+OCO5xw5bRM1sTxJHgRu9E/F9t+fcNo67wHwvvmSCNjvgxSzusZPtOCqG6?= =?us-ascii?Q?lBwDedpQnWvLKSqtKSRa8NFx6ngjp1GIYtR4Wx1fnocJjeCSvASKLC5O9zvI?= =?us-ascii?Q?BX5nGoj1UxqxWy6zLr4TIqKkCh9UNoL3EFnrtHhCWZa7s39q1fcsqoiQkkw/?= =?us-ascii?Q?FeGwEFg3hfuVlIcpd4cpGNaTzWF/sYsaqBy5G/FV2VSLdveRUvpt5TXUFrME?= =?us-ascii?Q?RBaDMttEe6evmPMLveM5TwAaSVesFIwPCPNIE66hWuPBCLhMimjBf6lOGeM1?= =?us-ascii?Q?fYbTw2aHLp5t09VLLATayuJzmtu/0BK7BZmLrz4yURTzYgxhfuJjNiYv9Cxw?= =?us-ascii?Q?ZGnc+VXyUxQHOwTs43gIdPlwF03hcVdHW4jMQfMdT25Rb7Fap3u42gYzckOp?= =?us-ascii?Q?usIYQc/XpkP3PuB0vG9QfSIzPqGyKN7U0B6rYjfpio2RDrYyIcjwDgvUtztM?= =?us-ascii?Q?m1Y7w4sKnRN/Fe9cs8TRcW0O4391TyAZbufGJ5IHYoPSJdzjKny9pcUrDSOz?= =?us-ascii?Q?PxMuggP0HaItuMHzRNp9Sn37k7I5Zfet3/vGwatASDxEm+IMYZjJeB7q3r/q?= =?us-ascii?Q?UjphxUNLNPcU6devVplQBILr1L6ACRgrf5xrEfCGy9u2PVA9P1YlBfpQY7Hx?= =?us-ascii?Q?t8MLZ/goVSzq1Ww88OP/m4MuVy8dT?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1933; 6:+g5QX4rz0NrmErwCbryNVczmeVxlLqubJqJwAw8w3HXjhYeZH22IRqpQzPC8sw7n8WJpDblRA1YglGeU5YQZHq2TXz1N0uVYOBYpBBFqeVH3U1C3eoZHDnA9dtmtWlZwhpJNFGocFxCTk7z+Gfhu6D4Wg8pxuebXM5dz0QR+JI7UEwzhHWmBIH+P3a8JmIICVhbXPo/QIbbIVhLK3llXHZcYDLQCjrJAeyY1Mk3nr039dOyYwQnIyc680vvuU/Uq1JD7//b+/RBaFtJiYp1X7l+Aryu6iTJbExQePYD9HCeIoBwASPrEQHSRl/zryfaVwaOOahAg/9kmTXEsPWDf1Q==; 5:fW7k5ep6uj1QvqhVuWYVNFIqr2GsCsX3mH0EfxGC6UJBYv2va3UyPesdYVlOKtt6VMvYAtHIKE1o4Thp5Z28DRR4xrpMqQuZOdvvu58co7HMAFk/CauGwWtGEDObVRxxDtZk7XuVPFQeAeGIi1oMXEd5Fn5Am6mbTVNHntvlkec=; 24:KM5NLvCQ+tFcYokK53jxXJVdVgfsVwyUBYEsGPiQ+jVdqwUO2yUGto3AzaPh5+KI0SRNpyzNkRzEdOkpNU3jT7w9mGO5vaBLMEWsdr2CEVw=; 7:jivlH2mSknAzF4s1pRFjZQyjX/LkEOpZZAsebCP6QI/qVErsI52ilKeMvZWQBzGnmcGQcW9amUa5O7/MrE1PUvskuZt4/1WXWuZ6QxRlg5V+F7WNGKHUxEx7vTeoRfsb7UWglyLo6uJolTr6Ff0bmeA/o8jZCJ4wTDkCqAtw7GeQbn692F2NxvbWznzd3jOu5DdI08vo6JICLMV3kcl7EnXQ+VrhzMHpdIe8v0iXCk0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:19:15.1829 (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: SN1PR0201MB1933 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.87 Subject: [Qemu-devel] [PATCH v2 06/47] hw/block: 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, qemu-block@nongnu.org, 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 Cc: qemu-block@nongnu.org --- V2: - Split hw patch into individual directories hw/block/dataplane/virtio-blk.c | 6 +++--- hw/block/onenand.c | 8 ++++---- hw/block/tc58128.c | 44 +++++++++++++++++++------------------= ---- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-bl= k.c index 5556f0e64e..69dfd49191 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -178,8 +178,8 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) /* Set up guest notifier (irq) */ r =3D k->set_guest_notifiers(qbus->parent, nvqs, true); if (r !=3D 0) { - fprintf(stderr, "virtio-blk failed to set guest notifier (%d), " - "ensure -enable-kvm is set\n", r); + error_report("virtio-blk failed to set guest notifier (%d), " + "ensure -enable-kvm is set", r); goto fail_guest_notifiers; } =20 @@ -187,7 +187,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) for (i =3D 0; i < nvqs; i++) { r =3D virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, true); if (r !=3D 0) { - fprintf(stderr, "virtio-blk failed to set host notifier (%d)\n= ", r); + error_report("virtio-blk failed to set host notifier (%d)", r); while (i--) { virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false); } diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 08c63adc9a..cca63e3a16 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -600,7 +600,7 @@ static void onenand_command(OneNANDState *s) default: s->status |=3D ONEN_ERR_CMD; s->intstatus |=3D ONEN_INT; - fprintf(stderr, "%s: unknown OneNAND command %x\n", + error_report("%s: unknown OneNAND command %x", __func__, s->command); } =20 @@ -667,7 +667,7 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, return 0x0000; } =20 - fprintf(stderr, "%s: unknown OneNAND register %x\n", + error_report("%s: unknown OneNAND register %x", __func__, offset); return 0; } @@ -712,7 +712,7 @@ static void onenand_write(void *opaque, hwaddr addr, break; =20 default: - fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n", + error_report("%s: unknown OneNAND boot command %"PRIx64"", __func__, value); } break; @@ -763,7 +763,7 @@ static void onenand_write(void *opaque, hwaddr addr, break; =20 default: - fprintf(stderr, "%s: unknown OneNAND register %x\n", + error_report("%s: unknown OneNAND register %x", __func__, offset); } } diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 1d9f7ee000..d274c9aafe 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -50,8 +50,8 @@ static void init_dev(tc58128_dev * dev, const char *filen= ame) dev->flash_contents[1] =3D (blocks >> 8) & 0xff; dev->flash_contents[2] =3D (blocks >> 16) & 0xff; dev->flash_contents[3] =3D (blocks >> 24) & 0xff; - fprintf(stderr, "loaded %d bytes for %s into flash\n", ret, - filename); + error_report("loaded %d bytes for %s into flash", ret, + filename); } } } @@ -60,26 +60,26 @@ static void handle_command(tc58128_dev * dev, uint8_t c= ommand) { switch (command) { case 0xff: - fprintf(stderr, "reset flash device\n"); - dev->state =3D WAIT; - break; + error_report("reset flash device"); + dev->state =3D WAIT; + break; case 0x00: - fprintf(stderr, "read mode 1\n"); - dev->state =3D READ1; - dev->address_cycle =3D 0; - break; + error_report("read mode 1"); + dev->state =3D READ1; + dev->address_cycle =3D 0; + break; case 0x01: - fprintf(stderr, "read mode 2\n"); - dev->state =3D READ2; - dev->address_cycle =3D 0; - break; + error_report("read mode 2"); + dev->state =3D READ2; + dev->address_cycle =3D 0; + break; case 0x50: - fprintf(stderr, "read mode 3\n"); - dev->state =3D READ3; - dev->address_cycle =3D 0; - break; + error_report("read mode 3"); + dev->state =3D READ3; + dev->address_cycle =3D 0; + break; default: - fprintf(stderr, "unknown flash command 0x%02x\n", command); + error_report("unknown flash command 0x%02x", command); abort(); } } @@ -103,8 +103,8 @@ static void handle_address(tc58128_dev * dev, uint8_t d= ata) break; case 2: dev->address +=3D data * 528; - fprintf(stderr, "address pointer in flash: 0x%08x\n", - dev->address); + error_report("address pointer in flash: 0x%08x", + dev->address); break; default: /* Invalid data */ @@ -119,10 +119,6 @@ static void handle_address(tc58128_dev * dev, uint8_t = data) =20 static uint8_t handle_read(tc58128_dev * dev) { -#if 0 - if (dev->address % 0x100000 =3D=3D 0) - fprintf(stderr, "reading flash at address 0x%08x\n", dev->address); -#endif return dev->flash_contents[dev->address++]; } =20 --=20 2.11.0