From nobody Mon Feb 9 17:59:35 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 1506732418271579.3259934431112; Fri, 29 Sep 2017 17:46:58 -0700 (PDT) Received: from localhost ([::1]:37615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5vj-0001uz-E8 for importer@patchew.org; Fri, 29 Sep 2017 20:46:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5WZ-000599-AU for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5WW-0006Yt-D7 for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:55 -0400 Received: from mail-bl2nam02on0059.outbound.protection.outlook.com ([104.47.38.59]:13120 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 1dy5WW-0006Xi-6j for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:52 -0400 Received: from BN6PR02CA0040.namprd02.prod.outlook.com (2603:10b6:404:5f::26) by BY1PR02MB1132.namprd02.prod.outlook.com (2a01:111:e400:52a7::18) 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:50 +0000 Received: from CY1NAM02FT053.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by BN6PR02CA0040.outlook.office365.com (2603:10b6:404:5f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Sat, 30 Sep 2017 00:20:50 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT053.mail.protection.outlook.com (10.152.74.165) 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:49 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:43101 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dy5WS-0000Fv-JD; Fri, 29 Sep 2017 17:20:48 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5WS-0007XK-G4; Fri, 29 Sep 2017 17:20:48 -0700 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8U0KdDf031243; Fri, 29 Sep 2017 17:20:39 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5WJ-0007WY-3F; Fri, 29 Sep 2017 17:20:39 -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=FkCyNr3858oI278m6Dgyi7IB2G1SXd2XA0HlGuFyQeo=; b=zRIiXj1vqVoXR2R7SyNr3xL4ddO1/R46R6NaR5G2MVbNb7+pJ0gOcpyh+QNzDl2KyouYA3fA5wSRQF67AFVD433Vp+n8nT0c7g6J74MFX+0/CTu3WhT8Nb+e3IwWkbUY3bGfK4Xnzzpub7YRvYYQ0I29nc970XJD2mg/hOp0R90= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; 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.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:16:52 -0700 Message-ID: <4921ec19d0e72aa3dff6eb5c8a93a7f0e9691f60.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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(47776003)(305945005)(8936002)(8676002)(478600001)(54906003)(77096006)(39060400002)(50226002)(106002)(4326008)(48376002)(81166006)(6916009)(2950100002)(50466002)(9786002)(2906002)(5660300001)(36756003)(316002)(2351001)(76176999)(50986999)(106466001)(36386004)(33646002)(118296001)(356003)(81156014)(6666003)(16586007)(189998001)(63266004)(5003940100001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR02MB1132; 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; CY1NAM02FT053; 1:VFU8F1Wonmo/GLfyrCQ63HQbBTm84KzTd1HDfc2RcMhzDBDTfP4EklVrtkDw3/d4u6HPgU7CvGpyFkNAs5MB1GRQQhEDAnViem0JU/iFHbiuaa7mmyy/OVCiQDHSwmH0 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e8b86f0-4dc2-4cce-9dfe-08d507991a81 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY1PR02MB1132; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1132; 3:zftyaABSvm19KELRBAJqjISNpSmhXidDOPS665DaHgN+x2rNmmnQNwxOH+Of4k7PbGcrCDSx6oULA3QyU4x4yLYZMxgj5m9l9n+agxqlaI9TUmlGEhBT29/dMAIibAZf9j/ZMTcxrkbYAj/UKIEpd/glAOpb0l+9XGcRJmAbHL2bwhnHnrFwMEKPNb/N7BM/kp87q64R628NibKpU6UyinYo9aSoAjw0sDovhlew+cmC3y5pzjyTGTyF9xw/l4mWuabXjxDqxsNbHaaBpxEv4igiL+BbFyQIBl47njd9XkhkNtqzuLyQFiAi67OhrPVHmD/A8q0nWv0OaQzOj6jnPRZXjMByBiG6b08obWYiHoY=; 25:Xmfo6Iz40iepVPcWupIwyTv6/PDRBB3wjXERmdyoLIHVtzH3pM11h8sTl5HOMPmIdkDB+992ApfpwGu1UxuRbV25Sdainfgidv3DJhWrE4oL0x00rKgaq9gHhL2N4JDjGNr+drgxHF6nFBeurRKB00FinjXYsGlaWk6WREcutB/1z5MhwBN+IotEuxNrM75/wz8ZSloC4hPJMLTz8HqKd7WuuknS1O0tAyR3c5+LwTyeg0W/YQO4UOEY7CLmOgfxjax/SkGjuzgO8jdhoRkmrGej8o11DSua1UxIeFZJIQBo0UTtq07hh9Gkm5cjM1dkVoDVfJLvN9wQCkRphk072w== X-MS-TrafficTypeDiagnostic: BY1PR02MB1132: X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1132; 31:y9sZgDgmgL9qgCeSPqDh6mwHiEefiU/E7ONtLUUAKBXWjxgABPqvfy2/vOmBFlA8Q5v3FmuiY5s4e+sIDXCmPWaW5ZQpI5laxFvDxk1E3Y1OzCxWxx33w+1irJEHeqhN1muQbLfsOmw3WhJZYclp9+EafM6hCAso7vSM5qelMQVj5FkPyQTsRuRy5FgLVlPcKSsZxUJYUbIgZa8xmtVc1NfjbQ7dWX2tFV7H6cgV/jg=; 20:LHgcLXM+UtfOj2YR/kBmda+sBKM+xtnJAf5D7uBdBojmV21IDQutFQERXAIVsnHDx7o3J8/nEIUdchmlY8crJC4e+kvtgMsVzJnjJwVTxetgwM5QaH9iTDj18iaMPNDCyJl+v6bq7kevljv1cnbSLqva5ZmcKNVuhIRiQL+YKOoZJy0PqZ3OVlp4vgnqmuPohUOuEGkxfWPoOibB23mcF3YPmHWtTyg4mQQbNKReEpjiUpiuHBZxNLtoBgF5kawtjcTuqMmKWUwa0wnGtEus0lp8+x8lTlEUtDi4U5tHBcjoiC2dpAK8ruN+B+7DE9sDg8aEYuValCQ6NFHjYxsA0gNqmt03ITdmg7y2j82LFonh2cuVCqHwNHfxFdQ2aUCIslBUtDO81WbhN1h+duPwd33wfvGJGM5BALLxGpPoyk+tf/RN5sACjPNhswCgstvWWbfDVvPSD3FZ9A3ZoX9M9LGc0Ivw3V0XY+1hIg7TC8kP91VI25jErrPAA8Bg9sGt 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)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY1PR02MB1132; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY1PR02MB1132; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1132; 4:BUb43w7+E77bZTNc4zTfwCcbRNPRwHQnEKFre3OlUTMKVCq1DXxMTtQGjid1C2tCbbZQ8bOb9U38G47otj6SnxsR9XmsM4ZGZe2cMdKHoHhuvYucwsM9JI9iuWa7IqUIx/4k7PnheShvg3zQvtl+scFrIiuDhzvJstuB2gqx20l986aSPUtwD4Y0mdElgAQVOt/f7lodTnQCnoHRroD4EG8/fo3QPEB5CdDcTcPNcJdMM6pFFtKs0FFfMMFQOwGK8cUA93yq0+qRzpQU9IWRP97P3x9OTcuA8q6Zkrkt9owDNrl5M5fxWDa/cLPpxetg3YscjCluca1ETZfdiyIgxQ== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR02MB1132; 23:P8/hhObk2YDQoqgzkTSSQZ/XuOXghDcDmV5LmXhwc?= =?us-ascii?Q?zD7QEAd5lfk0ehSz9JnvB/33d6HIp0kxZ1VGdq7dtsRMHgph3xO7o0ELfDUO?= =?us-ascii?Q?erLLN1E/Ci0aV5VUvXpP3CW4XmaZ471900t3EqDX6ShJhOMj6cgFfSi/gLW5?= =?us-ascii?Q?ftOUUZ9LNzfsdF4Jebecwib54muTqyjbaFJcq43F07uZi/hEDkEoDzwlRtmb?= =?us-ascii?Q?35gAEfDaaxPmPJ77Cx4Gkj7A/C6zsHi9gpcSoh++zYn8/sroqcaJzsq8emrL?= =?us-ascii?Q?g0mjhgQ6+J+J8YxZ8bKu1llLtEr/FE4fOQHgFWxjOJFeXcxmLJN9wrWT3g3J?= =?us-ascii?Q?cGOjed/DXb+YS6G/XBq9ODtSb858vrNMJFivgTPo6+FHCjalESAiLSU0Fuiw?= =?us-ascii?Q?N7I6U4XoY6ewmiJcA5Jz6rDrFrt2YM5zkOjbv6X+hPfXNfIk0aDdbxlc20rR?= =?us-ascii?Q?WpoJR/JA6eGnZqP9LPi18FtN1iElf8HsqBm8GZ41Fr4uXPGjFQ/nRr4aY50S?= =?us-ascii?Q?cfL886NYALwULuWykU8m27rgLm49qcTyH53sQwaYT/QjgJjNsAxjzulyqRwE?= =?us-ascii?Q?UDxKRYjnePjlFG+bBkHd1P5x0rViFQjWEJx1ZJ5KXEHq3xBl7xlQvRYkLuxp?= =?us-ascii?Q?QGmozJplw3N+5WlKXdcWGBdrXW3mKXzX60olf8XLyI2gRgSaeurkM3qfhb1h?= =?us-ascii?Q?7LWAw8SLbTCl7UiFvTeV6hrz1rn++3P+qXZSe5DKGEeW/DHVYV6X5sRHlIN+?= =?us-ascii?Q?CMhmvYepHOADeGs7VwzO9GWmAdcELXCjxDqtDcKmpi5F0FefL2U/sf0cOdOS?= =?us-ascii?Q?MeC5zRhXd6q8ev9fpKDuvSoHjrgMepDUB8RSmQonUuEKVvwk5bK/hsbDN6hH?= =?us-ascii?Q?pB42mhMuz86Faz7E9D52VoRv8/VxyyPBhyqb6cgG+JaonNgkwluqgPRUjPz1?= =?us-ascii?Q?amLJY78XB2x/cmWDWMQWMHxSoaffo+b0X47Yg2B7pjefGUZDxwC7lmVEAIMu?= =?us-ascii?Q?lOwWuP9iKJHJbEJtAbwm7lQNW8+QFB83CHETEDHdlJwG3mDf6M9cz+YPIooJ?= =?us-ascii?Q?oolSkP9vSSWc7ZbdZeuaBgTWpK4?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1132; 6:s950W9vZkZJ3fPRTSQ92niGWGQXLlPFSUhRwYp56I04Z8ceJN3SiLrfBsS25AYGC7pkKEsx7iHtvwY8Qc9gHSfUnA6Pd4rhPJuh4NVS7xzX8iP0dHKF/IitnJGo94YhLjatHJGtZBI/CagagMLAOpE1XgCNzupNpp/bRM6GrbmPhMNt192/7WNshHmXIPzVOcQBBk8wHR5+vZGBDlBiY95L44RCdhTaBCgkdfopX4HF8Y3ZcvjsoK8APnL8P5LlJGSz8Zqgz2AbSaK6aN8TeS6/ZTtkQmZ+yqJ9gOy/xTRTJ51kHGAqvlDTwbZz5B+O8dNxUgictgLpTg/Iq2t6ExA==; 5:buhp6R+M8dQDJG9P0DqC/xI/MNQqECjy6WlKJynl88i9tM8PoBYXkOOHr0pU/7vN1D+FfdyCMvm6112SgskyCTeSxEhAuvdsnukREkxkYkYQoN30TdUCDam7CVR0rXZVXFPQXQxWNFUIMdWJK/6n0oKoZcibHg6U+8Tu7Db39uA=; 24:Bpe42EqBmG8HidPnyqcs8+nMuhNBbyFZxM+koEPdL8ehKwzxDp81iIsXSrgXB1piRhHHvvLrPG6zUF0t8wazp5c23Y6FLwL5qLJsN0Eusw8=; 7:5rLm92J1rWHw2iGSr6cayMom+X4IxTZ3WzUSCky9vvMO2PZY9MdQyWBCw7H7yH2la8z9TjH16EAJy0k5Oeej/j2mZJnkbfDDfFKZ3qRxwoNi4UgOl+KIDgYaCOpziz8Dpshaq7dcoeIXTPK9epj4sh9mpTvP6i8YnL626R/iRQhKN7FZNv2LLDyBMJY54hAR+4yvGv63VyeGCRxb4mg9PXxA5USNTbW1heodrYP+B/g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:20:49.4198 (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: BY1PR02MB1132 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.59 Subject: [Qemu-devel] [PATCH v2 37/47] hw/sparc*: 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: Mark Cave-Ayland , armbru@redhat.com, Fabien Chouteau , alistair.francis@xilinx.com, alistair23@gmail.com, Artyom Tarasenko 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: Fabien Chouteau Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- V2: - Split hw patch into individual directories hw/sparc/leon3.c | 9 +++++---- hw/sparc/sun4m.c | 8 ++++---- hw/sparc64/niagara.c | 2 +- hw/sparc64/sun4u.c | 9 +++++---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index ec2816bf94..d434edec92 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -172,7 +173,7 @@ static void leon3_generic_hw_init(MachineState *machine) } =20 if (bios_size > prom_size) { - fprintf(stderr, "qemu: could not load prom '%s': file too big\n", + error_report("qemu: could not load prom '%s': file too big", filename); exit(1); } @@ -180,11 +181,11 @@ static void leon3_generic_hw_init(MachineState *machi= ne) if (bios_size > 0) { ret =3D load_image_targphys(filename, 0x00000000, bios_size); if (ret < 0 || ret > prom_size) { - fprintf(stderr, "qemu: could not load prom '%s'\n", filename); + error_report("qemu: could not load prom '%s'", filename); exit(1); } } else if (kernel_filename =3D=3D NULL && !qtest_enabled()) { - fprintf(stderr, "Can't read bios image %s\n", filename); + error_report("Can't read bios image %s", filename); exit(1); } g_free(filename); @@ -197,7 +198,7 @@ static void leon3_generic_hw_init(MachineState *machine) kernel_size =3D load_elf(kernel_filename, NULL, NULL, &entry, NULL= , NULL, 1 /* big endian */, EM_SPARC, 0, 0); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", + error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index e1bdd4828d..7a2812aaa4 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -261,7 +261,7 @@ static unsigned long sun4m_load_kernel(const char *kern= el_filename, KERNEL_LOAD_ADDR, RAM_size - KERNEL_LOAD_ADDR); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", + error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } @@ -273,8 +273,8 @@ static unsigned long sun4m_load_kernel(const char *kern= el_filename, INITRD_LOAD_ADDR, RAM_size - INITRD_LOAD_ADDR); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s= '\n", - initrd_filename); + error_report("qemu: could not load initial ram disk '%s'", + initrd_filename); exit(1); } } @@ -688,7 +688,7 @@ static void prom_init(hwaddr addr, const char *bios_nam= e) ret =3D -1; } if (ret < 0 || ret > PROM_SIZE_MAX) { - fprintf(stderr, "qemu: could not load prom '%s'\n", bios_name); + error_report("qemu: could not load prom '%s'", bios_name); exit(1); } } diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 9a8d6109d4..60799220f3 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -153,7 +153,7 @@ static void niagara_init(MachineState *machine) dinfo->is_default =3D 1; rom_add_file_fixed(blk_bs(blk)->filename, NIAGARA_VDISK_BASE, = -1); } else { - fprintf(stderr, "qemu: could not load ram disk '%s'\n", + error_report("qemu: could not load ram disk '%s'", blk_bs(blk)->filename); exit(1); } diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index c3280aaf38..070d9b94f9 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -165,7 +166,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_fi= lename, RAM_size - KERNEL_LOAD_ADDR); } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", + error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } @@ -178,8 +179,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_fi= lename, *initrd_addr, RAM_size - *initrd_addr); if ((int)*initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s= '\n", - initrd_filename); + error_report("qemu: could not load initial ram disk '%s'", + initrd_filename); exit(1); } } @@ -322,7 +323,7 @@ static void prom_init(hwaddr addr, const char *bios_nam= e) ret =3D -1; } if (ret < 0 || ret > PROM_SIZE_MAX) { - fprintf(stderr, "qemu: could not load prom '%s'\n", bios_name); + error_report("qemu: could not load prom '%s'", bios_name); exit(1); } } --=20 2.11.0