From nobody Tue Feb 10 06:43:34 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 1506732219485101.91046711330898; Fri, 29 Sep 2017 17:43:39 -0700 (PDT) Received: from localhost ([::1]:37596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5sV-0007ZU-OM for importer@patchew.org; Fri, 29 Sep 2017 20:43:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5WQ-00051y-NE for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5WN-0006RU-FH for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:46 -0400 Received: from mail-co1nam03on0087.outbound.protection.outlook.com ([104.47.40.87]:2944 helo=NAM03-CO1-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 1dy5WN-0006Qt-3X for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:43 -0400 Received: from MWHPR0201CA0072.namprd02.prod.outlook.com (10.167.160.49) by BY2PR0201MB1926.namprd02.prod.outlook.com (10.163.75.156) 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:20:40 +0000 Received: from CY1NAM02FT064.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by MWHPR0201CA0072.outlook.office365.com (2603:10b6:301:73::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.7 via Frontend Transport; Sat, 30 Sep 2017 00:20:40 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT064.mail.protection.outlook.com (10.152.74.64) 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:20:38 +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 1dy5WI-00083e-BC; Fri, 29 Sep 2017 17:20:38 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5WI-0007W9-6O; Fri, 29 Sep 2017 17:20:38 -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 v8U0KaTn001018; Fri, 29 Sep 2017 17:20:36 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5WG-0007VJ-6Z; Fri, 29 Sep 2017 17:20:36 -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=9/m7sh3gFuQkTOm9Ot9f8uiH3IY3u66i6/5fO97Wy4U=; b=zHz8BGrXf3RCLoOJtXkWlBcCkbQ05qXxWx8YpcF3FygcNrJi/1ZjTiIdWzOcBPnRw6bSnRU4U37poE0LSFuz41JLHt87PBRnT1GUsgEgT7GqX7JaAwEYL5qHIBhqGDQydmZvEFbkNUqNF8pn4xUQWZWyoQOhRQ0agwuCb+d72mU= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; aurel32.net; dkim=none (message not signed) header.d=none;aurel32.net; 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:16:49 -0700 Message-ID: <5496a72654fb5c27793708e470ece06fe15ab423.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)(39860400002)(346002)(376002)(2970300002)(438002)(189002)(199003)(9786002)(50226002)(6916009)(5003940100001)(2950100002)(39060400002)(6666003)(50986999)(4326008)(76176999)(47776003)(63266004)(8676002)(77096006)(106002)(106466001)(81166006)(478600001)(2351001)(33646002)(5660300001)(81156014)(305945005)(8936002)(118296001)(356003)(189998001)(36756003)(2906002)(36386004)(50466002)(54906003)(48376002)(16586007)(316002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB1926; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:3; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT064; 1:LRKZwHMVJVq7oCaX9mU+AmIX68MmwDVu9Zq/vdV/l+X5IZbolhy9cl42Ev17Wc5r5DY3A1OQ1/0VjgQ+ChTXWSQjaZa9zcWoEcXABoKX5qpM/4J1Id9gqRSkx5JO936k MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 158f9017-a820-40df-418f-08d507991432 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY2PR0201MB1926; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 3:9qRTsILrVQSGdAVohyZ+TXTjkLE1K8V+vIN2cCnyUowZtWmC0FZLC21ZbDJPut1hZbvClemozJUt4JhTHr38Lutt0T08lbLGE7MePGT0QlmGR/zZOxAlomtWQS+9pbPQxYpGOG9teU2uSOP5M81+68dXwwXeTpiQLlSxICdEldr2cGgtg5zNIjVliJzMy9krzlq+yuzeAv9l1PabL85NwFpBQHPI2NVxGJw2NmjQDVlLQrnbiJe2ZtT+uDIBUuUXwmwAA3U/B34o16MUKbO67XvUNNewkR3lXzrjgdHXtmFiv4r6lKFPzYXc+T/Qjcy4wNi5U4RR91ASrrwkM9O85Z22UYyD97+DdKHXVBzMOlA=; 25:Wdo9WoXHfdhAY5X4UjdB0DNA7W0s6N6TpzVSJW1mA1MsUFL5Ck84HP2h652Fa1gueWHGD12o6RE+cFHBlbFUU3/91/uN/FdQTOMUFEv615yUed5D4Oxcrhe8z79TqhBke5uCjOeCXymdQosbGL2PQFnfE6Eu8P6iucXggCVB0DNSPxTnAZkW+DhmO4ac+WUY4E6oPIVfkYnIuFf7M1FX5I7VV+Xi3/ydhRPUwNq+vdpnjaIanNuIG7VH8EKqKirLRCmNv1x5Tuh25qFAc5KRH8b86yDFt0dg82ER4+5kdgebLUbGgHYGL7GC6AYAL4BoWn/2t2mHUEHunKIIOg/eYw== X-MS-TrafficTypeDiagnostic: BY2PR0201MB1926: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 31:Rd8cbjfHBQdHy3XctYrxTS2LEy9KPcZaIHs4cjwX7qN4CUL8RCo9UzlotzhpTW8BGRV+f9IasxG9RmZ7YwI5PB/UcnGaZScQ1b65pETSBAQhLXit17+UZ6SPXZLF2Gf/9LFPmFnK8Ps8yTAhRxixF9G4IZH43keQaZOgCjL6KDTNlqL832dmTLE33SKlTISy5iZ1VxbbGJzrHIQQ71/HIq5fI14eP+8OQ2asG3SkS1Q=; 20:TSQkjHy/qqc7sl/dXQNraIeHWb6jytAIghaWlqgplwV5ufzvUv9J3BzS6aPQJQ0na2ETrgjkz5uHdfqZ/TKU7yhYfBjbdpAP044cr0VkfhpUQBUZ0D96ulimXhJQIKeMd/12tMyucHKwyWQFLcsFszbmFL8MwvvNZGtUMBVDJRtu0ZknLWam+MUi+yDV0NkWPXgJJ4HlWHtn4UCmrcIKfoX8it70+uQfbieQ0pmvfaO9ocIQkum8gqoGZZg/RJRaLUMxXrPr9e3lonJNihO8p/05yrlypCaJ+2U0LKr0ug/pFXDS4+ZybjhTaqRfg4iR5xzyF0sn6TW0jW8i1xIn7cvzadiZb1LH20vbTiXBMCXT9mNruyRNQod/zcZPE8qMDkKK7ldeqzNp4dghbNogn5CH6iKuRC3JKsdiGdDJ+2zCF5kzw7UQJ+k+UGeJnvUCJBM2t9+6qNEg9/bwxSmP4ISIdCP1cNuStiKpyFWELpEfhjrCaKNSsLUkuwny7ovE 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)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0201MB1926; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0201MB1926; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 4:g7zwCk8zXnC8rghnMIlWsKMRTp033wQKX3BRxb/lqGZRx4cAGaP+uUh+qObGdqXBjeMq0fbvUQOKADyrlQvtm5MvGIwYgtdEbGnbNWXKLo2XEMvAoWru62hfMnuEE/BYf6ab20qpV2IqXB7ax9kzns3h7uQzErBSlqsqO3EiPsX/jka1cxs3WVLsIm3m6iHyPP9lMhLldU85um6oXiye6W37IaGOR6AYVGUwBYJGw99+prPgdxWumKrMXhXnDCQs/2mNcmiX/vwU7qe4FLH0Lrw7q0oBOt1Wu784WArB/3oM8mIzJMwcPcXOcs7CFpeT4KavBr1NGDwgZxVzxdw0Ag== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0201MB1926; 23:xs0cYe6/glX0FDtgUP2ol46xy7ntTsKUHfmpIrE?= =?us-ascii?Q?/xKAXIrgxX1W8TGP03LqG5cRIar+J9zudrLNO5UOA2dz1Qwk+SUp5CT6Ac8K?= =?us-ascii?Q?HiGxBPT79wcVpcfzRUqqFnQV/WBH8fHlNwMr6vkCXOry1h4AUbQjSia9KxEY?= =?us-ascii?Q?6RqnBTCvdYxK2NdcXVZffqAd7TwQ0uRwYW2GFPIQ1PPq8aGtO+F4xkgbqVot?= =?us-ascii?Q?i2wAgFC9eKAKr5/YFrk3WgTyH/Ea1DDQrKlVLSt32OY5orQ8GnJZOch1mpX2?= =?us-ascii?Q?B72lDJT82yhsJyC81dEpFJF9r1ZeYOWsAb12nqsr0DPW9LvLVXtwpo0bU+nf?= =?us-ascii?Q?/FdmqfKGlGePoiMgQtQxeT8/voR2vv9fFZ8gtMMyDmgJDehlzCXF8WjiYBz0?= =?us-ascii?Q?BY81kayc7wC2U+wUxnZnIVO5q/E/Lvt0lCXHGh+jTlcO5M2IR7iFrU8IlsDt?= =?us-ascii?Q?oeCT7Eva0AzRJjQo7UWDZbULlMMdT4d/ozNx3kOn7N7Aqx2dpcx3+7ojWZeP?= =?us-ascii?Q?2B561xq7/R94QEQh8Rf9/Rghmy6dEY4rRHoSQXPPqvg8PejRaNKICJx4xUc3?= =?us-ascii?Q?WPhTqlPhFT6rG/3AUFVEwjpTic4nucZtt6nTiEs9GaZPFnDCQwhpUsorQe48?= =?us-ascii?Q?vpiSfAKE4YZo6S3uvBGuc2j1dQ3GB71DLbN5sduoNIzrfwxwZTByty/Y4BbX?= =?us-ascii?Q?EEwVTyBR7W1+hPQRZYZ/jY+cYj8PkdADGkxffuJ420yYbIT+eb/i0QkGH0n4?= =?us-ascii?Q?VLem9+TtCTHQ8oQug1RYthmAyANYT4lJF4a6mUsw+YFebvgEy75/lS3zuamZ?= =?us-ascii?Q?KmvZniEnbmGo5JKS5USrSsB9p/QntENf7Buxxu1ealsp/eDQMPnzWpCQ6Cw6?= =?us-ascii?Q?/dgIskY1SNno28OH3uH630p57Lfy/IYAYRxullYD2fIoVfWGmfYTO/JGNbDn?= =?us-ascii?Q?pcMdmkMd55d2odvSzjTBMXbrewKsvONdDhObPMgvMN1+rMIeW2Dly4KWJe4Y?= =?us-ascii?Q?uthmeRkk60pmmwzAhPcGzzIRNKyNALYbNDzpoeoHyy6ne3R0tMFxP/iutqZ8?= =?us-ascii?Q?l8guTofs=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 6:kerVy9OM8Z21+OXkhe2mGMQFHuZWZWRimzuZibgd5YVKzQuVGhGeRtiuTE9ajxEe/f/3SE+2MGmqtf+3VUUK21gryYeqFmI49M17XUDqKQlXSbNUE4dZU4mcXo3nbqszNNwCzJxjvQe2EAznUxpZnFmQtVSjpR0c4wZShCRyBFWNdFjNg+u1nFzqScHbhtbTcFSoet796bdXfFNAUs2+Uzn69Ro21uNRnn7kVvqgldcJSQLgDqpFxz35MZTmvFpdrZ7QsvuyHxKo/R2eC+7+3+yTgc/QHTMxTIB35qEMM9zXugr2Q1OhLzjepm18IN6qYbHNPVqFQIfN6gMSsQ3oEA==; 5:m6P6pls4eMWMN5loxJFzRNDylNMkQ+HqVssZzTiTJBqObR+3H/+WkXw2fPL4aEiVZHnNiXUbnYXuPEtU8FIUuvw1GOIesMxJ/2H46fngKo2g/6PGYeSzSUWcg6bXyoNTsDPCTW+NlOq6iUCiwZsRUY98n3Z3lpUq18t3eUorRRc=; 24:Upi9M38nxdnTFeItQjavfrcq3xV9gO001x2NMZkL5SVvBXr6l0G7NknEvzfhLhN4MJGJ45aygyJEM87XoSroWuPQK55MzY/oHK/3NF9aRLc=; 7:68Dul+pWV4TRl04iukNqLaPlJC3IHnP7GQgIGcxjblLamrp37llty/whrGCyxAk4PKUQ1enYEBnMEdpJWQ9DZt1gFQOkdzTL0Lgurk7qWdVCv2sCLOiLH6Kp7I4ZZ+CR1rGNdCzrVl27H+LQ+yh8HiHRzV52Ma8Ag1AFgBAIBAxGcfhmlMJpRs9Nrqqse+WBsvNzJxfYRhK2HGXHs9XzrTuAtZuDdrFn/bkp+tGnyn8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:20:38.8959 (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: BY2PR0201MB1926 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.87 Subject: [Qemu-devel] [PATCH v2 36/47] hw/sh4: 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, Magnus Damm , armbru@redhat.com, Aurelien Jarno , 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: Magnus Damm Cc: Aurelien Jarno --- V2: - Split hw patch into individual directories hw/sh4/r2d.c | 9 ++++---- hw/sh4/sh7750.c | 64 +++++++++++++++++++++++++++++------------------------= ---- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 16b9ed2db2..a010f559e2 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -319,8 +320,8 @@ static void r2d_init(MachineState *machine) SDRAM_BASE + LINUX_LOAD_OFFSET, INITRD_LOAD_OFFSET - LINUX_LOAD_= OFFSET); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_fil= ename); - exit(1); + error_report("qemu: could not load kernel '%s'", kernel_filena= me); + exit(1); } =20 /* initialization which should be done by firmware */ @@ -339,8 +340,8 @@ static void r2d_init(MachineState *machine) SDRAM_SIZE - INITRD_LOAD_OFFSET); =20 if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initrd '%s'\n", initrd_fil= ename); - exit(1); + error_report("qemu: could not load initrd '%s'", initrd_filena= me); + exit(1); } =20 /* initialization which should be done by firmware */ diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 166e4bd947..64ffc4c1d2 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -23,6 +23,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" @@ -147,9 +148,9 @@ static void porta_changed(SH7750State * s, uint16_t pre= v) int i, r =3D 0; =20 #if 0 - fprintf(stderr, "porta changed from 0x%04x to 0x%04x\n", + error_report("porta changed from 0x%04x to 0x%04x", prev, porta_lines(s)); - fprintf(stderr, "pdtra=3D0x%04x, pctra=3D0x%08x\n", s->pdtra, s->pctra= ); + error_report("pdtra=3D0x%04x, pctra=3D0x%08x", s->pdtra, s->pctra); #endif currenta =3D porta_lines(s); if (currenta =3D=3D prev) @@ -200,13 +201,13 @@ static void portb_changed(SH7750State * s, uint16_t p= rev) =20 static void error_access(const char *kind, hwaddr addr) { - fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") not supported\n", + error_report("%s to %s (0x" TARGET_FMT_plx ") not supported", kind, regname(addr), addr); } =20 static void ignore_access(const char *kind, hwaddr addr) { - fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") ignored\n", + error_report("%s to %s (0x" TARGET_FMT_plx ") ignored", kind, regname(addr), addr); } =20 @@ -326,47 +327,48 @@ static void sh7750_mem_writew(void *opaque, hwaddr ad= dr, uint16_t temp; =20 switch (addr) { - /* SDRAM controller */ + /* SDRAM controller */ case SH7750_BCR2_A7: s->bcr2 =3D mem_value; return; case SH7750_BCR3_A7: - if(!has_bcr3_and_bcr4(s)) - error_access("word write", addr); - s->bcr3 =3D mem_value; - return; + if (!has_bcr3_and_bcr4(s)) { + error_access("word write", addr); + } + s->bcr3 =3D mem_value; + return; case SH7750_PCR_A7: - s->pcr =3D mem_value; - return; + s->pcr =3D mem_value; + return; case SH7750_RTCNT_A7: case SH7750_RTCOR_A7: case SH7750_RTCSR_A7: - ignore_access("word write", addr); - return; - /* IO ports */ + ignore_access("word write", addr); + return; + /* IO ports */ case SH7750_PDTRA_A7: - temp =3D porta_lines(s); - s->pdtra =3D mem_value; - porta_changed(s, temp); - return; + temp =3D porta_lines(s); + s->pdtra =3D mem_value; + porta_changed(s, temp); + return; case SH7750_PDTRB_A7: - temp =3D portb_lines(s); - s->pdtrb =3D mem_value; - portb_changed(s, temp); - return; + temp =3D portb_lines(s); + s->pdtrb =3D mem_value; + portb_changed(s, temp); + return; case SH7750_RFCR_A7: - fprintf(stderr, "Write access to refresh count register\n"); - s->rfcr =3D mem_value; - return; + error_report("Write access to refresh count register"); + s->rfcr =3D mem_value; + return; case SH7750_GPIOIC_A7: - s->gpioic =3D mem_value; - if (mem_value !=3D 0) { - fprintf(stderr, "I/O interrupts not implemented\n"); + s->gpioic =3D mem_value; + if (mem_value !=3D 0) { + error_report("I/O interrupts not implemented"); abort(); - } - return; + } + return; default: - error_access("word write", addr); + error_access("word write", addr); abort(); } } --=20 2.11.0