From patchwork Thu Oct 19 16:16:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10017651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A2937602C8 for ; Thu, 19 Oct 2017 16:29:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 947E528DA2 for ; Thu, 19 Oct 2017 16:29:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 896FC28DA6; Thu, 19 Oct 2017 16:29:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2300828DA2 for ; Thu, 19 Oct 2017 16:29:54 +0000 (UTC) Received: from localhost ([::1]:50102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Dhh-0003OQ-8V for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Oct 2017 12:29:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DZG-00056M-07 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DZC-0001lD-EF for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:09 -0400 Received: from mail-co1nam03on0077.outbound.protection.outlook.com ([104.47.40.77]:12800 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 1e5DZB-0001jB-W4 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:06 -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=oBp04+oFX7viJOmIY60tsOyNn3rkfmJnKzmGXvxWaPQ=; b=HhRFUONBTScsb51JGkgp8r+H4+GKqjcRwEMSxm849NR9PqDlnmWKzzQ6xxCwNOkO09GYvw/bOcA41AqKoskOvGvgWbcyIPtwVwgcDoZZGR30k880qI+hgv3JKBU1BaYTnpT0bxgcfu2bSRVpu3Ommum1SrdeWAqUe0dj62wduTc= Received: from SN4PR0201CA0050.namprd02.prod.outlook.com (10.171.31.140) by BN6PR02MB3377.namprd02.prod.outlook.com (10.161.152.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4; Thu, 19 Oct 2017 16:21:03 +0000 Received: from CY1NAM02FT011.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::205) by SN4PR0201CA0050.outlook.office365.com (2603:10b6:803:20::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Thu, 19 Oct 2017 16:21:02 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; reactos.org; dkim=none (message not signed) header.d=none;reactos.org; 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 CY1NAM02FT011.mail.protection.outlook.com (10.152.75.156) 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:01 +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 1e5DZ6-0008W1-UR; Thu, 19 Oct 2017 09:21:00 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DZ6-00032v-RH; Thu, 19 Oct 2017 09:21:00 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGKppp017948; Thu, 19 Oct 2017 09:20:51 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DYx-00031a-Lk; Thu, 19 Oct 2017 09:20:51 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:16:58 -0700 Message-ID: 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)(376002)(39860400002)(346002)(2980300002)(438002)(189002)(199003)(305945005)(356003)(2870700001)(36386004)(50226002)(33646002)(8936002)(2351001)(189998001)(81166006)(8676002)(81156014)(5660300001)(2950100002)(50466002)(118296001)(6916009)(2906002)(77096006)(39060400002)(36756003)(76176999)(23676002)(50986999)(316002)(47776003)(106002)(54906003)(106466001)(63266004)(478600001)(9786002)(5820100001)(4326008)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3377; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT011; 1:yzPgKgvYGUZhTKEkLNhbvmgOoc1n2p032reSl9lBFlvQQcLX1FdaKsvgaVIufFkYpZaWRjioiCG4A5zl7bmqdhk3Nsu7wdJzrJ9s5XUBUEe1Wb4FYNamLogcXKbgC0cl X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfb2ee01-ad7c-457f-a944-08d5170d63fe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254168)(8251501002)(4534016)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199)(201703131423091); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:70YL++9P5/99xeZj+ew0UR7AThsxn9hL5qtMm/TuHapQ7glN8xXYlG/S/1fdDVHHXioKGaFZ4EuINp9qE1grkuTp5qejhRf1ScSY9Baqmr/QMSd2gXFzY2jgV3EuAP9HkoHfKAAX6Aoo06Wk50mFcixct9SuC7jJHFZcSsb0gzqH91aF964M2E+J9aHy7/1Ea9vyqzlEAq9AwzhMEtRGdBQfxNZF1aRHkWEU1s70ClVW4qI9yhVHkAaXgzCurU7ztPNiyt1HYnt9Gx6fc3E9mrHcNPIq2Q8Bs3bd/YevDAnSGGnpGCONTQ6B3+CZvKMrZ5SCcJC/031RID7APdbV3URUL2u24aqwA3q8R+jhvhE=; 25:ipizy6nmuCzVOHZORYQJyPqBPXN17v/ltZCkKgnTzfjQIGfYI65/FAdUc+nAu0DynYH0/I785U1VHcSwWgyXKyTIvGljzYuxjwEUTW5OlehlLMLEGA0loAtEra1qiYrw8ENRxFlL8zn0EaeRUSF7g0DIw5nwNWiv+xL+IfXhxzFApPVclUSr7fH5tM7izpk+jNPAbWjkkIM7wEWPfxvrlYHL9djP87spUtZdOvrYmNrLJuvcj13NJUjj8mPN2K+5U/FaQHtR4OOiyZrLI0RqqDsUmCSJhyTh9E3Dt1ds/v8Zjca6viTJPMZn/whZZTE9RvyllsvskDlc68Xr9Qu7tQ== X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:F0SB14LqduZidbAHoYdMqSroUO0F4CfMBu0//7A/x4uXRj/mVnN9XFvzEG/N1PHGKVv/m527+3TQE6+B2hNrwbW9OZMPiEItmLjTn2MCs8RD5NfSJ+BVI32g0zxkTnnQWahHcSY17Y+LtZXI1S/zilk+6GFZbILXhpGw8efuIeUq9M4FNSi1MBlcsU6Gydqk0IeXhADpcS4FOMHKewnE2PxZvXIytkBkFcMRlwpZe8Q=; 20:r2v2x/3FP+Fcdyfr1q8box9wUDGBRHCNC1lso54fvpfBN+lDy9fcv9NoE1KhGhiBZquKYn6CpEkKmvR5zwH+kpiet1HUeGq+ziEwW2Xela6ZRfW5i7OXahAgu0pfY+0bfxIqv2yUT3Lz2qCyheKVRQsSxBeAg30PNA8cmJ51+6cHDxva2Spa3w8TeMej7d+ZloLUEpEJo6Z1r+Jr7V8G3mOGUedxcOUpHF0hjZ3fIIIGtboY++TlABCPkY4SfeEujQLIe+LQnOTx5n2gn12w6udgS8j+z6MYJZXFOQDGcApNm2HwWmNL0szEXglf20u5CoCrPevjGuQ47snuKtxFiZgdMJlaEkW0kPsZgc2fmRwwbor8L8vIUfXHaInblbcdzjQvv29O6Vn+hJ5K/aQmSaMYv2UCUph+vQTNZrH5ZZ1AtdmeGiwIisbEWmT1NIXqbNkxA4qHpjDcL7MIUfN2l92p2P4E7HOAUp0CFkFulH+KEFNNG1NK3M4mh81IP+Fa 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)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3377; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 4:UlYZS9QB8SNqcGviattCutRItmMRt4hWJcQQRAlbgrJ0jpxcSg6jN0jyZ08VsatRgtfMam1a8YrgA2BjZxFEXRMqdxMFStpUEhO3Tf1p6jfKEwpPEXerOYfJhy5czuqbHFPNeJT3tpmxt76/iRXdkMKaCo4zVmrahn9AqWMAlsyQqp8SQ0wo7MNUARKJFoTseib+PzWMS6xpgiYYcPGXyHjk6IDE5FLhMw8qSgL/Cde/m/s9aMmItQVe1jkk6pGeqxhE2+rsSO1LC1m4E2Y0WvZ5yzLLx9hHmBnh1l+e/A/Ijq6Run5T0CooLfZHGP7HUJdXSDWziDY7u4bMOnwFKA== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:ndzjYrUlAmDpYFZqPszFfDA7Flwbl5jJHA09gunaG?= =?us-ascii?Q?F+E1gy09JVCGp87qorgu9rgGnN/kBS4hMAy6ghrMQgRCYcErBOirMF/5dLHm?= =?us-ascii?Q?GWkNS73VCYpiO67bZOcsS/BMjh1DG+Ho9j4mRcT7EoTyxFA6P2QxyW5QNWKw?= =?us-ascii?Q?vgXq30PkDoA9ludicdTXauvLw+AZFCRCc8Sp1YmTYFHeICnE9T5Ia4hvrsE4?= =?us-ascii?Q?gyXwtkOrH0sXmIRl09vGTo5eR5XbVL67Xv6Vx5/UjVAc25c/Wfu7HcFAwU36?= =?us-ascii?Q?8+DHXoV+UVHnYYClS53G6y1UrTBLWIEkG8Kh2a9r3x+jj/i8OhP5gxX0RTSR?= =?us-ascii?Q?53bpUfCAnu7HhqCHvDyXw+SdfUIvHSiH4CV7IEW18U8J7JVXHiFN55iCNNau?= =?us-ascii?Q?hYi6+vYsbvv6sQGnT3pJFkdhXL0cfzYWCyjGiPYVG7goeb7dPxKJVPHU+O3W?= =?us-ascii?Q?C0nmR5RMxFWpFqq7tOvysJTy0DtI7dQ1pKA2yiQRHGux6TiT9NKkfyiAHJOw?= =?us-ascii?Q?UEE38XDjKa9cUWzeDLkp5119tNZKHIim/eGxpD9FUFjau78ocEr19RZGcvbE?= =?us-ascii?Q?B7vkC3/Y9baf56sow9XvLqQpJx7tcvrww3EbaxmdeD8TbBqM2DRtrlTgV8AO?= =?us-ascii?Q?jWqZWy8b+74tozkHgZhtXBL25EQeJRWFus4rCYg9EYxMFinJTeAEAPm/EVBZ?= =?us-ascii?Q?XbhO65hvhoxgSSCKmYjNmzyMy7+n/iTmGhyhZIE2nRjWtg8mYv0W6wPO0Cwu?= =?us-ascii?Q?jSXdjoMgXUN3x44J2EjRKGPkJ8ikPedcor2xVfOBvxD4w6YUCQL+laNIE8pq?= =?us-ascii?Q?Rh9XY8kKIy/BGco/dENDKEBHF3gavi42hftCNfoxUb3IxiqTXbyCuUn/y9eZ?= =?us-ascii?Q?gJc4n6MNfwWVSsEK8BNYcY2IDFoLzDVbKpM4NYddPbqCuer3RUL5YNvn/s8g?= =?us-ascii?Q?1tTwnjpVTcH4pUL3312B708xFlLHN2dFbf2OjzAQW7jRJa1ziaYTuIIkg4Bb?= =?us-ascii?Q?Txo+zBdm312Vcx1l1M4mdzK15NodVpWl0AlNrmUvkeVpQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:JbDdSZQpN/n9ZAi7qOvB3y3Nztkt/SncOv+TLUybhZyzGDvpSszmjtyseaakQwDNzDVWhYDhEhIT4nApNwX3Dxiivlk/QHrdxw2f9bwRwbNK49vUa7B4teGIxuwBk7U9CbThguw99N7revlP2595glwlZCJ1+Hq7BTLiZogbz2zQZOHnkRNd0HB8d78MnL5icxlSY5dJCNKQXm8OO8to0WoTSllj0zbmG08uuyXP9jXPGWpeXiEe0/UEgA96pBb5Y6Gb6mon2jbM3gGf9qf4l0GYeGKc/AVFOdwiLsMClg9yIzYH737v0m5IvSsLcN1L/JjEYmSANfo5XjjV7yer2A==; 5:1oj81jcPg2Svudqx3VFI7DJCrsI8c5OdoTMCa33OiNun/d+7r6aTv8DB4Ka+VRunHEdDBH55o5bhbzVeAGM34Zhwl01w71tQNkKtx3R2hnqjLHMi4sa2gjzKfo+j+hHFvQjZ8cdNOaX8bx3OfDCT9A==; 24:LnXwx6gP5xVD3oIg1v77yfAFFxWHFQ4IMAAAXpuadbV8bxQqrEBdaivZo2+knWmtQptWIFrSDamu2jFlv+LMGIKuwL40obW7Y4RtVaweuyk=; 7:4hgmXm7CATkScruNcNuqVxGvecOSxoMfO2sIaCtYsnWr28hFMtK+g16DS3Lh3AlFE59XlkenJ5p9IqGn770mVQqmJQGzZBysgZ47iUojSBzxAVLq3ctnlI0ljill47Vz2G/6SMlVzCjQBgy4OXlM/GpgYi0fifT4bTt/hK/tAkA+slLu7oNZXXxWpfVZ2RXfzAuuNSf+/nm7vNeRJY5Obw/2/UHh6Kplyv+rfNrnjKk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:21:01.6971 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfb2ee01-ad7c-457f-a944-08d5170d63fe 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: BN6PR02MB3377 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.77 Subject: [Qemu-devel] [PATCH v3 23/46] hw/mips: 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: Paul Burton , armbru@redhat.com, alistair.francis@xilinx.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Yongbok Kim , alistair23@gmail.com, Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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: Paul Burton Cc: Aurelien Jarno Cc: Yongbok Kim Cc: "Hervé Poussineau" Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/mips/boston.c | 4 ++-- hw/mips/mips_fulong2e.c | 13 ++++++------- hw/mips/mips_jazz.c | 4 ++-- hw/mips/mips_malta.c | 16 +++++++--------- hw/mips/mips_mipssim.c | 11 +++++------ hw/mips/mips_r4k.c | 18 ++++++++---------- 6 files changed, 30 insertions(+), 36 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 776ee283e1..ee82968ea7 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -353,7 +353,7 @@ static const void *boston_fdt_filter(void *opaque, const void *fdt_orig, err = fdt_open_into(fdt_orig, fdt, fdt_sz); if (err) { - fprintf(stderr, "unable to open FDT\n"); + error_report("unable to open FDT"); return NULL; } @@ -361,7 +361,7 @@ static const void *boston_fdt_filter(void *opaque, const void *fdt_orig, ? machine->kernel_cmdline : " "; err = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); if (err < 0) { - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); return NULL; } diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 75318680e1..b10ae3a7b4 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -120,7 +120,7 @@ static int64_t load_kernel (CPUMIPSState *env) (uint64_t *)&kernel_low, (uint64_t *)&kernel_high, 0, EM_MIPS, 1, 0); if (kernel_size < 0) { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -134,17 +134,16 @@ static int64_t load_kernel (CPUMIPSState *env) if (initrd_size > 0) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (initrd_offset + initrd_size > ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, initrd_offset, ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } @@ -342,7 +341,7 @@ static void mips_fulong2e_init(MachineState *machine) isa_bus = vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 0)); if (!isa_bus) { - fprintf(stderr, "vt82c686b_init error\n"); + error_report("vt82c686b_init error"); exit(1); } diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 7e6626dc88..d3999cffd9 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -271,10 +271,10 @@ static void mips_jazz_init(MachineState *machine, sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(rc4030, 4)); break; } else if (is_help_option(nd->model)) { - fprintf(stderr, "qemu: Supported NICs: dp83932\n"); + error_report("Supported NICs: dp83932"); exit(1); } else { - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model); + error_report("Unsupported NIC: %s", nd->model); exit(1); } } diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2adb9bcf89..66d3f82a2c 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -812,7 +812,7 @@ static int64_t load_kernel (void) NULL, (uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0); if (kernel_size < 0) { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -846,9 +846,8 @@ static int64_t load_kernel (void) initrd_offset = (loaderparams.ram_low_size - initrd_size - 131072 - ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (kernel_high >= initrd_offset) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, @@ -856,8 +855,8 @@ static int64_t load_kernel (void) ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } @@ -1043,9 +1042,8 @@ void mips_malta_init(MachineState *machine) /* allocate RAM */ if (ram_size > (2048u << 20)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 2048 MB\n", - ((unsigned int)ram_size / (1 << 20))); + error_report("Too much memory for this machine: %dMB, maximum 2048MB", + ((unsigned int)ram_size / (1 << 20))); exit(1); } diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index a092072e2a..deb4c5fce1 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -78,7 +78,7 @@ static int64_t load_kernel(void) if ((entry & ~0x7fffffffULL) == 0x80000000) entry = (int32_t)entry; } else { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -92,17 +92,16 @@ static int64_t load_kernel(void) if (initrd_size > 0) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (initrd_offset + initrd_size > loaderparams.ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, initrd_offset, loaderparams.ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 1272d4ef9d..dd3e5f43fc 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -97,7 +97,7 @@ static int64_t load_kernel(void) if ((entry & ~0x7fffffffULL) == 0x80000000) entry = (int32_t)entry; } else { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -111,9 +111,8 @@ static int64_t load_kernel(void) if (initrd_size > 0) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (initrd_offset + initrd_size > ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, @@ -121,8 +120,8 @@ static int64_t load_kernel(void) ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } @@ -203,9 +202,8 @@ void mips_r4k_init(MachineState *machine) /* allocate RAM */ if (ram_size > (256 << 20)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n", - ((unsigned int)ram_size / (1 << 20))); + error_report("Too much memory for this machine: %dMB, maximum 256MB", + ((unsigned int)ram_size / (1 << 20))); exit(1); } memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size); @@ -246,7 +244,7 @@ void mips_r4k_init(MachineState *machine) blk_by_legacy_dinfo(dinfo), sector_len, mips_rom / sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); } } else if (!qtest_enabled()) { /* not fatal */