From patchwork Wed Nov 8 22:58:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10049693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C8F76032D for ; Wed, 8 Nov 2017 23:30:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DB7029977 for ; Wed, 8 Nov 2017 23:30:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5105A299AA; Wed, 8 Nov 2017 23:30:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74A6B29977 for ; Wed, 8 Nov 2017 23:30:57 +0000 (UTC) Received: from localhost ([::1]:34446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZo8-0005Oi-IJ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 08 Nov 2017 18:30:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMr-0000oK-MJ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMo-0003ht-HQ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:45 -0500 Received: from mail-sn1nam01on0057.outbound.protection.outlook.com ([104.47.32.57]:31808 helo=NAM01-SN1-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 1eCZMo-0003hX-Ab for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:42 -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=ffeJIWsqd2ZCCY0V+CMTHt700F/DxtyN/FUVlJuAC7A=; b=ims55rToY5/bwgZLYODzcpCP2RhnGwad6JgZeF+v6F/ONJjL99jXXktph8Unjo/IRbMYy4660VTvBjPRYCzjllbphbSd77g9cCY8SjL7Ctr4y1lv90HcM3+Ct/HWCyMSjihnKK32o30JmGVgLeh5ZJNHIKHZmET0ETY58ydOW/E= Received: from CY4PR02CA0032.namprd02.prod.outlook.com (10.175.57.146) 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.197.13; Wed, 8 Nov 2017 23:02:39 +0000 Received: from CY1NAM02FT029.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by CY4PR02CA0032.outlook.office365.com (2603:10b6:903:117::18) 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:39 +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 CY1NAM02FT029.mail.protection.outlook.com (10.152.75.143) 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:39 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36357 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMk-0003yo-MX; Wed, 08 Nov 2017 15:02:38 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMk-00037K-Gh; Wed, 08 Nov 2017 15:02:38 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2Tct010358; Wed, 8 Nov 2017 15:02:29 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMa-000369-T8; Wed, 08 Nov 2017 15:02:28 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:30 -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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(4326008)(47776003)(8936002)(36386004)(2950100002)(8676002)(81156014)(6916009)(106002)(33646002)(6666003)(81166006)(189998001)(50466002)(118296001)(575784001)(2351001)(77096006)(9786002)(54906003)(305945005)(36756003)(356003)(39060400002)(50986999)(50226002)(48376002)(76176999)(16586007)(478600001)(63266004)(2906002)(316002)(5660300001)(5003940100001)(106466001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1334; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT029; 1:BtVBiAXe0CjHP9nqGDcQoZ+KxXA4btd+rB+f/TMD/7f6Llyr1YqmpgqnF/oqlfBS2tDJctnoNtqX2RqdAxSYpx0k66rKh60VdfqqE2AIdNM3ZvrY45LUgUolA7cKFuAy MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4a0c103-9cbb-4d61-2c5f-08d526fccf6e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 3:rA796cBMDY5x167C+MFvks02PfdUnFCinIReNhSKKpYhO0Ben1pbM60EwlgHt5eRcovhMcIKSsxyoimLZt1IhhmsR9BVaG4rvv2APvMmC2SxAVQVlJl2yzDBpNtnyZt8OHmkEluAR+7vmWe0TTl6wQOxeFb9YwZo1VRjBbQ+sXaAkocKrcSenrhOEiL7CJiUIYhUX2Mk8uI//ie7fYCqk2osu2xCf/tV53xc0VemaXc2i/YUnugSH55o/S22tafm6d7UZA5ZdNiyst8PfMx5Y43EzL8/4uFWJtYWMVd44r1u8fnf95OAHS5HYYnc2usAxej92nbpv9VPUNK5bNZ3p5n7oYP2BcQU6RoLYQp6FH0=; 25:mumyJcoRtPfGhhdyJgx12xtvW1bekmTEUGu0FeIdcgLjK6ma61rAt6X4pUt0QUkUYOtpYxqkUhiMsEv72KeFUzoFqdYCdy+oOO1aEDUDZoeiAdbDfV2Bssj9xSwp9sX4U/O4PRo05cgBR8UOdySfwPlXZBuIG14yVECsorE8l5OotfcxJcdXDxK29r9dShMv0y+7KbxIz5kjlV7lDf/ekELUuJi7a0jsJ6IxzNuRHU672MiARqW1dfE4JplaGbUIKZAW9kq/hwHWmS5MlQ4enwaWOifnp7RrFkNyZqUlvHdrX7DhVQce4FQMX9Ua4TCxeTkaqs64lvmLW6tGr9JXuAeyf3xJRD/XWyuy4Gp14ic= X-MS-TrafficTypeDiagnostic: CY1PR02MB1334: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 31:zLYPxtTScVKC8fIomwyo1g5QRBLBjXp7nd6n27//0Afm6aTz6/I/pCXCb/iLzjIhkP1Vbx3MXlYM1Z1azJzJYc/ncp68olpnT112t1uSAubUPfE1LflDdpIk0aezxbPOzJFP7yO6ZPHcsIYQ3wUQoTTeP1Jqq2YkpobqbIZNJIs4SQiJW9qaTX2dDHU1Wf6kos6kOzI5y3M8CjlkERZrV3bfBM5RkQWbHbAHGfA6U6o=; 20:ZT/E0T4pLJCL8MKF7x8lYe2vjDke+QlrBxGZMaTFCYrP5/teN8qCFkO2Of04C2E41BnNj8KUKJxq/Cd54byQmGQrnXauYHj843K5uy1/QWTGERweKh3LgNizq0DxwsirTrExeFcARvXoHBNJSKXZwXJdW2wPLboniCOMthHQP/S7u9WmmcD78rsiKfe+hL6KPVHarvT03vU9v1CWy1tAhj+PmoJwPVaGRiHNccJkd0j+x2sc6+/qOfITiU9k6fWSITKn0Ae/oOUJKUo5XNdzyWo+BdVT5xY+JOtSH6sfjkBJDdwqNfA4dkPnwhmumSESVwtCEs1oDId0KQMlVnKOvVOCPRmGneJ6+GjJ+xqUI68i038b+V4puESzFzDXpom+kFnA5v0ZdS9ytnY5qbPlH54cvTWDcJgjmLLA2m4ip9xmgoihgfw6UWCvrQCCRGW6uFMdX9nC1pWVs5EuE/U4uhRwK8TA39JfObUWWguHSLqxqq9defnXXHmzgiyCIt1h 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)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(3231021)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123564025)(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:FGa7HqhVgB9msRqeia7UuntTZ1P6pqLEcK5FoWc/1V4NZtDBoSz15MZHIRX6B+VZt5FezACFh1R1emAyH6QhBUzFq1QpyQ8mtw5EaSaVEI+y+JsCcW97iynjqGrNvch1gRY+YxUw1a8A+ox/7Zkr8MsuXLmHsaFPehOspgaVdMmsbJLJCVMD9dvPEHi4DqGNtJIGW1yLWoQbgJt0LKw073M8ZcVo3ht8B49JY8W+VcqitWN2c9FsGY6E7U5tIPPWLK9hIH4e/HdjkfjX+207Fz8jfoPu3BdkFCTxD6KqDX/lFbmDzZ/EtnL30JSG+JlF3Y0Kf88cliOmzl80m7CG4A== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1334; 23:PYrMQxyGy5LHe1E3uTxDoXPSlKTLEy6muFmJH/PQW?= =?us-ascii?Q?CxugrT0ZbVgVaLG1NiaX/Y1EIdbloCBhs674ff9EDO083KmkDBNKpCq20bgq?= =?us-ascii?Q?A8c8fjZRITp2qgHKmA4uAexAe7MAso3uxDP9fE7MEBAe85LfBzQlc4TV0uoe?= =?us-ascii?Q?BsnwkREOintugnEsCBAFTj/9LEpDFmGLtwlI4dTSuoXcxKdm3ozO03vHypB8?= =?us-ascii?Q?KH2/i7sBQLdeZqJDGYU4R1F7PkIw8Lf/kybN5DZz+nOo8ecUq9ssTqSs1O/D?= =?us-ascii?Q?0HwsD0GCeR9r9s0yV9NTVr2E/+wJvcrgotik7wMfSS1h3zq122mrggpoHJci?= =?us-ascii?Q?C/oCG2/SzF1Idbo30FXIs0xEhRkxz5Fm2jCbUkguzLfSRZHor157cJUZR8KB?= =?us-ascii?Q?KRUMrPYm64Yq7NnCtpIE/rC4yJ2EkJ9Zl5pZLsDWqoKUm2zbqR56oYDEcvw3?= =?us-ascii?Q?Uc/eHxwjJrTk1TNp2XM4TRlmztR1pljy+xZhUnPmzh+cTNfAkbAku4GDmNF6?= =?us-ascii?Q?M51fPe9bpdVTYxReDwfhujR6VQK4Yr8L/jmRGGfO4dNdbfctqHtVO/aEO2F1?= =?us-ascii?Q?jLa6PjyVRpIIt6r+lGe/bONA+BP25P3Zexr9QP4bHnFZIqkQ8yB2r4y72ssU?= =?us-ascii?Q?+u1fNRyoXm7l6AXMnXRu6awiEbfe7aMbFx51v+xyBS9OXWIYaNjDHzua2ecZ?= =?us-ascii?Q?lAbp/5nasI0wP5LaHolvOdylPHlwIwdv81p+KyMAER5B3aX4Mbgp+Lv2WFnN?= =?us-ascii?Q?MM2aJEP1hKg1KFsfwhnT74gTbERYD9QVZshvu4xn9b+ppt8X+yrp9zj2BP9w?= =?us-ascii?Q?7y71YL9nwLtfFcO/pen8FbKMs4dxbQNjN608xPBeZyGLRECITAHcpPE4bDKd?= =?us-ascii?Q?q6HQhApztKFrhiSwKA38Hngzt+/CS7SPGucrltDBuvNlWTHuGP4Oj4zF4nLS?= =?us-ascii?Q?QLDP0gX5TikeC85+XU5yYz0i+L4aU/teZ/C2IB74O+E3Brhkv2zcr145DKC5?= =?us-ascii?Q?ra5G3pvbdT5t5Bc1xM/N/UCVC8m4go9FRC0TwDWq7CsCMDU1HIySyRLz+/DW?= =?us-ascii?Q?Q3xzoIKwxiKVnhPY8ODSmLEjtbzLKxwNkV6Em1ssYIGIGkXdw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 6:QSZyv3fzzi3Cg5ZGeNrgGFF8JwYQRnjJe4J9AnvHOw1/UcQAxhQZMoe/6iTfb432Omk9SqsRqG6Ly5y3g2pr96qcFqbbV9WvhUSGqkjqqWPVmehT7fzxAiSEEtj226gPj6QoR7FupnidfX0F+2Lcq5awF5gsGQIPYohWFnkLxf/dp1jDwpbrRVAVk/Sfd6fBfd2fHVgP/RSo9u/6W/30YE72d1fiWKOMCnIIs48oDOYR6KKNPRmmMrLOMBuok4uPtrXBR6iUxryKL6qgvHPpxAOQUhsHsa0gncX9wOb8HEJ+zZzftyNobA8O702ayq3bi7CY4+ZF/9VC8vZY/leXQB6pETws5MTHVnO2ohAcoZY=; 5:Gk1kiSBcwCDm2Ff3spF8UDTB3ovHiLSv21rfeUAXRVzLy3MhPY1bA3oMJZ/5OwIQxi0q7fzJ65VdEKp/rQSJvnst2TmITOs0lMrtC6MlfgSHqjiaY3MRGLDXM4FrOsQwecEQsoD3+hgp6EQ2kx1ZG+Rd/xXT7OgiOYXijxNDwog=; 24:33kO3AJd3levhOgCZw9eJ5I0br6+K+kThyDLHEXxkEYdUf8rNPVzCGp78uqmvGay7l4W9u42ND0ZdjvLUyaQAIyA6tMDB7p4MJUb2sqBWYs=; 7:da7v04xa6Ya1BjuY7Z3ABSuStgrZ3XcdHz7F9w1rD7UlbYi2/o3PThLqTmKHYoq2cGoe1a/swKde6l7jdgB5D0SIwVCXC5/XuqIb08oGwEIEPG8vDDg/5Auv5JKL+uR73FKr/Ox7mqqkVc1Ku+nDnZrQE9ZZlEai/Alf1rCiJ1ZlF3jUqMJ8AM085hjIJ4IT1ovI7apJ29Y5f0oIfdBdUZDeVpZW+H4W+tI0LkOnBQE+h6CKVjFcvuwXH4ddOQBi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:39.3542 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4a0c103-9cbb-4d61-2c5f-08d526fccf6e 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: CY1PR02MB1334 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.57 Subject: [Qemu-devel] [PATCH v4 34/45] hw/sd: 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Some of the prints in hw/sd/sd.c were manually converted to using DPRINTF() instead. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud --- V3: - Fixup some DPRINTF() prints being wrong V2: - Split hw patch into individual directories hw/sd/pl181.c | 5 +++-- hw/sd/sd.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 55c8098ecd..2b878a0c5e 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" @@ -146,7 +147,7 @@ static void pl181_fifo_push(PL181State *s, uint32_t value) int n; if (s->fifo_len == PL181_FIFO_LEN) { - fprintf(stderr, "pl181: FIFO overflow\n"); + error_report("pl181: FIFO overflow"); return; } n = (s->fifo_pos + s->fifo_len) & (PL181_FIFO_LEN - 1); @@ -160,7 +161,7 @@ static uint32_t pl181_fifo_pop(PL181State *s) uint32_t value; if (s->fifo_len == 0) { - fprintf(stderr, "pl181: FIFO underflow\n"); + error_report("pl181: FIFO underflow"); return 0; } value = s->fifo[s->fifo_pos]; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 35347a5bbc..5d7fa3e418 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -700,7 +700,7 @@ static void sd_lock_command(SDState *sd) sd->card_status &= ~CARD_IS_LOCKED; sd->pwd_len = 0; /* Erasing the entire card here! */ - fprintf(stderr, "SD: Card force-erased by CMD42\n"); + error_report("SD: Card force-erased by CMD42"); return; } @@ -1282,7 +1282,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, return sd_r1; case 56: /* CMD56: GEN_CMD */ - fprintf(stderr, "SD: GEN_CMD 0x%08x\n", req.arg); + error_report("SD: GEN_CMD 0x%08x", req.arg); switch (sd->state) { case sd_transfer_state: @@ -1564,9 +1564,10 @@ send_response: if (rsplen) { int i; DPRINTF("Response:"); - for (i = 0; i < rsplen; i++) - fprintf(stderr, " %02x", response[i]); - fprintf(stderr, " state %d\n", sd->state); + for (i = 0; i < rsplen; i++) { + DPRINTF(" %02x", response[i]); + } + DPRINTF(" state %d\n", sd->state); } else { DPRINTF("No response %d\n", sd->state); } @@ -1580,14 +1581,14 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) DPRINTF("sd_blk_read: addr = 0x%08llx, len = %d\n", (unsigned long long) addr, len); if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) { - fprintf(stderr, "sd_blk_read: read error on host side\n"); + error_report("sd_blk_read: read error on host side"); } } static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) { - fprintf(stderr, "sd_blk_write: write error on host side\n"); + error_report("sd_blk_write: write error on host side"); } }