From patchwork Thu Oct 19 16:17:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 828233 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="Tw5Wjzk8"; 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 3yHvsS6DZZz9t41 for ; Fri, 20 Oct 2017 03:44:28 +1100 (AEDT) Received: from localhost ([::1]:50180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Dvn-0007Oh-0D for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 12:44:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DaH-0005zE-J5 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DaE-00028h-45 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:13 -0400 Received: from mail-by2nam03on0070.outbound.protection.outlook.com ([104.47.42.70]:44096 helo=NAM03-BY2-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 1e5DaD-00028F-Mi for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:10 -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=hUqe3XWXhP8HShrclETV7OO9c+A0LH1swx+lqsx6hnE=; b=Tw5Wjzk8iyljCnWIazyfv1EuH423U3rSE4W1OxfAHxQquYNopN7Z/fo01t/XbgQW+6G4EyU9R6Syp3o8t55xeV56I1DVzfkVFEMjhIdkdMPDN/8mmMwXz9uy8AhWs8lnFjEXZAalRvLi8DeRMnnAKXwnBJCj+aTgev2vbXK2UE8= Received: from BY2PR02CA0118.namprd02.prod.outlook.com (10.163.44.172) by DM5PR02MB3386.namprd02.prod.outlook.com (10.164.152.162) 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:22:06 +0000 Received: from SN1NAM02FT029.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by BY2PR02CA0118.outlook.office365.com (2a01:111:e400:5261::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.7 via Frontend Transport; Thu, 19 Oct 2017 16:22:06 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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 (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; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT029.mail.protection.outlook.com (10.152.72.110) 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:22:05 +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 1e5Da8-00005R-Qt; Thu, 19 Oct 2017 09:22:04 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5Da8-0003FY-NZ; Thu, 19 Oct 2017 09:22:04 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGLqXO006889; Thu, 19 Oct 2017 09:21:52 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZw-0003Az-78; Thu, 19 Oct 2017 09:21:52 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:17:59 -0700 Message-ID: <106b49578902e1e7ec8a05c3b638f02cd95737ca.1508390588.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 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)(346002)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(47776003)(23676002)(106466001)(33646002)(575784001)(118296001)(6916009)(76176999)(5660300001)(50986999)(50466002)(8676002)(2906002)(81166006)(9786002)(478600001)(2950100002)(54906003)(81156014)(305945005)(8936002)(2351001)(77096006)(106002)(50226002)(5820100001)(36386004)(316002)(39060400002)(189998001)(63266004)(356003)(36756003)(4326008)(2870700001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3386; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT029; 1:MYWJEiESxKWEpPTg1sDmXn3suvlK5GSzFeOXQDvXNLWpxqtmEEBhax/jvweZR+1OhjY/U65quFw+OhcP1Xke+koUqzoMSZ1Yh5KsymKEO7RTe5WClbGSVvm/jw1B1X4c X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6ed2a14-ac61-4469-f6f3-08d5170d89ea X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254168)(8251501002)(4534016)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199)(201703131423091); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 3:EjHQLGAkptbk1mHf2QiCYgu6kY7hUtIMMPpcMc/rq6SAlshjc4EU4NlGKYkQYKA4wK2nLx1l0dMyjYybpt3oROgO4nlD/kXuLt3DY4RGTs37JeimySbDcWVNz7q2l6EjE9CKLzsx+nQR6exiWrQGGU8bSdmL6OvstASIAjx3aCZvlksWHSx+/PneekcAWPeyMH9QWSQ13SJWXTMjZsL6JMamdQMU9yWt6QBCQQPHsdacKCKbxyvgK7dOoBSNirGFHYzi0U2aSlhVTJNWhcdTsV5K1b/jPIRXd0KbCQ2lF4J26KQESD+HhlF3Awa+gVviS2GbY6mxh9h33QaG/rVPZQsrQzUzhjdyT4XI7ZvOEYo=; 25:MRLA30W6hFICbZyOcr5BbjvY56w0RhjYsnYYAniYtchQ5uADVZUV93Y0PSuF9YC+o0s5EXC6ZeK4iAtLELlOVLn5SmCiPOtA8bil6On16C8Y6dpZbFUu0HqIaWtGGbOHx/ZBVdsHV5yPWmKKqTLgRqUK9ddoqhwLbmRMpE2fMXkBrpRDLUb2KlKR8d0xsdE7BWm8h+v/ZtmU17LFIO1MrpfZco3lD+absSvBPna9SwBOBHRoDT8NQUwUVyVrtClNK3W5Uz8Mb1buraeLMa1Cwg8iVLteH3H8IuNTDQRaY2tpN+JyqkRGwHhnaMoCwhAVE24VDsBULG+/lNtUsOrb+w== X-MS-TrafficTypeDiagnostic: DM5PR02MB3386: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 31:JzWSZZ5PijE6wOmxpm3VPMtSvLlKAotUFG2AlJZTXlK7X//7vJ2DxtjCdXuN/SZqhoBJdm+LPPlAz3F3BXUsV6PLuWEmL8vYF4fnWVW7cWbdAdunSyB0d/EMb7KhIm4uJglJj1+HHOhjFcEAVMLbRdJKE/UKrFKqSh6O9l1C+/pbYofLqj0PxuLcaxkGaQOPiZP5vsDv5iGAfGEAC4Z6+AzLnDIL9ILu0CepPpYxsWY=; 20:iBUsq6Mjd665nyEesWnq8VAgm/L+xuE5N3NFcVaz3zyHTKGcUVXpVK43ImwDKZN0w64rI2FDo1RjgB5dDnIELPOP9o8o4magd5ImRph39/+TWC0UYlwkMiZ0WAi74cGoPgYMFMl8pgDFD+8Qc2UvpK4oq5Z6pFFTVgeCzLyAB4O3n0T+jx7+CnDgKDm2oNcNDptheKiBOUaHGng0lWrIGaIFTdEqTY0xQ5QREob0MhB1AuBGYEoDvxdi0Bjh24GqDTWDJ4i/8ZrJzggAiJfWqaVDfjGW2QZOc+BXbsHhdYc7LHcl5DiuSbaFz+G2cnIHDeau+LoJf/djEr8O4qJPtaQTZFITFk4ibKlX63qDtMuJlkNsEAyBN0WdTk0pNqlqV9/rOXzY93KqkO4x6otN7GA/VrfkK5CVJV0A+QJ85JI9qGE+Od0wUkGa6RqQSxM5kPY6DsGWTW7ECA8EHTdTt3x3rbNQX41OPVfmEU0QoU7DreJF6suXe5qRoz93ZcYx 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)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3386; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 4:c7bD/Dr8nKNycgCXBXlANr3l10IN0EA98S88hJ88BjrzZATBJsoIJpUlIcmG7ioFxSFVQrOJxtxeGXNn/sO2aMNsFssf9nvk2UTIg1J2+sLwuinIxfiQHP9XvjP9cGIHGj56T/E2tIMPYYb2AAqhI89O/ftJoUvGN+7/1l+3V3sKp5vNrUzyDmWzByiTeeowMIpfWPCxaDartef7HrZV/SKuEla8OHqYiUmTyLZZU/MH/6v+3D69cY8kvCsFYoab0omT7tqs2+GURs2qXPD237z4AQ8RVY+w4yHS2q8OAHuSJFI9Mhny6XG99ORKD/8nW/4IvwyFOswj760TFbIwFw== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3386; 23:BYx/4lfA77+iuikdkvKmdsqWVXiP9hE8QYe9WXx4f?= viHNnz/btBnNRZKdmsFKBOnw2IV1aFf1Gk5Q2lpjoSilpEDgx03MNOGFs/a5fDzvjE30nho+7KE2g17gK84ExhtowXu/6Uw3x4IjY4gCNGNm+8grAtQRsWiLmYSJNXPIaORl54QE+mdcYFqHv+zRU/godWt0cw0SDUBkInXc5DjW7CtXk57VXKLlMnV+s86ExWqYF4Cz/qBTSkvC9LV71aadICeKNjlLHe08iMMx5+7o4/Yf/bYwVQOn93TYYUUDAYZXIZlAK7C8sf3qebDyUWL0YrGmFMw6vNUEv95WfxygpPFBJjy3JFMv/Qj00aXjERfU376KWYrAT9xdC1uKZ6VQZ6k4jaynd5XpU6+CsJX6ZdgfXLaLCn6aqfQvkWRq+PWJvIboUYGEJZaMQYe3hQ1yTeW99OIU0L/QGfSmD3XJkDWqSGhpkVa4tOT5R8OfVj5b8u+1+Tin582zbzAz+id6kdbSTIIGCPe/YSmtSHL3MHflX+w22Vkj6zE41gzNjF/eDj2dS7aphOY3OZHKmWZ5NwZBzaQbNyTBwu65Zl7FF+K6NblUihqkkLyQip0shZaZMJtcytms7/Ji1ImQOBFIv42aiRRg5x982Kr01KF2+3uoeZgERM/ZFiWlkGOdZQwKen8tVffq6h4chS6tQm0S7rLD7Y5lzsw2LkXPrscTOQpTaa/4RDC4KVwvfb/hffXzWlIveXiN2hdZgU4WxzE3whkTvde0jISzwqGO2mriFWyG01rrXyQ0S/dnv99U36MTXO33Dyv6wtS99cpZ5dQqImIMP2DCSHlXGKmBV441zqSXd8A/CqHLqf4FVTWhXTbiTDlf2ynsfPTV3sSEIxquqGt48zDVKlpOBVeZITHrueUVYtMmSDfVglhho2TbPnQoq6ZP/JH5ixCRypV7E/7kZb0LZSMud7dxY0Yb7xX4hXg7JaxFJAofB0MWOzWKNw9ziXPXXaCabsa4R5LJ/8d2TrGD/fU5D1BE2pFVPryUV/xSfn+LfhVjkvcsYmPNoM= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 6:qIPwImKI/ZmdHbGIGM3y2J7vmIG5qcjXthxFEjTOCq9cRSvOg9Z9A2muK4gGv9PsGKZC0XfK5Q8nhT7ROcl+mW0qwi0AH0sPZ3KTxSyhcTXzJI9BLy2sMoIuB37l9oM+YSh+KyHu87GYj05Dmf9eL9W3BpldR/P4kIpQXAxbXCpKcJXWB1ih33N5VO6uQNNvxgkhSHf4MyIJHFkvoPorxPJ/+ZsV6wh4CJkl7mYqRCoJfOBpVWQcvcmsT/zZbAPsEvZMTN7/1B3sMCNi6umKFWxY18fdgb5c4kE2/TNstXmz/2pDAwkCi7UoAeNTQ57/opdQ0GiXuS9c9Mfb1YMP6A==; 5:YS+O10JDSg0Hk+eKWP4f9DcHEgWu4fr6jVWXM1uIUFEhb3bhaJVOMgdWGDuT9JE8T2J1yJA+ZMVbfuAp/8MQWwPBoz1pFk2K9Hi9j8ZjLsmdmLaWrdAdGWEayJJhoofu01zFVFeRR8OFsXxpLzt9tA==; 24:Er81YqxGqbVJUBOtj6V9GpZxksoSOLxkvypFf6V3C6cnFqbjTM+qAIcxlpteSq6AyBpQgB/wN6ZWe3BHv+OIScxtBf0M8lDv8VAVNGCNegw=; 7:Q4hF/VE4Tc0rka2ixh/c28wPZWE3xP+OcQl+gasibAPT6VvssVg80l8TrOKVgNjGFTiN49CTToIEpwLKE49PnsMLSTbIHtoxNaaeqUr7D37+9COAEt/xt8BcHLQP48PVivJwXFED33eayIvvBX26RfY5pkvj8daEHxZ41smBrgtwHjwtrjfRCuKuXbhxLr/wLckNsOnoQEqPqxde+z0Tw2nTA9bU59SCxn77bqxyBIE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:22:05.5246 (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: DM5PR02MB3386 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.70 Subject: [Qemu-devel] [PATCH v3 36/46] hw/sparc*: 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: Mark Cave-Ayland , armbru@redhat.com, Fabien Chouteau , alistair.francis@xilinx.com, alistair23@gmail.com, Artyom Tarasenko 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: Fabien Chouteau Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/sparc/leon3.c | 16 +++++++--------- hw/sparc/sun4m.c | 16 +++++++--------- hw/sparc64/niagara.c | 4 ++-- hw/sparc64/sun4u.c | 10 +++++----- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index ec2816bf94..b69d69c515 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" @@ -144,9 +145,8 @@ static void leon3_generic_hw_init(MachineState *machine) /* Allocate RAM */ if ((uint64_t)ram_size > (1UL << 30)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d, maximum 1G\n", - (unsigned int)(ram_size / (1024 * 1024))); + error_report("Too much memory for this machine: %d, maximum 1G", + (unsigned int)(ram_size / (1024 * 1024))); exit(1); } @@ -172,19 +172,18 @@ static void leon3_generic_hw_init(MachineState *machine) } if (bios_size > prom_size) { - fprintf(stderr, "qemu: could not load prom '%s': file too big\n", - filename); + error_report("could not load prom '%s': file too big", filename); exit(1); } if (bios_size > 0) { ret = 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("could not load prom '%s'", filename); exit(1); } } else if (kernel_filename == 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,8 +196,7 @@ static void leon3_generic_hw_init(MachineState *machine) kernel_size = 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", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } if (bios_size <= 0) { diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index e1bdd4828d..1ce0b0a407 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -261,8 +261,7 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename, KERNEL_LOAD_ADDR, RAM_size - KERNEL_LOAD_ADDR); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } @@ -273,8 +272,8 @@ static unsigned long sun4m_load_kernel(const char *kernel_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("could not load initial ram disk '%s'", + initrd_filename); exit(1); } } @@ -688,7 +687,7 @@ static void prom_init(hwaddr addr, const char *bios_name) ret = -1; } if (ret < 0 || ret > PROM_SIZE_MAX) { - fprintf(stderr, "qemu: could not load prom '%s'\n", bios_name); + error_report("could not load prom '%s'", bios_name); exit(1); } } @@ -754,10 +753,9 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size, /* allocate RAM */ if ((uint64_t)RAM_size > max_mem) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d, maximum %d\n", - (unsigned int)(RAM_size / (1024 * 1024)), - (unsigned int)(max_mem / (1024 * 1024))); + error_report("Too much memory for this machine: %d, maximum %d", + (unsigned int)(RAM_size / (1024 * 1024)), + (unsigned int)(max_mem / (1024 * 1024))); exit(1); } dev = qdev_create(NULL, "memory"); diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 9a8d6109d4..b267b2dbda 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -153,8 +153,8 @@ static void niagara_init(MachineState *machine) dinfo->is_default = 1; rom_add_file_fixed(blk_bs(blk)->filename, NIAGARA_VDISK_BASE, -1); } else { - fprintf(stderr, "qemu: could not load ram disk '%s'\n", - blk_bs(blk)->filename); + error_report("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 8282651aeb..780c695cf9 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,8 +166,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, RAM_size - KERNEL_LOAD_ADDR); } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } /* load initrd above kernel */ @@ -178,8 +178,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, *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("could not load initial ram disk '%s'", + initrd_filename); exit(1); } } @@ -326,7 +326,7 @@ static void prom_init(hwaddr addr, const char *bios_name) ret = -1; } if (ret < 0 || ret > PROM_SIZE_MAX) { - fprintf(stderr, "qemu: could not load prom '%s'\n", bios_name); + error_report("could not load prom '%s'", bios_name); exit(1); } }