From nobody Mon Feb 9 18:22:55 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 1506731995366383.4649578254523; Fri, 29 Sep 2017 17:39:55 -0700 (PDT) Received: from localhost ([::1]:37579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5ou-0004Gs-I0 for importer@patchew.org; Fri, 29 Sep 2017 20:39:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5WN-0004yZ-HK for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5WL-0006QA-9h for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:43 -0400 Received: from mail-cys01nam02on0069.outbound.protection.outlook.com ([104.47.37.69]:63673 helo=NAM02-CY1-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 1dy5WC-0006LG-Ob; Fri, 29 Sep 2017 20:20:33 -0400 Received: from CY4PR02CA0027.namprd02.prod.outlook.com (10.175.57.141) by CY1PR0201MB1930.namprd02.prod.outlook.com (10.163.56.28) 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:29 +0000 Received: from BL2NAM02FT020.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by CY4PR02CA0027.outlook.office365.com (2603:10b6:903:117::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Sat, 30 Sep 2017 00:20:28 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2NAM02FT020.mail.protection.outlook.com (10.152.77.162) 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:28 +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 1dy5W7-00083S-Mc; Fri, 29 Sep 2017 17:20:27 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5W7-0007Td-JF; Fri, 29 Sep 2017 17:20:27 -0700 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8U0KOMs000989; Fri, 29 Sep 2017 17:20:24 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5W4-0007TV-EG; Fri, 29 Sep 2017 17:20:24 -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=Aqx4ZQ/jebhVkbTp9wifJ8nCxFPZk20Qk4UiyAsLm8Y=; b=l7xq6H7qfO33t3TZXSyPUbPF0u4rFpxAel8E/TMDH40PJ7t4rQzNmXW8R6YNIAf2FVe4GBOqJyQHH1PK0BnUQhwzfn8wGYQeK5NRY7sU6yn8UEvBCRtELD8bAnsrfG51Bxl+UuaWLvC58fePxnw6sGX38nwagLB6MkTyfvIlYIo= Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; 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:36 -0700 Message-ID: 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)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(63266004)(16586007)(54906003)(81156014)(50986999)(81166006)(2950100002)(8676002)(47776003)(2906002)(8936002)(118296001)(5003940100001)(106002)(478600001)(50466002)(48376002)(6916009)(50226002)(4326008)(77096006)(316002)(305945005)(189998001)(356003)(39060400002)(2351001)(36386004)(36756003)(575784001)(33646002)(6666003)(76176999)(106466001)(5660300001)(9786002)(21314002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1930; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT020; 1:pRRMZWCVVLyD7b9d7Foi1utbGZ5bJBBfILskhreEOXe7J9jVqkSLiRrFmpB4qo2MMZJhY0ovHDnR56ZZlikUk7Nb9G2Zz8gUXHQQlGwJ51QAwGf+qk822i2BHCMACSEA MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 710c2637-b78b-4afe-d3bf-08d507990de4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY1PR0201MB1930; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 3:NEYighSmUOaPAZzHOo4wFzsKdjUzfBtUBb86o6JBcd7UVFmPiFR3xreskipv1DZuzfLLOTj6xT4RYAY83NmO3wD974+uX66GghXLbl0crnto7web9qM7JoNlmb9mhm16L68THUlw0AWqw734wKKirW2GM+fJ8SOi5vPu3Oh1jN6pRE5kPouTZVaSGG8h7THBL/6RFvslxGTqQ4slvnaaN7D9dIY8wIdGMDtLpLPrNZhSmGA0jXyBkND0UR6zbaVFbGrsqtEAWiVKniUMgrfLC+IJpYEcG0czfk5qP/dEKLDNgpTgqr/SWkZWvJCvaKOjFo5ZS3fJqyrc7kVDaAEZfG0/ylJzejRCMeZZ4a0mEvE=; 25:0Jl254UAcb0wVzCzQbzQa/b23a9Y+bYQF/NhAd2aNMv997Zoj++f01saL8CNaN9oeVnZBoXCzW1cPs3w6DCsFJmDTeN/aaJ8k/XywUHOitGiOX/lQyTwktBds/6eyILfuVsXyy4kZuAMSln4EA8xcetC+bmCkXX5HhDUnwuKb2SreW92jCYdP0Zk5ERIUEp7+WwFVX/WV6XyCbkE62udRn5wf1y1Q3QFqzqbZoC/SJyJnJhAj4/Zsj2V9M4sCulapA4CdhGkg96agn56txj+X8FQutYAhT65yzeHYxhigqBjPzFiaGbimhEfvZGKAR/9f2x28BSTftXuAJ4BtxT4mQ== X-MS-TrafficTypeDiagnostic: CY1PR0201MB1930: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 31:PWIYhMiJApKlJX7FJ1GFCEN6WeELsT6VjxUQVjp5CE4mr6lfmiIG9bp1yfFnfzZT4y88dSxBhxCSjo0C5DqhO8yrS/dQER1/Zay5MG/qATZsn0pOYy4bwLbDg9tFrhqWQAYDAhH/UxkWpp9QswNheOOvdI8X6ZgADtg/CL4QBoymC+zwUL8ii4XqBCgTy04AuCDxB0yOXjpT8ndZf/qYPwMFVM2rhOLIByxpLMOnKeE=; 20:7CwFtovznokKPv5ihCZFLqTbMzYG49NMEEipuCZfV1Cz8X8gS50WoyMFw2DheL0knGCaI7oV0GTObHE5Fs7o8aUgkqJHUUxsc7x/ub8RVCh4fIsOXmhdpH8To0wFw/JUofDOJNRjS+23/ssTEFhO4W5NlXe+i9ojMhuL7U/SCnzXq13CrvB/AASZeelai5wSCOjHeJbsPWXAZQBBlD/DDgBo+OkjTlioMUMNDB4ou3A/D6zDna9TnBTxd+lER7dCtpH+YRLGk5NB3uaK5COb/pKe5SjRjbQgv4JMxgl+2yHzQI+4MNwFJY+mpZEDiCDppFg0ptd7yuPjKpy2tJWp2AU/iPuzKCIxe7SOTROC1qVwIKw+IPBWtPdJ1NHjsGKKQWVUY7fG5On299lQ3+2eRnXsMB7u6+cBqlMC5VNfWjQh3vfI8MfdyLBgAIo/onDqHcGf7Cm/hXSE2g+YJA/iCeBWHBG1VgXQlsIrypxYqfBqZdMgXsSDtMAOTLjvBkQB X-Exchange-Antispam-Report-Test: UriScan:(142945433499172)(788757137089)(192813158149592)(21532816269658); 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)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0201MB1930; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0201MB1930; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 4:knv7oqp1vvHK7g2XBGCYC+w+Y3TVxoBUS6/+6uj/nd7tVfCQ6PJSCaQCHbVlPvDWIEDw1nrXt0dDARXkzCArFACK061Pudjac3o4MGMrASDRSAeBRW6gNU7RageTANDu0FcGxoNF/11n6uzNnkZKHv2bwI/DbUJ+tTevOIvY5gvSQa44xDA4eVIeHNAiYp2gf6qAR+JMNHhmmgEBjSkygE+PlN7sEaoQw37P2PkYX4yDqXzXxSRsMKbVy63px7DEBovq2PZsaUzSVyQDmeqvwGW7yZkMKm7i8/IHolsmf6kiRDH3hxdbFPwCerT1Wn7ksPBOuhxd9RTsemzqq78aUHOQcxrsPYIC9foKqlNkcfHjIfVn3RNwfLetkq40XKBYlnjcU0b/Q2BuG5LLuw9kMQ== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1930; 23:7PgmChS1/KjgGZIUG5sHFU8C7E/uaRU4WMBgCTS?= =?us-ascii?Q?XayEdMb3f8CiSxrSCf0vppc1qg/Gu9brWZGB/t9BaNT3nBGxfwOwugiNp5Wx?= =?us-ascii?Q?P9vMPdg8EEdHN01kryhcxhy4kwRaFz5aL/pHfoJJEhM1POQeNl9MqabU686F?= =?us-ascii?Q?jBwjVEgsDNrd7jDpctemic5Uzgeul+TvZ6idbNKDZL4pFZO9McnG8tFg6tfY?= =?us-ascii?Q?3YfKGT0QJPCUmKSgAIUkJv41zYAJgC5A0lc3npXJljLnCmB56XbBE4O7v4JE?= =?us-ascii?Q?mmRqSn1yvP8mrok7udL0SJT7w54hnysNpEIbeyK+xnWg9hpUU6oCcjh29nk4?= =?us-ascii?Q?zOAD/GYX8jhss2D8oUBSCm+w1PHXdWPSd3+CFCwYdykilc2Aqf0Knbs7zkXw?= =?us-ascii?Q?I1WNscAVD5yRW6zl9wHX1A0xaThFqVG80B1d2AT+A16cAX+4CJKMnchtH2yQ?= =?us-ascii?Q?nOwhT6OCneiU8NvIFWnVEAGG+KfUVRnoJFU4yi8/Gss3VtbUuAXxlLmgmBEq?= =?us-ascii?Q?NKCKvMYX3zMi9T3OMJC4Bj+V10t37qh7hw+Ot5G+fEjsx2+BjgfyHGmCb79Z?= =?us-ascii?Q?IuPK+YV6F3/NvJu1VI4Uhc+W+y94w46dUMY9uqc/WftnSZxvJqg6gEtNEGTH?= =?us-ascii?Q?SgLFGUhjEXaN2W6axL3OgP4O951xj0XuxkWG3XYV05rHeFVH6zje16Uuy0lH?= =?us-ascii?Q?LwkvRcAkb6x1raT06q7u6iNba/4lleYI93cnUKhQ5rGi1n7tySKVdPRYOUkD?= =?us-ascii?Q?A2nVaHt6ZQ4nB6QbolS7nHQNC79DFgTTV1rLpxuarbfPiNKBW0OJAcbSJ00o?= =?us-ascii?Q?0bif7RB/lduQiqFF9ny/f2nLqkoH54tAH1zlKKnpimEi90ByJgAjSKOvl7jN?= =?us-ascii?Q?yZblAMtGaPq8Ot6hoDpXTpT2s+VmVTv/3eZrD+28zrQ21DogQSroa36kC6BS?= =?us-ascii?Q?oNL7QohJqSWcfhew4s35VRFxVKhs/Z/YPcWpozvi+rOCjhBH9L9kXYT/v6Sx?= =?us-ascii?Q?CLNcND10D6BqAoQA9g0qdb0ef7ltyHwmm/tEoTREqejAMEAmtiKuCnWOV9pS?= =?us-ascii?Q?kOACef3eXZRzpVNwZ7GjheEgMle0d+1MtCOmZ6GWVw6Jiw6syHw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 6:HSIPaENKHfhzpNTuvVQ/2vyp9D6OgEB7JvttXbufExD0ELVXpuZnGdVx9kyD68fp6PxhckhDM5/hFmBir0JwJNNcm4QZH0vsoIMGTldG2nAPQYrogh52RtzanVOQSMaBe1kIXbKga+YItl+K05Tz4bBYYu6vR1Ehlaa3YMgeMI2AxsdMmvxbkxbmsake9lnGI7y9OokQcN07Z1cjVwGuUHwd0ZmcrjXynTMfUtQYIZT02h1hYQNqCxTbYfmLffSQe6h/jKETflJJqYqJEsm2P850UiK/1pfltBJKZAF+s8J+WNIudgeG+gSygfd8HlvHnoLA75r6Zo52goL/sbjD1Q==; 5:93EbRMzxNUba1IPYC/cJwJGWvoVfRm5Q9qTolSkiTGUkyzzn6CBlL6/VZsZgVx6IeZUwAInAIwAAg6JFzArLPLA4Sg7AnQmYg7wA51FOz4C2DerXkl2YjJrrQ43SfyHzRtU6Z7QIzo0DwD2HJBTZGe5EudzMGKFaqVKp5Y3TEYw=; 24:aHp1G+nOq5sInt7W/ucMUNhe49HDHsgv5Od0luOQPuhWu1XOgC82y7ytCpIin8KWKgXnx2SwgkcXtpW9AChAZMowXVMxrfP2CDIUnSXJAac=; 7:XFlE6r32Q8ohEtjjkAq8QEkUvHzCKl1k0dNqlP5GaSsU7F4mGQTGufZirsjFuq3JlJQc3RXNBhCVn9BSGFzo2XTieHYrw3jJDtTKt+5nUd3VhzWU6VsCUI8BC7A+5lPCgQwiR2nn07W3ZUsA5wH5RJwKYe8mcJhMqB68OYIvSEO9K4Xfl6znDYPbyWMUGPS6hZqgNmplGjW55apy+D4RYU1gPkcCQZ089/zGG9TANjo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:20:28.3690 (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: CY1PR0201MB1930 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.69 Subject: [Qemu-devel] [PATCH v2 32/47] hw/ppc: 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, qemu-ppc@nongnu.org, armbru@redhat.com, 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: qemu-ppc@nongnu.org Acked-by: David Gibson --- V2: - Split hw patch into individual directories hw/ppc/e500.c | 20 ++++++++++---------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544_guts.c | 5 +++-- hw/ppc/ppc405_boards.c | 8 ++++---- hw/ppc/ppc440_bamboo.c | 19 ++++++++++--------- hw/ppc/ppc4xx_pci.c | 3 ++- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- 9 files changed, 35 insertions(+), 32 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index db0e49ab8f..8a5350161f 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -333,13 +333,13 @@ static int ppce500_load_device_tree(MachineState *mac= hine, ret =3D qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start", initrd_base); if (ret < 0) { - fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n"); + error_report("couldn't set /chosen/linux,initrd-start"); } =20 ret =3D qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", (initrd_base + initrd_size)); if (ret < 0) { - fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); + error_report("couldn't set /chosen/linux,initrd-end"); } =20 } @@ -353,7 +353,7 @@ static int ppce500_load_device_tree(MachineState *machi= ne, ret =3D qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", machine->kernel_cmdline); if (ret < 0) - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); =20 if (kvm_enabled()) { /* Read out host's frequencies */ @@ -720,7 +720,7 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Params= *params, =20 CPU_FOREACH(cs) { if (kvm_openpic_connect_vcpu(dev, cs)) { - fprintf(stderr, "%s: failed to connect vcpu to irqchip\n", + error_report("%s: failed to connect vcpu to irqchip", __func__); abort(); } @@ -821,7 +821,7 @@ void ppce500_init(MachineState *machine, PPCE500Params = *params) cs =3D CPU(cpu); =20 if (env->mmu_model !=3D POWERPC_MMU_BOOKE206) { - fprintf(stderr, "MMU model %i not supported by this machine.\n= ", + error_report("MMU model %i not supported by this machine.", env->mmu_model); exit(1); } @@ -967,7 +967,7 @@ void ppce500_init(MachineState *machine, PPCE500Params = *params) cur_base, ram_size - cur_base); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", + error_report("qemu: could not load kernel '%s'", machine->kernel_filename); exit(1); } @@ -982,8 +982,8 @@ void ppce500_init(MachineState *machine, PPCE500Params = *params) ram_size - initrd_base); =20 if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - machine->initrd_filename); + error_report("qemu: could not load initial ram disk '%s'", + machine->initrd_filename); exit(1); } =20 @@ -1024,7 +1024,7 @@ void ppce500_init(MachineState *machine, PPCE500Param= s *params) kernel_size =3D load_uimage(filename, &bios_entry, &loadaddr, NULL, NULL, NULL); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load firmware '%s'\n", filena= me); + error_report("qemu: could not load firmware '%s'", filename); exit(1); } } @@ -1037,7 +1037,7 @@ void ppce500_init(MachineState *machine, PPCE500Param= s *params) initrd_base, initrd_size, kernel_base, kernel_size); if (dt_size < 0) { - fprintf(stderr, "couldn't load device tree\n"); + error_report("couldn't load device tree"); exit(1); } assert(dt_size < DTB_MAX_SIZE); diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 6d0ace20ca..fa54056bc3 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -278,7 +278,7 @@ static void ppc_core99_init(MachineState *machine) } } if (ppc_boot_device =3D=3D '\0') { - fprintf(stderr, "No valid boot device for Mac99 machine\n"); + error_report("No valid boot device for Mac99 machine"); exit(1); } } diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index bc7c8b7bd7..4d75113533 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -221,7 +221,7 @@ static void ppc_heathrow_init(MachineState *machine) #endif } if (ppc_boot_device =3D=3D '\0') { - fprintf(stderr, "No valid boot device for G3 Beige machine\n"); + error_report("No valid boot device for G3 Beige machine"); exit(1); } } diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index ce1254b5d4..3a2c49e3fd 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -83,7 +84,7 @@ static uint64_t mpc8544_guts_read(void *opaque, hwaddr ad= dr, value =3D env->spr[SPR_E500_SVR]; break; default: - fprintf(stderr, "guts: Unknown register read: %x\n", (int)addr); + error_report("guts: Unknown register read: %x", (int)addr); break; } =20 @@ -102,7 +103,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr add= r, } break; default: - fprintf(stderr, "guts: Unknown register write: %x =3D %x\n", + error_report("guts: Unknown register write: %x =3D %x", (int)addr, (unsigned)value); break; } diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index e92db2c66a..0a31a1c116 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -324,7 +324,7 @@ static void ref405ep_init(MachineState *machine) kernel_size =3D load_image_targphys(kernel_filename, kernel_base, ram_size - kernel_base); 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); } @@ -336,8 +336,8 @@ static void ref405ep_init(MachineState *machine) initrd_size =3D load_image_targphys(initrd_filename, initrd_ba= se, ram_size - initrd_base); 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); } } else { @@ -607,7 +607,7 @@ static void taihu_405ep_init(MachineState *machine) kernel_size =3D load_image_targphys(kernel_filename, kernel_base, ram_size - kernel_base); 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/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index f92d47f28d..77b74dfe9e 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -12,6 +12,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "net/net.h" #include "hw/hw.h" @@ -80,22 +81,22 @@ static int bamboo_load_device_tree(hwaddr addr, ret =3D qemu_fdt_setprop(fdt, "/memory", "reg", mem_reg_property, sizeof(mem_reg_property)); if (ret < 0) - fprintf(stderr, "couldn't set /memory/reg\n"); + error_report("couldn't set /memory/reg"); =20 ret =3D qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start", initrd_base); if (ret < 0) - fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n"); + error_report("couldn't set /chosen/linux,initrd-start"); =20 ret =3D qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", (initrd_base + initrd_size)); if (ret < 0) - fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); + error_report("couldn't set /chosen/linux,initrd-end"); =20 ret =3D qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); if (ret < 0) - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); =20 /* Copy data from the host device tree into the guest. Since the guest= can * directly access the timebase without host involvement, we must expo= se @@ -190,7 +191,7 @@ static void bamboo_init(MachineState *machine) env =3D &cpu->env; =20 if (env->mmu_model !=3D POWERPC_MMU_BOOKE) { - fprintf(stderr, "MMU model %i not supported by this machine.\n", + error_report("MMU model %i not supported by this machine.", env->mmu_model); exit(1); } @@ -224,7 +225,7 @@ static void bamboo_init(MachineState *machine) NULL); pcibus =3D (PCIBus *)qdev_get_child_bus(dev, "pci.0"); if (!pcibus) { - fprintf(stderr, "couldn't create PCI controller!\n"); + error_report("couldn't create PCI controller!"); exit(1); } =20 @@ -265,7 +266,7 @@ static void bamboo_init(MachineState *machine) } /* XXX try again as binary */ if (success < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", + error_report("qemu: could not load kernel '%s'", kernel_filename); exit(1); } @@ -277,7 +278,7 @@ static void bamboo_init(MachineState *machine) ram_size - RAMDISK_ADDR); =20 if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load ram disk '%s' at %x\n", + error_report("qemu: could not load ram disk '%s' at %x", initrd_filename, RAMDISK_ADDR); exit(1); } @@ -287,7 +288,7 @@ static void bamboo_init(MachineState *machine) if (kernel_filename) { if (bamboo_load_device_tree(FDT_ADDR, ram_size, RAMDISK_ADDR, initrd_size, kernel_cmdline) < 0) { - fprintf(stderr, "couldn't load device tree\n"); + error_report("couldn't load device tree"); exit(1); } } diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 6953f8b9ac..0b91d22253 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -20,6 +20,7 @@ * 4xx SoCs, such as the 440EP. */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" @@ -254,7 +255,7 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_nu= m, int level) =20 trace_ppc4xx_pci_set_irq(irq_num); if (irq_num < 0) { - fprintf(stderr, "%s: PCI irq %d\n", __func__, irq_num); + error_report("%s: PCI irq %d", __func__, irq_num); return; } qemu_set_irq(pci_irqs[irq_num], level); diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 94138a4e8c..7551d53fa5 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -576,7 +576,7 @@ static void ppc_prep_init(MachineState *machine) } } if (ppc_boot_device =3D=3D '\0') { - fprintf(stderr, "No valid boot device for Mac99 machine\n"); + error_report("No valid boot device for Mac99 machine"); exit(1); } } @@ -597,7 +597,7 @@ static void ppc_prep_init(MachineState *machine) qdev_init_nofail(dev); pci_bus =3D (PCIBus *)qdev_get_child_bus(dev, "pci.0"); if (pci_bus =3D=3D NULL) { - fprintf(stderr, "Couldn't create PCI host controller.\n"); + error_report("Couldn't create PCI host controller."); exit(1); } sysctrl->contiguous_map_irq =3D qdev_get_gpio_in(dev, 0); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index ed9b406fd3..7641737f81 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -187,7 +187,7 @@ static int xilinx_load_device_tree(hwaddr addr, =20 r =3D qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdli= ne); if (r < 0) - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); cpu_physical_memory_write(addr, fdt, fdt_size); return fdt_size; } @@ -219,7 +219,7 @@ static void virtex_init(MachineState *machine) env =3D &cpu->env; =20 if (env->mmu_model !=3D POWERPC_MMU_BOOKE) { - fprintf(stderr, "MMU model %i not supported by this machine.\n", + error_report("MMU model %i not supported by this machine.", env->mmu_model); exit(1); } --=20 2.11.0