From nobody Fri Dec 19 20:19:09 2025 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@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508431381066612.051529515445; Thu, 19 Oct 2017 09:43:01 -0700 (PDT) Received: from localhost ([::1]:50172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DuJ-0006DS-Ua for importer@patchew.org; Thu, 19 Oct 2017 12:42:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Da5-0005rI-GP for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5Da2-000257-6u for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:01 -0400 Received: from mail-bl2nam02on0080.outbound.protection.outlook.com ([104.47.38.80]:9280 helo=NAM02-BL2-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 1e5Da2-000251-0n for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:58 -0400 Received: from SN4PR0201CA0013.namprd02.prod.outlook.com (10.161.238.151) by CY4PR02MB3381.namprd02.prod.outlook.com (10.165.89.152) 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:21:53 +0000 Received: from SN1NAM02FT046.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::205) by SN4PR0201CA0013.outlook.office365.com (2603:10b6:803:2b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4 via Frontend Transport; Thu, 19 Oct 2017 16:21:53 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT046.mail.protection.outlook.com (10.152.72.191) 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:21:53 +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 1e5DZw-00005F-Kd; Thu, 19 Oct 2017 09:21:52 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DZw-0003B2-GS; Thu, 19 Oct 2017 09:21:52 -0700 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 v9JGLnVD006875; Thu, 19 Oct 2017 09:21:49 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZt-0003AX-9h; Thu, 19 Oct 2017 09:21:49 -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=aZB6LIjwtqerKdO+CeatQgq1tQlEgenh6RUwDz3eDQU=; b=jsIUF/BsMoxGv1pkPobNpVHTI3LZFUqk6ChFoBHMwM65FFecGXaytaT87nWQcLOAyg+ofD9z0Vcl59mj6TA98LcGrjWyDM9oQNYu1ZIkP60OkV18SIGeeFlvLO5K/Ih0at5BwfgBhUmW1llwshUVH5Bu4rew4LAwBdLsa8ofnJ8= 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@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: Thu, 19 Oct 2017 09:17:56 -0700 Message-ID: <388233ed6156d0e80674d1f477772dc260776144.1508390588.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-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.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(2980300002)(438002)(189002)(199003)(118296001)(316002)(36756003)(77096006)(6666003)(16586007)(48376002)(50466002)(356003)(5003940100001)(305945005)(54906003)(4326008)(5660300001)(478600001)(6916009)(106002)(47776003)(2950100002)(81156014)(189998001)(81166006)(33646002)(8936002)(106466001)(8676002)(2906002)(2351001)(50986999)(76176999)(63266004)(9786002)(36386004)(39060400002)(50226002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3381; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT046; 1:sPM7stlc2s9ZcXAf3ZPyFciI5+F0aCjY/FDqwDpTtZHkYsjW9wAKw7JkTtALx7cyJ5GbVXBKcY2JFCnyk/NyV6dSOyiEOOCZEm3J56wfcuXnBXDo41k9qKKnatszjwYr MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d9be360-e2a4-415f-1572-08d5170d8276 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254168)(8251501002)(4534016)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199)(201703131423091); SRVR:CY4PR02MB3381; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3381; 3:rGedeGJL0BZMSmtZFpRxzsKFCn0/yQSzASVRm0bolbKkjMBzrKaXbPbEMjbDc56WDTp73TexlFdRcbmPbWY6DeSrosS2xBEFKr2Kq6mhApKQ5zoTI13y2vwxLblKc0P6DL4uzoBe0yi4RU+QkhblKLxvbgAVvF7xCJcv4ATdCcZFII6HT9hxyH4Qvpp37HCgCW5zfjromEw/q0Jo0uEVVcniAP1QD28txJIP0z/C/Z6RY1KxhzV+Fv6o6P3nTGC/fEWwdAqb/Za01lgPjWLc803r4l33J3q/408+gCfCTOc48akBK3b6tAjD5fj5DNFm0FZdQEgGJ9XZzd3hmpm7ZugHaGCyeB3IirDIcS/wS2Y=; 25:8Y2KYSXEsAxAUHiuHARsMnOo/UNf8QNezha8Qa87eHWTLskN1dpnJ8PWciAZjN7vY9mU2xOANU3nAtgSdSxejEb/p4HJdKgzWbPlQt4/WUe93KJt/r/JXmfKfyFFleRmIe87fyIleqbgCM0oW+ZoVwwsdTs1KyuXOt3q55ccpCS9rV0Q7t3NRn/eZHmTL8q4HPDR8NC4J3rhp8MxNaiq12ySGaTonMzvKG3Wcbhn/5caMLKMZONHMguriZUSFgE2OW+E78JoB7O/6LaT77GVDBRQRnkaOv2bs/GB0yXh6cwS2VoASuCPRGk4MoAxr9BYU9X6vZCSL6DDTGwninQG4Q== X-MS-TrafficTypeDiagnostic: CY4PR02MB3381: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3381; 31:CwFuxbsoIy3MVM+2ySZfe1yikcs086fsqHC/eLVD3y8r87g9mbgBgbwR3lhtBf8DmHTwoY1nVEaO+ewOjY5IZGBJ/Vt+MCAYeNOtsdZA662iBZJ0BzZKPrnts/aqqIsqc7lG7x/ocfgAbueiHitdTfCL0wdb9EZJkP9gyKtYp0wJGLjWKyfcnCgzwCMTBMz+bCicdra4er6iedIc+1dg162dHnjxJtjosG3Q2FsOjww=; 20:64uDfIwbZRy7DH/PFnBGnsGWDzoWlojfkDoJqOiHE6JcYSUp9GMvuxf5rCa9zSqOF7SnV3lCL4cbEDBMSsZy6XjJFC1mPWkxm0DMyvMEQKHjNOfAhWxuIWpF9Kl3GIbmdxYXAUQ/iDdi1k3JCrtbtdyJNMT6nMSanRtOkafBNVz8xeTmrqp1jEuGhh2HP/a/op41YBiZ8MM+eHrB8HGAS8U/+jfv1nntuT0OJQ6rG2gPtDbU4022CkBI1FluUkX3gFwr8C9Db0hbibvkdFlou+E6/adQ7Fd5tvmYvFOB+8aH6aRFCu0DT4iK4CVw1Ig4uaPQC/rtx7q1wSoUf6in1IIysGGr5Vwa8FIPUdJ3J9H9mpVK4Ij+vm2EokVboA1vfIXwUh3M7KG/RLm2ztNnD0EXK8rtGiMlvM9c6x4WsGDjBsDoYZDWDgC6FAfneqNWB3OV+YHERRbWXBfsF2aPF47iCc4hhVEjsqeQSrj2OnEbeKe6co04ntOGFr1J2U0f 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)(3002001)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3381; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3381; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3381; 4:e3Tih8ETg0XXQpNWjVjrRnnAJkSPWWDsVr5HDwIXmAyjECjh1WpGiHMpU51ZFNhK4BKtEXrx2xm7PjKWOpewXjKDMA/vTvPyB91Z+Vn6K67zAninZIgQ8eIFFzXu6gwQA9nx5RwPmradMKQH9I2/WO9DWWkQUAcIUXCflx3t6JO7M2p2XQ1J2JnzDQ3aoNWq9sgMAIKHM1yG7XPrfWV5keqFZiu8uiZ5Kf5yN3O26vbdZuWUguAVkR3KkCGWGHGfTLmUV/hhCt/aNJhvbZynTVliB1400QK3oSOzLLmGMYFSrK9g2B0WMnU5EBeP3xTlYky1UA27Eu/IHP3caZh9uw== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3381; 23:SWpdIpw1o6682BmDwB+GD/raRJC3hoiC5wyW0J6OL?= =?us-ascii?Q?NCugk0/t+ggkg9dU53LqafXcEAJGt7mQ9bxvNh5ug+FuqdvrPzAp23MX3vRs?= =?us-ascii?Q?6KufeCoIZXIxr+b/nQzFytPoWyTIom2vA2LOi7g7vS8tI7mBaKNEkBWTyz38?= =?us-ascii?Q?bTOFCanZRSa0huSNyxiEKixm3PKhhNZdfT2lmP4L9rG5Xw8O/lyr6a458vIV?= =?us-ascii?Q?9m+LkRcHvftgv7wdcsyRrI3l7xGXy3P7SKDD3G7Dlxv5bOLMDCsW9M5dFzO5?= =?us-ascii?Q?+8PmtyTtRJyJWBpITIklR+/ehiFJd/4ZMPDHWZbO43ffuWDbSaMgiIk01xPh?= =?us-ascii?Q?W+4aU3MeML6rzsMTZJTTxn41Xhh/SicMUy5tE624rASKUWSIbl08U3KfjOqY?= =?us-ascii?Q?AFrHMlcc/BzpO2r7KShT7ZwiXjbCsJKXGAi9WrdDzzKzxu66bLHMExilc5GT?= =?us-ascii?Q?0IFpdolvOWwSYXvVnhG9qcojInh311dg+AVGJC6W9CqPPH5y9Jy9l9cywYWI?= =?us-ascii?Q?ukQ11psOxaOhiDy91HTB4W19N8nJ7Av/Wu6tfdtCt6u7ebvCWFSL80p3Y8Lu?= =?us-ascii?Q?1uObfn9u5Uo6DnG9oCOwsvrAnKskBSY54tkyrQGREjMo+QfRQFV53dy9Cffp?= =?us-ascii?Q?tuz8VuvKb8TbQPT5mjEbAwn+105L2e7uWP9KAjHMFQCfO9KqZHP4v90+VBbt?= =?us-ascii?Q?vhnEOoE/KIhSpzSIsTRRT9mg1Aw1acsN67JH1rEv44YaGUigSsHuCoq1TwL5?= =?us-ascii?Q?GX5roEmmqnjSLPuQmntyXkQLCXCrv9IwdeVgv4Il9JD5qpKlCNW4DWlnQhOH?= =?us-ascii?Q?mkDVy4KB4Mzt6YjLggllapesoekaY9i9sxmHCWf0COdR7Nd2S/7fpZYxL6Wd?= =?us-ascii?Q?ZvkQUJ991ZbQKB3JlZwVy3Qwf9344Vxu85M70yjGx7czcbXw4UQIP4nJQHcb?= =?us-ascii?Q?HmQopsHxQOhS0Bwj1G00xdsoNYGviN1fxbdUfk8XTKvG7fS/5Xz3dz4D3uGB?= =?us-ascii?Q?UbxeIObHQwTcU69ZBHGuawXAA2drLiJCZT0ydCO/ndT9H/uT3gioLWGtewwP?= =?us-ascii?Q?hKgY0g=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3381; 6:HfDEwkXJcx+Bs23FB+PrSwUHnaVinJOkauUTRNEAXszP0Gqu9xcqNaYl0z8/XI87J/DV0WRVN+NHOnXP+NBcXaewqJ7ZPOUu3BO9A6KKkqIA1aireZQO8x2pOlSTyKjqwXMnzStxkTK5opsQEq0noPRxRQhUK6dL9CNcZqGJGM9EJFTN3OA2UyCYnhSRXD+TN8QueEKbpTexMNZblHKoWvXK9Q0NxTw7MsEqOAiR+RC6GTnxHO8ASqnlq4p/zuE8mqmyJIe01TOUpgXBs3q0vVnvJU9Jjh5OQxGaLBdcchGN1perjO0eSKVUVlzEyK7pXuoV2QFWS+qSaKBQ0wmbYQ==; 5:xFXHW3Pr/AJNcN8jok1TWMoDFUWYCeI/EAGZV6xZmNp6H6m+2d11gJszSkElBqpXLLn20q7lLYim8c0Zy0IPdO+CoENA2v0R7LkzbC9S0ZEs1PaVqQm6iBWNrYIGHnv50tIeVic1ofKL2O1xTRqbhw==; 24:5KqlV/TAMx9eGANYLp6nv2eopMC+H+O9XoBcjpTk+hwqk6neiDT4Awe79VS+u/wHjT77oNX/us7daFIUTvPbtcJute1yE8FLpplTiWnFzAE=; 7:tisDh7JrPIXDU8IDpqK/D2mGAH49vE7QWWSWZ2haAGsfMvPWwTJCFKBimPX42E6Ig0KYspLDWARehsTSUvmPq/Rx2/g2Zo9GJO/0gigz2ODBo/f90MPhI0aGtBWTf3LF4rQaXWKMCzSfJ7lp07iC5aOzKymSU5ew0+oZwjAFal1RXyHy4x1YfsT1vGKI61xzs+vveF8ETTPgVvqGCs59NMGy+9iPV12wVYb8q4vQC00= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:21:53.0614 (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: CY4PR02MB3381 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.80 Subject: [Qemu-devel] [PATCH v3 35/46] hw/sh4: 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, Magnus Damm , armbru@redhat.com, Aurelien Jarno , 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_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..127b510b6d 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("could not load kernel '%s'", kernel_filename); + 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("could not load initrd '%s'", initrd_filename); + 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