From patchwork Thu Oct 19 16:15:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 828198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="v0meH65g"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yHvRM6Br3z9t7p for ; Fri, 20 Oct 2017 03:25:19 +1100 (AEDT) Received: from localhost ([::1]:50080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DdF-00081a-Qe for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 12:25:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DYK-0004D1-Ry for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DYI-0000xs-IS for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:12 -0400 Received: from mail-sn1nam01on0076.outbound.protection.outlook.com ([104.47.32.76]:51566 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 1e5DYB-0000u4-MP; Thu, 19 Oct 2017 12:20:03 -0400 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=6BI1KhONe9jnK/tpq+YceOJJPNARyK4QJxvsKOv5u4Q=; b=v0meH65gjvg75PBXxNPyhRAb5wCWT/F6MTCQJvLaRceXIG49zSVl9psD55NazgtD1NhFY1KF5pPToqYbnwWxP0zA1xxtPLih3uIJegoAh5x/iM/pLk8pb1pyYOx65pqcsQizLESW+sER8F7+gdLCENAHDc2tD2d14xk/iZhbwv4= Received: from SN4PR0201CA0023.namprd02.prod.outlook.com (10.161.238.161) by BY2PR02MB1330.namprd02.prod.outlook.com (10.162.79.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:00 +0000 Received: from CY1NAM02FT021.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by SN4PR0201CA0023.outlook.office365.com (2603:10b6:803:2b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Thu, 19 Oct 2017 16:20:00 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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 (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 CY1NAM02FT021.mail.protection.outlook.com (10.152.75.187) 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:19:59 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35343 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e5DY6-0007vG-PX; Thu, 19 Oct 2017 09:19:58 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DY6-0002SQ-LU; Thu, 19 Oct 2017 09:19:58 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGJou2017279; Thu, 19 Oct 2017 09:19:50 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DXy-0002Rb-01; Thu, 19 Oct 2017 09:19:50 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:15:57 -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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(2950100002)(189998001)(5660300001)(81166006)(54906003)(8676002)(6916009)(8936002)(33646002)(118296001)(50226002)(478600001)(77096006)(106002)(81156014)(356003)(16586007)(36386004)(2906002)(2351001)(305945005)(4326008)(5003940100001)(316002)(63266004)(36756003)(50466002)(9786002)(76176999)(47776003)(575784001)(48376002)(39060400002)(50986999)(106466001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1330; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT021; 1:1e500ELSnVOcgdNiUKLB5HUIL91Vb3xVOIaM1om5fm+WCvn9vQ6flB3kWxbmW32EJ99qW0v7Jy4Wo/f8rGPIUeMJYeryelajoRyhkKhhWyCUlq6WBNu7hKUSTtQjr9X1 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37bcfc2a-8c68-4752-57ac-08d5170d3eb7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY2PR02MB1330; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 3:79vnj6iYGVmfEmsrt3PXPZwjDh1TsIvcxUlKjasighAar+hW4VJYrX9FpIyHiTtNIJBp0tZn7nhKpiBPQCdsPEC1xpPnMX9LKCRPqybs74EP2IVlLUdOP3k1R+3j0kU0/f6E86JH2IwP18kyce63/hYj1yih4Y5KktilATt7um/SirHTktPLz2DWfvgvmj8ZpBZfhTV4vPP7+4aMwLZYIquRqveyus5iNuqk++B3bERuoqyk8KQhGDlt+Oe06ze6EMrnqKvq9DcgY1RVs9GoiC7PiRO3RWiYKfQ6v1Aam8Z7bmZElS4w4Z1VVhMq889lVff9drtLmWbeweVV5Dv8xMBvEruV3G7YXxwyqYjXP/E=; 25:4m85PtZVaoCCJQ/cTigRkJGMcQkeomZK23O1/QZSH3ogGajrI+ptwPvjbi9538UYHYZc5VVmbqqQQHu2TZtH85u2ZxemecdT3Q8IZHzfTHFppK8iatm6ZVi4+RaU6OIGvNDF6T4n4luesbX2O31v4NUjxsITk/YXaLmW3ea9IWBwMvpeQluHw47eG2xpeQd9ZWnsj8tpmg+KniFTKYNZ600L91+Ipo7he5LHWGl/1dEOWzFVX1ANrUJL25hS6oSqxB1sKKizDfXMuC2oiu5bz9HabpjZI1dbDLgub/rnEOy+Aog+tNDy3Fq5yBSw3qq2GLHqpfCYX/6fsIU/U4cIeA== X-MS-TrafficTypeDiagnostic: BY2PR02MB1330: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 31:TDytRlfWvaGC5BiLgQhWgGjoA3rfJOB/cPMT1X0MoNjoKWPSlurFTsDGGGgjcbywWdy52ekYiJPMSErqkfg7Ic6RwTRkcR98ADikFpj1f8mEW/XKCW6VF4kLaJfFqddU3taYcIpITBQZW7/OnG2hOJuUES0M0kNOutR3bCnK+cFFLiA8BLAh+JEh4fXptsy1LpAA9QFel4NgknBCouN7AD08ujxUauSm8ALik5rKt9E=; 20:4PpHPfGA+QmOYtYNMyfEWlADXAvKob1xJmwvtGXdDDXVbV5dogWEXtwAtWCki7GhzyQYWjZ7tDooZHDLVMxvhxJOkyjIMFoK21APW1ympkaw+sqcOmy3VYzvb/ug1fsdzCbIpFNJkkg//PAVev4lYqCE7xHBW0fp1y015iw1fQ41QbAuM6RdIOE/1KWABi5nnmWsl6pSwAuWPrPVVMVWwscEn1DGzCh7s75vkhxIjy7aYR4zFu7Amdyoxpu1AljO5HmQJdqcKnTc58pEo8sGG05FWLBHoPB3bMiuUxLO4nurntBeQqNpU8RkiYw+VqFVQ9LM5JMR3XP8qDxPl/z22/7OIHw2KFqYVLTB3S2uI+JM+vctTStsIHf+V5OPdPfIMsRvUXY0Ma12EaSUIiDHoPnRguHUKFvCPzEFb7Jw0BCr+cHgqF3Rx89xL9EH8RJLhBa14LWFWeVjVmN7hZhh3z0oXm6ObmY89nKgY5bKT8PN3UskmSie9guWh6TqAvKO 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)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93004095)(6055026)(6041248)(20161123558100)(20161123562025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR02MB1330; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR02MB1330; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 4:pcNAPwIfyogJ4MzxEMhJCR1KCz5TrnTbolK3J1ZYJPIVMKJFyLQhD1Sdv/Exb6Xn//+xrKssVCSZIHNeqtBXBFeVO81e91pCuFpjcS3IPmQyGNRXmgYKoJQHtsVS2i5MYyScnC9h47SzZBVBAnI2rllWKIGMVlvFMGpabuMEI38fImOTXt8nJo2/xiFKFGjtNo1D87S45P92Ohz1WVGFMpfc9A2pllJK4InMNQCIiVcBQDwCX3nth4J3WfIuZo4E9Jlfkwh/kBWTN112YmnUc58jUMiu8hAiwMOYaMCJm376tZCNQ6LpJpJtwOweqfu9A0YPgS02jHZEvQc40Y0gVg== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1330; 23:YSz75fxMv+PwtT03aGUrKf/TosK4yJ/jhB7GQFk9X?= 4uMtTXWx80E5e2QmL2FvuIR/JZKxSHKobm5sWuiQ2XhpuIHuwrB4mpwfFcjXNTnfDdGdEI7ZToriL+xhWsVKNQqVasfqOdtRBuXblZe49i4oiL3o+IIt2fw1Pawg0Fa1sxrWWQK+iMiz4YTtnXByTEjv076hgp0fPenh5a1nA9lYqIAUE3H8ROIzvoRH/tTMPDG+Uv/XCvjuJtCM+e7WDukwYmElF1YV35GGxfgGEuSRDWfNl4dbBM0FHB4bCZm1IH+mZSqYjf0iBKGrXizvhLric0AJfWOvqKdZ0wzFB3c95DJ5+fjGfU383iYI4nUBD5gI+Km0WkAJ4Im2MLDNDF4OeMYtlDl1SXOxPrmPetRpH2MAsBIEBhH1nthQfS2YfMnjZg8QqO2XSJHZ4dB5hun7b1vq2QDeqa+eXj/WwvkRkf9Dg7ow+bBlk3SKmgZUtx5T4cmn/Y5xLciL9RypeDixe/FlcbcU0aArTk0tScPv9c1lxcyU926yt/ma5q0HYuuCxiW+BH9Kt7hhG9PGSz24H7eQr3YAmDd4Ue1+9XIo23cwucTbB2vXwsVnJoW51iz/9Wk7/gHUPifZsfLHeFwpurQED2yz8hheOomm6nmtAy4dm0VWCKZ11Ok4WmupEJj7gfPDtEYMfRsEGtDCnmfDG+xUZryOsfhtWpQ8UncmjAqaNY+YNRWNDtqMw5noVO097/wXLwoVMFrHBryUZdIHew6kKWKmLSiXt8caKHjn6fGVWROqyOk3t+msMRKqZJvlORc2YD9rCySZ7E1JGLtVXuFx8cY5+ix112VN0hZVwRRCiv68PvmaC6U6sI5Xn2fnKC55y74eWkiWRy3rXD0EL1O1L9jZmvFrWCGAoVwge7MBDFyz2riXG0Xca9LQh8R2nr/IQCjwQDDVy+vS1wzEKlOJiuFIyg4RKW6p86kaa+kt1HSI9wPW4tifUFsqqyldWx2ebdSDS78OqrOf0o0gdsa+cOHdSeTRERKfUl7q8PgdFOSytou0RyGnSRdSeqRQqB0CPKsR28u9C1T5rdk5Rg4d46NhTGxVFbD1K04Cg== X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 6:xMzz4e0Nih3iA+ppHQExkVWdMC3t0pd5qvdHUmoVtgjEf/7G1bISyEbpXUI9Nne9mULWEUU0ANbvT+Z9IfvtXvmS3vcuZw9BHfHxVLkcjTeVhk1Ox00dQOStU28g+tnLSCITH7rg8J1jl3zo7sDSWNyVZKXGG1LKeNUBk+ag17uVux6pdHw78Nccw+DCjRSbXV15s0c75EGmA6qav2Dc3ZWFhYdJnn2z4C+87eAHPxRZrpFHb5TaVOnmPyQ3/+fWgQ7FmhWB0JtVO7iEU0AkGQ+oypcr4hHzNabtFiSx2OGZy4JJ4b5ueejTnIyj/D2U5TSDPan28P1Mbb/OvwpO+w==; 5:lbP2ZuWa0islUhmjqqrQQ2xnA2E2VQCxHGN/tncHilC2bGU01lubxyxP4GzNcvtkvXyq1NK7mRoeTu/hKphr4+DbotuWK7/w2xmPpY05Ijy0IEVy/3mYqfgjNhDK1YOJsalKDg8Nj+5tzB+uubh9jw==; 24:64Pt2m8NgjCWRAXLzToE5Fnl+Dsd8lNFv+oMLdfwWYPWzg2R6zftpmzEQsvZ+8iqT6L4m86Qsae1l+HxUy2JrXuU3Svy3D+AIgHEXbVZuLQ=; 7:qRNXzDlfumkcPLzuqyWRGgpbVItw1J+sLqTWmqw8J7kudHMEM6cv9K1RuC2Rdt7Y1kV0js9kaklbfhUsQKr7lzWDZTya7t0XDbKkXvjecaL6n3hSnKdo4yLLdO/ub5UtKFysL1HukR9FH/M73MigFHyr5zv/I/7w/6QX39CBMwFUfCGqa0utJ4AADLOEqS2zDc7/MEMyj0Uj45+LVd+gIvp7dHLN7Wu6pl47XWiB+DY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:19:59.3259 (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: BY2PR02MB1330 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.76 Subject: [Qemu-devel] [PATCH v3 06/46] hw/block: 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, qemu-block@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. 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-blk.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 = k->set_guest_notifiers(qbus->parent, nvqs, true); if (r != 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; } @@ -187,7 +187,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) for (i = 0; i < nvqs; i++) { r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, true); if (r != 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 ed77f859e9..9591e9e82c 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -596,7 +596,7 @@ static void onenand_command(OneNANDState *s) default: s->status |= ONEN_ERR_CMD; s->intstatus |= ONEN_INT; - fprintf(stderr, "%s: unknown OneNAND command %x\n", + error_report("%s: unknown OneNAND command %x", __func__, s->command); } @@ -663,7 +663,7 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, return 0x0000; } - fprintf(stderr, "%s: unknown OneNAND register %x\n", + error_report("%s: unknown OneNAND register %x", __func__, offset); return 0; } @@ -708,7 +708,7 @@ static void onenand_write(void *opaque, hwaddr addr, break; default: - fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n", + error_report("%s: unknown OneNAND boot command %"PRIx64"", __func__, value); } break; @@ -759,7 +759,7 @@ static void onenand_write(void *opaque, hwaddr addr, break; 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 *filename) dev->flash_contents[1] = (blocks >> 8) & 0xff; dev->flash_contents[2] = (blocks >> 16) & 0xff; dev->flash_contents[3] = (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 command) { switch (command) { case 0xff: - fprintf(stderr, "reset flash device\n"); - dev->state = WAIT; - break; + error_report("reset flash device"); + dev->state = WAIT; + break; case 0x00: - fprintf(stderr, "read mode 1\n"); - dev->state = READ1; - dev->address_cycle = 0; - break; + error_report("read mode 1"); + dev->state = READ1; + dev->address_cycle = 0; + break; case 0x01: - fprintf(stderr, "read mode 2\n"); - dev->state = READ2; - dev->address_cycle = 0; - break; + error_report("read mode 2"); + dev->state = READ2; + dev->address_cycle = 0; + break; case 0x50: - fprintf(stderr, "read mode 3\n"); - dev->state = READ3; - dev->address_cycle = 0; - break; + error_report("read mode 3"); + dev->state = READ3; + dev->address_cycle = 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 data) break; case 2: dev->address += 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) static uint8_t handle_read(tc58128_dev * dev) { -#if 0 - if (dev->address % 0x100000 == 0) - fprintf(stderr, "reading flash at address 0x%08x\n", dev->address); -#endif return dev->flash_contents[dev->address++]; }