From patchwork Thu Oct 19 16:16:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10017653 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 612C7602C8 for ; Thu, 19 Oct 2017 16:30:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54B8128DA2 for ; Thu, 19 Oct 2017 16:30:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 494C928DA6; Thu, 19 Oct 2017 16:30:15 +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 9363F28DA2 for ; Thu, 19 Oct 2017 16:30:14 +0000 (UTC) Received: from localhost ([::1]:50107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Di1-0003hT-Oq for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Oct 2017 12:30:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DYP-0004LX-Dt for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DYL-000120-Lv for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:17 -0400 Received: from mail-cys01nam02on0087.outbound.protection.outlook.com ([104.47.37.87]:5500 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 1e5DYL-00011O-Ce for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:13 -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=bkza3t6CbneSAW/zQ8qs888E2Clr6KKg9Rnuyo4/JW4=; b=SZGUmwx2IZRelEV47SuiRw10kSG6QQL+kRETx0tXusRe2nL+nlLkEW5OXMzGmgNTp1kuraev1iMN2AoFQmTKGQDUjE7OsF2DYW4VGZNNCAk4IbK6KJiI0dc/E8W8PTLlqZH0RM/FkqAvZTfw+lQXil4b6Iwp5L9ZUg+sj5SLSX0= Received: from SN4PR0201CA0001.namprd02.prod.outlook.com (10.161.238.139) by BN6PR02MB3379.namprd02.prod.outlook.com (10.161.153.10) 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:20:10 +0000 Received: from BL2NAM02FT008.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by SN4PR0201CA0001.outlook.office365.com (2603:10b6:803:2b::11) 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:20:10 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=xilinx.com; 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; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT008.mail.protection.outlook.com (10.152.76.162) 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:20:10 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36732 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e5DYH-0007vh-Dn; Thu, 19 Oct 2017 09:20:09 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DYH-0002ja-21; Thu, 19 Oct 2017 09:20:09 -0700 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGK2im003246; Thu, 19 Oct 2017 09:20:03 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DYA-0002Wz-NZ; Thu, 19 Oct 2017 09:20:02 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:16:09 -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-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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(81166006)(47776003)(36756003)(48376002)(33646002)(39060400002)(2351001)(36386004)(8936002)(106466001)(189998001)(4326008)(81156014)(106002)(575784001)(5003940100001)(8676002)(16586007)(77096006)(2950100002)(54906003)(50226002)(305945005)(118296001)(2906002)(6916009)(63266004)(478600001)(76176999)(316002)(5660300001)(9786002)(356003)(50466002)(50986999)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3379; 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; BL2NAM02FT008; 1:EI0smY17Fr3xt/jtlwdvhyfLcdqLWUhBdKDGlxJ16hFziCNvx1DUadELyKUmFqCtL2qO4cHNNv+261uw/mfp0YXpiLcHGQ5QPz8x0iV1rhPbUoXyEae7G73BHSWENeh9 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18280317-a8ee-4223-2df1-08d5170d4522 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254168)(8251501002)(4534016)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199)(201703131423091); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 3:Ih5a7Ld4jw83lrFUQdg2XtKFVC6MzzlZrce1GoxZlRvo4cHaUKqV50DzPZNVD3YXN1JBpt1YM95oTBYJFq3BlKHrBVn36OaukBNZ1us9PiHKESzzx8cY6xCnQLqPKWbS23FavIq08voOB+dmDYlflj6CG59L4l3W3VNK+iGMeyYKL9T/BigVBC0N/ddOZCSszPJGZPJoyFAzKL7h2eIPS9WqdxHERk9Q0n71nWWB6wVj0IL4uEb+SzEAApd6BXgYV2aQTLQvO/zOdt8XoR46wbJuWG38B4Jqs0ffXTZIEZ9Qjh9JomqBdDUHD75CjIl18OGm7Qk7EMXpZeOC2Or1X1PTcJ04v8O3KO5Glb33GUk=; 25:W43cD8EEOfCaSOrqkCsZl0BXmKvGM75fdDknPw9fOPectaac1+vXTBRE3M+PQuY1FSnCiTS8mM7cn80bGweflCcFOPfAiaty1xEsslUU/+zl0aECu/gWDmUBAMscockudkddCj7wBLOtoLIffeqzZrRLKSe1TNPjbKWHtzLCAj0K+vkzdFAw8cYapUxqCIMFavs0Pipc02OY7QRcQKlfGvkptzHZEVgw2w27/sxhrCqvWrO3gRozjwf6lrN7jWkCrKBAI6cEVHHpRjs4I1ByYHNJQ6Mdkbzru54n2sJHIhYxdLHJ4XeNJPDYCqKvdVx7xTVRi8QTK9qjmZUybvuIfw== X-MS-TrafficTypeDiagnostic: BN6PR02MB3379: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 31:LSwNkjEIYB3BeDwiE8bclhxm4AG51CUnSX/e0APQTIwemLdv2Tn+n70S4xGN2LzRyVb+IF88kP18dMuBU/YMy7AflKLpyqv9xLfsdMmN8RfPv9JZdZR3dg+4BJljRSpla0O9xEFvCxRETVDniaBo84UXtVbx7Zn11rKvx1DvhuwRdS+4nAY37DYlqbUNL1UO4O263sl9WnyVoUBcCtAhUDf2fjlbjjnA4vZI5ahFM7Q=; 20:Yjdiq2hdkD8N0czVLT7Fflz/wEb6sNfkz87K+sJ4Nn2FbxxzKI9wiUUTjy9Yrgbo4lZKeJrWlP0fNPye//sfW8Gp+7oAIFMTBAX01mFo18e9BcM8xWyadG/myFf6GmhoAuKmS7+iDj3rFb6lzYQmgCL9D2yv8l61/Mzkp4G4nrYRhCYUApY58bO/h2cOxZzA4o6Jr9vPWSVQt73DokQge90+gQK4JY1ZRpA6o+hzj/n7DP/qd3iB/v/VA9FBwwtamI7Wo+WYCvv5MeQEdeLnX2no92fRQTUk/cEdNO0pMIZ0Fa8VNNu6odMF93CD1UOJzu16LZ+xsKlXbKqGgvS1ihIgTCbkuwMayZz9M/P9YE9UWjgGj9f+s/3HgN1mwWWTj62KhglOEmYgXvj8v1OZMyVPJ9hC2T7MXXvTO+5uEyqHWgxUxZu8XtoTsH7QLEtQhVftgipE4u/fRfRbqoEz9x9OrYY/4H/rbArF4DO3VMzvU86xMfHCMc0ciEACkKJT 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)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3379; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 4:7aqT2BBbAWIHqDppSGkPccf4hFe2Mvqb6VYimDUELDVQDgHteRqjIpsHwyT0z5uf8eIowO6L1fVCYHjrsAsBIimDGh5MwtU+RMhuqSTwSEydrCnPTpaxPdtQrzIbSsN+mVF4FVADN/xl1zD2oG9u1EZNul+XZoAWcIJlXGZg50pEo0v5jPwwYzBnptMO4itjMIQkPsbKrTWXSfVVQstmy82+h3HBIcy70GCXiCoStU1c5t2ViUE5lHTGHGvpO802TfB1JEeWxcgBllpBZA7D55uoWze6E1JDqazxTvf/vjV7aWXxICy77tQHelfs6DXezakoVamujSgDu2kTflhVUQ== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3379; 23:38yzbilj6WwwdLnrDxHuXLuHC0Kllm0UjsMSqZ/lE?= =?us-ascii?Q?D4KvFzC5eHKMYDqsF1cwTa/Vq41/x31nuMsVguZrcsUASQe9Ya6I+H+pjWUk?= =?us-ascii?Q?5ATz+k62itRlBkkukhAVkLpW89UW50axFOCnDOwE1HtTsRO+2ad9Idlee1OB?= =?us-ascii?Q?z64t937rIbqyTgV1KJeWWElXjlpT23xESYIiC6+VisU28Tif5UFtO8runawa?= =?us-ascii?Q?/8/4H5TaPJafczvBBH/N/8HQZ99OKaTYdeJyrLCsmQztcqA/efVKUJs0EZBb?= =?us-ascii?Q?edYoOLFMsJU6Cl4DMYMbos+8Iy7BsthhCBkNJQlwEZNZ7YMbAb/dbQ1qYHDz?= =?us-ascii?Q?ay7DtgMfLwLUbdEInWr2e9G1zwnCRa2Oma9lErz5dScn7owmqLgnivzTuWxK?= =?us-ascii?Q?lPbEWulqjFMlVtVjE+TW0xrk580gRElv8mPf8Zzbeok4zxfCB2EkKnmfFJLz?= =?us-ascii?Q?P6QMQ1aP+xNRMOT6186TTKQaD8LgXbStHyYXIqaoLBeE4uqvH+gHvNVpkCj0?= =?us-ascii?Q?WxMpG2x56w3qd12e3EpGaJvFYb7mWmSWIZcFXzChsGT4gQFd08uv2gwdcqgI?= =?us-ascii?Q?b9EbRn039jG3EZ6NlXo7MbWZWncQxmgoy7gh/xfGYvs1/ZW19Y8T7ZP2CneH?= =?us-ascii?Q?aMnBKaEQ/cR/y6zu6qNBDSqHUtiIzpHjpsjPzovdu8hQ9bJNq16K/E29wZnn?= =?us-ascii?Q?8dGtXbTAKBaQjBYcU5qucprW7pnBydl1ZznMjTVh9D/voVfUzC1IZduLR3lJ?= =?us-ascii?Q?yfDcnrjIiVa+dDxFQk+F17BkG69Og5N0Ca3yxwhaEuFMxtMp8huVladFsBoW?= =?us-ascii?Q?/RXRJ55j6mOyq/j++p18X7Bzj8nohhrxpx1g4dJ2zgjQfzv8u6vRClzuqiXQ?= =?us-ascii?Q?oEx2fy0QeAW3HWRXFwqNQXyEVx42z93EEtWwZg7ByNsuasc8hmRbqkl7BzlJ?= =?us-ascii?Q?tEOLSjTYOjXKHf8OLwK+2HgjlfGZF9UC/kTYrNqd5KMYl4hhP7Ls46AkXKmK?= =?us-ascii?Q?cqzK2S3Fgcmbo28g4lqOYuat8eI/eeNVn5GAa8HDhiKt24rbh4w5ilnNgEzn?= =?us-ascii?Q?ROml2RmUJxuiRByQdChE3HsHeUrN2X93wbnrR0BoA1RZvZG7A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 6:aA5dJ2Hnk0tPq9FlmouwIRXjuzWLC4bCKF+iWy0s9tQVDDiZZEWkcmqe82yDlVO19TjHCbk2EwEvCxBjfkfW0w/a/y6pg6w23PIQoRmKB+XsK9mVDM42D6K31c1T2vsdmWfONyaA/K8BtM27t47BlEpFaAyrTwj0lUk3NkvVSrNRoV3Cc+7/kn5dwmppDl1UIKwiJda4Bv7YPZNfW1XT8Mv5nmrjdFFNgDRhldecMh9qcj037RmJwY0VgexwSmaKr4MSHGqhyJyFIAPtKcBoM8TWG6hnYnIPFzj49cqSBdgt+5Fx+Idx1D1bc9eB5OgKp0eHlaKlW74fA1vFzOcf2w==; 5:JqZRBTnYwYE/u3UyIcABQ4WJ9kGmQYjxNWtQBjT5euFkkfCtQg/be+Cgs8FcOk3agBx20NRwoD3yoe0jvq3cAeQp4+XaeyePpTXDWDwPIn6YmSJT4pNLIqAMm1tK57Pu+2dMYdZmNMgetHA0JAv/dQ==; 24:3eW1kn8CGMcW+IBSAtXh3J6YKys/33RfbUL7ChtUHrcbpiMRpQYGi+b6Iqqap4kuAj+5UohCfyKL3hdgwNwvESZWoswayCABt5ArxhBW8A8=; 7:OtCtAwVjoLZReJjP6hXelvpF+sDnyk/f8jRFksfkDmQndPUInIElVRbl4mUHwHDWQ0wtwPH4oazFYcfWaBVm0CkP7XZRl6+ykeolf9oDn6y/ExHJjDMKNSY7h9mvj/V3D+xlxvgVp+iXiA7z0bkAJiTcT+ewKEjXQfkYuDS/ejzlEmi+UZRkYH8gkJCrQ6PRu9iCOyep7Sy0ZtVuP6jwF0NE5qjaLBvEDIHWgvaaqLg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:20:10.2174 (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: BN6PR02MB3379 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.87 Subject: [Qemu-devel] [PATCH v3 10/46] hw/cris: 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, armbru@redhat.com, alistair.francis@xilinx.com 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 "Edgar E. Iglesias" Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/cris/axis_dev88.c | 3 ++- hw/cris/boot.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index 5eb552bce2..d121836b69 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -349,7 +350,7 @@ void axisdev88_init(MachineState *machine) li.cmdline = kernel_cmdline; cris_load_image(cpu, &li); } else if (!qtest_enabled()) { - fprintf(stderr, "Kernel image must be specified\n"); + error_report("Kernel image must be specified"); exit(1); } } diff --git a/hw/cris/boot.c b/hw/cris/boot.c index f896ed7f86..fda0a039b8 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -86,14 +87,13 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) } if (image_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - li->image_filename); + error_report("could not load kernel '%s'", li->image_filename); exit(1); } if (li->cmdline && (kcmdline_len = strlen(li->cmdline))) { if (kcmdline_len > 256) { - fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n"); + error_report("Too long CRIS kernel cmdline (max 256)"); exit(1); } pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline);