From patchwork Thu Oct 19 16:16:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 828212 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="iL3sERn8"; 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 3yHvbZ4W8Sz9t6m for ; Fri, 20 Oct 2017 03:32:26 +1100 (AEDT) Received: from localhost ([::1]:50122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Dk8-000614-LT for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 12:32:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DYQ-0004Nx-TM for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DYN-00014Z-Al for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:18 -0400 Received: from mail-co1nam03on0064.outbound.protection.outlook.com ([104.47.40.64]:26851 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 1e5DYM-00011w-GC for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:14 -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=LWHCZYpqCwgFlXiOffbHw3MdKghzOzH8fJVoXiw7hlI=; b=iL3sERn8tcd6JnmZV9r1Ygri+5/8hjxoVQgp0OOdDw5K5sWNnH6xpJ/laFp2c9TZFDdNgB7k3fJGJWTIXJ2e5rAr4JVzXUl4hNXQ1a3CLRVucFQ1JS7FroxY3O8WRK7vFLmDyUh+yxl6kTAOdYM7oPSRdgdfdkfhcyMTCwI6O7E= Received: from BN6PR02CA0078.namprd02.prod.outlook.com (10.161.158.19) by CY4PR02MB3383.namprd02.prod.outlook.com (10.165.89.154) 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:11 +0000 Received: from CY1NAM02FT019.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::207) by BN6PR02CA0078.outlook.office365.com (2603:10b6:405:60::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.156.4 via Frontend Transport; Thu, 19 Oct 2017 16:20:10 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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.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 CY1NAM02FT019.mail.protection.outlook.com (10.152.75.177) 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:09 +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 1e5DYG-0008Uv-Un; Thu, 19 Oct 2017 09:20:08 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DYG-0002ja-QZ; Thu, 19 Oct 2017 09:20:08 -0700 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGJxjQ017298; Thu, 19 Oct 2017 09:19:59 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DY7-0002Sl-E7; Thu, 19 Oct 2017 09:19:59 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:16:06 -0700 Message-ID: <10f2a6ab34ec0ea3e8365613f8731702c8d758d3.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)(39860400002)(346002)(376002)(2980300002)(438002)(189002)(199003)(478600001)(4326008)(81166006)(81156014)(63266004)(39060400002)(8676002)(23676002)(305945005)(189998001)(118296001)(356003)(6666003)(47776003)(50226002)(5820100001)(36386004)(9786002)(36756003)(2351001)(2906002)(106466001)(33646002)(77096006)(50986999)(316002)(2870700001)(106002)(2950100002)(50466002)(5660300001)(6916009)(54906003)(76176999)(8936002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3383; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT019; 1:G1j4ZI0OyMw6D2u/bXFyybrGo15nVV8VXmPKHetdYI7vHsYEDMS2J6muHh2jXLyIGeh6FWW4tzAy2WHH4srE7gkFmm7I/zpMLOxWS2335vQucv2TslKkXtUBYxqYoEkK X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: acdc11d3-43ef-4fc1-febb-08d5170d44f0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY4PR02MB3383; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 3:E2j8RIIVS5I4n6GvEO24bctjKPZv241cdqt8qz1iJXUhEvucS4OtvCKUW65UCWYY6nZrMxxuzzoeASQkt6iJQgdrP1lgIWTM4MZTYOnk0UXYJxv151Fl92c0a2dgYJxhPhYlaYVrBXvajYvz2zgUozoFHyj9Y3ZGzYU1nP3jQCAF+y8fUpDDUtaKTWobu/lOwkGqZ6IC1uuBseZWTZLEjvwh7EG7/Y5NCyst/Ur/jVz3MPAI0GZxH8B5xdmjJGfi7eX/Tm7r0Pq7sA7YEhuHVbrDzgfCZ7CPxx8K+m5brCbhbs2lx6jSCBzZ/YO8Grbh3DaLeZG3VfIycE/IDJZdtncgKXSVfRTYsa6kospTsYk=; 25:jbIS1y6mxiM1eA840GDoLGikCrn4u3irWgIknIL/Z8oUxE+/roig70HyX5bZchE/1eAxKphr3r3SfcoiPZabpzXStwSDP67QGpumtEHosWlGsRozVKfhwR1dFY4ztRxcAjSf3HMa+UBb25hmxeu1LgLPuNbYKW+RSOBaGXscf6c/ZZnsGdIl3fGM7oz1Ei64gsOk1MUYzPdbNuH2cIjGwnNQ5l10acjTGom2sjOIgCnJD4bXpGoZceNQiNXnNGhutr2qx+JB2Rc0yA2o2t/QqCEZkuZPpS7qTqE3uWtAHl92ZEF3fsXxi5REw2bN1CBPEiwp6h4wwPqGR2/NiM3T+A== X-MS-TrafficTypeDiagnostic: CY4PR02MB3383: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 31:o1yMrI33/wt3wetkCf/7n95Kyye5f7SY1hB14Q+Sc86RNXVTgcgDbvV8DtPsopMv1i0rZ3z27H+7p4ZOJpkWyLod9Onm/TzBkt4DSVx76NlpBmEnqqxKPZw9TRdICpzD472FV4m2X5z9x7A9nVbmdvZ2Jb8Z0T33nPajM/+33JOTtRWKnmHS7lP9ZfgQSc38mPqC0rUpz6IqqhMYjsP2xHil5bjfIKgdG1ItjDtMxfI=; 20:5uP8Jb7mNbTo5k2sYcMMFL8GVQUFYRy0r5H5EOCb1ni04rW1vzitT5rz7gXnWmiIfSNDRvRyj8S7xAD+a0K7ci4g8ak2SzWQWf115F2UwI2+/tFZ8osMf9J5UNL+CA2xp/2tbOgOlFvWbMBZG1l6GfKKtsGWwmBYtbbKPZDu+XZuYbGGDLNurpabmBNb6D3SM0iCYaYnAeJQXXfL6sfL2+PWpacsHl2YeEfEA2cwcq0y9wCD/VkRgqy7VRK1UpfXcfmcXw+FB1HKIXlyoD6AL6FTeh04OXAIG7UyRfBbtEExghWNbJs0KdkNqo+2rD5LuQv8ogvIG3EfClgUNYCSrnBIYUwsFV5PzVpfl08qPy9vgPq9184ca3jCuIqok/+Kz0fxPwARPDFy6muc/AjhGAj/a2Pr5uxh0WpI8Sbj53fQkCO2BXwel+LZuiejunAtz+H6jkhyCQ7LW4dIi1Rd76OWMPnppDxHTDbzrzdpt/IDvkd2N2Jtknv1AtoSW7Vq 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)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3383; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3383; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 4:XbWuXyFOAY/+5DinExSK/NVRCJyq8Hhwh90zaAPxd5wv4/7Ry9lhp7h3DgZI/1nJZkRNo8Zhle+9CmuUvFBABvu8aOaXlxe51OY6fJm/61UlMdKphfeGqhinKQjqK+wmabNNDO0JyO9jQEfG9m4a50vwOIxsvlxXvRdJyI0Ch+bSqZHmZ4lKc7I5aSDaJusB4NnsTxcwzRfbKgnqV94ztuIyidJoM3BZFpoGGCo26Oh47An5YgmYPhPaTWQyRshHX+Tmk5dtp9LCKhdYpRH4MxW6EhxVnTYkiZqkR1Uvw82QTc652kkJBr8XTOZJK7uMH4L5F3etJIEf1OzofwzTdQ== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3383; 23:7PjdOsuXMVNXaOv45/UO6I4yBL8bVk5hlgyjgtybt?= tUKe6rXpMpviiKNgObNft6wer+hgjTeIP49Dr3/QrPvyymlc+JrpQIL38p37CpfEHQdlu9ewU7q75k2/HXvbi7/E7E3+aAsQ9yrYWp8qX7zLCSeY31mPFfumL/llg6NWKGMcca+YpqWiy9t2i1QnyW1CWiihYF7Lg67siJM9VkKTRV5+uW9DQIW3IScVcFJVnI+6YkCNEFNIazpox4wSyq+d/C0H52X9ACWSVQZAkDoTwlzz0vvVIs4MYy/yIWIHng8ibLCpwbjL745Ae5L2tiVD7z1RU/dkhWy6YBgmCeZ8KhNbpUA9nBV2GQc0vc+O3jExN3Vv+3sVovzpTR+G7yd7gBm+2BI/Py72rUNfoOTfE8r/LGeZAdirBMkUAtRDwXLOljpKPZRQDk+mmcj38jwAjI08TDuRP6eBIu4UztQoA5og5U5LXgoNJb/7a1z1tE/17n/6ONVv4ezWGpfx+lDzG610pbY+S18mLaExTpvGGzbQj+k2M5fo3ref93cGYZYgz/1+7ZtTIaK1Yq/yHndpSPCLljBXF2TL7Yd8HhNqDPIfWVaOFozpbnGAZIcdORgFdfNlUaDT5U9mmir33mcqcvWUWe0rnqLkGsx7rxv0Zj5aBbM8p/0p7dx7cmuGihtjO+MMiWz1Unejl7zdk+BTXOsdL09NUC5prW0cY6qv7uzZCOK4kpmSXCrJ0A+XMOj92vvap7/71oB6iqu8T/BvVmu9/gUtbIbK4chhtihTAfmN7s+bKMEpzxi0hJlBJieeaXs1Kl37SOB089tj2XTeuaop9IPaCtvbZ7Lccvg+SjEMQLu3xuohpxVFh9ouKdl1ZPTuRBTrX0M3kHTdaTeTRac2v5nV3ef6LxHFHXEDsedXPXvuUkHu3LWGQbJ4F1xhgix1CNMvGk+zt5a/f66aMWcqGQDYCvc6buCfMD8FzFN17s3heK2VhFLrXZXod8iy7Mqia5DORUudhdxXJ83Fd1rtcMnVnc/Ua/XC3xr6Hh76ByLWZCQBJ21/qmQdAA= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 6:7O/1rysN+32AyK5Ji5OY0IxMT6X094njimyZAAya2JZL2AA0nURrNJ5y0By7KOJHME4Sw7L0dUVs9xFXblWTZda9fY4O9dh18CvLxx54DH6E1Rr7cs/zmm6lvCjcCjMvZWPhCOYBpi/Twb3wQi1VwMwYFEochvJ3TtHY/dP2LxVzMX2VkE6dCkwu53VXlmzY9Eu9TLpjEfgPTy1YGeOcPIQlPtHHoExmM5M0eqavk1vTJ/CQyO/yMWATq/eef3fAvcWp85SN7upQRCX26rYNTWGH1mhiGWiJmNEbcS9H6pf/JeBmV1rr0cS+UJADE16ztUxqGBp92JER6LbY7b1uow==; 5:QaW08O7VmaA1IHzNXeEhuOEkRwKYg7bSuHsvZz1f6MkUEIoBv8v3K9CGIgJMUEwB25jbG4OIVP6qMPA72YABOE1b0iSGTjlbwQuxJKgxUQ47o2KqfU37ndlxWwcvLaF8zyu4e8ZAHVVa3d45okSM2Q==; 24:9aCnP2yoz+7HVcvMTug2z6kr9gTxqRGrnXesf4tbE6XH96HPnZMw/fyg/RzhNG5DxTSFF02rkKSdhpc8Z15U2ZGIAFb86OyEcNqPt0SuW9o=; 7:079XdFqTixN84d9uTlHjis8qiWggRC0ejh0uonX0/wRvXwcZ87YfDRuK4HFV6rdW7qlVvvbj3JSKsoWOC4zGNnrMvQskDytESsPbmCg45vHuQpvzWzwSG6MY2iqOvmRFod3jVXY9snsDPxEMPDGhtPhlwi5IbQvNZciVI7SsKIbe7Hy4PUCfuZ9E/Q1GI5FWND8Ef3asQF0WjD4/vVTtpxddxmfxfHFMq1IhVWJZcaI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:20:09.7857 (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: CY4PR02MB3383 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.64 Subject: [Qemu-devel] [PATCH v3 09/46] hw/core: 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, "Michael S. Tsirkin" , armbru@redhat.com, Paolo Bonzini , alistair.francis@xilinx.com 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: "Michael S. Tsirkin" Cc: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- V3: - Fix white space error V2: - Split hw patch into individual directories hw/core/loader.c | 43 ++++++++++++++++++++++--------------------- hw/core/ptimer.c | 7 ++++--- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 91669d65aa..75f3d4301c 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -43,6 +43,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "disas/disas.h" @@ -82,8 +83,8 @@ int load_image(const char *filename, uint8_t *addr) return -1; size = lseek(fd, 0, SEEK_END); if (size == -1) { - fprintf(stderr, "file %-20s: get size error: %s\n", - filename, strerror(errno)); + error_report("file %-20s: get size error: %s", + filename, strerror(errno)); close(fd); return -1; } @@ -623,8 +624,8 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out; if (hdr->ih_type != image_type) { - fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, - image_type); + error_report("Wrong image type %d, expected %d", hdr->ih_type, + image_type); goto out; } @@ -670,14 +671,14 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, address = *loadaddr; break; default: - fprintf(stderr, "Unsupported u-boot image type %d\n", hdr->ih_type); + error_report("Unsupported u-boot image type %d", hdr->ih_type); goto out; } data = g_malloc(hdr->ih_size); if (read(fd, data, hdr->ih_size) != hdr->ih_size) { - fprintf(stderr, "Error reading file\n"); + error_report("Error reading file"); goto out; } @@ -693,7 +694,7 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, bytes = gunzip(data, max_bytes, compressed_data, hdr->ih_size); g_free(compressed_data); if (bytes < 0) { - fprintf(stderr, "Unable to decompress gzipped image!\n"); + error_report("Unable to decompress gzipped image!"); goto out; } hdr->ih_size = bytes; @@ -763,8 +764,8 @@ int load_image_gzipped_buffer(const char *filename, uint64_t max_sz, data = g_malloc(max_sz); bytes = gunzip(data, max_sz, compressed_data, len); if (bytes < 0) { - fprintf(stderr, "%s: unable to decompress gzipped kernel file\n", - filename); + error_report("%s: unable to decompress gzipped kernel file", + filename); goto out; } @@ -893,8 +894,8 @@ int rom_add_file(const char *file, const char *fw_dir, char devpath[100]; if (as && mr) { - fprintf(stderr, "Specifying an Address Space and Memory Region is " \ - "not valid when loading a rom\n"); + error_report("Specifying an Address Space and Memory Region is " \ + "not valid when loading a rom"); /* We haven't allocated anything so we don't need any cleanup */ return -1; } @@ -909,8 +910,8 @@ int rom_add_file(const char *file, const char *fw_dir, fd = open(rom->path, O_RDONLY | O_BINARY); if (fd == -1) { - fprintf(stderr, "Could not open option rom '%s': %s\n", - rom->path, strerror(errno)); + error_report("Could not open option rom '%s': %s", + rom->path, strerror(errno)); goto err; } @@ -921,8 +922,8 @@ int rom_add_file(const char *file, const char *fw_dir, rom->addr = addr; rom->romsize = lseek(fd, 0, SEEK_END); if (rom->romsize == -1) { - fprintf(stderr, "rom: file %-20s: get size error: %s\n", - rom->name, strerror(errno)); + error_report("rom: file %-20s: get size error: %s", + rom->name, strerror(errno)); goto err; } @@ -931,8 +932,8 @@ int rom_add_file(const char *file, const char *fw_dir, lseek(fd, 0, SEEK_SET); rc = read(fd, rom->data, rom->datasize); if (rc != rom->datasize) { - fprintf(stderr, "rom: file %-20s: read error: rc=%d (expected %zd)\n", - rom->name, rc, rom->datasize); + error_report("rom: file %-20s: read error: rc=%d (expected %zd)", + rom->name, rc, rom->datasize); goto err; } close(fd); @@ -1105,10 +1106,10 @@ int rom_check_and_register_reset(void) continue; } if ((addr > rom->addr) && (as == rom->as)) { - fprintf(stderr, "rom: requested regions overlap " - "(rom %s. free=0x" TARGET_FMT_plx - ", addr=0x" TARGET_FMT_plx ")\n", - rom->name, addr, rom->addr); + error_report("rom: requested regions overlap " + "(rom %s. free=0x" TARGET_FMT_plx + ", addr=0x" TARGET_FMT_plx ")", + rom->name, addr, rom->addr); return -1; } addr = rom->addr; diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 7221c68a98..514e177de2 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -6,6 +6,7 @@ * This code is licensed under the GNU LGPL. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" @@ -56,7 +57,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust) if (s->period == 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with period zero, disabling\n"); + error_report("Timer with period zero, disabling"); } timer_del(s->timer); s->enabled = 0; @@ -89,7 +90,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust) if (delta == 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with delta zero, disabling\n"); + error_report("Timer with delta zero, disabling"); } timer_del(s->timer); s->enabled = 0; @@ -263,7 +264,7 @@ void ptimer_run(ptimer_state *s, int oneshot) if (was_disabled && s->period == 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with period zero, disabling\n"); + error_report("Timer with period zero, disabling"); } return; }