From nobody Mon Feb 9 19:30:02 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 150673092161760.16425339794273; Fri, 29 Sep 2017 17:22:01 -0700 (PDT) Received: from localhost ([::1]:37488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5Xa-0005eD-P4 for importer@patchew.org; Fri, 29 Sep 2017 20:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5VF-0003vz-Mr for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5VC-0004Re-EE for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:33 -0400 Received: from mail-by2nam03on0082.outbound.protection.outlook.com ([104.47.42.82]:10596 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 1dy5VC-0004OO-1i for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:30 -0400 Received: from MWHPR02CA0051.namprd02.prod.outlook.com (10.164.133.40) by DM5PR02MB2697.namprd02.prod.outlook.com (10.175.85.15) 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:19:27 +0000 Received: from BL2NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by MWHPR02CA0051.outlook.office365.com (2603:10b6:301:60::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.56.11 via Frontend Transport; Sat, 30 Sep 2017 00:19:26 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT060.mail.protection.outlook.com (10.152.76.124) 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:19:26 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:40098 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dy5V7-0000Dg-8e; Fri, 29 Sep 2017 17:19:25 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5V7-0006vg-5A; Fri, 29 Sep 2017 17:19:25 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8U0JFai000375; Fri, 29 Sep 2017 17:19:15 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5Ux-0006uN-1Z; Fri, 29 Sep 2017 17:19:15 -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=aquf96Vk/B9eWkT9nr74pFcBrDSIXAzxnqtc478pN3o=; b=obeSQkKGN6cjKy/77dNCH2FH/r0eSx5ves3Rh4hz0AGPu+VTL6A+WWhhSq5aU+J36TvG8C5aK0Hwr1wIxUt1xA4ENpCRo5VEUpKVHOIoszSoOHnps4d1nODI2iAiLPKBkDkylOUBTNBTwWIyFfgr1ozsbRW1g89m5G06vjDTsHs= 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 (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.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:15:28 -0700 Message-ID: <3fe4e8e663e8b4d76fea0b37a8279de41f541cc5.1506730372.git.alistair.francis@xilinx.com> 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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39860400002)(2980300002)(438002)(189002)(199003)(189998001)(16586007)(6916009)(118296001)(478600001)(5003940100001)(48376002)(50226002)(4326008)(305945005)(47776003)(77096006)(356003)(5660300001)(6666003)(2906002)(2950100002)(36386004)(9786002)(316002)(76176999)(50986999)(8936002)(33646002)(106002)(2351001)(81156014)(50466002)(39060400002)(8676002)(63266004)(106466001)(36756003)(54906003)(81166006)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB2697; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT060; 1:Wg/uA8KdAb6WRBrn5EacOVETIz61jeMJTB8HU/AArsiGjr2BqUDsdw1gmn0CN4kpmKMYOZkUMA780QKFwjb2iAHgMZHASAmQZ9jOnhcNRcZx2GqCLtM1LUQtFYnURBHE MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc72f8a2-eaa0-4632-eda7-08d50798e8b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DM5PR02MB2697; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2697; 3:/JOPYqunOxl/JlVc221EWUISOlR3xv4AQW/Z8DoDPWV1XE4+BjhGiofvhvhzE/s3nC7qIjtg+tqjhUSilWDzkavxKNEW1wXSVJs37njAHMmJ7n2q/XIfuZ2V+ijY2T+MqJYEYWUy8fDHKcfawARV1AMW96ICisTJox7XzwvuwcO6iGVjUqs9pPF2OqWpEZIE1oTnSlaZ+IDRxPlowNKXr15UitUGSdEeEZYyogVloBdALZAb0jNZYAncAfd98qOI771tz3Z6+HvvqehYkz4WbHAoAZ58LEfeCHfGfPHXer1fmzkpRjFmmBqD8EupllE74W8hyYbih3m7oXllqvC3mS1dhIz3mLjwR/PobkGaGaU=; 25:Sv+kvUnXKd0roFyspj5lx67D36NI4v2HkJXT0ohFLmvsEsFycCLzUMsQBfw0UMG5k/5ip9AkupRX3eqBIKU1J9n67K4ZNvN7kMO+nVeINyML8pDJFetbklyKeJ8EcI66VpMrdE27jiIBQvKWekR9Jb1sIWWhXlf0r+e/E5/Ti+83w+3WYoHCRPNp/zc3bM7YwSr5NxUAeoUkia04P9JT7J4q+ERiG3M5GaINxuxLwo+tC70u5H312zI4zp3KzoqIyxjjdMAspoBB0U+LH8L5o/R+Nr4u5MlCe5x0HvhuWTZHrRX2CSr3a1krMYUJ3HE9Ejsw/L9vJEi1PpRSwJ9V8A== X-MS-TrafficTypeDiagnostic: DM5PR02MB2697: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2697; 31:fX9XIWUgBH2IYvFrjiNiCx+79zwtTs6vbaQpyCIwn9A7GmM54SEA7YdC2ymccpWZiOpCLD6P0mo/LrfKSkCTE4NFI/ELeoICT9hLHVE2ERPd/jfyYHToFZ37KkPTe5c419AHSD/PnlVDV2I7ZqOxYHw1AzWp2rYYVuiZbX9HPXNCY+8UnhyIMfrq/QgmtPB0adyMPGhiupQLnOPOPsrZyz7aJPBCOotd2iTpTFn7m/I=; 20:TxVcPNp3DoKpRzSGP52CuPLkXlQRZsZW04Ha6nw2l8RGTOz0MFgnjk0xXgJnt2ay8DYDgA6+C/qIRx0IHnxbQhGUj/NYafNQUVcTgKRQooX7cMaq3BHGrsEs7UBQ8+aFAQvcNQUlTqB3T/2Lb2GAESBy4NG4PGAAoraPUiIak3G1I8jP8cW5xNfM2dODVdlF5LOJqBJal06nELlGYGFnE9scyLHx6xxEJnoFuYrmqOKutwVJtT+nAcRs3oOUdf51XxfPvUrF8EMjEFSpMiM036T1TJtLVzd6p8EpFCLG4lth2x8WLxdKz/sZhFoOSPxOEdicBu1vtmylop2G/NaYQSUHx9XWPSoHZqqCGohWvhpxPOoFCIc7r/M8HFi8MRSlXnGlxRGZ/rk7JcyI/smC8LQT1nhtQBAdaC5miok5+jOhvbacAj+w9h3G2GolaCyMj3td9a57kCLw7SYuXQcRjVsIg9uKp3iSjAH6sOT02X/lYPJkj2S/CW13+sEXRlLn 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)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB2697; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB2697; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2697; 4:88tUITcPJMaQZbvPGX6a4wHIWwgm4IrqzTesMFyM3HCz8BUwqJ8w0XJZNAF4DCycG/eMikn1btL88/f4i8TjdCvpGWcZkRyTLJCykZYKeaswganylQf7R0BDdkQB5AuSeWqqvdzbW17TjBqzOgHawBFWZULAC+6kZ3Nxb37Ea3t3fCwivmQw3gI92hyGlGRGrRr4EZiYtIaYjXAVJUKsKSBTW+fmwrBjxS/F2cff+pWiPZTvXqyLDlzXVJ6MttqdF3pFjaf07jg65KDZgSKK4PSofxItLNka7No6Clel3D2X/L9YM3j4u+wbfkYWL5RuS8UOhAWxoktszNT2Pk/B4A== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB2697; 23:Fpl0A0lZcH45MZPLGkueCPJSPiELuznrZENIN9nsK?= =?us-ascii?Q?2yZ8rhWX4QgWpJG718OcxV72L9m3CcGqWGpBXzRpgEkfyXHZNZUYF70FnOjM?= =?us-ascii?Q?H6OKGiyY/MiEsrzpMsCjGJwfGveFM0kgO813jKQ5ndU0/bd1bVd71U2l7PW1?= =?us-ascii?Q?w8kc0DzMK/9QjW+G/tcEUw3ZATJc+mJa34QVDhzTaqclvF6JljnnRNHmSIPE?= =?us-ascii?Q?5RFDa7YcEnOnef9bUr9r0FuF+FEeU7KbCMKfKNjy/UgHN0PMaGO4kcUqsVoB?= =?us-ascii?Q?7I/5Xvs8/jFYUJyx/ELcZSIMPIj/JGiAZRf3w5mBNJoE/Av3Ffv5NrhND7DA?= =?us-ascii?Q?XuLwUgOxRCssswdz5JXiRkFyCtHDmNmyoDqL2v3U+hC24dDC3LBxuB9Uj3K4?= =?us-ascii?Q?xqr8/haJ4qDdBDz+088MCuIncSVfe2msm241WoEvcRwC77pLO3qAVfmeNDlK?= =?us-ascii?Q?Qs97zssWBDsmOYg2nVi/uruumirllbAf7UfkQx5WvpzgybP3tpjF4zkgDZ+r?= =?us-ascii?Q?4EB7lhhQW9mmTUB4ie03lYWah+bGS1dbqWMeeUq40IoWSjCr/FOQjlDHygM+?= =?us-ascii?Q?kd9/TbhpZQFKplhTnH1USkkTXoSTT3QG7QIlEAmZed2AhNvNBPcyJK4igkUD?= =?us-ascii?Q?i2zKNhChFT06KKcQO6p4jyuFOaRlk7zJPxq3ZUrSBY9QAp+I1x6/BxbHguP5?= =?us-ascii?Q?uyATB0ZlGJSmmmz6mtc8G9MefBondHq5U38OZN0If2R7+EMeISBpz1i0/lK/?= =?us-ascii?Q?jlrkm5oip0/GqC/r6nRR/3zEjAi7XmLMQH9oZxR5hR1O/o6BXCVc93fwXLl7?= =?us-ascii?Q?nli3U522jAwb2wOGf0NKiUh2/wB7j4/a+XDmYDx2a3zg1hbUqqVSQjx7N0mw?= =?us-ascii?Q?D8EeRn6B5fqacFzJIM3vXkYeyjqA93W7we3M+Gm76TrdcsqS7DuivjpQFPoo?= =?us-ascii?Q?t+/LDrvGlYV6ZBdQfAU99qnVM9tO22jBn7Fu0iqSQYFDR0V8vHMn9nV0wyZT?= =?us-ascii?Q?/u5Zb+dhRUQEvocisOmQhJYc6ntIFC5s8D/O+cRAxo9sO0N5kIErMzTKAOql?= =?us-ascii?Q?sjssUBlgpagbrBBD8iPm9Po1/hL?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB2697; 6:J7+zXt4KW6siKJezYOdyPAo8ivCRsExJ0+IWkXw8wOWUEY41jQRXw65jrQlBYN88CR61nSxNhmFS0gL57LqPkxw6YER6gMGbHwWPSCfhdfOH0hBNbia/bqE2GSdzVS3xgrHy18LS2os5ao6fJiUHdvm0SuNpBBd/6JorHIddiP9F0IOqUwWUxATEEVt9/tflN5s4DWyo1hRZuGusYkBwIcI4/U2KBMKxURGBPIbYci9BWWs6mpsGP9OcqExG75ToSijFRRVY9B2gqTZiUgHhJc5vz5jk+Zu75YwZ0nYNl8mmv5bnjwurGaoG31pt8WpG2v1PTOn65Uhux0OHShvAfw==; 5:D4IWooq9peXYtesfDjxJtxvitM1YhYlmDMcU33eu3coJA+jTtbHq0maZko5DPRDmNWF2oJyXdvOQxUFsKKWMgL7G3TMCyWjwul7Bp0vt74t8Mj0/RCFfHOcwy5RY1Gt1dVQ1VGhoJN+zhOmiYmj2FjhT+H17YoHcx6a0js0hNrU=; 24:L7IMkh3HvHFvOENwDPiqprR5xXD4Lp79rCRX8Te2D1lomNOMlzPOWCcw/7et7J5YHwi9ZgskkLe4Vc3QprG5mIIIVNF1yWU0qOneWiAx3T0=; 7:pCKGThYNqN/Lpj0V9paVCcw4DtMBlQZYxpvHXb+6faa93AUMIDPp8JxrAvC24DTSzhCYd0yhvHXG6HIXTpK8Qs9KrLHRp2o9jwRpCQMkJ6rsl9xcHqgsODIuE6PQApfmcVcO0z3XK4K3Dc1mQycPD5sYLH3aehPSktiuBwCVT2xssSsjZYEJ18GU7uJdN1KMnMfyIx0hgFrnh47Yzf3J4MbFp7Mjh0LPWATJh5UIa+I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:19:26.0772 (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: DM5PR02MB2697 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.82 Subject: [Qemu-devel] [PATCH v2 09/47] hw/core: 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, "Michael S. Tsirkin" , armbru@redhat.com, Paolo Bonzini , 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: "Michael S. Tsirkin" Cc: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- V2: - Split hw patch into individual directories hw/core/loader.c | 31 ++++++++++++++++--------------- hw/core/ptimer.c | 7 ++++--- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 4593061445..95bdcbbe36 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -43,6 +43,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "disas/disas.h" @@ -82,7 +83,7 @@ int load_image(const char *filename, uint8_t *addr) return -1; size =3D lseek(fd, 0, SEEK_END); if (size =3D=3D -1) { - fprintf(stderr, "file %-20s: get size error: %s\n", + error_report("file %-20s: get size error: %s", filename, strerror(errno)); close(fd); return -1; @@ -623,7 +624,7 @@ static int load_uboot_image(const char *filename, hwadd= r *ep, hwaddr *loadaddr, goto out; =20 if (hdr->ih_type !=3D image_type) { - fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_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, hwa= ddr *ep, hwaddr *loadaddr, address =3D *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; } =20 data =3D g_malloc(hdr->ih_size); =20 if (read(fd, data, hdr->ih_size) !=3D hdr->ih_size) { - fprintf(stderr, "Error reading file\n"); + error_report("Error reading file"); goto out; } =20 @@ -693,7 +694,7 @@ static int load_uboot_image(const char *filename, hwadd= r *ep, hwaddr *loadaddr, bytes =3D 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 =3D bytes; @@ -763,7 +764,7 @@ int load_image_gzipped_buffer(const char *filename, uin= t64_t max_sz, data =3D g_malloc(max_sz); bytes =3D gunzip(data, max_sz, compressed_data, len); if (bytes < 0) { - fprintf(stderr, "%s: unable to decompress gzipped kernel file\n", + 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]; =20 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,7 +910,7 @@ int rom_add_file(const char *file, const char *fw_dir, =20 fd =3D open(rom->path, O_RDONLY | O_BINARY); if (fd =3D=3D -1) { - fprintf(stderr, "Could not open option rom '%s': %s\n", + error_report("Could not open option rom '%s': %s", rom->path, strerror(errno)); goto err; } @@ -921,7 +922,7 @@ int rom_add_file(const char *file, const char *fw_dir, rom->addr =3D addr; rom->romsize =3D lseek(fd, 0, SEEK_END); if (rom->romsize =3D=3D -1) { - fprintf(stderr, "rom: file %-20s: get size error: %s\n", + error_report("rom: file %-20s: get size error: %s", rom->name, strerror(errno)); goto err; } @@ -931,7 +932,7 @@ int rom_add_file(const char *file, const char *fw_dir, lseek(fd, 0, SEEK_SET); rc =3D read(fd, rom->data, rom->datasize); if (rc !=3D rom->datasize) { - fprintf(stderr, "rom: file %-20s: read error: rc=3D%d (expected %z= d)\n", + error_report("rom: file %-20s: read error: rc=3D%d (expected %zd)", rom->name, rc, rom->datasize); goto err; } @@ -1105,10 +1106,10 @@ int rom_check_and_register_reset(void) continue; } if ((addr > rom->addr) && (as =3D=3D rom->as)) { - fprintf(stderr, "rom: requested regions overlap " - "(rom %s. free=3D0x" TARGET_FMT_plx - ", addr=3D0x" TARGET_FMT_plx ")\n", - rom->name, addr, rom->addr); + error_report("rom: requested regions overlap " + "(rom %s. free=3D0x" TARGET_FMT_plx + ", addr=3D0x" TARGET_FMT_plx ")", + rom->name, addr, rom->addr); return -1; } addr =3D 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_adju= st) =20 if (s->period =3D=3D 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 =3D 0; @@ -89,7 +90,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adju= st) =20 if (delta =3D=3D 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 =3D 0; @@ -263,7 +264,7 @@ void ptimer_run(ptimer_state *s, int oneshot) =20 if (was_disabled && s->period =3D=3D 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with period zero, disabling\n"); + error_report("Timer with period zero, disabling"); } return; } --=20 2.11.0