From patchwork Mon Nov 13 22:34:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837588 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="QSJge3u3"; 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 3ybQZC6Z45z9s82 for ; Tue, 14 Nov 2017 09:40:03 +1100 (AEDT) Received: from localhost ([::1]:56595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOc-0002A8-0N for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:40:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNj-00025l-AC for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNg-0006sA-1v for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:07 -0500 Received: from mail-dm3nam03on0049.outbound.protection.outlook.com ([104.47.41.49]:20208 helo=NAM03-DM3-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 1eENNW-0006m0-GX; Mon, 13 Nov 2017 17:38:54 -0500 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=jsxv8zsstxXnU92Gf7+yAgPz1B7TBVMqgvU+kSDMx6I=; b=QSJge3u3Nmfdjb1xrTlji3I9jzQiGO+9cQcp02Zc+prllH+Ya+6LuWRFqcjWX4aENNvPJhNys3PlIRfJVKQbBkIPk6lDnby7h1hXLttz/wo0KBJ6+aRbqmgRDTmZ8PBJuFzECWlNRh0bBB1T2BRbz4dqUGwGVpZF7ta7oAlB8gU= Received: from CY4PR02CA0034.namprd02.prod.outlook.com (10.175.57.148) 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.218.12; Mon, 13 Nov 2017 22:38:50 +0000 Received: from SN1NAM02FT012.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::207) by CY4PR02CA0034.outlook.office365.com (2603:10b6:903:117::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:38:50 +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 SN1NAM02FT012.mail.protection.outlook.com (10.152.72.95) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:38:50 +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 1eENNR-00048X-KM; Mon, 13 Nov 2017 14:38:49 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNR-0000Km-HO; Mon, 13 Nov 2017 14:38:49 -0800 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMcdnj012402; Mon, 13 Nov 2017 14:38:39 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNH-0000Je-Nv; Mon, 13 Nov 2017 14:38:39 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:39 -0800 Message-ID: <1743d21d4c073ae4f8aabada57692bd2e536aa8e.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(346002)(39860400002)(2980300002)(438002)(189002)(199003)(2950100002)(118296001)(4326008)(9786002)(16586007)(110136005)(36756003)(47776003)(54906003)(5003940100001)(50986999)(36386004)(106002)(76176999)(575784001)(50226002)(77096006)(63266004)(5890100001)(50466002)(189998001)(478600001)(305945005)(39060400002)(316002)(356003)(81156014)(5660300001)(48376002)(8936002)(106466001)(2906002)(81166006)(8676002)(33646002)(21314002)(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; SN1NAM02FT012; 1:CljZWwoqL/17zEvnAb8ha2To8cv40VPWUNyeEYrlNGL52jDO6j2sbMBTpiKHdovIH2+k1hCNTCW0O4PHJ1ELbvzrLngfapq9ynsd2jNDnqzSUjRgXpkd0s4evye7QJU3 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a71132e7-03bb-4a4c-584c-08d52ae74fbe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY4PR02MB3383; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 3:avodihhHkMe1g9ScGkUqP7Jeq84H9t6+IBJ2pGdygoDIEO+6Tw/qSVSYmE8QbNQ7eCSWYsyJH+pIbtPzfiJ70tKjQFaPNrVEwJG2LIB2boCHk0RkpNeoyBkeZIfpAhX7kpSrTnNm3c8Rrj/WsLjvlI9nJxPmM746CXKZ2gJtPG8XlnKwkgQaImZYWbhx1Qaw950KRFbi1p9WW48/tYxK3o4qAdHT6GcLxHwN33CBO0TOulGHgso9gnRvdlpXOJKjtMbS7H3XC7rYaeQyL9Du55Ps8k84ArRf0kx1XggaP7OYi8jaKJooFG4H7qsMbmKx8lHHiFDKKa5V2pUzcHpHACxteAPzupp9Y0u7UB7/x0k=; 25:K8LNtwhelP61V7bZ1KB0oO2JuBKL20+VpFom6VgR8dYqpFadbmMy9qfNK9qADTJCjLticqolDWuxhoJtSfO8Ufpb2HF3PiBbb4X3m3dKWKfzHD+8Zq7GDOnXmGkMpMz7x3TnBycQI614DqHuF8B5eRxHCj3TgvMm1t6GlGNpSTfywUABe+VsFc0Srxc/PBbVJcz3z0uFKCB+O+h12x0JQXNp6+B4SQ0sygQK93lY9N9XImk7XQiKbe/mkAwiQ0/apuBAbLPX4jJfjmgOcBsj7+jTK0R1+A3lsUE7Z+Etn4rtfEJ0yTxgf/o9p7ucmqtDWJjX5J1pwcekyC95CP61qQ== X-MS-TrafficTypeDiagnostic: CY4PR02MB3383: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 31:ohMFz4KKsa4WeaT+A2Z92ewt9QNVHpbgaDbaA09ilL5BY/YQGhTTI4kz4E69deu5Ed7UPuGXva9IPyrOfKtr2YY+WRR8N2Ca0U22QzXsHoZ8sxjn1ERIwWolRE3XqZBRJ2iMz+bDRKcsEzqoKHDkm5CpcsP8CyTMuMb2mtNw+udULrHpHEL+YQu2+qfsq7uA3RV8c482Ich2l4eGkaTPBeZMZ6MyfCuFp1+LY8Sc3+g=; 20:hQmTZcSGdkw7+fN+ttycElIWUHyB3DcHkmM/9NDQ7800dUhZ6FKFjWmb1G9/GPn9P07LpYI3cPNzKvs2XX8+3tQTu62152nTeDpT/ucHsbqXIXv1V7yCd+nln4mMzoIo9nsPt5ZMNYiE0Pf3P8x1CJnH3iHJPJxd9+PNXBrkgedHpIRT61vqAdxtsX5Ipo6dz7+W+oiExGc6V1c/NHR9x7Tu+wVJBceFE0YoOG6eM4ogumYU5JB/P+6KXd2Pn950jvvZ++GzxB7yrdvutWsHF3XojjHxGYrRbKt63uTuY2sNvOisP5HudsQjCC31NPFWtq9xm/LSC4iktTMb+lf0sZJnmkZaVLukEiwxviqG1EQ+0/L398EFooOxKuZj5Yae/aBNOOIuY+CFnnNJPbIPltYy5DN+Jqp3N9v6lV344AnMZudDkjVSGjSfJjpBVX7b+SDaPpBBPqyG6/nBZdcIbTATSmJKelnQSRxPpct6md9yl48V3Q0HTVQgIWEpO6rn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231022)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(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:uJnSr2zb+DC+FpUb7eBn8evzw3vRco0lqF8oTpCWe0H8pnvUMI2p9Hq+d+SDehBkV6XdRRh46hRXkguGQe5oQPJyFTcNd1fPpkuhtuMf1ClUoXrvdgxv4AvfDGAK7JHp7bZNmcRfAID4rjztMdGb1sm4n3uFjJ6gbE4wQvRCz+fBzr4PkcFjcThAj6gVSoRPZv5kwJiBoedyH0O7QPWnS0LlI1FKh0MAqlRZk24hHddYiMCCXDUzqEWrnANq0gaxP7oTUxnlaBLHA26dCob1dE+zNF3nmapdqfPSvwPRx5aOl0kk7Ln8iyA58sgQt83FP+u12G3IjrQ75JXYclFuZA== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3383; 23:/4jWLJ6BRUGuv9RRD5T/KmKdbpfR48VcsenVpsGkr?= ftNwz7pIrM7HKmRZfs6Re2XZRjAdpvaXLq3DWJZ8I5v58ZVBvaPz4jQ5JTemmNgMIg+UxdZkMyoXi7YsBPRV4ID5LG91nSyl+kfjzbJvUCPm00DCMUUK2sY4IalW5ejN4te2u3EP0rE2o1x4pmUkRhOxDryOsXuwRRuFiZNwmMd8TzauuYI+ETvefQw8tZuwBcps2FVASa2FnjCpRn//VIh1WsolIZZBaPq4OPCchpY/1krsmS37FCujCe6Z4kOIO5bkoP4oPUFcjIDWHIapct5tCYbdcGMeROGr+JxtqxPZGebhKw9g4v1Zqq3S3WoOLFxQKNe+M49alXoVk8VZXXhsFZgeMEMmUymSdG605HEJhQ8PRjkJz721caJeI0Z7nGm3c5msRfCGxXPD8LlMJBKAWYplYkudNDGSNzmJ2eFIF92mgi97teGMUSiaRLg6zKgQ6wxRkoxlja7LCzUtdtfn6aHrQdqz5zPCG0Go6ZC1TAAcSZnqpnPMRIG9V3+MlAa8TAe7rLJCOfdiqdu8awojTmhUySfDihUZw9mgXHwOO0b/X4axedGNgfazfnh45IqaCZFO4UUKWvD7fwHqtjj07LyWSe+Dr8tnd4Erewz+OhU7ykStQ4XTi2YSXjaaj2dz1RMVo7Mk98F1tg4keWAjfRM2xkzly1fix0fXijNEZxBdLrPWzw1AO5bV1zNkma64TP3wgxQGSoA+H7A2b/RE0vYJnt8sKJHAsWoRRfVDLSlzIto25sGNv9YQ54oo9zDWt02fGdluFIW7e/faLaG/kn4eqdL8emlEWl2OG2TgkV/sOCsfaSRTTdVVQDZOHnF0BYDi7bL/whwkwHw2DEWCQOiBuhuTmfV5GcZydNrHC7nXxhJCaBIuVOPgEubrLyLvW3fQalljSLBdNnYw5L0SNJ+dcCnhjhYuCp31ZGyQmwKGWzCM/oEWXtYJL5zsC/hSO6pO25VNYAvf7LY6s2Bcmt/xQT7jo3WvFFZ9cPe8/yPbwKxH7L+uOtYF4Q44ZlfP6h9rTTA+92tvAVQ7iUkDX9qwZJaNr00n5FTH+ny8w== X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 6:VXIdJVzwzL+Zd/nBLP67eDrr5k44WMuAxFWMq7J3EGNeS7Xga+gnxqz11/pIxwuBG+/S08+djpIkxbifEdn9Hig2yRj0qNHFPcBlPJcsHNLCq/xNc04HJ0wUuumVwDsaXS54LfYoWmApNDeGHDo7tyk4SnvdC+GxPTSdcZ5aD8EVtFe49gsm1QqIpJW+3xSA1UrJJRqdtZtRVcbWXBMFqNA6EMGkPLo/JDiFHsn99/lDjxwmX35FhCLWYH9CX4QAu2a5OFWVhx+3rY9phNg7DfL9YSyH1IBLKVuBpP4bVRv6umgEwcLSljRcL6z/h4fbwVqNqLwLrW5Up2DJni3A7z69/u6PtSBHiStYOyHM5Qg=; 5:EQVEm7ZuPhbqxxU+akolYmC1j64yr47X6CaykL6gFgHyV2JukaBXnMuzuw1cmkbjALNQbEer3+AHZPzaXU2nJwcbFMjwL9UkrlDng71r1IPlxPNMtGg+KlpW6mu9R6kDEiKY3JSq2tmJIgzA5qoESWPLw2A1fNsBSEUmUHBknos=; 24:pOoNXwkVQsgMmIgdBf5Dt+4mndYD3KKFAMSvCuDtXvQQAO1T9lQ4kWb16CY3XrVRB58i7He3DObBnFBGwb65RhJgewQAmePfhz41G1rfG0c=; 7:h8RFjjGqkc0OVh0xQ2xxqG9LfodKqsoYUx6hEfRIEBp32IyOSAPnWNREgEeBlMHqTGOCYuKoUVycdSZo5S7BT38GRWKUH9RYg4Y0z61FwmWjOmgCBhy0nklW2JHla6CUBSPaXY86VcuXNBKplhd1wfO+Ex2xuf2nb3iyBwjm6m43AplQ+6W+yVmyH+Z4IuysGazkBZL+i0atSPiDf5LHqMH1YnvUoXZnCB2DkQ1yyLIQWxOkz+W0v0e0QOryf7a3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:38:50.2729 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a71132e7-03bb-4a4c-584c-08d52ae74fbe 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.41.49 Subject: [Qemu-devel] [PATCH v5 01/29] audio: Replace AUDIO_FUNC with __func__ 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, Gerd Hoffmann , armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Apparently we don't use __MSC_VER as a compiler anymore and we always require a C99 compiler (which means we always have __func__) so we don't need a special AUDIO_FUNC macro. We can just replace AUDIO_FUNC with __func__ instead. Checkpatch failures were manually fixed. Signed-off-by: Alistair Francis Cc: Gerd Hoffmann Reviewed-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Gerd Hoffmann --- audio/alsaaudio.c | 4 ++-- audio/audio.c | 40 ++++++++++++++++++------------------ audio/audio_int.h | 6 ------ audio/audio_pt_int.c | 28 ++++++++++++------------- audio/audio_template.h | 26 +++++++++++------------ audio/dsoundaudio.c | 2 +- audio/mixeng.c | 2 +- audio/ossaudio.c | 10 ++++----- audio/paaudio.c | 56 +++++++++++++++++++++++++------------------------- audio/sdlaudio.c | 2 +- audio/wavaudio.c | 2 +- 11 files changed, 85 insertions(+), 93 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 3652a7b5fa..92a96f8b2b 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -823,7 +823,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as, audio_pcm_init_info (&hw->info, &obt_as); hw->samples = obt.samples; - alsa->pcm_buf = audio_calloc (AUDIO_FUNC, obt.samples, 1 << hw->info.shift); + alsa->pcm_buf = audio_calloc(__func__, obt.samples, 1 << hw->info.shift); if (!alsa->pcm_buf) { dolog ("Could not allocate DAC buffer (%d samples, each %d bytes)\n", hw->samples, 1 << hw->info.shift); @@ -934,7 +934,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) audio_pcm_init_info (&hw->info, &obt_as); hw->samples = obt.samples; - alsa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); + alsa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); if (!alsa->pcm_buf) { dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\n", hw->samples, 1 << hw->info.shift); diff --git a/audio/audio.c b/audio/audio.c index beafed209b..7658d2af66 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -424,12 +424,12 @@ static void audio_process_options (const char *prefix, const char qemu_prefix[] = "QEMU_"; size_t preflen, optlen; - if (audio_bug (AUDIO_FUNC, !prefix)) { + if (audio_bug(__func__, !prefix)) { dolog ("prefix = NULL\n"); return; } - if (audio_bug (AUDIO_FUNC, !opt)) { + if (audio_bug(__func__, !opt)) { dolog ("opt = NULL\n"); return; } @@ -792,7 +792,7 @@ static int audio_attach_capture (HWVoiceOut *hw) SWVoiceOut *sw; HWVoiceOut *hw_cap = &cap->hw; - sc = audio_calloc (AUDIO_FUNC, 1, sizeof (*sc)); + sc = audio_calloc(__func__, 1, sizeof(*sc)); if (!sc) { dolog ("Could not allocate soft capture voice (%zu bytes)\n", sizeof (*sc)); @@ -848,7 +848,7 @@ static int audio_pcm_hw_find_min_in (HWVoiceIn *hw) int audio_pcm_hw_get_live_in (HWVoiceIn *hw) { int live = hw->total_samples_captured - audio_pcm_hw_find_min_in (hw); - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=%d hw->samples=%d\n", live, hw->samples); return 0; } @@ -886,7 +886,7 @@ static int audio_pcm_sw_get_rpos_in (SWVoiceIn *sw) int live = hw->total_samples_captured - sw->total_hw_samples_acquired; int rpos; - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=%d hw->samples=%d\n", live, hw->samples); return 0; } @@ -909,7 +909,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size) rpos = audio_pcm_sw_get_rpos_in (sw) % hw->samples; live = hw->total_samples_captured - sw->total_hw_samples_acquired; - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live_in=%d hw->samples=%d\n", live, hw->samples); return 0; } @@ -935,7 +935,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size) } osamp = swlim; - if (audio_bug (AUDIO_FUNC, osamp < 0)) { + if (audio_bug(__func__, osamp < 0)) { dolog ("osamp=%d\n", osamp); return 0; } @@ -990,7 +990,7 @@ static int audio_pcm_hw_get_live_out (HWVoiceOut *hw, int *nb_live) if (nb_live1) { int live = smin; - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=%d hw->samples=%d\n", live, hw->samples); return 0; } @@ -1014,7 +1014,7 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int size) hwsamples = sw->hw->samples; live = sw->total_hw_samples_mixed; - if (audio_bug (AUDIO_FUNC, live < 0 || live > hwsamples)){ + if (audio_bug(__func__, live < 0 || live > hwsamples)) { dolog ("live=%d hw->samples=%d\n", live, hwsamples); return 0; } @@ -1263,7 +1263,7 @@ static int audio_get_avail (SWVoiceIn *sw) } live = sw->hw->total_samples_captured - sw->total_hw_samples_acquired; - if (audio_bug (AUDIO_FUNC, live < 0 || live > sw->hw->samples)) { + if (audio_bug(__func__, live < 0 || live > sw->hw->samples)) { dolog ("live=%d sw->hw->samples=%d\n", live, sw->hw->samples); return 0; } @@ -1287,7 +1287,7 @@ static int audio_get_free (SWVoiceOut *sw) live = sw->total_hw_samples_mixed; - if (audio_bug (AUDIO_FUNC, live < 0 || live > sw->hw->samples)) { + if (audio_bug(__func__, live < 0 || live > sw->hw->samples)) { dolog ("live=%d sw->hw->samples=%d\n", live, sw->hw->samples); return 0; } @@ -1354,7 +1354,7 @@ static void audio_run_out (AudioState *s) live = 0; } - if (audio_bug (AUDIO_FUNC, live < 0 || live > hw->samples)) { + if (audio_bug(__func__, live < 0 || live > hw->samples)) { dolog ("live=%d hw->samples=%d\n", live, hw->samples); continue; } @@ -1389,7 +1389,7 @@ static void audio_run_out (AudioState *s) prev_rpos = hw->rpos; played = hw->pcm_ops->run_out (hw, live); replay_audio_out(&played); - if (audio_bug (AUDIO_FUNC, hw->rpos >= hw->samples)) { + if (audio_bug(__func__, hw->rpos >= hw->samples)) { dolog ("hw->rpos=%d hw->samples=%d played=%d\n", hw->rpos, hw->samples, played); hw->rpos = 0; @@ -1410,7 +1410,7 @@ static void audio_run_out (AudioState *s) continue; } - if (audio_bug (AUDIO_FUNC, played > sw->total_hw_samples_mixed)) { + if (audio_bug(__func__, played > sw->total_hw_samples_mixed)) { dolog ("played=%d sw->total_hw_samples_mixed=%d\n", played, sw->total_hw_samples_mixed); played = sw->total_hw_samples_mixed; @@ -1513,7 +1513,7 @@ static void audio_run_capture (AudioState *s) continue; } - if (audio_bug (AUDIO_FUNC, captured > sw->total_hw_samples_mixed)) { + if (audio_bug(__func__, captured > sw->total_hw_samples_mixed)) { dolog ("captured=%d sw->total_hw_samples_mixed=%d\n", captured, sw->total_hw_samples_mixed); captured = sw->total_hw_samples_mixed; @@ -1924,7 +1924,7 @@ CaptureVoiceOut *AUD_add_capture ( goto err0; } - cb = audio_calloc (AUDIO_FUNC, 1, sizeof (*cb)); + cb = audio_calloc(__func__, 1, sizeof(*cb)); if (!cb) { dolog ("Could not allocate capture callback information, size %zu\n", sizeof (*cb)); @@ -1942,7 +1942,7 @@ CaptureVoiceOut *AUD_add_capture ( HWVoiceOut *hw; CaptureVoiceOut *cap; - cap = audio_calloc (AUDIO_FUNC, 1, sizeof (*cap)); + cap = audio_calloc(__func__, 1, sizeof(*cap)); if (!cap) { dolog ("Could not allocate capture voice, size %zu\n", sizeof (*cap)); @@ -1955,8 +1955,8 @@ CaptureVoiceOut *AUD_add_capture ( /* XXX find a more elegant way */ hw->samples = 4096 * 4; - hw->mix_buf = audio_calloc (AUDIO_FUNC, hw->samples, - sizeof (struct st_sample)); + hw->mix_buf = audio_calloc(__func__, hw->samples, + sizeof(struct st_sample)); if (!hw->mix_buf) { dolog ("Could not allocate capture mix buffer (%d samples)\n", hw->samples); @@ -1965,7 +1965,7 @@ CaptureVoiceOut *AUD_add_capture ( audio_pcm_init_info (&hw->info, as); - cap->buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); + cap->buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); if (!cap->buf) { dolog ("Could not allocate capture buffer " "(%d samples, each %d bytes)\n", diff --git a/audio/audio_int.h b/audio/audio_int.h index 5bcb1c60e1..5b25da0a37 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -252,10 +252,4 @@ static inline int audio_ring_dist (int dst, int src, int len) #define AUDIO_STRINGIFY_(n) #n #define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n) -#if defined _MSC_VER || defined __GNUC__ -#define AUDIO_FUNC __FUNCTION__ -#else -#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__) -#endif - #endif /* QEMU_AUDIO_INT_H */ diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c index 21ff9c5803..3fe56d8514 100644 --- a/audio/audio_pt_int.c +++ b/audio/audio_pt_int.c @@ -31,7 +31,7 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (void *), err = sigfillset (&set); if (err) { - logerr (p, errno, "%s(%s): sigfillset failed", cap, AUDIO_FUNC); + logerr(p, errno, "%s(%s): sigfillset failed", cap, __func__); return -1; } @@ -57,8 +57,8 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (void *), err2 = pthread_sigmask (SIG_SETMASK, &old_set, NULL); if (err2) { - logerr (p, err2, "%s(%s): pthread_sigmask (restore) failed", - cap, AUDIO_FUNC); + logerr(p, err2, "%s(%s): pthread_sigmask (restore) failed", + cap, __func__); /* We have failed to restore original signal mask, all bets are off, so terminate the process */ exit (EXIT_FAILURE); @@ -74,17 +74,17 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (void *), err2: err2 = pthread_cond_destroy (&p->cond); if (err2) { - logerr (p, err2, "%s(%s): pthread_cond_destroy failed", cap, AUDIO_FUNC); + logerr(p, err2, "%s(%s): pthread_cond_destroy failed", cap, __func__); } err1: err2 = pthread_mutex_destroy (&p->mutex); if (err2) { - logerr (p, err2, "%s(%s): pthread_mutex_destroy failed", cap, AUDIO_FUNC); + logerr(p, err2, "%s(%s): pthread_mutex_destroy failed", cap, __func__); } err0: - logerr (p, err, "%s(%s): %s failed", cap, AUDIO_FUNC, efunc); + logerr(p, err, "%s(%s): %s failed", cap, __func__, efunc); return -1; } @@ -94,13 +94,13 @@ int audio_pt_fini (struct audio_pt *p, const char *cap) err = pthread_cond_destroy (&p->cond); if (err) { - logerr (p, err, "%s(%s): pthread_cond_destroy failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_cond_destroy failed", cap, __func__); ret = -1; } err = pthread_mutex_destroy (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_destroy failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_mutex_destroy failed", cap, __func__); ret = -1; } return ret; @@ -112,7 +112,7 @@ int audio_pt_lock (struct audio_pt *p, const char *cap) err = pthread_mutex_lock (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_lock failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_mutex_lock failed", cap, __func__); return -1; } return 0; @@ -124,7 +124,7 @@ int audio_pt_unlock (struct audio_pt *p, const char *cap) err = pthread_mutex_unlock (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_unlock failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func__); return -1; } return 0; @@ -136,7 +136,7 @@ int audio_pt_wait (struct audio_pt *p, const char *cap) err = pthread_cond_wait (&p->cond, &p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_cond_wait failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_cond_wait failed", cap, __func__); return -1; } return 0; @@ -148,12 +148,12 @@ int audio_pt_unlock_and_signal (struct audio_pt *p, const char *cap) err = pthread_mutex_unlock (&p->mutex); if (err) { - logerr (p, err, "%s(%s): pthread_mutex_unlock failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func__); return -1; } err = pthread_cond_signal (&p->cond); if (err) { - logerr (p, err, "%s(%s): pthread_cond_signal failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_cond_signal failed", cap, __func__); return -1; } return 0; @@ -166,7 +166,7 @@ int audio_pt_join (struct audio_pt *p, void **arg, const char *cap) err = pthread_join (p->thread, &ret); if (err) { - logerr (p, err, "%s(%s): pthread_join failed", cap, AUDIO_FUNC); + logerr(p, err, "%s(%s): pthread_join failed", cap, __func__); return -1; } *arg = ret; diff --git a/audio/audio_template.h b/audio/audio_template.h index 99b27b285e..7de227d2d1 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -57,13 +57,13 @@ static void glue (audio_init_nb_voices_, TYPE) (struct audio_driver *drv) glue (s->nb_hw_voices_, TYPE) = max_voices; } - if (audio_bug (AUDIO_FUNC, !voice_size && max_voices)) { + if (audio_bug(__func__, !voice_size && max_voices)) { dolog ("drv=`%s' voice_size=0 max_voices=%d\n", drv->name, max_voices); glue (s->nb_hw_voices_, TYPE) = 0; } - if (audio_bug (AUDIO_FUNC, voice_size && !max_voices)) { + if (audio_bug(__func__, voice_size && !max_voices)) { dolog ("drv=`%s' voice_size=%d max_voices=0\n", drv->name, voice_size); } @@ -77,7 +77,7 @@ static void glue (audio_pcm_hw_free_resources_, TYPE) (HW *hw) static int glue (audio_pcm_hw_alloc_resources_, TYPE) (HW *hw) { - HWBUF = audio_calloc (AUDIO_FUNC, hw->samples, sizeof (struct st_sample)); + HWBUF = audio_calloc(__func__, hw->samples, sizeof(struct st_sample)); if (!HWBUF) { dolog ("Could not allocate " NAME " buffer (%d samples)\n", hw->samples); @@ -105,7 +105,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw) samples = ((int64_t) sw->hw->samples << 32) / sw->ratio; - sw->buf = audio_calloc (AUDIO_FUNC, samples, sizeof (struct st_sample)); + sw->buf = audio_calloc(__func__, samples, sizeof(struct st_sample)); if (!sw->buf) { dolog ("Could not allocate buffer for `%s' (%d samples)\n", SW_NAME (sw), samples); @@ -238,17 +238,17 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct audsettings *as) return NULL; } - if (audio_bug (AUDIO_FUNC, !drv)) { + if (audio_bug(__func__, !drv)) { dolog ("No host audio driver\n"); return NULL; } - if (audio_bug (AUDIO_FUNC, !drv->pcm_ops)) { + if (audio_bug(__func__, !drv->pcm_ops)) { dolog ("Host audio driver without pcm_ops\n"); return NULL; } - hw = audio_calloc (AUDIO_FUNC, 1, glue (drv->voice_size_, TYPE)); + hw = audio_calloc(__func__, 1, glue(drv->voice_size_, TYPE)); if (!hw) { dolog ("Can not allocate voice `%s' size %d\n", drv->name, glue (drv->voice_size_, TYPE)); @@ -266,7 +266,7 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct audsettings *as) goto err0; } - if (audio_bug (AUDIO_FUNC, hw->samples <= 0)) { + if (audio_bug(__func__, hw->samples <= 0)) { dolog ("hw->samples=%d\n", hw->samples); goto err1; } @@ -339,7 +339,7 @@ static SW *glue (audio_pcm_create_voice_pair_, TYPE) ( hw_as = *as; } - sw = audio_calloc (AUDIO_FUNC, 1, sizeof (*sw)); + sw = audio_calloc(__func__, 1, sizeof(*sw)); if (!sw) { dolog ("Could not allocate soft voice `%s' (%zu bytes)\n", sw_name ? sw_name : "unknown", sizeof (*sw)); @@ -379,7 +379,7 @@ static void glue (audio_close_, TYPE) (SW *sw) void glue (AUD_close_, TYPE) (QEMUSoundCard *card, SW *sw) { if (sw) { - if (audio_bug (AUDIO_FUNC, !card)) { + if (audio_bug(__func__, !card)) { dolog ("card=%p\n", card); return; } @@ -399,7 +399,7 @@ SW *glue (AUD_open_, TYPE) ( { AudioState *s = &glob_audio_state; - if (audio_bug (AUDIO_FUNC, !card || !name || !callback_fn || !as)) { + if (audio_bug(__func__, !card || !name || !callback_fn || !as)) { dolog ("card=%p name=%p callback_fn=%p as=%p\n", card, name, callback_fn, as); goto fail; @@ -408,12 +408,12 @@ SW *glue (AUD_open_, TYPE) ( ldebug ("open %s, freq %d, nchannels %d, fmt %d\n", name, as->freq, as->nchannels, as->fmt); - if (audio_bug (AUDIO_FUNC, audio_validate_settings (as))) { + if (audio_bug(__func__, audio_validate_settings(as))) { audio_print_settings (as); goto fail; } - if (audio_bug (AUDIO_FUNC, !s->drv)) { + if (audio_bug(__func__, !s->drv)) { dolog ("Can not open `%s' (no host audio driver)\n", name); goto fail; } diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 516846eb80..bc39cb9b4d 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -543,7 +543,7 @@ static int dsound_run_out (HWVoiceOut *hw, int live) } } - if (audio_bug (AUDIO_FUNC, len < 0 || len > bufsize)) { + if (audio_bug(__func__, len < 0 || len > bufsize)) { dolog ("len=%d bufsize=%d old_pos=%ld ppos=%ld\n", len, bufsize, old_pos, ppos); return 0; diff --git a/audio/mixeng.c b/audio/mixeng.c index 0bf9b5360f..2ab22df2aa 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -344,7 +344,7 @@ struct rate { */ void *st_rate_start (int inrate, int outrate) { - struct rate *rate = audio_calloc (AUDIO_FUNC, 1, sizeof (*rate)); + struct rate *rate = audio_calloc(__func__, 1, sizeof(*rate)); if (!rate) { dolog ("Could not allocate resampler (%zu bytes)\n", sizeof (*rate)); diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 0edd7ea5fe..a0428881c2 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -582,11 +582,9 @@ static int oss_init_out(HWVoiceOut *hw, struct audsettings *as, } if (!oss->mmapped) { - oss->pcm_buf = audio_calloc ( - AUDIO_FUNC, - hw->samples, - 1 << hw->info.shift - ); + oss->pcm_buf = audio_calloc(__func__, + hw->samples, + 1 << hw->info.shift); if (!oss->pcm_buf) { dolog ( "Could not allocate DAC buffer (%d samples, each %d bytes)\n", @@ -705,7 +703,7 @@ static int oss_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) } hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift; - oss->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); + oss->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); if (!oss->pcm_buf) { dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\n", hw->samples, 1 << hw->info.shift); diff --git a/audio/paaudio.c b/audio/paaudio.c index 65beb6f010..8cf19c51d0 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -206,7 +206,7 @@ static void *qpa_thread_out (void *arg) PAVoiceOut *pa = arg; HWVoiceOut *hw = &pa->hw; - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } @@ -222,7 +222,7 @@ static void *qpa_thread_out (void *arg) break; } - if (audio_pt_wait (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_wait(&pa->pt, __func__)) { goto exit; } } @@ -230,7 +230,7 @@ static void *qpa_thread_out (void *arg) decr = to_mix = audio_MIN (pa->live, pa->g->conf.samples >> 2); rpos = pa->rpos; - if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_unlock(&pa->pt, __func__)) { return NULL; } @@ -251,7 +251,7 @@ static void *qpa_thread_out (void *arg) to_mix -= chunk; } - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } @@ -261,7 +261,7 @@ static void *qpa_thread_out (void *arg) } exit: - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); return NULL; } @@ -270,7 +270,7 @@ static int qpa_run_out (HWVoiceOut *hw, int live) int decr; PAVoiceOut *pa = (PAVoiceOut *) hw; - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return 0; } @@ -279,10 +279,10 @@ static int qpa_run_out (HWVoiceOut *hw, int live) pa->live = live - decr; hw->rpos = pa->rpos; if (pa->live > 0) { - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); } else { - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); } return decr; } @@ -298,7 +298,7 @@ static void *qpa_thread_in (void *arg) PAVoiceIn *pa = arg; HWVoiceIn *hw = &pa->hw; - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } @@ -314,7 +314,7 @@ static void *qpa_thread_in (void *arg) break; } - if (audio_pt_wait (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_wait(&pa->pt, __func__)) { goto exit; } } @@ -322,7 +322,7 @@ static void *qpa_thread_in (void *arg) incr = to_grab = audio_MIN (pa->dead, pa->g->conf.samples >> 2); wpos = pa->wpos; - if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_unlock(&pa->pt, __func__)) { return NULL; } @@ -342,7 +342,7 @@ static void *qpa_thread_in (void *arg) to_grab -= chunk; } - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return NULL; } @@ -352,7 +352,7 @@ static void *qpa_thread_in (void *arg) } exit: - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); return NULL; } @@ -361,7 +361,7 @@ static int qpa_run_in (HWVoiceIn *hw) int live, incr, dead; PAVoiceIn *pa = (PAVoiceIn *) hw; - if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) { + if (audio_pt_lock(&pa->pt, __func__)) { return 0; } @@ -372,10 +372,10 @@ static int qpa_run_in (HWVoiceIn *hw) pa->dead = dead - incr; hw->wpos = pa->wpos; if (pa->dead > 0) { - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); } else { - audio_pt_unlock (&pa->pt, AUDIO_FUNC); + audio_pt_unlock(&pa->pt, __func__); } return incr; } @@ -579,7 +579,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, audio_pcm_init_info (&hw->info, &obt_as); hw->samples = g->conf.samples; - pa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); + pa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); pa->rpos = hw->rpos; if (!pa->pcm_buf) { dolog ("Could not allocate buffer (%d bytes)\n", @@ -587,7 +587,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, goto fail2; } - if (audio_pt_init (&pa->pt, qpa_thread_out, hw, AUDIO_CAP, AUDIO_FUNC)) { + if (audio_pt_init(&pa->pt, qpa_thread_out, hw, AUDIO_CAP, __func__)) { goto fail3; } @@ -636,7 +636,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) audio_pcm_init_info (&hw->info, &obt_as); hw->samples = g->conf.samples; - pa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); + pa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); pa->wpos = hw->wpos; if (!pa->pcm_buf) { dolog ("Could not allocate buffer (%d bytes)\n", @@ -644,7 +644,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) goto fail2; } - if (audio_pt_init (&pa->pt, qpa_thread_in, hw, AUDIO_CAP, AUDIO_FUNC)) { + if (audio_pt_init(&pa->pt, qpa_thread_in, hw, AUDIO_CAP, __func__)) { goto fail3; } @@ -667,17 +667,17 @@ static void qpa_fini_out (HWVoiceOut *hw) void *ret; PAVoiceOut *pa = (PAVoiceOut *) hw; - audio_pt_lock (&pa->pt, AUDIO_FUNC); + audio_pt_lock(&pa->pt, __func__); pa->done = 1; - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); - audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); + audio_pt_join(&pa->pt, &ret, __func__); if (pa->stream) { pa_stream_unref (pa->stream); pa->stream = NULL; } - audio_pt_fini (&pa->pt, AUDIO_FUNC); + audio_pt_fini(&pa->pt, __func__); g_free (pa->pcm_buf); pa->pcm_buf = NULL; } @@ -687,17 +687,17 @@ static void qpa_fini_in (HWVoiceIn *hw) void *ret; PAVoiceIn *pa = (PAVoiceIn *) hw; - audio_pt_lock (&pa->pt, AUDIO_FUNC); + audio_pt_lock(&pa->pt, __func__); pa->done = 1; - audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); - audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); + audio_pt_unlock_and_signal(&pa->pt, __func__); + audio_pt_join(&pa->pt, &ret, __func__); if (pa->stream) { pa_stream_unref (pa->stream); pa->stream = NULL; } - audio_pt_fini (&pa->pt, AUDIO_FUNC); + audio_pt_fini(&pa->pt, __func__); g_free (pa->pcm_buf); pa->pcm_buf = NULL; } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index e8d91d22af..e92135bd2f 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -277,7 +277,7 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) return; } - if (audio_bug (AUDIO_FUNC, sdl->live < 0 || sdl->live > hw->samples)) { + if (audio_bug(__func__, sdl->live < 0 || sdl->live > hw->samples)) { dolog ("sdl->live=%d hw->samples=%d\n", sdl->live, hw->samples); return; diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 341eec3121..068a595732 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -139,7 +139,7 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, audio_pcm_init_info (&hw->info, &wav_as); hw->samples = 1024; - wav->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); + wav->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift); if (!wav->pcm_buf) { dolog ("Could not allocate buffer (%d bytes)\n", hw->samples << hw->info.shift); From patchwork Mon Nov 13 22:34:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837612 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="qqWYbRI9"; 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 3ybQvx6z3Jz9s06 for ; Tue, 14 Nov 2017 09:55:25 +1100 (AEDT) Received: from localhost ([::1]:56717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENdU-0002yd-24 for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:55:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOl-0003HX-N1 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOZ-0007Pn-EO for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:11 -0500 Received: from mail-by2nam01on0069.outbound.protection.outlook.com ([104.47.34.69]:65248 helo=NAM01-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 1eENNg-0006s2-Mb; Mon, 13 Nov 2017 17:39:05 -0500 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=kzn5z3s4rP9eDB4Ko3bj3Yxf7K6bcz/BisM1+ioDwRI=; b=qqWYbRI9/O23Nk7Ax9m9CSr3cABagLzwgKa49iSj+rzKf3e0r/Cm6iIbxxSlSOZo1WP+DgBAqySwvoXlg5LYjjdn6g1nNx6Z36AfgWMkauWlyHkTy5yTVRV2doo1gzBzw48m5dCaKa/C6T3sMok13iWyMIN0RUOM6gM+rztCyH8= Received: from MWHPR0201CA0068.namprd02.prod.outlook.com (10.167.160.45) 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_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:38:57 +0000 Received: from SN1NAM02FT004.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by MWHPR0201CA0068.outlook.office365.com (2603:10b6:301:73::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:38:57 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; lists.xenproject.org; dkim=none (message not signed) header.d=none; lists.xenproject.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 SN1NAM02FT004.mail.protection.outlook.com (10.152.72.175) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:38:55 +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 1eENNX-00048j-D6; Mon, 13 Nov 2017 14:38:55 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNX-0000Lm-7i; Mon, 13 Nov 2017 14:38:55 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMcgFh012410; Mon, 13 Nov 2017 14:38:43 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNK-0000KL-NA; Mon, 13 Nov 2017 14:38:42 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:42 -0800 Message-ID: <67465b2020def3680dfd15d6473d3316c3fc8be0.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(4326008)(81166006)(16200700003)(53946003)(2950100002)(50986999)(63266004)(106466001)(50226002)(5660300001)(551934003)(39060400002)(76176999)(7416002)(36756003)(118296001)(2906002)(9786002)(305945005)(77096006)(8666007)(81156014)(356003)(33646002)(8676002)(478600001)(110136005)(48376002)(50466002)(8936002)(316002)(16586007)(5003940100001)(47776003)(36386004)(106002)(575784001)(54906003)(189998001)(5890100001)(21314002)(107986001)(579004)(559001)(569006); 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; SN1NAM02FT004; 1:iYv7+rEfRrKGdpgRgVAa/QZFvpY0eAOY/u8b0ly02hetr1vJ5wkeV8ks6nLb9pBc8cQJ5um835eb5o8DlHKeuPUebKOvtORnSbYYTPVpQzQZmT9I4mtPcb3zzj5/PdJv MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8db9d64c-9571-416c-89e0-08d52ae7537e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:Bl6fn4GOK3zxw7DH+s9Uf4WYLn/Xd8CN4C+EMGBNCtErDPns3f5hU2pBKUwMYdWGQMpi39Xv22NzbNfmBNuMGJXnQnQuJMd3MHTE6FXhski6jb7yDNtTNztvv8D7v/u1LT+imkYsJbeYU2hUprH5UDcQMzW69uGymn+pJsqyq1Nccv2ovEcEhHL21IcncVceikBCcFJ7jLWgvYI8dkjlnp2PakLQ2BkPNWmbeF2c72L85rqDwRcA8XBpG1Za6vLdTalPolNAh52LDxanMGArKhXAKuEk4dlEkZfXRKq0bP6G51x2PTwAYXVlRZI6cbTU2hXIgCSFo2GNlazXMxkYhbMbZvAfY2WaGxg4ei353hs=; 25:yQrx/DMyp5Z7UukQdiPhT05QaA3M6S268sIZCgBZc//frjLb+/eUvWElZqcg3cB+ji5azh1si0oGoefTVdvn2xX34jLe4Qt75xki8v6zR2Z1ufhtLDLGAyQR4HHbdp8PjBExPwWuJfsOruZe5fxEB2k2KxcTM/KqfZTV4odTLXH5Nw/vmARpGBAWFbKKCxn2oVObTCed6X1jtpSyUQV4dNeqOR5FU7UvbGzFiwRJPiVfmIxdRY1Mp4FXj6u42sG2s5BUgcU4IidkqArbkurPnJSfa3dTeS0qQSAc6XLlgXAQqILtIZr8eFgMrEIe2p7roj7rX1/+a9XYEyBuXyfjVA== X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:vo3OdTOMG/GcIfmuPC54JTJz5IEPYi6k52V497yYFgfd3Do/NWQ5PzGCjd+0uZiOa+X+8b+dyIXJ+gM+nlc+0WJUwm95tfpbLYzvjDoAXpX6Xx0tXBfWmr+4xsiOpcaVk5LFjw/eu5mKDTbjuNZVBG11H/RueC3k381xWH+uXr8rQqSgMbQMZFVRac9vNormF3pPt3VJHqFoBu3rVrnwOJ2wJXEVQKAygEkLLng6apw=; 20:m77WsEYHtNKHPMJvPzM4VoV2IMqVB+pEMz11BICmtyKIKzVmmyKdVhsszZmoV9UvyIEvUZjw+ifq7qtg1yYbjNV5CeDA5eI4n7JJ/36ZJAWujSWFAqQh4f+9E0qM2l95sZx7smLMHoKFOSLYdix69mvLLciAokPwP5i9m4J0Ub+uEl5zh8s2lKc8Fg1rULGQzuLWXYAwUe/+Gkp6DH2D1eOGSFkeo7uGyF6hWWtRulQrZRNaLmU7u7JjHNO9xXEDof8Ct+giacc4TZPlzW4vIxo+IcNfglT2wQwn5il/MXEqVtKeHNaBFhdMH1fdKGRGLwRGYkzUpfWgX/k9B5kBFHLlu9bAuI57thk2rCQh7DSCrQEtFXXHcMPFKHvqV5I8CepChXahEAtU9zXdoSZFq4C1MIw9UmX9Fcg1rXBrlxZGs9uyaAJhTYYnLVQoFIdeSwMmJxcsUJ68WIH15wLSzgdv5tDnz4kpv8FolRERGL6z9szMqHoky5RDOqTgpyg6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(131327999870524)(788757137089)(192813158149592)(70601490899591); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93004095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(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:n4ZO4p57bvUUjpiPl9g9r9znjFZsjwBQQ84DXMLHr5Gc4MF6EnEZ9nDwjFW1cOEr4jgbwMLaa7jS2HXu7fI1pyotzya/j5FEXzQsTxdxjtGHoXHJbmAwP90rQdZwHVGeZuZu4rlQ+mNA1iF0GCQyQgY1LkDlqfaxtnKC+YuFxh4dhIOjsBRPAZVdOJN6SUd4a6Tc/vtAncmk+yBYeRav02jKGmdvlHYofYV8T8U+YhBjm5EWlZ8F34fLycZ7rKHjZKxaKzLqZT36bybNS05FQdhFzY967ecpbaII5bs7L/c+vaZCLMsTpE/WL6/aIFCS/qxKyv7ev+TzpHjiFG3fZ9PNO6s3QFiViXy8TQvwMieStRvG3tnij5g3n+pLb3NZ1dkTuA5Av2U05WzdCjcVdQ== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:kOcgADPXJI3ELw6mOAbwPqRCAeEwPjffGO9Lnxq3O?= CFH08wWOGpnMu4DYWWMUumA/nrNHeUegZrD36utBTAiHeVhXBjPqjixXeAfzGLuUPFwvJhOspdolbPE+jQW6Cb7jJ3e9GHqZqKxuR9gwM44Rc0OehGGzqYyhv3L+89ZgaMia/vtjy6Tk74tzkm7+YpaXsi8iktUWBJ5+SClHkHAp12jXY9KCUjfGZin4zzwjC8FfsgAvnB27Gk0vYwUjGCpdJP2NINq/L4oIIzjug6pqhv6MSILJA2KPL0iyDDDNqJgcNlML4Amz+T8dQ64zZDdKX+vT7qJ9snD/AVHw18Ph7C73oXrikleTX0nTv9jwb1iTiIr7xbVBP62I2Mcf8KB9Xy+CD0wcF+IBZNXQ1RrJk3ghdAxGgX57o7JOvm8oQyPbn559uv9cUOsRXTqVJlhbNnvxAw0FspBsd+aqtiNlCVRZq57WLrCfnDLW+xRpTulclijVcWmOzN+8k7CjDhkOba1aKp2c7tG1OTUkvqM0v2jKMHrQZCmg5Lfxv+hFYU2tbOdaqpNJJ4lp/EvAuwzaV4BPKKYNGJ5tvpkcWfFxRBkQdFsTKy6lql2/IjQiUbs/dLTVV2T4r6Cq2fuZqK4kXU01fUZJx6bFvLabw0WqyrpQiUeYId63vgi8MkK2LDeIw0v5CS2zKCAkt5yA/9v8aZF70WMpL8HQHggfIlwjk4kL+UsT35jT12pfNvYhNPOaJ4avEUUiS0VQnW7J57D0W4ZPcAtwC0HZfOyZD49mV70HSlsV5aD2YZCigbFtQVdXfXGbrtssOMvEGzdzc+LzZQd1tVDZYcyl+P3wGwgcx+STijnJl0ftBuVmWwHf4Y4jE7+FYilTHmhbah5sPi38Ps0b/zozc9bydOM+GRjuZV6VHFV4Ng90hvI0/7mTkOJcExpacC8qQiHXD1xbACixztxEt9J4f+gTGPTZXvV/SvvVwaSEh3Yfssuqd1Pt4xgppn7NwiPTxO9yirtsaBNgtVxRjCpc1BipGv22aUNJ2PhwVWu//Kz8kf/ZQJxfAPeuH6HEdzkTAHKNjpoCAaZIQyZaspAetPSTxbDfOyydeXYnTn+vFiF9CVpS9pGbv2d9skg5pw4ppQ+grXICdUnQSALhs8izEGPGGiPm2bTbrdY+H3EAV2AOTI33mxvObmEQIp5JQfG8x2MKQP2j1J6YdQduaOObMNYtUYKlRcwiIXq109PAM5NW4vydpaE6yg= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:SHUFJ5SivgPM5CET6h901O8TzyYbfI5b0TjniIa1Cr6DJPtX/SiRb4IYjlweJlIWBteeKHYzNuhBPIKddoBfKivRDvlYRhEh+f+pvFSE2hQveUgaAiKZwZKOSUPOoghU/TbOX9En8nVruNf6Zk0UYg4M8Wr10aITbCgvS4M/IdAMDk2bmPR0MRz6td6HWEjddyezJ0CTYQqG+5DhElZLSyFrFV3TFeXe6GkBU7q4LABVqt3Yt04mIaJr9MT7Q3tOgsHwCEAJF2u8+i1BnPK7bx5w2p3chNOBCn/91nbOW7fLGR8jqvJyTIKVhIzNrqkxu5yl1RQTqW6NdhRdVYsUK4zTdJ52J0FEEZBYo0qYwhc=; 5:Ndh1PPoEfUH3U37zmQHCCCkp1Kz5l3NTa5q5xFRNlrexeKxIC8P6gKVhscOR485skbaM3//JqGewzxWiKLWFml34Lg1JyZ5yJ9QJJzM+immKgIbPfGWRVIwLjcl03Xw1E+vIisEfpf+kTFNUjiUJRgQcqnFJ1hQPAKnEsZQxPhk=; 24:Xr3wkzNg/G26VUg9xjQ31rr0btvgVmzTpQT+8vqmkSHfVZvDMqWn7oUwSIgaa0RXvSV5zGP3lwGus7uX9ZrUuVZ51VKvGUFUSIAGd2vehyY=; 7:YLCuMZnyIDjsqBHeEE9BRkMeXqwgZlOcEKmipefQjaLg/bIdkoy0/T8wKQo74woSRD33KQXGwO6MoTHzUev1f7YDQARk83ubPL4ky/1cxs2Tw+v09Kuek26vm9l4Z1RTixkuFqsnECBdz/+lnmVQZcpzxEqN5RBUCza2jaVQc63XvnAT9WcTX6ulwkXrEMK/DInNAlFVzdQdvVhnXFhvIqu857ZlLoCjsaf8RJPeXixiD5zBLKnTazrmwafkHsF9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:38:55.9250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8db9d64c-9571-416c-89e0-08d52ae7537e 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.34.69 Subject: [Qemu-devel] [PATCH v5 02/29] Replace all occurances of __FUNCTION__ with __func__ 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: "Dr. David Alan Gilbert" , Stefano Stabellini , Fam Zheng , qemu-block@nongnu.org, Peter Crosthwaite , John Snow , Juan Quintela , armbru@redhat.com, alistair.francis@xilinx.com, Yongbok Kim , qemu-arm@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , xen-devel@lists.xenproject.org, Anthony Perard , alistair23@gmail.com, Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace all occurs of __FUNCTION__ except for the check in checkpatch with the non GCC specific __func__. One line in hcd-musb.c was manually tweaked to pass checkpatch. Signed-off-by: Alistair Francis Cc: Gerd Hoffmann Cc: Andrzej Zaborowski Cc: Stefano Stabellini Cc: Anthony Perard Cc: John Snow Cc: Aurelien Jarno Cc: Yongbok Kim Cc: Peter Crosthwaite Cc: Stefan Hajnoczi Cc: Fam Zheng Cc: Juan Quintela Cc: "Dr. David Alan Gilbert" Cc: qemu-arm@nongnu.org Cc: qemu-block@nongnu.org Cc: xen-devel@lists.xenproject.org Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Reviewed-by: Anthony PERARD Reviewed-by: Juan Quintela Reviewed-by: Gerd Hoffmann --- hw/arm/nseries.c | 2 +- hw/arm/omap1.c | 42 +++++++++++++++++++++--------------------- hw/arm/omap2.c | 12 ++++++------ hw/arm/palm.c | 14 +++++++------- hw/arm/pxa2xx.c | 46 +++++++++++++++++++++++----------------------- hw/arm/pxa2xx_gpio.c | 6 +++--- hw/arm/pxa2xx_pic.c | 4 ++-- hw/arm/tosa.c | 10 +++++----- hw/audio/hda-codec.c | 10 +++++----- hw/audio/intel-hda.c | 28 ++++++++++++++-------------- hw/audio/wm8750.c | 4 ++-- hw/block/nand.c | 4 ++-- hw/block/onenand.c | 8 ++++---- hw/bt/core.c | 10 +++++----- hw/bt/hci-csr.c | 14 +++++++------- hw/bt/hci.c | 26 +++++++++++++------------- hw/bt/hid.c | 2 +- hw/bt/l2cap.c | 22 +++++++++++----------- hw/bt/sdp.c | 6 +++--- hw/display/blizzard.c | 18 +++++++++--------- hw/display/omap_dss.c | 6 +++--- hw/display/pxa2xx_lcd.c | 14 +++++++------- hw/display/qxl-render.c | 6 +++--- hw/display/qxl.h | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/xenfb.c | 2 +- hw/dma/omap_dma.c | 26 +++++++++++++------------- hw/dma/pxa2xx_dma.c | 14 +++++++------- hw/gpio/max7310.c | 8 ++++---- hw/gpio/omap_gpio.c | 2 +- hw/i2c/omap_i2c.c | 6 +++--- hw/ide/ahci.c | 2 +- hw/ide/microdrive.c | 4 ++-- hw/input/lm832x.c | 6 +++--- hw/input/pxa2xx_keypad.c | 6 +++--- hw/input/tsc2005.c | 8 ++++---- hw/input/tsc210x.c | 4 ++-- hw/intc/omap_intc.c | 2 +- hw/isa/vt82c686.c | 2 +- hw/mips/gt64xxx_pci.c | 2 +- hw/misc/cbus.c | 12 ++++++------ hw/misc/omap_clk.c | 4 ++-- hw/misc/omap_gpmc.c | 6 +++--- hw/misc/omap_l4.c | 4 ++-- hw/misc/omap_sdrc.c | 2 +- hw/misc/omap_tap.c | 6 +++--- hw/misc/tmp105.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/sd/pxa2xx_mmci.c | 6 +++--- hw/ssi/omap_spi.c | 6 +++--- hw/timer/omap_gptimer.c | 6 +++--- hw/timer/twl92230.c | 6 +++--- hw/usb/desc.c | 2 +- hw/usb/dev-bluetooth.c | 4 ++-- hw/usb/hcd-musb.c | 4 ++-- hw/usb/tusb6010.c | 14 +++++++------- hw/xenpv/xen_domainbuild.c | 16 ++++++++-------- hw/xenpv/xen_machine_pv.c | 2 +- include/hw/arm/omap.h | 10 +++++----- include/hw/arm/sharpsl.h | 2 +- memory_mapping.c | 2 +- migration/block.c | 4 ++-- ui/cursor.c | 6 +++--- ui/spice-display.c | 4 ++-- 64 files changed, 272 insertions(+), 272 deletions(-) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 58005b6619..32687afced 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -463,7 +463,7 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int len) uint8_t ret; if (len > 9) { - hw_error("%s: FIXME: bad SPI word width %i\n", __FUNCTION__, len); + hw_error("%s: FIXME: bad SPI word width %i\n", __func__, len); } if (s->p >= ARRAY_SIZE(s->resp)) { diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index b3e7625130..1388200191 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -999,7 +999,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr, case omap1510: return 0x03310115; default: - hw_error("%s: bad mpu model\n", __FUNCTION__); + hw_error("%s: bad mpu model\n", __func__); } break; @@ -1010,7 +1010,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr, case omap1510: return 0xfb47002f; default: - hw_error("%s: bad mpu model\n", __FUNCTION__); + hw_error("%s: bad mpu model\n", __func__); } break; } @@ -1716,7 +1716,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr, case 0x18: /* ARM_SYSST */ if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) { s->clkm.clocking_scheme = (value >> 11) & 7; - printf("%s: clocking scheme set to %s\n", __FUNCTION__, + printf("%s: clocking scheme set to %s\n", __func__, clkschemename[s->clkm.clocking_scheme]); } s->clkm.cold_start &= value & 0x3f; @@ -2129,14 +2129,14 @@ qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s) void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler) { if (line >= 16 || line < 0) - hw_error("%s: No GPIO line %i\n", __FUNCTION__, line); + hw_error("%s: No GPIO line %i\n", __func__, line); s->handler[line] = handler; } void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down) { if (row >= 5 || row < 0) - hw_error("%s: No key %i-%i\n", __FUNCTION__, col, row); + hw_error("%s: No key %i-%i\n", __func__, col, row); if (down) s->buttons[row] |= 1 << col; @@ -2313,7 +2313,7 @@ void omap_uwire_attach(struct omap_uwire_s *s, uWireSlave *slave, int chipselect) { if (chipselect < 0 || chipselect > 3) { - fprintf(stderr, "%s: Bad chipselect %i\n", __FUNCTION__, chipselect); + fprintf(stderr, "%s: Bad chipselect %i\n", __func__, chipselect); exit(-1); } @@ -2335,7 +2335,7 @@ static void omap_pwl_update(struct omap_pwl_s *s) if (output != s->output) { s->output = output; - printf("%s: Backlight now at %i/256\n", __FUNCTION__, output); + printf("%s: Backlight now at %i/256\n", __func__, output); } } @@ -2473,7 +2473,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr, case 0x04: /* VRC */ if ((value ^ s->vrc) & 1) { if (value & 1) - printf("%s: %iHz buzz on\n", __FUNCTION__, (int) + printf("%s: %iHz buzz on\n", __func__, (int) /* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */ ((omap_clk_getrate(s->clk) >> 3) / /* Pre-multiplexer divider */ @@ -2490,7 +2490,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr, ((value & (1 << 5)) ? 80 : 127) / (107 * 55 * 63 * 127))); else - printf("%s: silence!\n", __FUNCTION__); + printf("%s: silence!\n", __func__); } s->vrc = value & 0x7f; break; @@ -2562,7 +2562,7 @@ static void omap_rtc_alarm_update(struct omap_rtc_s *s) { s->alarm_ti = mktimegm(&s->alarm_tm); if (s->alarm_ti == -1) - printf("%s: conversion failed\n", __FUNCTION__); + printf("%s: conversion failed\n", __func__); } static uint64_t omap_rtc_read(void *opaque, hwaddr addr, @@ -3028,7 +3028,7 @@ static void omap_mcbsp_source_tick(void *opaque) if (!s->rx_rate) return; if (s->rx_req) - printf("%s: Rx FIFO overrun\n", __FUNCTION__); + printf("%s: Rx FIFO overrun\n", __func__); s->rx_req = s->rx_rate << bps[(s->rcr[0] >> 5) & 7]; @@ -3074,7 +3074,7 @@ static void omap_mcbsp_sink_tick(void *opaque) if (!s->tx_rate) return; if (s->tx_req) - printf("%s: Tx FIFO underrun\n", __FUNCTION__); + printf("%s: Tx FIFO underrun\n", __func__); s->tx_req = s->tx_rate << bps[(s->xcr[0] >> 5) & 7]; @@ -3176,7 +3176,7 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr, /* Fall through. */ case 0x02: /* DRR1 */ if (s->rx_req < 2) { - printf("%s: Rx FIFO underrun\n", __FUNCTION__); + printf("%s: Rx FIFO underrun\n", __func__); omap_mcbsp_rx_done(s); } else { s->tx_req -= 2; @@ -3282,7 +3282,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, if (s->tx_req < 2) omap_mcbsp_tx_done(s); } else - printf("%s: Tx FIFO overrun\n", __FUNCTION__); + printf("%s: Tx FIFO overrun\n", __func__); return; case 0x08: /* SPCR2 */ @@ -3297,7 +3297,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, s->spcr[0] &= 0x0006; s->spcr[0] |= 0xf8f9 & value; if (value & (1 << 15)) /* DLB */ - printf("%s: Digital Loopback mode enable attempt\n", __FUNCTION__); + printf("%s: Digital Loopback mode enable attempt\n", __func__); if (~value & 1) { /* RRST */ s->spcr[0] &= ~6; s->rx_req = 0; @@ -3330,13 +3330,13 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, s->mcr[1] = value & 0x03e3; if (value & 3) /* XMCM */ printf("%s: Tx channel selection mode enable attempt\n", - __FUNCTION__); + __func__); return; case 0x1a: /* MCR1 */ s->mcr[0] = value & 0x03e1; if (value & 1) /* RMCM */ printf("%s: Rx channel selection mode enable attempt\n", - __FUNCTION__); + __func__); return; case 0x1c: /* RCERA */ s->rcer[0] = value & 0xffff; @@ -3418,7 +3418,7 @@ static void omap_mcbsp_writew(void *opaque, hwaddr addr, if (s->tx_req < 4) omap_mcbsp_tx_done(s); } else - printf("%s: Tx FIFO overrun\n", __FUNCTION__); + printf("%s: Tx FIFO overrun\n", __func__); return; } @@ -3536,7 +3536,7 @@ static void omap_lpg_tick(void *opaque) timer_mod(s->tm, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->on); s->cycle = !s->cycle; - printf("%s: LED is %s\n", __FUNCTION__, s->cycle ? "on" : "off"); + printf("%s: LED is %s\n", __func__, s->cycle ? "on" : "off"); } static void omap_lpg_update(struct omap_lpg_s *s) @@ -3557,9 +3557,9 @@ static void omap_lpg_update(struct omap_lpg_s *s) timer_del(s->tm); if (on == period && s->on < s->period) - printf("%s: LED is on\n", __FUNCTION__); + printf("%s: LED is on\n", __func__); else if (on == 0 && s->on) - printf("%s: LED is off\n", __FUNCTION__); + printf("%s: LED is off\n", __func__); else if (on && (on != s->on || period != s->period)) { s->cycle = 0; s->on = on; diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index f5b148881c..b53878b8b9 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -1312,7 +1312,7 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s) if (mode[0] == 1 || mode[0] == 2 || mode[1] == 1 || mode[1] == 2) fprintf(stderr, "%s: bad EN_54M_PLL or bad EN_96M_PLL\n", - __FUNCTION__); + __func__); } static void omap_prcm_dpll_update(struct omap_prcm_s *s) @@ -1331,7 +1331,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s) s->dpll_lock = 0; switch (mode) { case 0: - fprintf(stderr, "%s: bad EN_DPLL\n", __FUNCTION__); + fprintf(stderr, "%s: bad EN_DPLL\n", __func__); break; case 1: /* Low-power bypass mode (Default) */ case 2: /* Fast-relock bypass mode */ @@ -1358,7 +1358,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s) omap_clk_reparent(core, dpll_x2); break; case 3: - fprintf(stderr, "%s: bad CORE_CLK_SRC\n", __FUNCTION__); + fprintf(stderr, "%s: bad CORE_CLK_SRC\n", __func__); break; } } @@ -1628,7 +1628,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr, case 0x500: /* CM_CLKEN_PLL */ if (value & 0xffffff30) fprintf(stderr, "%s: write 0s in CM_CLKEN_PLL for " - "future compatibility\n", __FUNCTION__); + "future compatibility\n", __func__); if ((s->clken[9] ^ value) & 0xcc) { s->clken[9] &= ~0xcc; s->clken[9] |= value & 0xcc; @@ -1647,7 +1647,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr, case 0x540: /* CM_CLKSEL1_PLL */ if (value & 0xfc4000d7) fprintf(stderr, "%s: write 0s in CM_CLKSEL1_PLL for " - "future compatibility\n", __FUNCTION__); + "future compatibility\n", __func__); if ((s->clksel[5] ^ value) & 0x003fff00) { s->clksel[5] = value & 0x03bfff28; omap_prcm_dpll_update(s); @@ -1659,7 +1659,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr, case 0x544: /* CM_CLKSEL2_PLL */ if (value & ~3) fprintf(stderr, "%s: write 0s in CM_CLKSEL2_PLL[31:2] for " - "future compatibility\n", __FUNCTION__); + "future compatibility\n", __func__); if (s->clksel[6] != (value & 3)) { s->clksel[6] = value & 3; omap_prcm_dpll_update(s); diff --git a/hw/arm/palm.c b/hw/arm/palm.c index a1f55d79b4..285f43709d 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -44,7 +44,7 @@ static void static_write(void *opaque, hwaddr offset, uint64_t value, { #ifdef SPY printf("%s: value %08lx written at " PA_FMT "\n", - __FUNCTION__, value, offset); + __func__, value, offset); #endif } @@ -127,11 +127,11 @@ static void palmte_onoff_gpios(void *opaque, int line, int level) switch (line) { case 0: printf("%s: current to MMC/SD card %sabled.\n", - __FUNCTION__, level ? "dis" : "en"); + __func__, level ? "dis" : "en"); break; case 1: printf("%s: internal speaker amplifier %s.\n", - __FUNCTION__, level ? "down" : "on"); + __func__, level ? "down" : "on"); break; /* These LCD & Audio output signals have not been identified yet. */ @@ -139,12 +139,12 @@ static void palmte_onoff_gpios(void *opaque, int line, int level) case 3: case 4: printf("%s: LCD GPIO%i %s.\n", - __FUNCTION__, line - 1, level ? "high" : "low"); + __func__, line - 1, level ? "high" : "low"); break; case 5: case 6: printf("%s: Audio GPIO%i %s.\n", - __FUNCTION__, line - 4, level ? "high" : "low"); + __func__, line - 4, level ? "high" : "low"); break; } } @@ -234,7 +234,7 @@ static void palmte_init(MachineState *machine) rom_size = get_image_size(option_rom[0].name); if (rom_size > flash_size) { fprintf(stderr, "%s: ROM image too big (%x > %x)\n", - __FUNCTION__, rom_size, flash_size); + __func__, rom_size, flash_size); rom_size = 0; } if (rom_size > 0) { @@ -244,7 +244,7 @@ static void palmte_init(MachineState *machine) } if (rom_size < 0) { fprintf(stderr, "%s: error loading '%s'\n", - __FUNCTION__, option_rom[0].name); + __func__, option_rom[0].name); } } diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index ab691a7985..db860c238e 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -107,7 +107,7 @@ static uint64_t pxa2xx_pm_read(void *opaque, hwaddr addr, return s->pm_regs[addr >> 2]; default: fail: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -139,7 +139,7 @@ static void pxa2xx_pm_write(void *opaque, hwaddr addr, break; } - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } } @@ -180,7 +180,7 @@ static uint64_t pxa2xx_cm_read(void *opaque, hwaddr addr, return s->cm_regs[CCCR >> 2] | (3 << 28); default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -205,7 +205,7 @@ static void pxa2xx_cm_write(void *opaque, hwaddr addr, break; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } } @@ -410,7 +410,7 @@ static uint64_t pxa2xx_mm_read(void *opaque, hwaddr addr, return s->mm_regs[addr >> 2]; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -429,7 +429,7 @@ static void pxa2xx_mm_write(void *opaque, hwaddr addr, } default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } } @@ -619,7 +619,7 @@ static uint64_t pxa2xx_ssp_read(void *opaque, hwaddr addr, if (!s->enable) return 0xffffffff; if (s->rx_level < 1) { - printf("%s: SSP Rx Underrun\n", __FUNCTION__); + printf("%s: SSP Rx Underrun\n", __func__); return 0xffffffff; } s->rx_level --; @@ -636,7 +636,7 @@ static uint64_t pxa2xx_ssp_read(void *opaque, hwaddr addr, case SSACD: return s->ssacd; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -653,9 +653,9 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr, s->sscr[0] = value & 0xc7ffffff; s->enable = value & SSCR0_SSE; if (value & SSCR0_MOD) - printf("%s: Attempt to use network mode\n", __FUNCTION__); + printf("%s: Attempt to use network mode\n", __func__); if (s->enable && SSCR0_DSS(value) < 4) - printf("%s: Wrong data size: %i bits\n", __FUNCTION__, + printf("%s: Wrong data size: %i bits\n", __func__, SSCR0_DSS(value)); if (!(value & SSCR0_SSE)) { s->sssr = 0; @@ -668,7 +668,7 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr, case SSCR1: s->sscr[1] = value; if (value & (SSCR1_LBM | SSCR1_EFWR)) - printf("%s: Attempt to use SSP test mode\n", __FUNCTION__); + printf("%s: Attempt to use SSP test mode\n", __func__); pxa2xx_ssp_fifo_update(s); break; @@ -728,7 +728,7 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr, break; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } } @@ -990,7 +990,7 @@ static uint64_t pxa2xx_rtc_read(void *opaque, hwaddr addr, else return s->last_swcr; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -1096,7 +1096,7 @@ static void pxa2xx_rtc_write(void *opaque, hwaddr addr, break; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); } } @@ -1344,7 +1344,7 @@ static uint64_t pxa2xx_i2c_read(void *opaque, hwaddr addr, s->ibmr = 0; return s->ibmr; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -1417,7 +1417,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr addr, break; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); } } @@ -1618,7 +1618,7 @@ static uint64_t pxa2xx_i2s_read(void *opaque, hwaddr addr, } return 0; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -1641,14 +1641,14 @@ static void pxa2xx_i2s_write(void *opaque, hwaddr addr, s->status &= ~(1 << 7); /* I2SOFF */ } if (value & (1 << 4)) /* EFWR */ - printf("%s: Attempt to use special function\n", __FUNCTION__); + printf("%s: Attempt to use special function\n", __func__); s->enable = (value & 9) == 1; /* ENB && !RST*/ pxa2xx_i2s_update(s); break; case SACR1: s->control[1] = value & 0x0039; if (value & (1 << 5)) /* ENLBF */ - printf("%s: Attempt to use loopback function\n", __FUNCTION__); + printf("%s: Attempt to use loopback function\n", __func__); if (value & (1 << 4)) /* DPRL */ s->fifo_len = 0; pxa2xx_i2s_update(s); @@ -1675,7 +1675,7 @@ static void pxa2xx_i2s_write(void *opaque, hwaddr addr, } break; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); } } @@ -1851,7 +1851,7 @@ static uint64_t pxa2xx_fir_read(void *opaque, hwaddr addr, pxa2xx_fir_update(s); return ret; } - printf("%s: Rx FIFO underrun.\n", __FUNCTION__); + printf("%s: Rx FIFO underrun.\n", __func__); break; case ICSR0: return s->status[0]; @@ -1860,7 +1860,7 @@ static uint64_t pxa2xx_fir_read(void *opaque, hwaddr addr, case ICFOR: return s->rx_len; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); break; } return 0; @@ -1912,7 +1912,7 @@ static void pxa2xx_fir_write(void *opaque, hwaddr addr, case ICFOR: break; default: - printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr); + printf("%s: Bad register " REG_FMT "\n", __func__, addr); } } diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index 521dbad039..e15070188e 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -107,7 +107,7 @@ static void pxa2xx_gpio_set(void *opaque, int line, int level) uint32_t mask; if (line >= s->lines) { - printf("%s: No GPIO pin %i\n", __FUNCTION__, line); + printf("%s: No GPIO pin %i\n", __func__, line); return; } @@ -195,7 +195,7 @@ static uint64_t pxa2xx_gpio_read(void *opaque, hwaddr offset, return s->status[bank]; default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } return 0; @@ -248,7 +248,7 @@ static void pxa2xx_gpio_write(void *opaque, hwaddr offset, break; default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } } diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index b516ced8c0..61275fa040 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -165,7 +165,7 @@ static uint64_t pxa2xx_pic_mem_read(void *opaque, hwaddr offset, case ICHP: /* Highest Priority register */ return pxa2xx_pic_highest(s); default: - printf("%s: Bad register offset " REG_FMT "\n", __FUNCTION__, offset); + printf("%s: Bad register offset " REG_FMT "\n", __func__, offset); return 0; } } @@ -198,7 +198,7 @@ static void pxa2xx_pic_mem_write(void *opaque, hwaddr offset, s->priority[32 + ((offset - IPR32) >> 2)] = value & 0x8000003f; break; default: - printf("%s: Bad register offset " REG_FMT "\n", __FUNCTION__, offset); + printf("%s: Bad register offset " REG_FMT "\n", __func__, offset); return; } pxa2xx_pic_update(opaque); diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 044796350a..a55b1a369c 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -159,7 +159,7 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data) s->buf[s->len] = data; if (s->len ++ > 2) { #ifdef VERBOSE - fprintf(stderr, "%s: message too long (%i bytes)\n", __FUNCTION__, s->len); + fprintf(stderr, "%s: message too long (%i bytes)\n", __func__, s->len); #endif return 1; } @@ -181,14 +181,14 @@ static int tosa_dac_event(I2CSlave *i2c, enum i2c_event event) case I2C_START_SEND: break; case I2C_START_RECV: - printf("%s: recv not supported!!!\n", __FUNCTION__); + printf("%s: recv not supported!!!\n", __func__); break; case I2C_FINISH: #ifdef VERBOSE if (s->len < 2) - printf("%s: message too short (%i bytes)\n", __FUNCTION__, s->len); + printf("%s: message too short (%i bytes)\n", __func__, s->len); if (s->len > 2) - printf("%s: message too long\n", __FUNCTION__); + printf("%s: message too long\n", __func__); #endif break; default: @@ -200,7 +200,7 @@ static int tosa_dac_event(I2CSlave *i2c, enum i2c_event event) static int tosa_dac_recv(I2CSlave *s) { - printf("%s: recv not supported!!!\n", __FUNCTION__); + printf("%s: recv not supported!!!\n", __func__); return -1; } diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 5402cd196c..e8aa7842e6 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -316,7 +316,7 @@ static void hda_audio_command(HDACodecDevice *hda, uint32_t nid, uint32_t data) goto fail; } dprint(a, 2, "%s: nid %d (%s), verb 0x%x, payload 0x%x\n", - __FUNCTION__, nid, node->name, verb, payload); + __func__, nid, node->name, verb, payload); switch (verb) { /* all nodes */ @@ -449,7 +449,7 @@ static void hda_audio_command(HDACodecDevice *hda, uint32_t nid, uint32_t data) fail: dprint(a, 1, "%s: not handled: nid %d (%s), verb 0x%x, payload 0x%x\n", - __FUNCTION__, nid, node ? node->name : "?", verb, payload); + __func__, nid, node ? node->name : "?", verb, payload); hda_codec_response(hda, true, 0); } @@ -484,7 +484,7 @@ static int hda_audio_init(HDACodecDevice *hda, const struct desc_codec *desc) a->desc = desc; a->name = object_get_typename(OBJECT(a)); - dprint(a, 1, "%s: cad %d\n", __FUNCTION__, a->hda.cad); + dprint(a, 1, "%s: cad %d\n", __func__, a->hda.cad); AUD_register_card("hda", &a->card); for (i = 0; i < a->desc->nnodes; i++) { @@ -526,7 +526,7 @@ static void hda_audio_exit(HDACodecDevice *hda) HDAAudioStream *st; int i; - dprint(a, 1, "%s\n", __FUNCTION__); + dprint(a, 1, "%s\n", __func__); for (i = 0; i < ARRAY_SIZE(a->st); i++) { st = a->st + i; if (st->node == NULL) { @@ -547,7 +547,7 @@ static int hda_audio_post_load(void *opaque, int version) HDAAudioStream *st; int i; - dprint(a, 1, "%s\n", __FUNCTION__); + dprint(a, 1, "%s\n", __func__); if (version == 1) { /* assume running_compat[] is for output streams */ for (i = 0; i < ARRAY_SIZE(a->running_compat); i++) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index a3e670c188..948268afd8 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -265,7 +265,7 @@ static void intel_hda_update_irq(IntelHDAState *d) } else { level = 0; } - dprint(d, 2, "%s: level %d [%s]\n", __FUNCTION__, + dprint(d, 2, "%s: level %d [%s]\n", __func__, level, msi ? "msi" : "intx"); if (msi) { if (level) { @@ -285,7 +285,7 @@ static int intel_hda_send_command(IntelHDAState *d, uint32_t verb) cad = (verb >> 28) & 0x0f; if (verb & (1 << 27)) { /* indirect node addressing, not specified in HDA 1.0 */ - dprint(d, 1, "%s: indirect node addressing (guest bug?)\n", __FUNCTION__); + dprint(d, 1, "%s: indirect node addressing (guest bug?)\n", __func__); return -1; } nid = (verb >> 20) & 0x7f; @@ -293,7 +293,7 @@ static int intel_hda_send_command(IntelHDAState *d, uint32_t verb) codec = hda_codec_find(&d->codecs, cad); if (codec == NULL) { - dprint(d, 1, "%s: addressed non-existing codec\n", __FUNCTION__); + dprint(d, 1, "%s: addressed non-existing codec\n", __func__); return -1; } cdc = HDA_CODEC_DEVICE_GET_CLASS(codec); @@ -307,22 +307,22 @@ static void intel_hda_corb_run(IntelHDAState *d) uint32_t rp, verb; if (d->ics & ICH6_IRS_BUSY) { - dprint(d, 2, "%s: [icw] verb 0x%08x\n", __FUNCTION__, d->icw); + dprint(d, 2, "%s: [icw] verb 0x%08x\n", __func__, d->icw); intel_hda_send_command(d, d->icw); return; } for (;;) { if (!(d->corb_ctl & ICH6_CORBCTL_RUN)) { - dprint(d, 2, "%s: !run\n", __FUNCTION__); + dprint(d, 2, "%s: !run\n", __func__); return; } if ((d->corb_rp & 0xff) == d->corb_wp) { - dprint(d, 2, "%s: corb ring empty\n", __FUNCTION__); + dprint(d, 2, "%s: corb ring empty\n", __func__); return; } if (d->rirb_count == d->rirb_cnt) { - dprint(d, 2, "%s: rirb count reached\n", __FUNCTION__); + dprint(d, 2, "%s: rirb count reached\n", __func__); return; } @@ -331,7 +331,7 @@ static void intel_hda_corb_run(IntelHDAState *d) verb = ldl_le_pci_dma(&d->pci, addr + 4*rp); d->corb_rp = rp; - dprint(d, 2, "%s: [rp 0x%x] verb 0x%08x\n", __FUNCTION__, rp, verb); + dprint(d, 2, "%s: [rp 0x%x] verb 0x%08x\n", __func__, rp, verb); intel_hda_send_command(d, verb); } } @@ -345,7 +345,7 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res if (d->ics & ICH6_IRS_BUSY) { dprint(d, 2, "%s: [irr] response 0x%x, cad 0x%x\n", - __FUNCTION__, response, dev->cad); + __func__, response, dev->cad); d->irr = response; d->ics &= ~(ICH6_IRS_BUSY | 0xf0); d->ics |= (ICH6_IRS_VALID | (dev->cad << 4)); @@ -353,7 +353,7 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res } if (!(d->rirb_ctl & ICH6_RBCTL_DMA_EN)) { - dprint(d, 1, "%s: rirb dma disabled, drop codec response\n", __FUNCTION__); + dprint(d, 1, "%s: rirb dma disabled, drop codec response\n", __func__); return; } @@ -365,17 +365,17 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res d->rirb_wp = wp; dprint(d, 2, "%s: [wp 0x%x] response 0x%x, extra 0x%x\n", - __FUNCTION__, wp, response, ex); + __func__, wp, response, ex); d->rirb_count++; if (d->rirb_count == d->rirb_cnt) { - dprint(d, 2, "%s: rirb count reached (%d)\n", __FUNCTION__, d->rirb_count); + dprint(d, 2, "%s: rirb count reached (%d)\n", __func__, d->rirb_count); if (d->rirb_ctl & ICH6_RBCTL_IRQ_EN) { d->rirb_sts |= ICH6_RBSTS_IRQ; intel_hda_update_irq(d); } } else if ((d->corb_rp & 0xff) == d->corb_wp) { - dprint(d, 2, "%s: corb ring empty (%d/%d)\n", __FUNCTION__, + dprint(d, 2, "%s: corb ring empty (%d/%d)\n", __func__, d->rirb_count, d->rirb_cnt); if (d->rirb_ctl & ICH6_RBCTL_IRQ_EN) { d->rirb_sts |= ICH6_RBSTS_IRQ; @@ -1144,7 +1144,7 @@ static int intel_hda_post_load(void *opaque, int version) IntelHDAState* d = opaque; int i; - dprint(d, 1, "%s\n", __FUNCTION__); + dprint(d, 1, "%s\n", __func__); for (i = 0; i < ARRAY_SIZE(d->st); i++) { if (d->st[i].ctl & 0x02) { intel_hda_parse_bdl(d, &d->st[i]); diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index 8bb44a7cc1..6d8b728923 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -315,7 +315,7 @@ static int wm8750_event(I2CSlave *i2c, enum i2c_event event) #ifdef VERBOSE if (s->i2c_len < 2) printf("%s: message too short (%i bytes)\n", - __FUNCTION__, s->i2c_len); + __func__, s->i2c_len); #endif break; default: @@ -555,7 +555,7 @@ static int wm8750_tx(I2CSlave *i2c, uint8_t data) #ifdef VERBOSE default: - printf("%s: unknown register %02x\n", __FUNCTION__, cmd); + printf("%s: unknown register %02x\n", __func__, cmd); #endif } diff --git a/hw/block/nand.c b/hw/block/nand.c index 76dcd3f76e..919cb9b803 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -321,7 +321,7 @@ static void nand_command(NANDFlashState *s) break; default: - printf("%s: Unknown NAND command 0x%02x\n", __FUNCTION__, s->cmd); + printf("%s: Unknown NAND command 0x%02x\n", __func__, s->cmd); } } @@ -640,7 +640,7 @@ DeviceState *nand_init(BlockBackend *blk, int manf_id, int chip_id) DeviceState *dev; if (nand_flash_ids[chip_id].size == 0) { - hw_error("%s: Unsupported NAND chip ID.\n", __FUNCTION__); + hw_error("%s: Unsupported NAND chip ID.\n", __func__); } dev = DEVICE(object_new(TYPE_NAND)); qdev_prop_set_uint8(dev, "manufacturer_id", manf_id); diff --git a/hw/block/onenand.c b/hw/block/onenand.c index de65c9ebb9..e243182394 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -659,12 +659,12 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, case 0xff02: /* ECC Result of spare area data */ case 0xff03: /* ECC Result of main area data */ case 0xff04: /* ECC Result of spare area data */ - hw_error("%s: imeplement ECC\n", __FUNCTION__); + hw_error("%s: imeplement ECC\n", __func__); return 0x0000; } fprintf(stderr, "%s: unknown OneNAND register %x\n", - __FUNCTION__, offset); + __func__, offset); return 0; } @@ -709,7 +709,7 @@ static void onenand_write(void *opaque, hwaddr addr, default: fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n", - __FUNCTION__, value); + __func__, value); } break; @@ -760,7 +760,7 @@ static void onenand_write(void *opaque, hwaddr addr, default: fprintf(stderr, "%s: unknown OneNAND register %x\n", - __FUNCTION__, offset); + __func__, offset); } } diff --git a/hw/bt/core.c b/hw/bt/core.c index 615f0af073..c1806b71a3 100644 --- a/hw/bt/core.c +++ b/hw/bt/core.c @@ -32,23 +32,23 @@ static void bt_dummy_lmp_connection_complete(struct bt_link_s *link) { if (link->slave->reject_reason) fprintf(stderr, "%s: stray LMP_not_accepted received, fixme\n", - __FUNCTION__); + __func__); else fprintf(stderr, "%s: stray LMP_accepted received, fixme\n", - __FUNCTION__); + __func__); exit(-1); } static void bt_dummy_lmp_disconnect_master(struct bt_link_s *link) { - fprintf(stderr, "%s: stray LMP_detach received, fixme\n", __FUNCTION__); + fprintf(stderr, "%s: stray LMP_detach received, fixme\n", __func__); exit(-1); } static void bt_dummy_lmp_acl_resp(struct bt_link_s *link, const uint8_t *data, int start, int len) { - fprintf(stderr, "%s: stray ACL response PDU, fixme\n", __FUNCTION__); + fprintf(stderr, "%s: stray ACL response PDU, fixme\n", __func__); exit(-1); } @@ -113,7 +113,7 @@ void bt_device_done(struct bt_device_s *dev) while (*p && *p != dev) p = &(*p)->next; if (*p != dev) { - fprintf(stderr, "%s: bad bt device \"%s\"\n", __FUNCTION__, + fprintf(stderr, "%s: bad bt device \"%s\"\n", __func__, dev->lmp_name ?: "(null)"); exit(-1); } diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c index d13192b9b5..ac067b81f6 100644 --- a/hw/bt/hci-csr.c +++ b/hw/bt/hci-csr.c @@ -111,14 +111,14 @@ static uint8_t *csrhci_out_packet(struct csrhci_s *s, int len) if (off < FIFO_LEN) { if (off + len > FIFO_LEN && (s->out_size = off + len) > FIFO_LEN * 2) { - fprintf(stderr, "%s: can't alloc %i bytes\n", __FUNCTION__, len); + fprintf(stderr, "%s: can't alloc %i bytes\n", __func__, len); exit(-1); } return s->outfifo + off; } if (s->out_len > s->out_size) { - fprintf(stderr, "%s: can't alloc %i bytes\n", __FUNCTION__, len); + fprintf(stderr, "%s: can't alloc %i bytes\n", __func__, len); exit(-1); } @@ -169,7 +169,7 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf, s->hci->bdaddr_set(s->hci, s->bd_addr.b); fprintf(stderr, "%s: bd_address loaded from firmware: " - "%02x:%02x:%02x:%02x:%02x:%02x\n", __FUNCTION__, + "%02x:%02x:%02x:%02x:%02x:%02x\n", __func__, s->bd_addr.b[0], s->bd_addr.b[1], s->bd_addr.b[2], s->bd_addr.b[3], s->bd_addr.b[4], s->bd_addr.b[5]); } @@ -181,7 +181,7 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf, break; default: - fprintf(stderr, "%s: got a bad CMD packet\n", __FUNCTION__); + fprintf(stderr, "%s: got a bad CMD packet\n", __func__); return; } @@ -226,7 +226,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt) case H4_NEG_PKT: if (s->in_hdr != sizeof(csrhci_neg_packet) || memcmp(pkt - 1, csrhci_neg_packet, s->in_hdr)) { - fprintf(stderr, "%s: got a bad NEG packet\n", __FUNCTION__); + fprintf(stderr, "%s: got a bad NEG packet\n", __func__); return; } pkt += 2; @@ -241,7 +241,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt) case H4_ALIVE_PKT: if (s->in_hdr != 4 || pkt[1] != 0x55 || pkt[2] != 0x00) { - fprintf(stderr, "%s: got a bad ALIVE packet\n", __FUNCTION__); + fprintf(stderr, "%s: got a bad ALIVE packet\n", __func__); return; } @@ -254,7 +254,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt) default: bad_pkt: /* TODO: error out */ - fprintf(stderr, "%s: got a bad packet\n", __FUNCTION__); + fprintf(stderr, "%s: got a bad packet\n", __func__); break; } diff --git a/hw/bt/hci.c b/hw/bt/hci.c index 476ebec0ab..df05f07887 100644 --- a/hw/bt/hci.c +++ b/hw/bt/hci.c @@ -458,7 +458,7 @@ static inline uint8_t *bt_hci_event_start(struct bt_hci_s *hci, if (len > 255) { fprintf(stderr, "%s: HCI event params too long (%ib)\n", - __FUNCTION__, len); + __func__, len); exit(-1); } @@ -589,7 +589,7 @@ static void bt_hci_inquiry_result(struct bt_hci_s *hci, bt_hci_inquiry_result_with_rssi(hci, slave); return; default: - fprintf(stderr, "%s: bad inquiry mode %02x\n", __FUNCTION__, + fprintf(stderr, "%s: bad inquiry mode %02x\n", __func__, hci->lm.inquiry_mode); exit(-1); } @@ -1528,7 +1528,7 @@ static void bt_submit_hci(struct HCIInfo *info, "the Inquiry command has been issued, a Command " "Status event has been received for the Inquiry " "command, and before the Inquiry Complete event " - "occurs", __FUNCTION__); + "occurs", __func__); bt_hci_event_complete_status(hci, HCI_COMMAND_DISALLOWED); break; } @@ -1567,7 +1567,7 @@ static void bt_submit_hci(struct HCIInfo *info, "the Inquiry command has been issued, a Command " "Status event has been received for the Inquiry " "command, and before the Inquiry Complete event " - "occurs", __FUNCTION__); + "occurs", __func__); bt_hci_event_complete_status(hci, HCI_COMMAND_DISALLOWED); break; } @@ -1972,7 +1972,7 @@ static void bt_submit_hci(struct HCIInfo *info, short_hci: fprintf(stderr, "%s: HCI packet too short (%iB)\n", - __FUNCTION__, length); + __func__, length); bt_hci_event_status(hci, HCI_INVALID_PARAMETERS); break; } @@ -1992,7 +1992,7 @@ static inline void bt_hci_lmp_acl_data(struct bt_hci_s *hci, uint16_t handle, if (len + HCI_ACL_HDR_SIZE > sizeof(hci->acl_buf)) { fprintf(stderr, "%s: can't take ACL packets %i bytes long\n", - __FUNCTION__, len); + __func__, len); return; } memcpy(hci->acl_buf + HCI_ACL_HDR_SIZE, data, len); @@ -2030,7 +2030,7 @@ static void bt_submit_acl(struct HCIInfo *info, if (length < HCI_ACL_HDR_SIZE) { fprintf(stderr, "%s: ACL packet too short (%iB)\n", - __FUNCTION__, length); + __func__, length); return; } @@ -2042,7 +2042,7 @@ static void bt_submit_acl(struct HCIInfo *info, if (bt_hci_handle_bad(hci, handle)) { fprintf(stderr, "%s: invalid ACL handle %03x\n", - __FUNCTION__, handle); + __func__, handle); /* TODO: signal an error */ return; } @@ -2050,7 +2050,7 @@ static void bt_submit_acl(struct HCIInfo *info, if (datalen > length) { fprintf(stderr, "%s: ACL packet too short (%iB < %iB)\n", - __FUNCTION__, length, datalen); + __func__, length, datalen); return; } @@ -2061,7 +2061,7 @@ static void bt_submit_acl(struct HCIInfo *info, hci->asb_handle = handle; else if (handle != hci->asb_handle) { fprintf(stderr, "%s: Bad handle %03x in Active Slave Broadcast\n", - __FUNCTION__, handle); + __func__, handle); /* TODO: signal an error */ return; } @@ -2074,7 +2074,7 @@ static void bt_submit_acl(struct HCIInfo *info, hci->psb_handle = handle; else if (handle != hci->psb_handle) { fprintf(stderr, "%s: Bad handle %03x in Parked Slave Broadcast\n", - __FUNCTION__, handle); + __func__, handle); /* TODO: signal an error */ return; } @@ -2106,13 +2106,13 @@ static void bt_submit_sco(struct HCIInfo *info, if (bt_hci_handle_bad(hci, handle)) { fprintf(stderr, "%s: invalid SCO handle %03x\n", - __FUNCTION__, handle); + __func__, handle); return; } if (datalen > length) { fprintf(stderr, "%s: SCO packet too short (%iB < %iB)\n", - __FUNCTION__, length, datalen); + __func__, length, datalen); return; } diff --git a/hw/bt/hid.c b/hw/bt/hid.c index f6affbbb44..09d17322e4 100644 --- a/hw/bt/hid.c +++ b/hw/bt/hid.c @@ -420,7 +420,7 @@ static void bt_hid_interrupt_sdu(void *opaque, const uint8_t *data, int len) return; bad: fprintf(stderr, "%s: bad transaction on Interrupt channel.\n", - __FUNCTION__); + __func__); } /* "Virtual cable" plug/unplug event. */ diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c index e342045140..3e53dd082d 100644 --- a/hw/bt/l2cap.c +++ b/hw/bt/l2cap.c @@ -468,7 +468,7 @@ static void l2cap_channel_close(struct l2cap_instance_s *l2cap, if (likely(ch)) { if (ch->remote_cid != source_cid) { fprintf(stderr, "%s: Ignoring a Disconnection Request with the " - "invalid SCID %04x.\n", __FUNCTION__, source_cid); + "invalid SCID %04x.\n", __func__, source_cid); return; } @@ -791,7 +791,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, /* TODO: do the IDs really have to be in sequence? */ if (!id || (id != l2cap->last_id && id != l2cap->next_id)) { fprintf(stderr, "%s: out of sequence command packet ignored.\n", - __FUNCTION__); + __func__); return; } #else @@ -814,7 +814,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, /* We never issue commands other than Command Reject currently. */ fprintf(stderr, "%s: stray Command Reject (%02x, %04x) " - "packet, ignoring.\n", __FUNCTION__, id, + "packet, ignoring.\n", __func__, id, le16_to_cpu(((l2cap_cmd_rej *) params)->reason)); break; @@ -837,7 +837,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, /* We never issue Connection Requests currently. TODO */ fprintf(stderr, "%s: unexpected Connection Response (%02x) " - "packet, ignoring.\n", __FUNCTION__, id); + "packet, ignoring.\n", __func__, id); break; case L2CAP_CONF_REQ: @@ -866,7 +866,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, ((l2cap_conf_rsp *) params)->data, len - L2CAP_CONF_RSP_SIZE(0))) fprintf(stderr, "%s: unexpected Configure Response (%02x) " - "packet, ignoring.\n", __FUNCTION__, id); + "packet, ignoring.\n", __func__, id); break; case L2CAP_DISCONN_REQ: @@ -888,7 +888,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, /* We never issue Disconnection Requests currently. TODO */ fprintf(stderr, "%s: unexpected Disconnection Response (%02x) " - "packet, ignoring.\n", __FUNCTION__, id); + "packet, ignoring.\n", __func__, id); break; case L2CAP_ECHO_REQ: @@ -898,7 +898,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, case L2CAP_ECHO_RSP: /* We never issue Echo Requests currently. TODO */ fprintf(stderr, "%s: unexpected Echo Response (%02x) " - "packet, ignoring.\n", __FUNCTION__, id); + "packet, ignoring.\n", __func__, id); break; case L2CAP_INFO_REQ: @@ -918,7 +918,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, /* We never issue Information Requests currently. TODO */ fprintf(stderr, "%s: unexpected Information Response (%02x) " - "packet, ignoring.\n", __FUNCTION__, id); + "packet, ignoring.\n", __func__, id); break; default: @@ -1067,7 +1067,7 @@ static void l2cap_frame_in(struct l2cap_instance_s *l2cap, if (unlikely(cid >= L2CAP_CID_MAX || !l2cap->cid[cid])) { fprintf(stderr, "%s: frame addressed to a non-existent L2CAP " - "channel %04x received.\n", __FUNCTION__, cid); + "channel %04x received.\n", __func__, cid); return; } @@ -1129,7 +1129,7 @@ static uint8_t *l2cap_bframe_out(struct bt_l2cap_conn_params_s *parm, int len) if (len > chan->params.remote_mtu) { fprintf(stderr, "%s: B-Frame for CID %04x longer than %i octets.\n", - __FUNCTION__, + __func__, chan->remote_cid, chan->params.remote_mtu); exit(-1); } @@ -1354,7 +1354,7 @@ void bt_l2cap_psm_register(struct bt_l2cap_device_s *dev, int psm, int min_mtu, if (new_psm) { fprintf(stderr, "%s: PSM %04x already registered for device `%s'.\n", - __FUNCTION__, psm, dev->device.lmp_name); + __func__, psm, dev->device.lmp_name); exit(-1); } diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c index 3cb60b9495..7c0d38b504 100644 --- a/hw/bt/sdp.c +++ b/hw/bt/sdp.c @@ -506,7 +506,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len) int rsp_len = 0; if (len < 5) { - fprintf(stderr, "%s: short SDP PDU (%iB).\n", __FUNCTION__, len); + fprintf(stderr, "%s: short SDP PDU (%iB).\n", __func__, len); return; } @@ -518,7 +518,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len) if (len != plen) { fprintf(stderr, "%s: wrong SDP PDU length (%iB != %iB).\n", - __FUNCTION__, plen, len); + __func__, plen, len); err = SDP_INVALID_PDU_SIZE; goto respond; } @@ -545,7 +545,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len) case SDP_SVC_SEARCH_ATTR_RSP: default: fprintf(stderr, "%s: unexpected SDP PDU ID %02x.\n", - __FUNCTION__, pdu_id); + __func__, pdu_id); err = SDP_INVALID_SYNTAX; break; } diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index cbf07d14d9..291abe6fca 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -474,7 +474,7 @@ static uint16_t blizzard_reg_read(void *opaque, uint8_t reg) return s->gpio_pdown; default: - fprintf(stderr, "%s: unknown register %02x\n", __FUNCTION__, reg); + fprintf(stderr, "%s: unknown register %02x\n", __func__, reg); return 0; } } @@ -502,7 +502,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->pll_mode = value & 0x77; if ((value & 3) == 0 || (value & 3) == 3) fprintf(stderr, "%s: wrong PLL Control bits (%i)\n", - __FUNCTION__, value & 3); + __func__, value & 3); break; case 0x0e: /* Clock-Source Select */ @@ -541,7 +541,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) case 0x28: /* LCD Panel Configuration */ s->lcd_config = value & 0xff; if (value & (1 << 7)) - fprintf(stderr, "%s: data swap not supported!\n", __FUNCTION__); + fprintf(stderr, "%s: data swap not supported!\n", __func__); break; case 0x2a: /* LCD Horizontal Display Width */ @@ -586,7 +586,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->hssi_config[1] = value; if (((value >> 4) & 3) == 3) fprintf(stderr, "%s: Illegal active-data-links value\n", - __FUNCTION__); + __func__); break; case 0x42: /* High-speed Serial Interface Tx Mode */ s->hssi_config[2] = value & 0xbd; @@ -641,7 +641,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->enable = value & 1; s->blank = (value >> 1) & 1; if (value & (1 << 4)) - fprintf(stderr, "%s: Macrovision enable attempt!\n", __FUNCTION__); + fprintf(stderr, "%s: Macrovision enable attempt!\n", __func__); break; case 0x6a: /* Special Effects */ @@ -718,7 +718,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->bpp = blizzard_iformat_bpp[s->iformat]; if (!s->bpp) fprintf(stderr, "%s: Illegal or unsupported input format %x\n", - __FUNCTION__, s->iformat); + __func__, s->iformat); break; case 0x8e: /* Data Source Select */ s->source = value & 7; @@ -730,7 +730,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) !((s->ix[1] - s->ix[0]) & (s->iy[1] - s->iy[0]) & (s->ox[1] - s->ox[0]) & (s->oy[1] - s->oy[0]) & 1)) fprintf(stderr, "%s: Illegal input/output window positions\n", - __FUNCTION__); + __func__); blizzard_transfer_setup(s); break; @@ -784,7 +784,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->pm = value & 0x83; if (value & s->mode & 1) fprintf(stderr, "%s: The display must be disabled before entering " - "Standby Mode\n", __FUNCTION__); + "Standby Mode\n", __func__); break; case 0xe8: /* Non-display Period Control / Status */ s->status = value & 0x1b; @@ -815,7 +815,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) break; default: - fprintf(stderr, "%s: unknown register %02x\n", __FUNCTION__, reg); + fprintf(stderr, "%s: unknown register %02x\n", __func__, reg); break; } } diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 783e9e1318..601f178fdd 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -526,7 +526,7 @@ static void omap_disc_write(void *opaque, hwaddr addr, s->dispc.l[0].attr = value & 0x7ff; if (value & (3 << 9)) fprintf(stderr, "%s: Big-endian pixel format not supported\n", - __FUNCTION__); + __func__); s->dispc.l[0].enable = value & 1; s->dispc.l[0].bpp = (value >> 1) & 0xf; s->dispc.invalidate = 1; @@ -617,7 +617,7 @@ static void omap_rfbi_transfer_start(struct omap_dss_s *s) if (s->rfbi.control & (1 << 1)) { /* BYPASS */ /* TODO: in non-Bypass mode we probably need to just assert the * DRQ and wait for DMA to write the pixels. */ - fprintf(stderr, "%s: Bypass mode unimplemented\n", __FUNCTION__); + fprintf(stderr, "%s: Bypass mode unimplemented\n", __func__); return; } @@ -1086,6 +1086,6 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta, void omap_rfbi_attach(struct omap_dss_s *s, int cs, struct rfbi_chip_s *chip) { if (cs < 0 || cs > 1) - hw_error("%s: wrong CS %i\n", __FUNCTION__, cs); + hw_error("%s: wrong CS %i\n", __func__, cs); s->rfbi.chip[cs] = chip; } diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c index 845521c5b2..b83f80753a 100644 --- a/hw/display/pxa2xx_lcd.c +++ b/hw/display/pxa2xx_lcd.c @@ -405,7 +405,7 @@ static uint64_t pxa2xx_lcdc_read(void *opaque, hwaddr offset, default: fail: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } return 0; @@ -424,7 +424,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset, s->status[0] |= LCSR0_QD; if (!(s->control[0] & LCCR0_LCDT) && (value & LCCR0_LCDT)) - printf("%s: internal frame buffer unsupported\n", __FUNCTION__); + printf("%s: internal frame buffer unsupported\n", __func__); if ((s->control[3] & LCCR3_API) && (value & LCCR0_ENB) && !(value & LCCR0_LCDT)) @@ -460,7 +460,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset, case OVL1C1: if (!(s->ovl1c[0] & OVLC1_EN) && (value & OVLC1_EN)) - printf("%s: Overlay 1 not supported\n", __FUNCTION__); + printf("%s: Overlay 1 not supported\n", __func__); s->ovl1c[0] = value & 0x80ffffff; s->dma_ch[1].up = (value & OVLC1_EN) || (s->control[0] & LCCR0_SDS); @@ -472,7 +472,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset, case OVL2C1: if (!(s->ovl2c[0] & OVLC1_EN) && (value & OVLC1_EN)) - printf("%s: Overlay 2 not supported\n", __FUNCTION__); + printf("%s: Overlay 2 not supported\n", __func__); s->ovl2c[0] = value & 0x80ffffff; s->dma_ch[2].up = !!(value & OVLC1_EN); @@ -486,7 +486,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset, case CCR: if (!(s->ccr & CCR_CEN) && (value & CCR_CEN)) - printf("%s: Hardware cursor unimplemented\n", __FUNCTION__); + printf("%s: Hardware cursor unimplemented\n", __func__); s->ccr = value & 0x81ffffe7; s->dma_ch[5].up = !!(value & CCR_CEN); @@ -560,7 +560,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset, default: fail: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } } @@ -1050,7 +1050,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, s->dest_width = 4; break; default: - fprintf(stderr, "%s: Bad color depth\n", __FUNCTION__); + fprintf(stderr, "%s: Bad color depth\n", __func__); exit(1); } diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index 90e0865618..e7ac4f8789 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -78,7 +78,7 @@ void qxl_render_resize(PCIQXLDevice *qxl) qxl->guest_primary.bits_pp = 32; break; default: - fprintf(stderr, "%s: unhandled format: %x\n", __FUNCTION__, + fprintf(stderr, "%s: unhandled format: %x\n", __func__, qxl->guest_primary.surface.format); qxl->guest_primary.bytes_pp = 4; qxl->guest_primary.bits_pp = 32; @@ -248,7 +248,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor, break; default: fprintf(stderr, "%s: not implemented: type %d\n", - __FUNCTION__, cursor->header.type); + __func__, cursor->header.type); goto fail; } return c; @@ -275,7 +275,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) } if (qxl->debug > 1 && cmd->type != QXL_CURSOR_MOVE) { - fprintf(stderr, "%s", __FUNCTION__); + fprintf(stderr, "%s", __func__); qxl_log_cmd_cursor(qxl, cmd, ext->group_id); fprintf(stderr, "\n"); } diff --git a/hw/display/qxl.h b/hw/display/qxl.h index f6556adb73..7d1b60014a 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -133,7 +133,7 @@ typedef struct PCIQXLDevice { #define PCI_QXL(obj) OBJECT_CHECK(PCIQXLDevice, (obj), TYPE_PCI_QXL) #define PANIC_ON(x) if ((x)) { \ - printf("%s: PANIC %s failed\n", __FUNCTION__, #x); \ + printf("%s: PANIC %s failed\n", __func__, #x); \ abort(); \ } diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 74d10af3d4..79f161740a 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -148,7 +148,7 @@ static void tc6393xb_gpio_set(void *opaque, int line, int level) // TC6393xbState *s = opaque; if (line > TC6393XB_GPIOS) { - printf("%s: No GPIO pin %i\n", __FUNCTION__, line); + printf("%s: No GPIO pin %i\n", __func__, line); return; } diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 8e2547ac05..30cd415330 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -644,7 +644,7 @@ static void xenfb_guest_copy(struct XenFB *xenfb, int x, int y, int w, int h) } if (oops) /* should not happen */ xen_pv_printf(&xenfb->c.xendev, 0, "%s: oops: convert %d -> %d bpp?\n", - __FUNCTION__, xenfb->depth, bpp); + __func__, xenfb->depth, bpp); dpy_gfx_update(xenfb->con, x, y, w, h); } diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 45dfe7aadd..abd18c67ea 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -161,7 +161,7 @@ static void omap_dma_channel_load(struct omap_dma_channel_s *ch) a->pck_element = 0; if (unlikely(!ch->elements || !ch->frames)) { - printf("%s: bad DMA request\n", __FUNCTION__); + printf("%s: bad DMA request\n", __func__); return; } @@ -519,7 +519,7 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) continue; #endif printf("%s: Bus time-out in DMA%i operation\n", - __FUNCTION__, dma->num); + __func__, dma->num); } min_elems = INT_MAX; @@ -879,14 +879,14 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *s, ch->pack[0] = (value & 0x0040) >> 6; ch->port[0] = (enum omap_dma_port) ((value & 0x003c) >> 2); if (ch->port[0] >= __omap_dma_port_last) - printf("%s: invalid DMA port %i\n", __FUNCTION__, + printf("%s: invalid DMA port %i\n", __func__, ch->port[0]); if (ch->port[1] >= __omap_dma_port_last) - printf("%s: invalid DMA port %i\n", __FUNCTION__, + printf("%s: invalid DMA port %i\n", __func__, ch->port[1]); ch->data_type = 1 << (value & 3); if ((value & 3) == 3) { - printf("%s: bad data_type for DMA channel\n", __FUNCTION__); + printf("%s: bad data_type for DMA channel\n", __func__); ch->data_type >>= 1; } break; @@ -1440,7 +1440,7 @@ static int omap_dma_sys_read(struct omap_dma_s *s, int offset, case 0x482: /* DMA_PCh1_SR */ case 0x4c0: /* DMA_PChD_SR_0 */ printf("%s: Physical Channel Status Registers not implemented.\n", - __FUNCTION__); + __func__); *ret = 0xff; break; @@ -1898,13 +1898,13 @@ static void omap_dma4_write(void *opaque, hwaddr addr, omap_dma_reset(s->dma); s->ocp = value & 0x3321; if (((s->ocp >> 12) & 3) == 3) /* MIDLEMODE */ - fprintf(stderr, "%s: invalid DMA power mode\n", __FUNCTION__); + fprintf(stderr, "%s: invalid DMA power mode\n", __func__); return; case 0x78: /* DMA4_GCR */ s->gcr = value & 0x00ff00ff; if ((value & 0xff) == 0x00) /* MAX_CHANNEL_FIFO_DEPTH */ - fprintf(stderr, "%s: wrong FIFO depth in GCR\n", __FUNCTION__); + fprintf(stderr, "%s: wrong FIFO depth in GCR\n", __func__); return; case 0x80 ... 0xfff: @@ -1935,7 +1935,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->src_sync = (value >> 24) & 1; /* XXX For CamDMA must be 1 */ if (ch->buf_disable && !ch->src_sync) fprintf(stderr, "%s: Buffering disable is not allowed in " - "destination synchronised mode\n", __FUNCTION__); + "destination synchronised mode\n", __func__); ch->prefetch = (value >> 23) & 1; ch->bs = (value >> 18) & 1; ch->transparent_copy = (value >> 17) & 1; @@ -1947,7 +1947,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->fs = (value & 0x0020) >> 5; if (ch->fs && ch->bs && ch->mode[0] && ch->mode[1]) fprintf(stderr, "%s: For a packet transfer at least one port " - "must be constant-addressed\n", __FUNCTION__); + "must be constant-addressed\n", __func__); ch->sync = (value & 0x001f) | ((value >> 14) & 0x0060); /* XXX must be 0x01 for CamDMA */ @@ -1978,7 +1978,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->endian_lock[1] =(value >> 18) & 1; if (ch->endian[0] != ch->endian[1]) fprintf(stderr, "%s: DMA endianness conversion enable attempt\n", - __FUNCTION__); + __func__); ch->write_mode = (value >> 16) & 3; ch->burst[1] = (value & 0xc000) >> 14; ch->pack[1] = (value & 0x2000) >> 13; @@ -1988,10 +1988,10 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->translate[0] = (value & 0x003c) >> 2; if (ch->translate[0] | ch->translate[1]) fprintf(stderr, "%s: bad MReqAddressTranslate sideband signal\n", - __FUNCTION__); + __func__); ch->data_type = 1 << (value & 3); if ((value & 3) == 3) { - printf("%s: bad data_type for DMA channel\n", __FUNCTION__); + printf("%s: bad data_type for DMA channel\n", __func__); ch->data_type >>= 1; } break; diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index 634a4328f0..f4eb26cf17 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -169,7 +169,7 @@ static inline void pxa2xx_dma_descriptor_fetch( s->chan[ch].dest &= ~3; if (s->chan[ch].cmd & (DCMD_CMPEN | DCMD_FLYBYS | DCMD_FLYBYT)) - printf("%s: unsupported mode in channel %i\n", __FUNCTION__, ch); + printf("%s: unsupported mode in channel %i\n", __func__, ch); if (s->chan[ch].cmd & DCMD_STARTIRQEN) s->chan[ch].state |= DCSR_STARTINTR; @@ -264,7 +264,7 @@ static uint64_t pxa2xx_dma_read(void *opaque, hwaddr offset, unsigned int channel; if (size != 4) { - hw_error("%s: Bad access width\n", __FUNCTION__); + hw_error("%s: Bad access width\n", __func__); return 5; } @@ -312,7 +312,7 @@ static uint64_t pxa2xx_dma_read(void *opaque, hwaddr offset, } } - hw_error("%s: Bad offset 0x" TARGET_FMT_plx "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset 0x" TARGET_FMT_plx "\n", __func__, offset); return 7; } @@ -323,7 +323,7 @@ static void pxa2xx_dma_write(void *opaque, hwaddr offset, unsigned int channel; if (size != 4) { - hw_error("%s: Bad access width\n", __FUNCTION__); + hw_error("%s: Bad access width\n", __func__); return; } @@ -337,7 +337,7 @@ static void pxa2xx_dma_write(void *opaque, hwaddr offset, if (value & DRCMR_MAPVLD) if ((value & DRCMR_CHLNUM) > s->channels) hw_error("%s: Bad DMA channel %i\n", - __FUNCTION__, (unsigned)value & DRCMR_CHLNUM); + __func__, (unsigned)value & DRCMR_CHLNUM); s->req[channel] = value; break; @@ -416,7 +416,7 @@ static void pxa2xx_dma_write(void *opaque, hwaddr offset, break; } fail: - hw_error("%s: Bad offset " TARGET_FMT_plx "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " TARGET_FMT_plx "\n", __func__, offset); } } @@ -431,7 +431,7 @@ static void pxa2xx_dma_request(void *opaque, int req_num, int on) PXA2xxDMAState *s = opaque; int ch; if (req_num < 0 || req_num >= PXA2XX_DMA_NUM_REQUESTS) - hw_error("%s: Bad DMA request %i\n", __FUNCTION__, req_num); + hw_error("%s: Bad DMA request %i\n", __func__, req_num); if (!(s->req[req_num] & DRCMR_MAPVLD)) return; diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index f82e3e6555..4c203ef5c6 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -67,7 +67,7 @@ static int max7310_rx(I2CSlave *i2c) default: #ifdef VERBOSE - printf("%s: unknown register %02x\n", __FUNCTION__, s->command); + printf("%s: unknown register %02x\n", __func__, s->command); #endif break; } @@ -82,7 +82,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data) if (s->len ++ > 1) { #ifdef VERBOSE - printf("%s: message too long (%i bytes)\n", __FUNCTION__, s->len); + printf("%s: message too long (%i bytes)\n", __func__, s->len); #endif return 1; } @@ -121,7 +121,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data) break; default: #ifdef VERBOSE - printf("%s: unknown register %02x\n", __FUNCTION__, s->command); + printf("%s: unknown register %02x\n", __func__, s->command); #endif return 1; } @@ -141,7 +141,7 @@ static int max7310_event(I2CSlave *i2c, enum i2c_event event) case I2C_FINISH: #ifdef VERBOSE if (s->len == 1) - printf("%s: message too short (%i bytes)\n", __FUNCTION__, s->len); + printf("%s: message too short (%i bytes)\n", __func__, s->len); #endif break; default: diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 17891e2d0f..08472193b5 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -399,7 +399,7 @@ static void omap2_gpio_module_write(void *opaque, hwaddr addr, case 0x10: /* GPIO_SYSCONFIG */ if (((value >> 3) & 3) == 3) - fprintf(stderr, "%s: bad IDLEMODE value\n", __FUNCTION__); + fprintf(stderr, "%s: bad IDLEMODE value\n", __func__); if (value & 2) omap2_gpio_module_reset(s); s->config[0] = value & 0x1d; diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 12264ee0f5..26e3e5ebf6 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -341,12 +341,12 @@ static void omap_i2c_write(void *opaque, hwaddr addr, } if ((value & (1 << 15)) && !(value & (1 << 10))) { /* MST */ fprintf(stderr, "%s: I^2C slave mode not supported\n", - __FUNCTION__); + __func__); break; } if ((value & (1 << 15)) && value & (1 << 8)) { /* XA */ fprintf(stderr, "%s: 10-bit addressing mode not supported\n", - __FUNCTION__); + __func__); break; } if ((value & (1 << 15)) && value & (1 << 0)) { /* STT */ @@ -393,7 +393,7 @@ static void omap_i2c_write(void *opaque, hwaddr addr, omap_i2c_interrupts_update(s); } if (value & (1 << 15)) /* ST_EN */ - fprintf(stderr, "%s: System Test not supported\n", __FUNCTION__); + fprintf(stderr, "%s: System Test not supported\n", __func__); break; default: diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 373311f91a..b72dcbcc32 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1053,7 +1053,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, g_assert(is_ncq(ncq_fis->command)); if (ncq_tfs->used) { /* error - already in use */ - fprintf(stderr, "%s: tag %d already used\n", __FUNCTION__, tag); + fprintf(stderr, "%s: tag %d already used\n", __func__, tag); return; } diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 17917c0b30..3090254783 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -156,7 +156,7 @@ static uint8_t md_attr_read(PCMCIACardState *card, uint32_t at) return 0x00; #ifdef VERBOSE default: - printf("%s: Bad attribute space register %02x\n", __FUNCTION__, at); + printf("%s: Bad attribute space register %02x\n", __func__, at); #endif } @@ -193,7 +193,7 @@ static void md_attr_write(PCMCIACardState *card, uint32_t at, uint8_t value) case 0x06: /* Socket and Copy Register */ break; default: - printf("%s: Bad attribute space register %02x\n", __FUNCTION__, at); + printf("%s: Bad attribute space register %02x\n", __func__, at); } } diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index 2340523da0..d39953126b 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -239,7 +239,7 @@ static uint8_t lm_kbd_read(LM823KbdState *s, int reg, int byte) default: lm_kbd_error(s, ERR_CMDUNK); - fprintf(stderr, "%s: unknown command %02x\n", __FUNCTION__, reg); + fprintf(stderr, "%s: unknown command %02x\n", __func__, reg); return 0x00; } @@ -331,7 +331,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value) if ((value & 3) && (value & 3) != 3) { lm_kbd_error(s, ERR_BADPAR); fprintf(stderr, "%s: invalid clock setting in RCPWM\n", - __FUNCTION__); + __func__); } /* TODO: Validate that the command is only issued once */ break; @@ -378,7 +378,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value) break; default: lm_kbd_error(s, ERR_CMDUNK); - fprintf(stderr, "%s: unknown command %02x\n", __FUNCTION__, reg); + fprintf(stderr, "%s: unknown command %02x\n", __func__, reg); break; } } diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c index 2b70bbb95c..93db9ed25b 100644 --- a/hw/input/pxa2xx_keypad.c +++ b/hw/input/pxa2xx_keypad.c @@ -231,7 +231,7 @@ static uint64_t pxa2xx_keypad_read(void *opaque, hwaddr offset, return s->kpkdi; break; default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } return 0; @@ -278,7 +278,7 @@ static void pxa2xx_keypad_write(void *opaque, hwaddr offset, break; default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } } @@ -326,7 +326,7 @@ void pxa27x_register_keypad(PXA2xxKeyPadState *kp, const struct keymap *map, int size) { if(!map || size < 0x80) { - fprintf(stderr, "%s - No PXA keypad map defined\n", __FUNCTION__); + fprintf(stderr, "%s - No PXA keypad map defined\n", __func__); exit(-1); } diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index eb5320af40..7990954b6c 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -201,7 +201,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) if (s->enabled != !(data & 0x4000)) { s->enabled = !(data & 0x4000); fprintf(stderr, "%s: touchscreen sense %sabled\n", - __FUNCTION__, s->enabled ? "en" : "dis"); + __func__, s->enabled ? "en" : "dis"); if (s->busy && !s->enabled) timer_del(s->timer); s->busy = s->busy && s->enabled; @@ -210,7 +210,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) s->timing[0] = data & 0x1fff; if ((s->timing[0] >> 11) == 3) fprintf(stderr, "%s: illegal conversion clock setting\n", - __FUNCTION__); + __func__); break; case 0xd: /* CFR1 */ s->timing[1] = data & 0xf07; @@ -222,7 +222,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) default: fprintf(stderr, "%s: write into read-only register %x\n", - __FUNCTION__, reg); + __func__, reg); } } @@ -338,7 +338,7 @@ static uint8_t tsc2005_txrx_word(void *opaque, uint8_t value) if (s->enabled != !(value & 1)) { s->enabled = !(value & 1); fprintf(stderr, "%s: touchscreen sense %sabled\n", - __FUNCTION__, s->enabled ? "en" : "dis"); + __func__, s->enabled ? "en" : "dis"); if (s->busy && !s->enabled) timer_del(s->timer); s->busy = s->busy && s->enabled; diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index 75ac8c2ab5..1cad57f644 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -287,7 +287,7 @@ static void tsc2102_audio_rate_update(TSC210xState *s) rate->fsref == ((s->audio_ctrl3 >> 13) & 1))/* REFFS */ break; if (!rate->rate) { - printf("%s: unknown sampling rate configured\n", __FUNCTION__); + printf("%s: unknown sampling rate configured\n", __func__); return; } @@ -913,7 +913,7 @@ uint32_t tsc210x_txrx(void *opaque, uint32_t value, int len) uint32_t ret = 0; if (len != 16) - hw_error("%s: FIXME: bad SPI word width %i\n", __FUNCTION__, len); + hw_error("%s: FIXME: bad SPI word width %i\n", __func__, len); /* TODO: sequential reads etc - how do we make sure the host doesn't * unintentionally read out a conversion result from a register while diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index ccdda89dab..6844c1aa83 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -540,7 +540,7 @@ static void omap2_inth_write(void *opaque, hwaddr addr, * for every register, see Chapter 3 and 4 for privileged mode. */ if (value & 1) fprintf(stderr, "%s: protection mode enable attempt\n", - __FUNCTION__); + __func__); return; case 0x50: /* INTC_IDLE */ diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index c129985e2a..1c728cd24b 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -30,7 +30,7 @@ //#define DEBUG_VT82C686B #ifdef DEBUG_VT82C686B -#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__) #else #define DPRINTF(fmt, ...) #endif diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 5a9dad9aae..e12336d14a 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -33,7 +33,7 @@ //#define DEBUG #ifdef DEBUG -#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__) #else #define DPRINTF(fmt, ...) #endif diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c index 677274ce3e..25e337ea77 100644 --- a/hw/misc/cbus.c +++ b/hw/misc/cbus.c @@ -62,7 +62,7 @@ static void cbus_io(CBusPriv *s) s->slave[s->addr]->io(s->slave[s->addr]->opaque, s->rw, s->reg, &s->val); else - hw_error("%s: bad slave address %i\n", __FUNCTION__, s->addr); + hw_error("%s: bad slave address %i\n", __func__, s->addr); } static void cbus_cycle(CBusPriv *s) @@ -299,7 +299,7 @@ static inline uint16_t retu_read(CBusRetu *s, int reg) return 0x0000; default: - hw_error("%s: bad register %02x\n", __FUNCTION__, reg); + hw_error("%s: bad register %02x\n", __func__, reg); } } @@ -372,7 +372,7 @@ static inline void retu_write(CBusRetu *s, int reg, uint16_t val) break; default: - hw_error("%s: bad register %02x\n", __FUNCTION__, reg); + hw_error("%s: bad register %02x\n", __func__, reg); } } @@ -538,7 +538,7 @@ static inline uint16_t tahvo_read(CBusTahvo *s, int reg) return 0x0000; default: - hw_error("%s: bad register %02x\n", __FUNCTION__, reg); + hw_error("%s: bad register %02x\n", __func__, reg); } } @@ -567,7 +567,7 @@ static inline void tahvo_write(CBusTahvo *s, int reg, uint16_t val) if (s->backlight != (val & 0x7f)) { s->backlight = val & 0x7f; printf("%s: LCD backlight now at %i / 127\n", - __FUNCTION__, s->backlight); + __func__, s->backlight); } break; @@ -588,7 +588,7 @@ static inline void tahvo_write(CBusTahvo *s, int reg, uint16_t val) break; default: - hw_error("%s: bad register %02x\n", __FUNCTION__, reg); + hw_error("%s: bad register %02x\n", __func__, reg); } } diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index 19151d07d6..9ea14186d4 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -1109,7 +1109,7 @@ struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name) for (i = mpu->clks; i->name; i ++) if (!strcmp(i->name, name) || (i->alias && !strcmp(i->alias, name))) return i; - hw_error("%s: %s not found\n", __FUNCTION__, name); + hw_error("%s: %s not found\n", __func__, name); } void omap_clk_get(struct clk *clk) @@ -1120,7 +1120,7 @@ void omap_clk_get(struct clk *clk) void omap_clk_put(struct clk *clk) { if (!(clk->usecount --)) - hw_error("%s: %s is not in use\n", __FUNCTION__, clk->name); + hw_error("%s: %s is not in use\n", __func__, clk->name); } static void omap_clk_update(struct clk *clk) diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 67d8e2f023..84f9e4c612 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -643,7 +643,7 @@ static void omap_gpmc_write(void *opaque, hwaddr addr, case 0x010: /* GPMC_SYSCONFIG */ if ((value >> 3) == 0x3) fprintf(stderr, "%s: bad SDRAM idle mode %"PRIi64"\n", - __FUNCTION__, value >> 3); + __func__, value >> 3); if (value & 2) omap_gpmc_reset(s); s->sysconfig = value & 0x19; @@ -806,7 +806,7 @@ static void omap_gpmc_write(void *opaque, hwaddr addr, break; case 0x230: /* GPMC_TESTMODE_CTRL */ if (value & 7) - fprintf(stderr, "%s: test mode enable attempt\n", __FUNCTION__); + fprintf(stderr, "%s: test mode enable attempt\n", __func__); break; default: @@ -864,7 +864,7 @@ void omap_gpmc_attach(struct omap_gpmc_s *s, int cs, MemoryRegion *iomem) assert(iomem); if (cs < 0 || cs >= 8) { - fprintf(stderr, "%s: bad chip-select %i\n", __FUNCTION__, cs); + fprintf(stderr, "%s: bad chip-select %i\n", __func__, cs); exit(-1); } f = &s->cs_file[cs]; diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c index 88c533a0fe..96fc057b4e 100644 --- a/hw/misc/omap_l4.c +++ b/hw/misc/omap_l4.c @@ -126,7 +126,7 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus, break; } if (!ta) { - fprintf(stderr, "%s: bad target agent (%i)\n", __FUNCTION__, cs); + fprintf(stderr, "%s: bad target agent (%i)\n", __func__, cs); exit(-1); } @@ -151,7 +151,7 @@ hwaddr omap_l4_attach(struct omap_target_agent_s *ta, hwaddr base; if (region < 0 || region >= ta->regions) { - fprintf(stderr, "%s: bad io region (%i)\n", __FUNCTION__, region); + fprintf(stderr, "%s: bad io region (%i)\n", __func__, region); exit(-1); } diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index dff37ecaf9..7b38c5568c 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.c @@ -109,7 +109,7 @@ static void omap_sdrc_write(void *opaque, hwaddr addr, case 0x10: /* SDRC_SYSCONFIG */ if ((value >> 3) != 0x2) fprintf(stderr, "%s: bad SDRAM idle mode %i\n", - __FUNCTION__, (unsigned)value >> 3); + __func__, (unsigned)value >> 3); if (value & 2) omap_sdrc_reset(s); s->config = value & 0x18; diff --git a/hw/misc/omap_tap.c b/hw/misc/omap_tap.c index e6ea8ee235..3f595e8df7 100644 --- a/hw/misc/omap_tap.c +++ b/hw/misc/omap_tap.c @@ -44,7 +44,7 @@ static uint64_t omap_tap_read(void *opaque, hwaddr addr, case omap3430: return 0x1b7ae02f; /* ES 2 */ default: - hw_error("%s: Bad mpu model\n", __FUNCTION__); + hw_error("%s: Bad mpu model\n", __func__); } case 0x208: /* PRODUCTION_ID_reg for OMAP2 */ @@ -61,7 +61,7 @@ static uint64_t omap_tap_read(void *opaque, hwaddr addr, case omap3430: return 0x000000f0; default: - hw_error("%s: Bad mpu model\n", __FUNCTION__); + hw_error("%s: Bad mpu model\n", __func__); } case 0x20c: @@ -75,7 +75,7 @@ static uint64_t omap_tap_read(void *opaque, hwaddr addr, case omap3430: return 0xcafeb7ae; /* ES 2 */ default: - hw_error("%s: Bad mpu model\n", __FUNCTION__); + hw_error("%s: Bad mpu model\n", __func__); } case 0x218: /* DIE_ID_reg */ diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 04e83787d4..9e22d64e36 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -131,7 +131,7 @@ static void tmp105_write(TMP105State *s) case TMP105_REG_CONFIG: if (s->buf[0] & ~s->config & (1 << 0)) /* SD */ - printf("%s: TMP105 shutdown\n", __FUNCTION__); + printf("%s: TMP105 shutdown\n", __func__); s->config = s->buf[0]; s->faults = tmp105_faultq[(s->config >> 3) & 3]; /* F */ tmp105_alarm_update(s); diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 9f61e27edc..2ebeab5d90 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -50,7 +50,7 @@ //#define DEBUG_BONITO #ifdef DEBUG_BONITO -#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__) #else #define DPRINTF(fmt, ...) #endif diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 3deccf02c9..0d4b88c609 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -330,7 +330,7 @@ static uint64_t pxa2xx_mmci_read(void *opaque, hwaddr offset, unsigned size) case MMC_BLKS_REM: return s->numblk; default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } return 0; @@ -369,7 +369,7 @@ static void pxa2xx_mmci_write(void *opaque, case MMC_SPI: s->spi = value & 0xf; if (value & SPI_SPI_MODE) - printf("%s: attempted to use card in SPI mode\n", __FUNCTION__); + printf("%s: attempted to use card in SPI mode\n", __func__); break; case MMC_CMDAT: @@ -442,7 +442,7 @@ static void pxa2xx_mmci_write(void *opaque, break; default: - hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset); + hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset); } } diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c index 22034656b8..34163e5646 100644 --- a/hw/ssi/omap_spi.c +++ b/hw/ssi/omap_spi.c @@ -295,10 +295,10 @@ static void omap_mcspi_write(void *opaque, hwaddr addr, if ((value ^ s->ch[ch].config) & (3 << 14)) /* DMAR | DMAW */ omap_mcspi_dmarequest_update(s->ch + ch); if (((value >> 12) & 3) == 3) /* TRM */ - fprintf(stderr, "%s: invalid TRM value (3)\n", __FUNCTION__); + fprintf(stderr, "%s: invalid TRM value (3)\n", __func__); if (((value >> 7) & 0x1f) < 3) /* WL */ fprintf(stderr, "%s: invalid WL value (%" PRIx64 ")\n", - __FUNCTION__, (value >> 7) & 0x1f); + __func__, (value >> 7) & 0x1f); s->ch[ch].config = value & 0x7fffff; break; @@ -367,7 +367,7 @@ void omap_mcspi_attach(struct omap_mcspi_s *s, int chipselect) { if (chipselect < 0 || chipselect >= s->chnum) - hw_error("%s: Bad chipselect %i\n", __FUNCTION__, chipselect); + hw_error("%s: Bad chipselect %i\n", __func__, chipselect); s->ch[chipselect].txrx = txrx; s->ch[chipselect].opaque = opaque; diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index 6d7c8a396f..ae2dc99832 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -357,7 +357,7 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->config = value & 0x33d; if (((value >> 3) & 3) == 3) /* IDLEMODE */ fprintf(stderr, "%s: illegal IDLEMODE value in TIOCP_CFG\n", - __FUNCTION__); + __func__); if (value & 2) /* SOFTRESET */ omap_gp_timer_reset(s); break; @@ -395,10 +395,10 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->st = (value >> 0) & 1; if (s->inout && s->trigger != gpt_trigger_none) fprintf(stderr, "%s: GP timer pin must be an output " - "for this trigger mode\n", __FUNCTION__); + "for this trigger mode\n", __func__); if (!s->inout && s->capture != gpt_capture_none) fprintf(stderr, "%s: GP timer pin must be an input " - "for this capture mode\n", __FUNCTION__); + "for this capture mode\n", __func__); if (s->trigger == gpt_trigger_none) omap_gp_timer_out(s, s->scpwm); /* TODO: make sure this doesn't overflow 32-bits */ diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index eb58c378e0..ef116c636c 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -403,7 +403,7 @@ static uint8_t menelaus_read(void *opaque, uint8_t addr) default: #ifdef VERBOSE - printf("%s: unknown register %02x\n", __FUNCTION__, addr); + printf("%s: unknown register %02x\n", __func__, addr); #endif break; } @@ -615,7 +615,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value) rtc_badness: default: fprintf(stderr, "%s: bad RTC_UPDATE value %02x\n", - __FUNCTION__, value); + __func__, value); s->status |= 1 << 10; /* RTCERR */ menelaus_update(s); } @@ -708,7 +708,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value) default: #ifdef VERBOSE - printf("%s: unknown register %02x\n", __FUNCTION__, addr); + printf("%s: unknown register %02x\n", __func__, addr); #endif } } diff --git a/hw/usb/desc.c b/hw/usb/desc.c index c36bf30e4f..85c15addc5 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -688,7 +688,7 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p, break; default: - fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __FUNCTION__, + fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __func__, dev->addr, type, len); break; } diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index 443e3c301d..0bbceaea0b 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -274,13 +274,13 @@ static void usb_bt_fifo_enqueue(struct usb_hci_in_fifo_s *fifo, if (off <= DFIFO_LEN_MASK) { if (off + len > DFIFO_LEN_MASK + 1 && (fifo->dsize = off + len) > (DFIFO_LEN_MASK + 1) * 2) { - fprintf(stderr, "%s: can't alloc %i bytes\n", __FUNCTION__, len); + fprintf(stderr, "%s: can't alloc %i bytes\n", __func__, len); exit(-1); } buf = fifo->data + off; } else { if (fifo->dlen > fifo->dsize) { - fprintf(stderr, "%s: can't alloc %i bytes\n", __FUNCTION__, len); + fprintf(stderr, "%s: can't alloc %i bytes\n", __func__, len); exit(-1); } buf = fifo->data + off - fifo->dsize; diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index 27d9d0bd82..d70a91a58c 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -253,8 +253,8 @@ /* #define MUSB_DEBUG */ #ifdef MUSB_DEBUG -#define TRACE(fmt,...) fprintf(stderr, "%s@%d: " fmt "\n", __FUNCTION__, \ - __LINE__, ##__VA_ARGS__) +#define TRACE(fmt, ...) fprintf(stderr, "%s@%d: " fmt "\n", __func__, \ + __LINE__, ##__VA_ARGS__) #else #define TRACE(...) #endif diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index 8f593a6fdb..2662c060ed 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -296,7 +296,7 @@ static uint32_t tusb_async_readb(void *opaque, hwaddr addr) } printf("%s: unknown register at %03x\n", - __FUNCTION__, (int) (addr & 0xfff)); + __func__, (int) (addr & 0xfff)); return 0; } @@ -313,7 +313,7 @@ static uint32_t tusb_async_readh(void *opaque, hwaddr addr) } printf("%s: unknown register at %03x\n", - __FUNCTION__, (int) (addr & 0xfff)); + __func__, (int) (addr & 0xfff)); return 0; } @@ -436,7 +436,7 @@ static uint32_t tusb_async_readw(void *opaque, hwaddr addr) return 0x54059adf; } - printf("%s: unknown register at %03x\n", __FUNCTION__, offset); + printf("%s: unknown register at %03x\n", __func__, offset); return 0; } @@ -456,7 +456,7 @@ static void tusb_async_writeb(void *opaque, hwaddr addr, default: printf("%s: unknown register at %03x\n", - __FUNCTION__, (int) (addr & 0xfff)); + __func__, (int) (addr & 0xfff)); return; } } @@ -477,7 +477,7 @@ static void tusb_async_writeh(void *opaque, hwaddr addr, default: printf("%s: unknown register at %03x\n", - __FUNCTION__, (int) (addr & 0xfff)); + __func__, (int) (addr & 0xfff)); return; } } @@ -505,7 +505,7 @@ static void tusb_async_writew(void *opaque, hwaddr addr, s->dev_config = value; s->host_mode = (value & TUSB_DEV_CONF_USB_HOST_MODE); if (value & TUSB_DEV_CONF_PROD_TEST_MODE) - hw_error("%s: Product Test mode not allowed\n", __FUNCTION__); + hw_error("%s: Product Test mode not allowed\n", __func__); break; case TUSB_PHY_OTG_CTRL_ENABLE: @@ -636,7 +636,7 @@ static void tusb_async_writew(void *opaque, hwaddr addr, break; default: - printf("%s: unknown register at %03x\n", __FUNCTION__, offset); + printf("%s: unknown register at %03x\n", __func__, offset); return; } } diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index c89ced2e88..027f76fad1 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -25,22 +25,22 @@ static int xenstore_domain_mkdir(char *path) int i; if (!xs_mkdir(xenstore, 0, path)) { - fprintf(stderr, "%s: xs_mkdir %s: failed\n", __FUNCTION__, path); + fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, path); return -1; } if (!xs_set_permissions(xenstore, 0, path, perms_ro, 2)) { - fprintf(stderr, "%s: xs_set_permissions failed\n", __FUNCTION__); + fprintf(stderr, "%s: xs_set_permissions failed\n", __func__); return -1; } for (i = 0; writable[i]; i++) { snprintf(subpath, sizeof(subpath), "%s/%s", path, writable[i]); if (!xs_mkdir(xenstore, 0, subpath)) { - fprintf(stderr, "%s: xs_mkdir %s: failed\n", __FUNCTION__, subpath); + fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, subpath); return -1; } if (!xs_set_permissions(xenstore, 0, subpath, perms_rw, 2)) { - fprintf(stderr, "%s: xs_set_permissions failed\n", __FUNCTION__); + fprintf(stderr, "%s: xs_set_permissions failed\n", __func__); return -1; } } @@ -158,7 +158,7 @@ static int xen_domain_watcher(void) char byte; if (pipe(fd) != 0) { - qemu_log("%s: Huh? pipe error: %s\n", __FUNCTION__, strerror(errno)); + qemu_log("%s: Huh? pipe error: %s\n", __func__, strerror(errno)); return -1; } if (fork() != 0) @@ -190,7 +190,7 @@ static int xen_domain_watcher(void) case -1: if (errno == EINTR) continue; - qemu_log("%s: Huh? read error: %s\n", __FUNCTION__, strerror(errno)); + qemu_log("%s: Huh? read error: %s\n", __func__, strerror(errno)); qemu_running = 0; break; case 0: @@ -198,13 +198,13 @@ static int xen_domain_watcher(void) qemu_running = 0; break; default: - qemu_log("%s: Huh? data on the watch pipe?\n", __FUNCTION__); + qemu_log("%s: Huh? data on the watch pipe?\n", __func__); break; } } /* cleanup */ - qemu_log("%s: destroy domain %d\n", __FUNCTION__, xen_domid); + qemu_log("%s: destroy domain %d\n", __func__, xen_domid); xc_domain_destroy(xen_xc, xen_domid); _exit(0); } diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 31d2f25627..69a52a9f93 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -36,7 +36,7 @@ static void xen_init_pv(MachineState *machine) /* Initialize backend core & drivers */ if (xen_be_init() != 0) { - fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__); + fprintf(stderr, "%s: xen backend core setup failed\n", __func__); exit(1); } diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index cac1b2ba43..b398607b06 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -960,10 +960,10 @@ void omap_mpu_wakeup(void *opaque, int irq, int req); # define OMAP_BAD_REG(paddr) \ fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr) # define OMAP_RO_REG(paddr) \ fprintf(stderr, "%s: Read-only register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr) /* OMAP-specific Linux bootloader tags for the ATAG_BOARD area (Board-specifc tags are not here) */ @@ -998,13 +998,13 @@ enum { # ifdef TCMI_VERBOSE # define OMAP_8B_REG(paddr) \ fprintf(stderr, "%s: 8-bit register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr) # define OMAP_16B_REG(paddr) \ fprintf(stderr, "%s: 16-bit register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr) # define OMAP_32B_REG(paddr) \ fprintf(stderr, "%s: 32-bit register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr) # else # define OMAP_8B_REG(paddr) # define OMAP_16B_REG(paddr) diff --git a/include/hw/arm/sharpsl.h b/include/hw/arm/sharpsl.h index 13981a6d03..5bf6db1fa2 100644 --- a/include/hw/arm/sharpsl.h +++ b/include/hw/arm/sharpsl.h @@ -7,7 +7,7 @@ #define QEMU_SHARPSL_H #define zaurus_printf(format, ...) \ - fprintf(stderr, "%s: " format, __FUNCTION__, ##__VA_ARGS__) + fprintf(stderr, "%s: " format, __func__, ##__VA_ARGS__) /* zaurus.c */ diff --git a/memory_mapping.c b/memory_mapping.c index a5d38552a6..775466f3a8 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -256,7 +256,7 @@ static void guest_phys_blocks_region_add(MemoryListener *listener, #ifdef DEBUG_GUEST_PHYS_REGION_ADD fprintf(stderr, "%s: target_start=" TARGET_FMT_plx " target_end=" - TARGET_FMT_plx ": %s (count: %u)\n", __FUNCTION__, target_start, + TARGET_FMT_plx ": %s (count: %u)\n", __func__, target_start, target_end, predecessor ? "joined" : "added", g->list->num); #endif } diff --git a/migration/block.c b/migration/block.c index 3282809583..be01e1aec0 100644 --- a/migration/block.c +++ b/migration/block.c @@ -630,7 +630,7 @@ static int flush_blks(QEMUFile *f) int ret = 0; DPRINTF("%s Enter submitted %d read_done %d transferred %d\n", - __FUNCTION__, block_mig_state.submitted, block_mig_state.read_done, + __func__, block_mig_state.submitted, block_mig_state.read_done, block_mig_state.transferred); blk_mig_lock(); @@ -657,7 +657,7 @@ static int flush_blks(QEMUFile *f) } blk_mig_unlock(); - DPRINTF("%s Exit submitted %d read_done %d transferred %d\n", __FUNCTION__, + DPRINTF("%s Exit submitted %d read_done %d transferred %d\n", __func__, block_mig_state.submitted, block_mig_state.read_done, block_mig_state.transferred); return ret; diff --git a/ui/cursor.c b/ui/cursor.c index 2e2fe13fa6..f3da0cee79 100644 --- a/ui/cursor.c +++ b/ui/cursor.c @@ -19,11 +19,11 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[]) if (sscanf(xpm[line], "%u %u %u %u", &width, &height, &colors, &chars) != 4) { fprintf(stderr, "%s: header parse error: \"%s\"\n", - __FUNCTION__, xpm[line]); + __func__, xpm[line]); return NULL; } if (chars != 1) { - fprintf(stderr, "%s: chars != 1 not supported\n", __FUNCTION__); + fprintf(stderr, "%s: chars != 1 not supported\n", __func__); return NULL; } line++; @@ -41,7 +41,7 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[]) } } fprintf(stderr, "%s: color parse error: \"%s\"\n", - __FUNCTION__, xpm[line]); + __func__, xpm[line]); return NULL; } diff --git a/ui/spice-display.c b/ui/spice-display.c index ad1ceafb3f..586f058f1b 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -630,13 +630,13 @@ static int interface_req_cursor_notification(QXLInstance *sin) static void interface_notify_update(QXLInstance *sin, uint32_t update_id) { - fprintf(stderr, "%s: abort()\n", __FUNCTION__); + fprintf(stderr, "%s: abort()\n", __func__); abort(); } static int interface_flush_resources(QXLInstance *sin) { - fprintf(stderr, "%s: abort()\n", __FUNCTION__); + fprintf(stderr, "%s: abort()\n", __func__); abort(); return 0; } From patchwork Mon Nov 13 22:34:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837589 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="NUtXOUij"; 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 3ybQZP1gsXz9sBZ for ; Tue, 14 Nov 2017 09:40:13 +1100 (AEDT) Received: from localhost ([::1]:56596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOl-0002R0-54 for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:40:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNe-00022O-3u for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNd-0006qy-0c for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:02 -0500 Received: from mail-cys01nam02on0065.outbound.protection.outlook.com ([104.47.37.65]:45024 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 1eENNV-0006lW-Tn; Mon, 13 Nov 2017 17:38:54 -0500 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=Ar9T/gbxE4P58QM9LI3LmU5IEjU46ANs9gl0qK85TGo=; b=NUtXOUijVHs/4VtWw+mLsHGawwv0Wtx7vipxmTdQhDuj7mq3if+xNKcWbTdY8jCtilxmtLV940bBFzDTGzCXx0oxF7AWSobUQEI6Sy0AfCTAFshS/rAkec1VqLiPWPJQAzWRSedeWnkGDtq27lckYMlIcnrZLrKhoT7JHqbma1Q= Received: from SN4PR0201CA0006.namprd02.prod.outlook.com (2603:10b6:803:2b::16) by DM2PR02MB1338.namprd02.prod.outlook.com (2a01:111:e400:50c8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:38:51 +0000 Received: from SN1NAM02FT026.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by SN4PR0201CA0006.outlook.office365.com (2603:10b6:803:2b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:38:50 +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 SN1NAM02FT026.mail.protection.outlook.com (10.152.72.97) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:38:50 +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 1eENNR-00048c-Lo; Mon, 13 Nov 2017 14:38:49 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNR-0000Km-J3; Mon, 13 Nov 2017 14:38:49 -0800 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMcjpc012418; Mon, 13 Nov 2017 14:38:46 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNN-0000KY-Mn; Mon, 13 Nov 2017 14:38:45 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:45 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(346002)(39860400002)(2980300002)(438002)(189002)(199003)(118296001)(36756003)(8936002)(4326008)(39060400002)(106466001)(316002)(5003940100001)(305945005)(33646002)(189998001)(2906002)(50226002)(356003)(47776003)(36386004)(48376002)(50466002)(106002)(81166006)(63266004)(2950100002)(76176999)(54906003)(77096006)(81156014)(478600001)(50986999)(16586007)(5660300001)(9786002)(110136005)(8676002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1338; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT026; 1:yZT2G4cxeu3NZ36x7RR1+3EpE1vXMZ6OddNQX0I7GZ5twTuh9GS9J5gZET5WpRDuC2uOw7zRFdVL1oPJHLaGSOG5xCiIl0KxrwcJ9yWWdRHr1Ou5MGxrR9ygKcLy3JiF MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1cf71bd0-f865-497a-31a2-08d52ae74fa0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 3:wtgkuyU4fnFuiM/JzS3vatSUbMTxWP3DJ9aQsMu9g4304kUo44gmMVAxmVY4J6196vrpsWfH2RVbyySTIod3k/CAioVcnrWXARo66i7KWvGx2AL/Boi0YxtUuXB8q4Hg192aGi7GFbfDW07+MZNwfOe9pOhbW37lKVODGRAFTak2Wo1aJh3UzgDU+Mb9ilePHReIZacnck/M54y+iTULlE4VoTjvOat/Gs+Jguo3pGITLWxmpNGg04lNa8oBySQSL/8DNkxg5OjLlggpS9Hdr9R/ZXvmU4+zqD3PAuwjSyJgPqsFFBWE3ZKGEF3PaI8kmNheVBySq/xu9YTfneOCKzpEX6kcPj7bJdC2Kl8RMXQ=; 25:xFBKeWrQrM00TkMXxbMb2TQA9/3SjxirWIeD2RiizKx8KFNFbcRFjoh6uwyLuMe3HBA+3jJAiG6UF/vGw9Xijl488/xsk8TzGwfAKtrv60bs1mRFjBX0l3eRFqcbGp+zsQMSp5gkUAZn5N+pKTT6Ki9d8DlbsaUy8XSW59SqDrF/7ofbt5bjKerknRiBM/aYCDhMVdmAiLw/h6WBsB73SWenN985S6xbtMn+QdNB4VWCdjVqGuXdounhpkWACsgTp1Ba6Tm4VKhm+9gNwNywffbM6KcC5vHPipzYAid9V4RrxMDHu0QLLQ0/Nd2xuT2mWKsr06Jhkq9o046Eyj39h9XCbDipM8OboOq8tYKswx8= X-MS-TrafficTypeDiagnostic: DM2PR02MB1338: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 31:Olb7ulg+0zKw2WO/j3Kx3w+uMPQTcbwdFR2WrSZNf/4f8PrPzYbJcvcloQUckx0sbFCIdZTJi6qb9uFcg+2Nq/mozrqOopSxdhemw/iHfSGOMvqnP1iFd1dq/AgfwaS0rkrMDyQbzdyPXhgFquFaocqGkUZ0q4nsfd76L2xEv1z9xqR+CMtF9U4qQK7re/3ITTgyRW4jjSzhCFaeLXvnHMLzbGdiu2X3Kvz3VmiAR8s=; 20:XRKjVonS9mPlCwhSI1zlMVqf/latrHdTSo157I64MS5+BR4sfFVP5sehTEy73C5CWdLqfLOnafqpp5Qs9IITMvI0eqh3kkDf7e4nZ91gURNkjuzG35LDJQRiuTVqrcQjqrYQy5tlEPgrExB/SdY5DSN5TRYTtCAvgyHuVGb/RavpQvU3WaiK8mzxzVpIzMl3NDM6oo7tR1bK8qHUtjhdjylS3br+MmaytG0Yb0sYEczfSw5b+wAu0bKSeWwzZDlCmIYaHSAJTDKy/wRdrfWDgVlqkUnVnfpyaWTzeCgAfKy2j7IRzooqTvvJTF+cKP2eE72tnLKXlK6t4308JUQW9EBOa7Vq0wxlZnrvpVenFM2tGdaTrkqZHyQdCRuuhql6CRMsMFEFA9H2bsyyxPtvcjL6gtiWOp8wBCoLOFtv8aZhNXfpft7zDU2Ga4yUBNyWCiciZB4PS2FsIDNVbjndG65Js4lJtm9tozFijEH65LZ3RPpwFRsDNQRr0u+xeK56 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(3231022)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1338; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 4:Vr/X0hB00w5ZBFhgGNBql57ToD6Njp2cfBb9t3bfoxkIkYdDf4P/M4lK3RlpNJ2iMMUjOJfF1piVgPxlIl3d3rXofLXlzFkrFuMWagypqq6TCoPHDYUgUZSMta0Lv0QvhLOmtULathcn6VRFyoZZTzgW9JYdmnksne58YwXmQaVZ64Z9rx+qSN4172kXl5HMFMBqK1KcBVeHd+vGFIAy9zVgaz/wbmbfRYTFn1Bj+y0zMq7bVb/RQQmSf/ViFLjGQ5frmA6VxjHTLUxVA4Vk+r+9XtSx+iXBqKcejTR+b0Oq9gndcfdD1Al5hL983jMZ X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1338; 23:0t4aRvsZCgOolfSWtHjCsqjn3O3VbnHj1Ijl5trZt?= RYKYJX+X8sGS5LL4zPQOuTrtPw6kUc9F5MzCpwITr+mxvOZZyryB0XGEOahc/nLpDoaHjN2rM6ZfCu2iidCROlyB0YXQvLkC/VYdaDNmS6OjfTQ9Chjr73PcrbqTBtPOaCUrbM8KOk6snDwPa/CRJuk4NzmVbxwViw8Tfv9Q7hEHtdrNLAGrNDPfftFTUPEFTKt6ns8lj31Ff4UX2dWnBgyO2dIhafV7dT84UGbmekl3wXyWkFPrOPG0x0jcTDIYXcbumxSW3jxhxPZesfYIJtQCh+O/h09HQhXoFu3sTeC3sCokycA7H/aEDHAXFsza/0oVE5OuLGc75cwzp8iGJrFR/QppAJJeREPi3VvHOiJAGuH6vLaM5Mqk3nDjxVlZh6GFPh0vZFUkFV4RsD0ICVgG8Mwisq0bOL03xyYO6xQotAMCmthE3EuK5NiWI4Xq36lBB4JCRsUCGms+VPXdcyvZPfMZ8ghfeHOYaBcy9u59lqY+DfcAX9zkE892pCWbckfTv6IoLSKLnAdj1qLyKLZ5YWVpuIyOk82sI0G/mGYhdv1zIvVGaWJpsAo37k7E4e4zmZAbEynuA4p2fSvvDw+2AXIYM4CGbwVSTqYIu374uiIukp3dU1XhFpJNSH0cCrzFITgAvYs0u+jGRTr1EbI+jcXlAb0sumOtHl5OsIuO8j3ypnY2+qHVg9pS9NxrfS5sgajDwYB83Ah0MHzWa//hlrIR83J6rXFhYmQIvnqXhnTS23Bk2l6hEk6V/aTjKeSBwTezoFkQOrhY0etgXDiRS+mwgbGmJm5a+8V81lrVZNKodPt2EwnpthPP/xMUZqn8fVYplbM3eBgm86OQOKlodjH9xYTW62Hhl25MGavf00ceX/wsLDoaqAUbNd+yqXGU95KDz0vxs0B7MXoZKxZsUeeBGSB8yWF76qzCvpvAhL3ei01mSht6T8sQqLghgq43NzXMdg6vR2te9jKINfy X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 6:rTE4LGqq0qjRIaOSNA+sE9u2hIXYVDfWOdsGVGPuqAmp2QejWdF6Yy+eLVz4f0iVM38U9VEADpL4Rixoq6z0hliuvFrxwFwS7rCKz7pcV/jZJ7NjGGhe4rLW/UFI+C1F0JEAEFTa1NxyT27ZhxAVfI7klWYws35LWfNvkFdHDUT3cBO8V/26o7Zn/A0SDmNxohR3Tx+wgzyus/r1LicFHT4WuuOUgK+NlvDHDMxol8YZbXCL5lxkvjLi79R+FJGyPsH98EKUFpCUJtJFLg+YZcYFNVraXoNx/DGqb1j5ivExIj8WHP6G7tKQuzom5iCjqwxPkeBhG60xBLmEUOqbyJQR0cejcDVY+Fjvp/9QQjI=; 5:KAP8Wc56zkc3siLP7wxnmPz92ZxFS/M/HyU0D+eIUSLge+OzRPMUvBWHrAAtM7xNSX6+yPk7BnhXA5vItxBzCuzZlLoth3p711FEqQmPWFyrqvV9ve0HeWQfpRh7rn8/orcYulKGAQXpvaKLkIzGRdovj/4M1qpEIs0NljQjSLU=; 24:4WVD1gMKd0dzJI8S8gsE39ll+IigJeOGRBZYH00ZPGr5u9KFJ/1HqJiOuvy1+8yVYnW9avcuNaXubhwfvXNI4nn0mJgoHGbenDX3YnC2Gr8=; 7:p2uydfA6YtyD92IXLwVpx2YKL3/qv1mC9/lSyX8UH1JVsJUqgmsy31BEWVxSBZiVj1t9MzUdIlkFJvRtE87ZssDFfetPWXl1PiaDdM4GR9NNGURNQyzB9y82n2/MQFdewt4+x3bKg14T176Sdn/riCqdIQzUgPVoyOqujJSX6CJWO1qWq00JTm4OF1voaGu+IqOUaPJMS4L0I6qYX0szQXCdM3zstt/JJceIIrVfFojA6ozpvlwb4V2mqWvtoQah SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:38:50.1847 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1cf71bd0-f865-497a-31a2-08d52ae74fa0 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: DM2PR02MB1338 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.65 Subject: [Qemu-devel] [PATCH v5 03/29] Fixes after renaming __FUNCTION__ to __func__ 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis Cc: Eric Blake Reviewed-by: Eric Blake --- V3: - Squash onto single lines - Don't fix indentation of case in omap_prcm_apll_update() hw/arm/omap1.c | 8 +++----- hw/block/onenand.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 1388200191..92e58f09c8 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -1717,7 +1717,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr, if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) { s->clkm.clocking_scheme = (value >> 11) & 7; printf("%s: clocking scheme set to %s\n", __func__, - clkschemename[s->clkm.clocking_scheme]); + clkschemename[s->clkm.clocking_scheme]); } s->clkm.cold_start &= value & 0x3f; return; @@ -3329,14 +3329,12 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, case 0x18: /* MCR2 */ s->mcr[1] = value & 0x03e3; if (value & 3) /* XMCM */ - printf("%s: Tx channel selection mode enable attempt\n", - __func__); + printf("%s: Tx channel selection mode enable attempt\n", __func__); return; case 0x1a: /* MCR1 */ s->mcr[0] = value & 0x03e1; if (value & 1) /* RMCM */ - printf("%s: Rx channel selection mode enable attempt\n", - __func__); + printf("%s: Rx channel selection mode enable attempt\n", __func__); return; case 0x1c: /* RCERA */ s->rcer[0] = value & 0xffff; diff --git a/hw/block/onenand.c b/hw/block/onenand.c index e243182394..ed77f859e9 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -659,7 +659,7 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, case 0xff02: /* ECC Result of spare area data */ case 0xff03: /* ECC Result of main area data */ case 0xff04: /* ECC Result of spare area data */ - hw_error("%s: imeplement ECC\n", __func__); + hw_error("%s: implement ECC\n", __func__); return 0x0000; } From patchwork Mon Nov 13 22:34:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837606 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="mkEEWgjI"; 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 3ybQrB67C0z9s7G for ; Tue, 14 Nov 2017 09:52:10 +1100 (AEDT) Received: from localhost ([::1]:56690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENaK-0007KY-Sh for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:52:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNy-0002Nj-6L for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNv-00073Q-8B for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:22 -0500 Received: from mail-cys01nam02on0046.outbound.protection.outlook.com ([104.47.37.46]:59760 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 1eENNg-0006sK-VA; Mon, 13 Nov 2017 17:39:05 -0500 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=DWX+8uzs60In0pDgNFxckd5/ULNdINuTHq6bVgozZzo=; b=mkEEWgjIOmpY8XvpHlc7OYO4MZvyuxBV9f3zBUMENvIeaEub3MWfcjJS//DoUhynLfLC/Bw7ZeyeVWOTKJQUxnC8VDDX7cAiKNVLgjq4jglyuFO6EsuYtKBnabzMEGWejkT2NMsltR/EmM4DtiiL9WGepp+za/2npaHQtY6Kv8E= Received: from MWHPR0201CA0019.namprd02.prod.outlook.com (10.167.160.160) by DM5PR02MB3387.namprd02.prod.outlook.com (10.164.153.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:01 +0000 Received: from BL2NAM02FT030.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::209) by MWHPR0201CA0019.outlook.office365.com (2603:10b6:301:74::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:01 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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 (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 BL2NAM02FT030.mail.protection.outlook.com (10.152.77.172) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:00 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45068 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENNb-0004VN-TL; Mon, 13 Nov 2017 14:38:59 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNb-0000Md-Ng; Mon, 13 Nov 2017 14:38:59 -0800 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 vADMcnhH012436; Mon, 13 Nov 2017 14:38:49 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNQ-0000Ki-TN; Mon, 13 Nov 2017 14:38:48 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:48 -0800 Message-ID: <7e6bb381c0278c977ce5c0eee2de1b230c5005a1.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(76176999)(39060400002)(50986999)(47776003)(63266004)(4326008)(54906003)(478600001)(8936002)(106002)(5660300001)(2950100002)(316002)(189998001)(118296001)(23676003)(50226002)(110136005)(106466001)(5820100001)(50466002)(33646002)(575784001)(77096006)(356003)(36756003)(9786002)(5890100001)(2870700001)(2906002)(81156014)(305945005)(36386004)(8676002)(81166006)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3387; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT030; 1:DqsOrJZPr8j6jq3dtmdJh/AhyeVA6KnMhMW9Ij2vGBjQ8OeYtZ8oyP310/u6B8DTVkvT9mYGCQ2+U3C1eMap2i2U5di7jS1n0JDE4Mug8d4DgPp3WWEs6DhSOpjjeRx3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc4f0938-9cc2-446e-27ca-08d52ae755e4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3387; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 3:x71eKESTQV1ymZ1y5VRoDJi1p3KiHtZP2qVXYoU47r24zi9KQrQljxu+oMKkvQCQn0/Ov9dCGshJK5gWrdBzTAC7hwiun2eMYrm0oyrMXuvZCE0XXem+CCJdU0uJYvbIg7PJBDMgMXOSVU2XBAca83GDw56EVE2+EDgcRxhsuOxFqZbPQUXZrpxhX7GKEf1Zqcm2gwpTbLtDTWVSibumoyBx3+re9j/vXCVxhy8D50Lrx/Pn2Bq+VIlgesoFtSq0WZ3FVHB6uYT8UeimQicps9CmEMoaE1Wzkmr9WO2oimlFbSXinXB1NXEgfLA/NcDyTPuCyilafYuC41AZ1xsxTQNh0ba32RMr1G+P/7hAT60=; 25:sEUSd5BoNg2z8Di2s11pVxpwa74TEQpkEXKLp4B8QzZ1E3pB5NEeC0hnix6kGPrxzNGhU9egF+1s+909ffTlslc5msodn4O5dOkBhQTV6NjKxoWjeQsWKk4K0pTCmxmyY/r5fn+NAilDHq5GBp2HnuaHLWyydbUVt5zAZJqRysF+QA1TbmwJYuuyWNM4kFkm5gZ8xtF9cezfNloFR69Qvaxy0IgGoT74gnjcWTnDwGvPXqrVWBYbWiOuJXghdrczs3hyJFVIuWMImf57RVKoEUu4XNBakd4snZg6bNYgyPLowcpasVxhhFUFkDjagPtgQFa6Ekr54lJBkkaHXCSHDhnu2CIvmpxDTmFaqJWLivs= X-MS-TrafficTypeDiagnostic: DM5PR02MB3387: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 31:NsLheOEA2DOw0OngM/XkVWUC6dggpx+/VMxu+Wxws213FVTkpP7O01Lf1UmIY1ZFlr5IdqU0ULSG60f4/PVnJ232JJRymvblx7PwjKaqb2x/Wwzy9Xx7/2KS5yHCMgoGBp0TpnjigyU1PQVa9f4fI8JtsB53xiSjV35/2rEK92/LlywHTVqMMuZvUIvHTzQD7OkcDJk+18bEOCZ56cUa4CTClQwtDtxO9Vxk+wK6J24=; 20:LWoy+wkISBrPLLcFiH8QS0QaDe7Ypgrjk4eNpT2IwqV/xWYgky8yVS8L+4+9ReM3jqa+KzkhPa06D/F5KhiyUoHrryjY1k6A5Fdhmx9DpaOsKa1V/r18Ogr/v+IhQOlxzqBRRFXAdjfc+fHfnaOL30BurPP1GGmb7HZwVMHM0XEaC8bG0AuomavHPrWpfZ61PE6P0PMDiVoE3AxAEtS5XuHFrqcPxyC7mVTpzDT03S7rlEJcQFRgfJzKclYNoEL3euETU3R77efC1n9Kn2Ftsft0cO/6QwXQYdmh0sck6NlxHyJX7J6I4IagDg3vqT+0AKcLXj6vb8tSL8ImDOgM6Z7SjGkcHH3U7XOc83IjnPma6wbPGYCBaTe9f8xqPJojAB66kPqLhYtsTLX1HaiF+l68oDBqTRNKHapd9aQQNG+jr72OS+7zOmQQ4wVRutVy6DbGsXr7scXQSh0iDJLjyEYWajFpOCevbQMWy67CYYBP8SLFVh5gn8CYo5T6L2SC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(3231022)(93006095)(93004095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123558100)(20161123564025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3387; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3387; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 4:JDDN15yPMS9WBm1Hbe3tUjjDfdycNmOcLyT5/9TK1KJUrm/04Sq+oueZTWamNy29NRK65ET2ZRYTlTtJtEzw44SImtxewCLtOc3CjCNqt5nlpWc5b1qhsCY8jrZXzlMIrgt8dfkXN0uFLEBftPnQ8Cd46FzLOqtit87BibouSnYUydpU6gNG2LJTg8VPFM5cCohTD8sBJldzNL8RBejDbfgfnPRA0HvcpzjzUfxCxrhXVKLIIpc0c65rBAfYjCu6odLK6sPrhPbNXjHmUTiwD1CRbHfBodfbH7aBrGrsGTQIGxBV3OTN5GkSIf3i8m+4NbjjQR6yANNwhGc0zAD3pg== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3387; 23:u9S8P+DIcm4oFOYuAKlikGM75dMMTdieVBpwImpJO?= +SuBjLGnP6jLAaXc++kr6bXHdjM+N/bFVJHnibGx9VMsJHlvB074x5YLdmjA6v5Kdba44TNrP/nUzEmumFQIBwBfE0m34/0dyjXbiMlJXod4T04nnGCmhIU9V0dwfCKSLW/bl4BMWhvGCu3Nfy13ruwgrijiJXIxrP1ja2lloctWrO1RAET2vD+1Dc9py50yTHq73l4V08emc9U115sPwqxwrPcbfEVKQyX9hKQ5Mr9WLknbozzmmGdEew5I6y3jDSRNStAF7Qyv/4K0gbQVmZ6aps1ohdtGuNUTJUiXMEsTgdypGhoGNok5TdNAm5xqkW8z+E5obKIbx0j9TarU0vgM3LoUlpzVGwCR25C+23RVuXWuuaiBOXncRvfjPk/iOCVFeR+jgba34KmIXwN1tVQGQR1ArVlMW38U4AvVUG+tt4JeP+nT+DJmc+XHgFb9TX23LSWzl7cf4x4TQGebID1TGpSB/q7cNkS68MQxTXiGJfM/5H5+qXFAZuZj67tzJ6K7zBJkOW4JCZXlzlULOaqNjzrzyuwk+/24fpDJzPDZA9+4seUk2Bli5A0yAOjFWntqkx7i352+rWGfyRr1Utqm8XgFlYy0v5O2YpfqcV3wfWDL40lfHAPsuITs7H1yM8ybYIvn8lB/SYosW2tyu6CZS1IjJLNI0LjsDPb4j87PtVrHqqnU0tXwAn7NeJbz18uPl+kSEvqmzzWRyVt+7kOLDz+GL8ve9s3V6pNYeCRuseRP49cd/aP4WbJqfuiTAljXcgmmUFXLyCDLJZLLflyWdudI/+HXXQw4SXdZBf4dRGZCMc0GBnGfgFGtV/+yrYvyI4IfRX31h4ASMw8XuLlCQGXbTMhlmOx5T9DNWiFy9RzNAbd3ljHLceFG0+KjC282IkvWz81SGOqY7HKNPi688I9wlttExoEquZ6f1Zip53OCtblii7xZBzv9MxFeP/F+W9fONUHdIk17UNs/VcAbE/bzlOijS08HHHMSKB9D/t7qOOiCRcXidMt7EE7ierMqE7qaUw8cPmwiDYieZD7jo3KjsqLb00B8jKO+FitlQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 6:Gx8Yqdlnm3LV9LjstY7S/p7cJUD61YyUnvqbsTKjKo5rEl5Htqo+i0EEZZhwYI+sqOHNlRjodzNMkp31+3TvW+MQy9QlSszDg8gID71u9pgHKriRskbQwkDkpqyk+5zu7DFlFtj8Qd9pIFwRI/GZ98o49GjsmMvPclbt00f/iK/MVxXGP9lEsXDyHYj2CyIlCZJWwhOKrXI7NoOc3HYITJqVxRm77C7o5sEYd1aDRbaTIEiV6B3kWYsT7DivAGOzrZBFyvmijv9Q7RA1XfnCwcYUvaKjnt3dLlCMfwd3wYxci+A+H9pEAOrWk3/jAgPVHg2/2yaTxcff3lNm069BZTtH/HSL/fJ7s7Cbyrnmfuk=; 5:zhSo/V868MDUvYQjts8eXzADGEHKo1lguz49IWyHjsLJtavZqvu3ZtDbLPkB1cwbRF9LCz6+sd3py1eLOFkdqMO8XQOlZn63RD2K+GRRz6g0d3ZECiMhGLywHioiimmUWiH7P1vPGyvE2+TxkfmDK4emF+L2+F4zVV0aKTmq4yA=; 24:XCByJsa50SWNP8ItV2TUtg2Ojim+kp/xggxYYLz+4/vyR6IYrd6jZ5fFbh7M1mB8lgXYqfm6pllhSKWPKLrQdIA4PMeS1+9aC4BzDgrn6HI=; 7:uBYAk/w2faB7l0whr7F7EU7n47WhLct0HdCDquXet8Sigces7m1wVItB5bRn6E4tUfcz1qftmxKcp9GlTUZCCZjP9f6T7t8RA0YDbd+0qphrQgXbQRRQbZAFuTLTtZ1fpXiTfpbhDUFzQeTYpxUBtmLmc2KyTrK8EgDo/y68azJdkuupBrtXXEp6dtSXh+suiOY2Mb8YMjYCd15ypeLfdFbN7GU7Nac0pascnwR+s9qyVFxXW8Y5Se3FmZNB4W+4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:00.5558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc4f0938-9cc2-446e-27ca-08d52ae755e4 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: DM5PR02MB3387 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.46 Subject: [Qemu-devel] [PATCH v5 04/29] hw/arm: 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, qemu-arm@nongnu.org, armbru@redhat.com, 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. The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file. Signed-off-by: Alistair Francis Cc: qemu-arm@nongnu.org Reviewed-by: Philippe Mathieu-Daudé --- V3: - Remoave 'qemu: ' prefix V2: - Split hw patch into individual directories hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 37 ++++++++++++++++++------------------- hw/arm/gumstix.c | 13 +++++++------ hw/arm/mainstone.c | 7 ++++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 +++-- hw/arm/omap2.c | 23 ++++++++++++----------- hw/arm/omap_sx1.c | 6 +++--- hw/arm/palm.c | 10 +++++----- hw/arm/pxa2xx.c | 7 ++++--- hw/arm/stellaris.c | 3 ++- hw/arm/tosa.c | 17 +++++++++-------- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 8 ++++---- hw/arm/z2.c | 6 +++--- 15 files changed, 77 insertions(+), 71 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index bb2dfc942b..56770a7048 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -278,7 +278,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) #endif if (!kernel_filename && !qtest_enabled()) { - fprintf(stderr, "Guest image must be specified (using -kernel)\n"); + error_report("Guest image must be specified (using -kernel)"); exit(1); } diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c2720c8046..6e6b8c0c6a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include #include "hw/hw.h" @@ -418,13 +419,13 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, char *filename; filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, binfo->dtb_filename); if (!filename) { - fprintf(stderr, "Couldn't open dtb file %s\n", binfo->dtb_filename); + error_report("Couldn't open dtb file %s", binfo->dtb_filename); goto fail; } fdt = load_device_tree(filename, &size); if (!fdt) { - fprintf(stderr, "Couldn't open dtb file %s\n", filename); + error_report("Couldn't open dtb file %s", filename); g_free(filename); goto fail; } @@ -432,7 +433,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } else { fdt = binfo->get_dtb(binfo, &size); if (!fdt) { - fprintf(stderr, "Board was unable to create a dtb blob\n"); + error_report("Board was unable to create a dtb blob"); goto fail; } } @@ -451,7 +452,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", NULL, &error_fatal); if (acells == 0 || scells == 0) { - fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); + error_report("dtb file invalid (#address-cells or #size-cells 0)"); goto fail; } @@ -459,8 +460,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, /* This is user error so deserves a friendlier error message * than the failure of setprop_sized_cells would provide */ - fprintf(stderr, "qemu: dtb file not compatible with " - "RAM size > 4GB\n"); + error_report("dtb file not compatible with RAM size > 4GB"); goto fail; } @@ -480,7 +480,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, acells, mem_base, scells, mem_len); if (rc < 0) { - fprintf(stderr, "couldn't set %s/reg for node %d\n", nodename, + error_report("couldn't set %s/reg for node %d", nodename, i); goto fail; } @@ -505,7 +505,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, acells, binfo->loader_start, scells, binfo->ram_size); if (rc < 0) { - fprintf(stderr, "couldn't set /memory/reg\n"); + error_report("couldn't set /memory/reg"); goto fail; } } @@ -519,7 +519,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, rc = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", binfo->kernel_cmdline); if (rc < 0) { - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); goto fail; } } @@ -528,14 +528,14 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, rc = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start", binfo->initrd_start); if (rc < 0) { - fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n"); + error_report("couldn't set /chosen/linux,initrd-start"); goto fail; } rc = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", binfo->initrd_start + binfo->initrd_size); if (rc < 0) { - fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); + error_report("couldn't set /chosen/linux,initrd-end"); goto fail; } } @@ -690,7 +690,7 @@ static void load_image_to_fw_cfg(FWCfgState *fw_cfg, uint16_t size_key, gsize length; if (!g_file_get_contents(image_name, &contents, &length, NULL)) { - fprintf(stderr, "failed to load \"%s\"\n", image_name); + error_report("failed to load \"%s\"", image_name); exit(1); } size = length; @@ -956,8 +956,7 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) is_linux = 1; } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - info->kernel_filename); + error_report("could not load kernel '%s'", info->kernel_filename); exit(1); } info->entry = entry; @@ -976,8 +975,8 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) info->initrd_start); } if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initrd '%s'\n", - info->initrd_filename); + error_report("could not load initrd '%s'", + info->initrd_filename); exit(1); } } else { @@ -1021,9 +1020,9 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) } else { fixupcontext[FIXUP_ARGPTR] = info->loader_start + KERNEL_ARGS_ADDR; if (info->ram_size >= (1ULL << 32)) { - fprintf(stderr, "qemu: RAM size must be less than 4GB to boot" - " Linux kernel using ATAGS (try passing a device tree" - " using -dtb)\n"); + error_report("RAM size must be less than 4GB to boot" + " Linux kernel using ATAGS (try passing a device tree" + " using -dtb)"); exit(1); } } diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index bba9e9f57a..8f11b03066 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -35,6 +35,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/pxa.h" #include "net/net.h" @@ -62,8 +63,8 @@ static void connex_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); if (!dinfo && !qtest_enabled()) { - fprintf(stderr, "A flash image must be given with the " - "'pflash' parameter\n"); + error_report("A flash image must be given with the " + "'pflash' parameter"); exit(1); } @@ -76,7 +77,7 @@ static void connex_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, connex_rom / sector_len, 2, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); exit(1); } @@ -99,8 +100,8 @@ static void verdex_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); if (!dinfo && !qtest_enabled()) { - fprintf(stderr, "A flash image must be given with the " - "'pflash' parameter\n"); + error_report("A flash image must be given with the " + "'pflash' parameter"); exit(1); } @@ -113,7 +114,7 @@ static void verdex_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, verdex_rom / sector_len, 2, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); exit(1); } diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index d07972a966..189febf8b7 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -12,6 +12,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/arm/pxa.h" @@ -143,8 +144,8 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, if (qtest_enabled()) { break; } - fprintf(stderr, "Two flash images must be given with the " - "'pflash' parameter\n"); + error_report("Two flash images must be given with the " + "'pflash' parameter"); exit(1); } @@ -154,7 +155,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, blk_by_legacy_dinfo(dinfo), sector_len, MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); exit(1); } } diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index b648770882..06127a873d 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1626,7 +1626,7 @@ static void musicpal_init(MachineState *machine) flash_size = blk_getlength(blk); if (flash_size != 8*1024*1024 && flash_size != 16*1024*1024 && flash_size != 32*1024*1024) { - fprintf(stderr, "Invalid flash image size\n"); + error_report("Invalid flash image size"); exit(1); } diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 92e58f09c8..b3a23a83d1 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -2313,7 +2314,7 @@ void omap_uwire_attach(struct omap_uwire_s *s, uWireSlave *slave, int chipselect) { if (chipselect < 0 || chipselect > 3) { - fprintf(stderr, "%s: Bad chipselect %i\n", __func__, chipselect); + error_report("%s: Bad chipselect %i", __func__, chipselect); exit(-1); } @@ -3987,7 +3988,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, dinfo = drive_get(IF_SD, 0, 0); if (!dinfo) { - fprintf(stderr, "qemu: missing SecureDigital device\n"); + error_report("missing SecureDigital device"); exit(1); } s->mmc = omap_mmc_init(0xfffb7800, system_memory, diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index b53878b8b9..3a1d995d6a 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s) /* TODO: update clocks */ if (mode[0] == 1 || mode[0] == 2 || mode[1] == 1 || mode[1] == 2) - fprintf(stderr, "%s: bad EN_54M_PLL or bad EN_96M_PLL\n", - __func__); + error_report("%s: bad EN_54M_PLL or bad EN_96M_PLL", + __func__); } static void omap_prcm_dpll_update(struct omap_prcm_s *s) @@ -1331,7 +1332,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s) s->dpll_lock = 0; switch (mode) { case 0: - fprintf(stderr, "%s: bad EN_DPLL\n", __func__); + error_report("%s: bad EN_DPLL", __func__); break; case 1: /* Low-power bypass mode (Default) */ case 2: /* Fast-relock bypass mode */ @@ -1358,7 +1359,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s) omap_clk_reparent(core, dpll_x2); break; case 3: - fprintf(stderr, "%s: bad CORE_CLK_SRC\n", __func__); + error_report("%s: bad CORE_CLK_SRC", __func__); break; } } @@ -1627,8 +1628,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr, case 0x500: /* CM_CLKEN_PLL */ if (value & 0xffffff30) - fprintf(stderr, "%s: write 0s in CM_CLKEN_PLL for " - "future compatibility\n", __func__); + error_report("%s: write 0s in CM_CLKEN_PLL for " + "future compatibility", __func__); if ((s->clken[9] ^ value) & 0xcc) { s->clken[9] &= ~0xcc; s->clken[9] |= value & 0xcc; @@ -1646,8 +1647,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr, break; case 0x540: /* CM_CLKSEL1_PLL */ if (value & 0xfc4000d7) - fprintf(stderr, "%s: write 0s in CM_CLKSEL1_PLL for " - "future compatibility\n", __func__); + error_report("%s: write 0s in CM_CLKSEL1_PLL for " + "future compatibility", __func__); if ((s->clksel[5] ^ value) & 0x003fff00) { s->clksel[5] = value & 0x03bfff28; omap_prcm_dpll_update(s); @@ -1658,8 +1659,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr, break; case 0x544: /* CM_CLKSEL2_PLL */ if (value & ~3) - fprintf(stderr, "%s: write 0s in CM_CLKSEL2_PLL[31:2] for " - "future compatibility\n", __func__); + error_report("%s: write 0s in CM_CLKSEL2_PLL[31:2] for " + "future compatibility", __func__); if (s->clksel[6] != (value & 3)) { s->clksel[6] = value & 3; omap_prcm_dpll_update(s); @@ -2486,7 +2487,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, dinfo = drive_get(IF_SD, 0, 0); if (!dinfo) { - fprintf(stderr, "qemu: missing SecureDigital device\n"); + error_report("missing SecureDigital device"); exit(1); } s->mmc = omap2_mmc_init(omap_l4tao(s->l4, 9), diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 9a14270795..e510465137 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -158,7 +158,7 @@ static void sx1_init(MachineState *machine, const int version) blk_by_legacy_dinfo(dinfo), sector_size, flash_size / sector_size, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory %d.\n", + error_report("Error registering flash memory %d.", fl_idx); } fl_idx++; @@ -182,7 +182,7 @@ static void sx1_init(MachineState *machine, const int version) blk_by_legacy_dinfo(dinfo), sector_size, flash1_size / sector_size, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory %d.\n", + error_report("Error registering flash memory %d.", fl_idx); } fl_idx++; @@ -194,7 +194,7 @@ static void sx1_init(MachineState *machine, const int version) } if (!machine->kernel_filename && !fl_idx && !qtest_enabled()) { - fprintf(stderr, "Kernel or Flash image must be specified\n"); + error_report("Kernel or Flash image must be specified"); exit(1); } diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 285f43709d..7f3637041a 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -233,8 +233,8 @@ static void palmte_init(MachineState *machine) if (nb_option_roms) { rom_size = get_image_size(option_rom[0].name); if (rom_size > flash_size) { - fprintf(stderr, "%s: ROM image too big (%x > %x)\n", - __func__, rom_size, flash_size); + error_report("%s: ROM image too big (%x > %x)", + __func__, rom_size, flash_size); rom_size = 0; } if (rom_size > 0) { @@ -243,13 +243,13 @@ static void palmte_init(MachineState *machine) rom_loaded = 1; } if (rom_size < 0) { - fprintf(stderr, "%s: error loading '%s'\n", - __func__, option_rom[0].name); + error_report("%s: error loading '%s'", + __func__, option_rom[0].name); } } if (!rom_loaded && !kernel_filename && !qtest_enabled()) { - fprintf(stderr, "Kernel or ROM image must be specified\n"); + fprintf(stderr, "Kernel or ROM image must be specified"); exit(1); } diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index db860c238e..0386a0d8bf 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -2062,7 +2063,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, s = g_new0(PXA2xxState, 1); if (strncmp(cpu_type, "pxa27", 5)) { - fprintf(stderr, "Machine requires a PXA27x processor.\n"); + error_report("Machine requires a PXA27x processor."); exit(1); } @@ -2095,7 +2096,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, dinfo = drive_get(IF_SD, 0, 0); if (!dinfo) { - fprintf(stderr, "qemu: missing SecureDigital device\n"); + error_report("missing SecureDigital device"); exit(1); } s->mmc = pxa2xx_mmci_init(address_space, 0x41100000, @@ -2220,7 +2221,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) dinfo = drive_get(IF_SD, 0, 0); if (!dinfo) { - fprintf(stderr, "qemu: missing SecureDigital device\n"); + error_report("missing SecureDigital device"); exit(1); } s->mmc = pxa2xx_mmci_init(address_space, 0x41100000, diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index de7c0fc4a6..f6f295b363 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/ssi/ssi.h" @@ -559,7 +560,7 @@ static void ssys_write(void *opaque, hwaddr offset, case 0x040: /* SRCR0 */ case 0x044: /* SRCR1 */ case 0x048: /* SRCR2 */ - fprintf(stderr, "Peripheral reset not implemented\n"); + error_report("Peripheral reset not implemented"); break; case 0x054: /* IMC */ s->int_mask = value & 0x7f; diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index a55b1a369c..a069c95f1c 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/arm/pxa.h" @@ -70,19 +71,19 @@ static void tosa_out_switch(void *opaque, int line, int level) { switch (line) { case 0: - fprintf(stderr, "blue LED %s.\n", level ? "on" : "off"); + error_report("blue LED %s.", level ? "on" : "off"); break; case 1: - fprintf(stderr, "green LED %s.\n", level ? "on" : "off"); + error_report("green LED %s.", level ? "on" : "off"); break; case 2: - fprintf(stderr, "amber LED %s.\n", level ? "on" : "off"); + error_report("amber LED %s.", level ? "on" : "off"); break; case 3: - fprintf(stderr, "wlan LED %s.\n", level ? "on" : "off"); + fprintf(stderr, "wlan LED %s.", level ? "on" : "off"); break; default: - fprintf(stderr, "Uhandled out event: %d = %d\n", line, level); + fprintf(stderr, "Uhandled out event: %d = %d", line, level); break; } } @@ -133,7 +134,7 @@ static void tosa_gpio_setup(PXA2xxState *cpu, static uint32_t tosa_ssp_tansfer(SSISlave *dev, uint32_t value) { - fprintf(stderr, "TG: %d %02x\n", value >> 5, value & 0x1f); + error_report("TG: %d %02x", value >> 5, value & 0x1f); return 0; } @@ -159,13 +160,13 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data) s->buf[s->len] = data; if (s->len ++ > 2) { #ifdef VERBOSE - fprintf(stderr, "%s: message too long (%i bytes)\n", __func__, s->len); + error_report("%s: message too long (%i bytes)", __func__, s->len); #endif return 1; } if (s->len == 2) { - fprintf(stderr, "dac: channel %d value 0x%02x\n", + error_report("dac: channel %d value 0x%02x", s->buf[0], s->buf[1]); } diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 418792cd02..56f9d60bed 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -364,7 +364,7 @@ static void versatile_init(MachineState *machine, int board_id) VERSATILE_FLASH_SECT_SIZE, VERSATILE_FLASH_SIZE / VERSATILE_FLASH_SECT_SIZE, 4, 0x0089, 0x0018, 0x0000, 0x0, 0)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); } versatile_binfo.ram_size = machine->ram_size; diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index efb5a29475..508629dfe9 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -266,7 +266,7 @@ static void a9_daughterboard_init(const VexpressMachineState *vms, if (ram_size > 0x40000000) { /* 1GB is the maximum the address space permits */ - fprintf(stderr, "vexpress-a9: cannot model more than 1GB RAM\n"); + error_report("vexpress-a9: cannot model more than 1GB RAM"); exit(1); } @@ -355,7 +355,7 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, */ uint64_t rsz = ram_size; if (rsz > (30ULL * 1024 * 1024 * 1024)) { - fprintf(stderr, "vexpress-a15: cannot model more than 30GB RAM\n"); + error_report("vexpress-a15: cannot model more than 30GB RAM"); exit(1); } } @@ -640,7 +640,7 @@ static void vexpress_common_init(MachineState *machine) pflash0 = ve_pflash_cfi01_register(map[VE_NORFLASH0], "vexpress.flash0", dinfo); if (!pflash0) { - fprintf(stderr, "vexpress: error registering flash 0.\n"); + error_report("vexpress: error registering flash 0."); exit(1); } @@ -655,7 +655,7 @@ static void vexpress_common_init(MachineState *machine) dinfo = drive_get_next(IF_PFLASH); if (!ve_pflash_cfi01_register(map[VE_NORFLASH1], "vexpress.flash1", dinfo)) { - fprintf(stderr, "vexpress: error registering flash 1.\n"); + error_report("vexpress: error registering flash 1."); exit(1); } diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 60561c7b7c..ee59142667 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -319,8 +319,8 @@ static void z2_init(MachineState *machine) #endif dinfo = drive_get(IF_PFLASH, 0, 0); if (!dinfo && !qtest_enabled()) { - fprintf(stderr, "Flash image must be given with the " - "'pflash' parameter\n"); + error_report("Flash image must be given with the " + "'pflash' parameter"); exit(1); } @@ -329,7 +329,7 @@ static void z2_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, Z2_FLASH_SIZE / sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); exit(1); } From patchwork Mon Nov 13 22:34:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837602 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="jpI5TJY+"; 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 3ybQm23V3Gz9s82 for ; Tue, 14 Nov 2017 09:48:34 +1100 (AEDT) Received: from localhost ([::1]:56667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENWq-0004SD-Gr for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:48:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNn-00029X-NV for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNl-0006wh-Vk for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:11 -0500 Received: from mail-sn1nam01on0074.outbound.protection.outlook.com ([104.47.32.74]:37917 helo=NAM01-SN1-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 1eENNg-0006s5-GB; Mon, 13 Nov 2017 17:39:04 -0500 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=45ezQMHwBHjjVfB6b6cpo7AwGrA4tmtr56e025FLqH8=; b=jpI5TJY+WnjRI8DMGrDE3ysxDW9PZDRU0lyg8EvoGGmaETNjjeOwCFA6BxAT/vRQdE7w5AXzA0BAjGRD1JwXUqz027LWsnQy/h9IAnq/6omWTaq9I3yF9ejRGnsug6qrm1tzWJSC6IWi7lPFDJ7aBoAhOixeuSDg/5zD8TYW9Lw= Received: from MWHPR0201CA0101.namprd02.prod.outlook.com (10.167.161.42) by DM5PR02MB3273.namprd02.prod.outlook.com (10.164.148.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:39:01 +0000 Received: from SN1NAM02FT053.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::204) by MWHPR0201CA0101.outlook.office365.com (2603:10b6:301:75::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:01 +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 SN1NAM02FT053.mail.protection.outlook.com (10.152.72.102) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:00 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45074 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENNc-0004VT-56; Mon, 13 Nov 2017 14:39:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNb-0000Md-RF; Mon, 13 Nov 2017 14:38:59 -0800 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMcpof012477; Mon, 13 Nov 2017 14:38:52 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNT-0000LQ-Ph; Mon, 13 Nov 2017 14:38:51 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:51 -0800 Message-ID: <55d08bd4870237b4853fc13d7bd71d4d2eb7aa20.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(189998001)(2906002)(54906003)(6306002)(2950100002)(118296001)(81166006)(106002)(4326008)(39060400002)(478600001)(106466001)(8936002)(110136005)(316002)(77096006)(36386004)(23676003)(47776003)(50986999)(63266004)(76176999)(2870700001)(9786002)(8676002)(36756003)(356003)(81156014)(5820100001)(33646002)(305945005)(50226002)(5660300001)(50466002)(107986001)(21314002)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3273; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT053; 1:U0CNn0KKpopscaiIots6zi866chYzODcnkFfNswt89t2GV9xZWT5ZxmWmiAMilp7ByulU13sqQ5SeNXE43SfXnMSJbi8d06nCVCh4REClS6JNP2tTuwGDwNw0pwLsyj8 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56192ea1-90fa-4a16-9bd2-08d52ae755e7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3273; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3273; 3:kyFe8vGcv8aa1mIy8vgKhEgQMhoOPGW/JGYCbsnonGCfv/F4tvLHpuQNcOFlP9GCynlQ0pRw1nOed/pocEFaF6Txab8yHBknONqS5+5bYaWKX1n+NDmunX3LL2EB7UWjBQm97hm7G638kI4Mt0H8gRFWL5iFKMnNfQP9zlSYoXZfFbYOXPmMV/m38LPHih2oe399hoap4bDHQrJpITXhhEIjrU34qIzeml8+JM+lGJfdocdNWfmrdSvq3tzjSACj5Htw31Gmy9vt72nPXfK6/ZzvIP98XJVQ8CsfBoO0A0d1FWE18L8tj7E6ajhf7cZgrhgKKvDukt3gzwyHTUzFYkvbGILKVOLf7Vv6ivr9w6A=; 25:M6hIfFkKsU90cK9i7ioFuemcdujnJeHfyWJLDmqiKxnUfQ7vma4Chsl8fM38PAlrGQMySMpV9GT5Xhsz3KkeIMyIKAH+GvJENGt1JN5Su45iULkzDqT48sMjxTFt7OHHg/0x61yYVNcpyl+4TDaw84IwxXaU7/BIH9vysv96/qRjDuouEVJCeJ03kD4GcnquMJqbZnu0d7BmWBJ2mQ8qAGofvG2pmPDpzsNkn5lzjYKYK+ooxONxcFWGTBbbQosVvhdVh/8qd6pjCmuTDBSLVrKWmQmzO99MqSLt1E+IAyWHDE/9JsvJ/WHFIGPnYTVzaIGeoqwKaBdJvbMiY1Omvm+4xnGaZA9Un9YSRcphm/o= X-MS-TrafficTypeDiagnostic: DM5PR02MB3273: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3273; 31:DKKB2jwExHH0Gt8eNEV0yBKmMSaGAezMayNomWzz0/caoPhzc9lYtPm478vQ4l33+TD5fbGf9wVngvJqEh0VWeE5bJBDC09bRiJy+WZ07MzrSoPTzyNIDmxC7Dd0c7ze+fOxPqK3+oNm3liSWmx0b7cVDWEXwrAATDphU6zH7Q/iNxK7VXIa18uikfkeg4/vYdSEMdmpkL6+BXBqasV3898Rb0Bu3MPwB/ArEa+Ayb4=; 20:g6ViWNsFUB+XESDiXSZfM70Py55Rym7TNXShNcwB1JE9sjESqxZJKaARaSLrHZO+XgFd2/k1oPwhApMnaX7Ph0qiJkw9P23iosjWSWDjIi4/nSZRK7v0Vnzhzivg1Om1R2/W4TxFctOgvnM6zap57Ak+if4ruylEpzOs+jekqpZ+ns7LUH9r60mV50xd0Zan4UbTZki2t1T3+TzjWSBEwlQ9aBfTkgAljJpglORtM27r2cn/MPCUsa3YyAN9LlmRSJu1udvD7+EBEjNDG2i+l1YGMcXzIiv7kMeppy7bTxJ2IgV9MPtoYHsDapNldUKBLGhyWYwvqnoaO+jxMr3m8CUxqyOAksPvgoouelfraS7MBCYpEq+Rt5dyDx81omTHmcDgLUfUrGHGvTu976sKijl+ZQawg62pPbjVJPllPzRM1b9undt90q/lQqQRNAndLQC5JfD/xQL24xdDgsteoVPa+jkeEkfofAg45L3Y4rmWUeSMhyj2FeUp0PbHOOPA X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(93006095)(93004095)(100000703101)(100105400095)(3231022)(10201501046)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3273; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3273; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3273; 4:ZIN2v03oE9P/9H2x0kTmEvZiQO1NgcdHqZsV6DWq3zoRi74rDDfFxvhyXvDpus+eLv1devgmDwcnv8qXF5jR/TJfdeapfbNP3KrzcZsyLENd4fmHQckteTn+bsFHN3lE+mRcp81qq68uESG9p57xoQnSV19Kg8z/6pTGzroXs24C1vE0qK5b681v2Ot6nbd5CdrX7BRc8I3XObZzMPxDJ3Yw58Zo0i5YyiaU0ak+cwGEyXQeA2Dr/UwRsRA9SehpMmrG4T9/cIUy+MuFWtm5shDVq0aUi7/T/KOBcRBPm0bQqKRgRPjY/8qbJcnsVAhYk8X65qAbfMzz/riEwZCTrRoPTPhoQz6FPg2DUFoPlAqJgpTzvNpdaJg92ZSVbW3O/DqkRBtHUf+GOWAevjRQgfEFbfAC0VTLXiWFJjPhmgE= X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3273; 23:nucr59/9BnR0Mr5nZybLjTGFzFlX1QobGTkoqua6S?= JUi8qfG85NPK62qvsRAoBFZhQnfXhljTrHp44QSIQ6vCHGDxey0sPSwF5BWre5wdau3dYK5K+VNJLKEybpdB3Czv4k02aiTPzrILlPQPVt3ZED047pwDbXyIM4soZv/Vtnn7md8XUlGQ86VyvR1QznoNrp+SoY46mo7elkwCewk6hqPrwxccoFbheXeIu0Idi9hoEsJF8I3fu9RTkBSGIMu3rrYvQHA6/lvfKXQdUfj06Zlq51U5fUaPDbEPO+rImXvRkHt1wiFczzriT3oM9YIgSdH2PRMnXCCwuhtj8aTOhUoc3cJubvXrLc6fuDD8LbYYN4eh96x9C9yT+eoHu7HiCCa71ZB0fIexKrHcd3IvTRpkQRnMqTmuDl4Rg0Zs82QJS74n12qPEwsgg4Q6Ay4KfQLqyMsNM9bbsHoW6pnkxn83gNC8UmOx06XHyQUlgON7CcIQlDwJCpsskv8+9/2o6FVG7yR11FMP7k67Ttp5McmMG6rM4IN3s3J7tD3evCjuTMfACU9i5oIeOuvizg/IgZpfDVl+lZ3wJJaJI3yt3CWY3WMMphnTQqkjE6hkXz8gSGJBzTEhdl+bSEvPXDptpJq50HtC3itXy13yHwUk6fZZO0hJfhGB99+oDE3ixhaaSHYxc6Nt50fZGL8WRMu1hnDz/zJvFfCbXUE7CANEhTo6V34b2dcq80GGng/y2lWCQRzb3/QCDNosWWktUzOMJOUNXWVLX3P0QAyBZBTq7tmYos4tj9UZa6Laj7r0e9sSw3Aq3XkZ/bzwBYaiUWCcl6y64O55THiaS9s/BrGSFQyoxMXuN5PetCcROZKZhqKQAcvuQ8mFJD/Wwi/26v5yD3qFWlswINt9U/Q5mS1j8Jo0BwWRm8I9Zwc979YvhDqFKKkqW19oad0+4n/Dk+v0KbWnDxEAfuR0J7T/rzIZW3NanYFx7zp+EUCssvI2c9GdFFXuTFa8BMDThZXvspHninZgNBx2xvVKhKrM9XnIlpxRwEO8JLUpGR6SDyku7BkjAataj41jo1hDV8LHqp9VMZA4OitX/lpv2/kZxBqOA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3273; 6:EFV02fCx+AEj95svIVipJj5MsIWkG69P+8AV0necFw9y1OvLZ5Lp+DfrdDATBAG6yBT4IbsyAwA4UXzpHE0LXRL5ZPA/mZhLIMcZQKsjEdEozlMwM/ylmOY7YIq8+mwwkQObHhXJbjB0gYaOkdXUR5v2D4seEFjG07wxUhhIyTGKV/eHXNql1IzR7hSTHJZfBuMm9rRwhGNiLtXQ2IkbviEgoHEMo8X4bb//5+Zk6KcugIgK6NnzSS4ArIe7AslkKZL2q0WovopVs6f0U+ylHxYPm3Lq0gTRQ5XWbkFwFx83US7VTz29ym0fizj152XTT+iiIW37Hb5nlQH++TSh+hezSGK9qzm7Nb9Snv/GAY0=; 5:ATyjdjjh2ojPggQyhCkuhbAIdxAkB889HpvhRiCTFTMs3eVgcc6RsJArOgGO0i/Ybh34xeMgTvbgH5qNk1qjxUxLXDCTY2ImzQ4Th3oU5OChb+WspGKU7QHsV3P4KaZAzFx42ORBN4fUAkrIG+jXcOD2Wb9UEWzmOVAMyCkMjEw=; 24:WzFVz13EWSRU5RoinoBmDqZFXOpxVsykX3wGCLeCEQ/6K5vBq9C2T6NL6DNgekiYU3QhBcgGHluIxUml6zbkDKTlTyYsTW81yTCEGv5/rb8=; 7:rzNLk5S/gE6h4l/pQ+XBC6X+pYqa/ME8Y3YbjG1ZQ3czgrAGDA5Gw0Fgd6fHG341OXer7OwiqQnZmymLRP4+ycJeLTCOsQbGQcuxxrV7pqJpHcVIVW15aGU5b9ZdD/JDX9fj3vEMDcFasY0+VcIEJvTbSO8pevUa44xuSCRqgt5q44mnNQNwN4iER9czRjEjpEmtgiP+HZ79Cbyn3LS5X9BqXjeGtZUsUZh2Gx48xOk7EMg+xraAtTq1SlHiQY4M SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:00.6722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56192ea1-90fa-4a16-9bd2-08d52ae755e7 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: DM5PR02MB3273 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.74 Subject: [Qemu-devel] [PATCH v5 05/29] hw/dma: 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+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 Reviewed-by: Philippe Mathieu-Daudé --- V3: - Remove ""s V2: - Split hw patch into individual directories hw/dma/omap_dma.c | 26 ++++++++++++++------------ hw/dma/soc_dma.c | 36 ++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index abd18c67ea..5d7fe06d98 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/omap.h" @@ -1898,13 +1899,13 @@ static void omap_dma4_write(void *opaque, hwaddr addr, omap_dma_reset(s->dma); s->ocp = value & 0x3321; if (((s->ocp >> 12) & 3) == 3) /* MIDLEMODE */ - fprintf(stderr, "%s: invalid DMA power mode\n", __func__); + error_report("%s: invalid DMA power mode", __func__); return; case 0x78: /* DMA4_GCR */ s->gcr = value & 0x00ff00ff; if ((value & 0xff) == 0x00) /* MAX_CHANNEL_FIFO_DEPTH */ - fprintf(stderr, "%s: wrong FIFO depth in GCR\n", __func__); + error_report("%s: wrong FIFO depth in GCR", __func__); return; case 0x80 ... 0xfff: @@ -1934,8 +1935,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->buf_disable = (value >> 25) & 1; ch->src_sync = (value >> 24) & 1; /* XXX For CamDMA must be 1 */ if (ch->buf_disable && !ch->src_sync) - fprintf(stderr, "%s: Buffering disable is not allowed in " - "destination synchronised mode\n", __func__); + error_report("%s: Buffering disable is not allowed in " + "destination synchronised mode", __func__); ch->prefetch = (value >> 23) & 1; ch->bs = (value >> 18) & 1; ch->transparent_copy = (value >> 17) & 1; @@ -1946,8 +1947,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->priority = (value & 0x0040) >> 6; ch->fs = (value & 0x0020) >> 5; if (ch->fs && ch->bs && ch->mode[0] && ch->mode[1]) - fprintf(stderr, "%s: For a packet transfer at least one port " - "must be constant-addressed\n", __func__); + error_report("%s: For a packet transfer at least one port " + "must be constant-addressed", __func__); ch->sync = (value & 0x001f) | ((value >> 14) & 0x0060); /* XXX must be 0x01 for CamDMA */ @@ -1977,8 +1978,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->endian[1] =(value >> 19) & 1; ch->endian_lock[1] =(value >> 18) & 1; if (ch->endian[0] != ch->endian[1]) - fprintf(stderr, "%s: DMA endianness conversion enable attempt\n", - __func__); + error_report("%s: DMA endianness conversion enable attempt", + __func__); ch->write_mode = (value >> 16) & 3; ch->burst[1] = (value & 0xc000) >> 14; ch->pack[1] = (value & 0x2000) >> 13; @@ -1986,12 +1987,13 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->burst[0] = (value & 0x0180) >> 7; ch->pack[0] = (value & 0x0040) >> 6; ch->translate[0] = (value & 0x003c) >> 2; - if (ch->translate[0] | ch->translate[1]) - fprintf(stderr, "%s: bad MReqAddressTranslate sideband signal\n", - __func__); + if (ch->translate[0] | ch->translate[1]) { + error_report("%s: bad MReqAddressTranslate sideband signal", + __func__); + } ch->data_type = 1 << (value & 3); if ((value & 3) == 3) { - printf("%s: bad data_type for DMA channel\n", __func__); + error_report("%s: bad data_type for DMA channel", __func__); ch->data_type >>= 1; } break; diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c index 9bb499bf9c..45516241c6 100644 --- a/hw/dma/soc_dma.c +++ b/hw/dma/soc_dma.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/soc_dma.h" @@ -270,11 +271,11 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base, if (entry->type == soc_dma_port_mem) { if (entry->addr <= virt_base && entry->addr + entry->u.mem.size > virt_base) { - fprintf(stderr, "%s: FIFO at %"PRIx64 - " collides with RAM region at %"PRIx64 - "-%"PRIx64 "\n", __func__, - virt_base, entry->addr, - (entry->addr + entry->u.mem.size)); + error_report("%s: FIFO at %"PRIx64 + " collides with RAM region at %"PRIx64 + "-%"PRIx64, __func__, + virt_base, entry->addr, + (entry->addr + entry->u.mem.size)); exit(-1); } @@ -284,9 +285,9 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base, while (entry < dma->memmap + dma->memmap_size && entry->addr <= virt_base) { if (entry->addr == virt_base && entry->u.fifo.out == out) { - fprintf(stderr, "%s: FIFO at %"PRIx64 - " collides FIFO at %"PRIx64 "\n", - __func__, virt_base, entry->addr); + error_report("%s: FIFO at %"PRIx64 + " collides FIFO at %"PRIx64, + __func__, virt_base, entry->addr); exit(-1); } @@ -321,11 +322,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base, if ((entry->addr >= virt_base && entry->addr < virt_base + size) || (entry->addr <= virt_base && entry->addr + entry->u.mem.size > virt_base)) { - fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64 - " collides with RAM region at %"PRIx64 - "-%"PRIx64 "\n", __func__, - virt_base, virt_base + size, - entry->addr, entry->addr + entry->u.mem.size); + error_report("%s: RAM at %"PRIx64 "-%"PRIx64 + " collides with RAM region at %"PRIx64 + "-%"PRIx64, __func__, + virt_base, virt_base + size, + entry->addr, entry->addr + entry->u.mem.size); exit(-1); } @@ -334,11 +335,10 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base, } else { if (entry->addr >= virt_base && entry->addr < virt_base + size) { - fprintf(stderr, "%s: RAM at %"PRIx64 "-%"PRIx64 - " collides with FIFO at %"PRIx64 - "\n", __func__, - virt_base, virt_base + size, - entry->addr); + error_report("%s: RAM at %"PRIx64 "-%"PRIx64 + " collides with FIFO at %"PRIx64, + __func__, virt_base, virt_base + size, + entry->addr); exit(-1); } From patchwork Mon Nov 13 22:34:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837599 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="5AUThQOW"; 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 3ybQhk5z14z9s9Y for ; Tue, 14 Nov 2017 09:45:42 +1100 (AEDT) Received: from localhost ([::1]:56638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENU4-0000wd-SO for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:45:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNo-00029r-4b for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNn-0006xu-2p for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:12 -0500 Received: from mail-cys01nam02on0058.outbound.protection.outlook.com ([104.47.37.58]:13120 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 1eENNi-0006t4-9h; Mon, 13 Nov 2017 17:39:06 -0500 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=2y/qtDdnIb4vnoQ0y+hbz7TjtdSf+BtmCQbNIDVDax0=; b=5AUThQOW9Kws0XOrt6Xb8pQw1JYCh3j/fDJZnV2DteaWMsHlc8uG/8HGWiu9u7xY1zUzIeK5OuVEkocDwVF6K9NnAkGallhAScKreOFoU4V5dCD4zcjC10mAEtT//J2XQwavejLDecqAIiCvnWhSpLgBev7+fYvkuf+/BBew+7A= Received: from BLUPR0201CA0010.namprd02.prod.outlook.com (10.163.116.20) by SN1PR02MB1341.namprd02.prod.outlook.com (10.162.0.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:03 +0000 Received: from CY1NAM02FT022.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by BLUPR0201CA0010.outlook.office365.com (2a01:111:e400:52e7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:02 +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=temperror 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 CY1NAM02FT022.mail.protection.outlook.com (10.152.75.185) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39: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 1eENNc-00048v-Hl; Mon, 13 Nov 2017 14:39:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNc-0000Md-Bk; Mon, 13 Nov 2017 14:39:00 -0800 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMcs7w012485; Mon, 13 Nov 2017 14:38:55 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNW-0000Li-M5; Mon, 13 Nov 2017 14:38:54 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:54 -0800 Message-ID: <96f96c11a00a303f4dc8c1fa7331470736e0f221.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(5660300001)(118296001)(106466001)(305945005)(189998001)(356003)(8676002)(2870700001)(81166006)(81156014)(23676003)(50466002)(2950100002)(47776003)(63266004)(478600001)(36386004)(8936002)(50226002)(106002)(4326008)(316002)(5820100001)(76176999)(50986999)(36756003)(2906002)(33646002)(54906003)(77096006)(39060400002)(110136005)(9786002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1341; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT022; 1:02TmbouIWasCU7sv378V/jIeBrRkYuqAIfIHhtirEIFqOMUVxq+nLIbBK1VKAzKoUU4wFsVMsKfhlaFmxVSv++W1v+fQFvVfpSkaWCn4D9Wb8IREFPt3dkMcz+QHy9BN X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f98092e-5a2c-4d99-f158-08d52ae75663 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:wrkBkyexR7ekz+W6vg5zN9D5g0dg9uMEwLssatiCHDkrkWTs1Zb+S8Ai4SdWgS+nzbAKAI1Smbq96oLfqrEijGFwzJreIohVrjdewWcvSnghcbyW16Mywp41iHWAZYEFjL4CM8EaBFMzn5Air85HUBhB6JBOHkQXcK/3oN10qLW+4/yTcyQk7y5BIdGMVmHqFJ3cfB1ABlFGFC2PeN7sDlpQtlkxxEvwDOVz7WvLn6kdzELfFOsZTen8z3LwtW1lfAysdQuSUWJAGnGPICkjPgGAKbeYXy0F0eq1TsXOl4pxB8CQU8WqbpBo4njHPuwo94g0vD6BbXFvn0QEoUqSh3KKZs8LWgUa0wpNXoy1riM=; 25:bFY8P9wrcqvlQXdDgGycAlZxK51O1vbtfwYdNhor5BlE8PMNllRbwavH8G9T21XUOKRUWOrTs9gnG661s67OY9qmj9p7bLTcGT1mzStNLKLWca4/E8TcGb4VX0EVv4wur8kKLheHsr+TXLtknhxnMnMFk5pc/Ca8VrdpekgmvQDpDmXeEw9kgks+jlIyj+sNVccKr4hd5Vkr87+4mRSabZ/KIeVtueIgs+caXVloZpjYwdH41Veh02v4TBppLMTjiJW3LlAfmYOJ2nPpxlfvk779DpS8+tOdhSC/Lili9VrgIH4caX6mKtDocCMXPJ3cOjMuorv9/ic0EXKsWEuwHIQyPr9bAqo6B5YHRs2CZU8= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:P2yd4QOXuWD4smRsMqiWNGfadnM2lxQ2ogfypowpyRsKGZIPK28+G/ujilrk1tl1AKGN9ex5Pckp+yS4B/q9tlQz2F4zZOARj/PF1kj4ieljeRzNzan3BNRy+adEg4yJPhEmzyQtdl9Kib/yPrkSEslq96SHEKvYK8UxrLjX5InSzvbPLqWgDdaTL7ZNxEgRglltrRCPywdF13y7fznuAf2rMXxU00R8U+i5eh0cmTs=; 20:adMH88DIdmNtLdGZ+V7Wfn7zse6WsT3XnFWCccJJJJpla/8Ko9r/rHFKPwX3d1DcCXlV6kQ/M4UQCxrab5PgLrIPhFOGVrWKYrp5cXQXTwK9Bc+RUIXnFPwiegverJHZFkiuV7sH72XSsm1xH+NS1Mc2ypPUXdA/MJ4zqoWs82vlcI9hdrQm6LIu1Lk82mMst5+kp/Ma6iiDLw1nw9sbbMaNURsdgM6G1EidQvh2iYsZcCfgezpvJD164o0fJPKyi3vmy9UR9nnN4iZ1CJ6Y1iCf03cf+R+w+jAzvO4cyDq04vQx10VCy/yd0pJSwmKXXWA9OPJRNmOBxDL5AbtlOq8ESr42cTexsw536cw3AfZUbwKga4lkx+W/u6HbU+vIpOZMeT3wJ0+l2L1Ulyqe0Lz0q5JKkDJ3DONxyMGpyJs9SLn9OuxrXN0FVH7OJFyY2BKNU55ZlF5kgyTLn/oCnqi2TVC7GAsYaSsn3zVh7bkPFQfJLeVv3vmjWJJYMKTS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); 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)(3231022)(3002001)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1341; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 4:APJgsD5ubc5jyQXqHBSDlFirOqoo17UxLZfcjUpjwxmZ74qPF3GqUq+ebPQ6lCYDEvzQPWtfCrMLkNd4C4gdfUnojdJ57zM3CAMtfdJl1mcLSYQUA0PsElKeMLfTzuMxCu2gJPcvHjuEO2y1uTKFoG8Mw5ebZTJE3APgxGebhXvY/q/MKfj+m4N3dztgHOqr38BzRxKbaoWglNL2fktvz/azRMWX86EYVZovSvHpmyAbdno9ZS1fQkHeCxgB+F0Rf+M+VC79WX/SbtvX6HgLQeNXs0XKPm69CF0tiHrUiUXofocMAgXe+ewhxYma7KDW3HLxMmA/pz1U9M7mNMJE5A== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:mT/X9QhvYnBZgSC24rXaFKolMGlMaey0swNOjmEq8?= ICKx9W30Mrq1QSC/z5jvG0B0xjpftQrM6KW//v5aTuaMc4AzD3LNi/cjB1mOuv53cIlcKS0KEZRQJUh+BVosFlbWHNiXHbVFyLbVjY8H2Mi3USm3Wk2QOZ+eIqT81NviHnaOJa3brrUxvvS4RW8bQ7mafQ+mP6XrKs7M0Ao4EGfwJQPXNrU2A1Md1bbEVA5HCzn2tKJo3F+ad9iXKf7OdvLW4IchpTKSxXsmo8GA6vwOHQQl/XcWFY20hrk/yZ4jjzW/8k31AB4TuDwtKFzzaZylX+Fj4XV1XThXp5M37Dq9Z5zDRHsZDEuKXmZu6T307VL/+J4UYU1oGuxOA82byy6VlUenVh7wGRlcqdYkHinI7c/cfGmUxtpbPKH+ILLW2XZwzUe58zcczW8WwRPi3nmj/7zkREhC2JeEbwoCRztlyhVj0AdyXQwzaXjSmrI2UXVj2UZffUGdfENzu4yiNYLWtn0gtIRMlZIx1AjfMc6JmnKvM5Qua9ShfEiypZD4m/v3fiZgl2UQ38RHorhzNNCbimYnPMQC90iWF3V37Et3SMaHXqb9RRsB1EnyThYaMVGKcCURN2VIRz9Gx2ph8ThxCpTRb3qJTjB4EEnWCfzwSfdfRoTHKn/tEeAsizcGRBcpJqJsX5+1xVwQQKoTd21MtyifvIzHjbaaIfA6hp1EyeLVfgZWFZklkvJTj5vwZ6TFKpMaxgc6pvalW4XWJZkxCPwmkB41eVAcHL6Lw8DlLveKJkI46UgOW6utFawe11JwLw4SE5/ar3VIzFL2L6z9ZPm/V6M+XvZ1zAev3WorZY0XGbv2tqb/3N36G1mvdSm9HQ8XBb660T4AJzB9QTlvIeVosM0reQ6zSAq8BzPoPNYNWNB0RdMFEroTXSw0Q0DkFiabA2BYVIhvdBKdrgUWW6yqRCQSA3SGsocwBGUKpZomUJIPPjUHS1cPStXx6xdv6QZQStXoQ51/TBghxsR X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:nfHN2+nPzXKG3ZihzJBQtHVGS5jNQYfM0tRrvFLVdlTit9/U9oTegSjwWvEPIUSCZUXG5I1lKTEU9UPmV/I+yDyc6PWB7Wp0V8NS6+LcSD3pgRWAvVXIGIwXaK2JU172t1dCbFNg6TdmxEA4+bFk/3FQxJmH1QYKMhOxcIUQlHHMihwUlzyJG4ZvCzcUij2m99EHyscXpeJrLewNwo/eYttRsuwO1SrVvOyO8ICyFUcLbwFOiQcHdfE8PPdDITcW8rU4I1IfNmI7l6BCB3aTWqz/20Xmldpi2lEhh2F89z8VTZXHwBwcZLrBxans7CYwI22x5YFJ0WJq+PLlQnQlOrlRwSq/hx3I4eRH7V8K1b4=; 5:JnIB5NANpcnwFsLqRN2EpAYFDvtiuxvKeUl/27/GbFRD08bNVaY9C8PNQq72kd3TQjzY1Rik1Y3w9ooabch4mT9vXzaDp++dyVebh8BeSpbbjmoWgfuGEAhUzhBwY/u9bnAeWhRn62cWO2Yxz02FGLs1S8B/4dPxpGRynaZmdHU=; 24:p0PD7W02MHhMniFw5nHV4XcVmTO1zjT87qwl4qYqvZO65dlz0wyp95xxM6TLyGDd5dRjTg6/VheVE629bEDtxs3mZaQg9WdJbynq8R8JcnI=; 7:YMwt6DNXy5Zz2Nn1LJWWx/GOhF0aBo84SSy5MZYaHyUBqnkBQUo2XFV6kfZxIBdPxr2KDtkDR19EpvuZETHSKetxGRNUtAMhOjB8Yy/ZrfiCYcCohmsC5hFbY3pgRZs0k/KoPX+t3ui9tWxH8T0d6W76egZUVxmiOkoB5YFTsYwvk0Prg+5+7tqHa7StUg31IZA/oGNsyvkP42s/frARHKKq/bh9v2DLkkWiPSzJ+E4mhV2mOYRS5OM5dY7qM5Fm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:01.2839 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f98092e-5a2c-4d99-f158-08d52ae75663 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: SN1PR02MB1341 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.58 Subject: [Qemu-devel] [PATCH v5 06/29] hw/gpio: 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+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 Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/gpio/omap_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 08472193b5..57aa2e54f5 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -399,7 +399,7 @@ static void omap2_gpio_module_write(void *opaque, hwaddr addr, case 0x10: /* GPIO_SYSCONFIG */ if (((value >> 3) & 3) == 3) - fprintf(stderr, "%s: bad IDLEMODE value\n", __func__); + error_report("%s: bad IDLEMODE value", __func__); if (value & 2) omap2_gpio_module_reset(s); s->config[0] = value & 0x1d; From patchwork Mon Nov 13 22:34:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837596 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="cUpND9iZ"; 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 3ybQdV01yzz9s82 for ; Tue, 14 Nov 2017 09:42:54 +1100 (AEDT) Received: from localhost ([::1]:56618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENRM-000707-2o for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:42:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNm-00028v-T4 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNl-0006wN-NC for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:10 -0500 Received: from mail-dm3nam03on0044.outbound.protection.outlook.com ([104.47.41.44]:21408 helo=NAM03-DM3-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 1eENNg-0006s1-F5; Mon, 13 Nov 2017 17:39:04 -0500 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=t4fS0+LHJ8Pb/j055VBrmvG3jhqDUnLP1BI0pIIgpC8=; b=cUpND9iZHWP0Ntj0PSHCGJcNLMNsPUIlbC7cIouDHe3xqLdw/NCDlJXc9HKjWjdHELDTyMGnFTwCnSXDVQ7BP9NFp24sAp7bclAw8OoKlf7C7dY2vxECyoQX2diZ087wOAfKyP9ZBCdBNPrKwj1CMfscaN87EPTjx0RIEQFTBfc= Received: from CY4PR02CA0016.namprd02.prod.outlook.com (10.169.188.26) by MWHPR02MB3279.namprd02.prod.outlook.com (10.164.187.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Mon, 13 Nov 2017 22:39:01 +0000 Received: from BL2NAM02FT036.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::205) by CY4PR02CA0016.outlook.office365.com (2603:10b6:903:18::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:01 +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 BL2NAM02FT036.mail.protection.outlook.com (10.152.77.154) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:00 +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 1eENNc-00048p-D2; Mon, 13 Nov 2017 14:39:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNc-0000Md-A1; Mon, 13 Nov 2017 14:39:00 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMcvIZ012489; Mon, 13 Nov 2017 14:38:57 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNZ-0000MM-Mf; Mon, 13 Nov 2017 14:38:57 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:34:57 -0800 Message-ID: <674645052585a2e064588677e37046403f89fd20.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(2870700001)(77096006)(54906003)(50986999)(5820100001)(23676003)(63266004)(478600001)(76176999)(118296001)(110136005)(39060400002)(189998001)(36756003)(316002)(4326008)(2906002)(36386004)(356003)(81166006)(305945005)(5660300001)(8676002)(50466002)(47776003)(106466001)(8936002)(33646002)(106002)(81156014)(2950100002)(50226002)(9786002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3279; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT036; 1:JU7TCjnJ3ALbsNxlTvv3av/qIKD1vrzJ7s4Jz/qevQRjJ/L4GCXJ2A97px0g5yahLoic3jvkwOmb4MyPFwww5bNJTGNnQ0n0DwaCAZJI4drvUG+LwH08UpPU6EOnOxJo X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b07a17e2-ca62-4d2b-3536-08d52ae755d9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:MWHPR02MB3279; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 3:CWvrrNYCeqvp+UhuQewdQj0Mv0Z+GWLdWLVbKqEOd8z/z9Rlc/Mpc7vH9XIwuUxzCXlyQefdTnu7rxANOLR3RBmDJZVuNK493QdUApNM9HsP86yQlwf+UZ7ByBw2tieD5FExGqvaecXs3d4kXtH1A9tvzuysQ8CnQGkY9I22XtZkKk4CGO2zrAFA5KrjXKc45aB9j/0vDfJ8uTvM/b6C8Pjq4MC+w4LcMik9YDS6atEDNywUfmGTQIoQEPklZs6/yPLTu1U4oBGEUvVL/n3tBdrzJxI/NNzsEVTlafWbTUPpssS1TBPtaquODPxLBzUnseGQvdrF4jy92xxii44brPG8le+2Oi2VpOVZxSSYhqA=; 25:VIPI+KlwuZHe/u5YIMgEorjQlf/7kLblnqFbapkQ7VCzuWzLm6pgI5CHEtTWam4Dc6RiUe/srJ5F7n8kQTT1JtuDjv335q6Sco633R9tkL3Kpokbgxpu6m5dlIBwDOR483OL2DhlFrK8iHGfCmH6vk13NmfK1pDkpi/TdlQPtmQVeiSRTdgsuR7aPNnbd17tlFkebbh04zw0wB0rBy/6Y3kHfsZRBP1/Qo5GbDjBBt+pq4AQSjkagAPOJ+jJhnYrtHdjGxW55mMp8ZsV2Ik9qruj1Bf6J1iupbTcXJhmulJ9OCa/ScR0Ph/lFNYp4rhvA+U0fdA4cxUAUVbvawW+0za9J1tUb2GntFbZwPiDlfI= X-MS-TrafficTypeDiagnostic: MWHPR02MB3279: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 31:/xk5djGzRF4YTAerceGwyORcXzV/fF/2Zkplex1O5070YQQZmX220Pkp6mDuUq6izlHCEqXPIOrq6pTe29WNxBy4876WSkEgJXy08UNg5BS2kOQKXrhqMAnc5Xu4I9Eft6tKNWsBKE6I3gnH55TMtjvirxnmAFKVrAqzWbLIqqzFzjMuao6OK9Du4ywbvBSdIzKPNAsOafP0K1eIVJH1w9B5g++iBrYviLkGxJliIZs=; 20:OSceYMFP8f+Qbe7KU47Cvjsc5h6LS/e0fil4KoP8CwEkadiEwAHsSFJHBGCGI9VM+PZfJ043iJnbrsjFhGF9skdJV+Y9UuYHYCheKrWIMAiXlLEqellmp+NOI1nXygrYt6FzqHGAE8fhtxunNg04fWNahS5NJMdAt2cmncXaaw9JAxHJwnKtTOKweuHtza1U1MsuSg8xJa1ITjk5ER1I2XDdoOZ01NRMQ5chteyQ9kne6LzNrxY036Hwekca+6olRvUYUTrPI8uBjuluSTWTEz+sw96Ot/kFHWng19fF7PNBjeXMVm7mdp7HCCzZBQhMzBkqQeze23lX08CxSB9EfuaUlvxLFKzOex424R7hsAdVLgEeeCnt5HIN7ea9HOS17qakwZO/gfrmyg0JBR9pwrbxz0MSkoGke0RGPqgUS/IOpBxxa9UQGaqR5rOCTVYanmwvB77ByFp+wUgBFZGoBJ37B1fhjElUVNuebs6H1QcODJd5oK4z1ScFbf44Jz2g X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3231022)(6055026)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3279; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3279; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 4:M5AwbucKDVZQOB9FYPH9nGP6i7PNOUFEPX8GzapIqmgvctiPghKceDkh2ec8ctslKQS9tlu/D+ATCwDCR+SP1afWyZrmQdfGMdN+T8199Ql/ffvPP07QhQna3nolRwWy7/4oatMcLaSY5BVvY7DvwEVlncGCB0ki1JRylndeJCguVkGU5ggG9QnBlaVI1Z/zlfnMG3u2NPQTbnsNbiL+qnX3CHf8ttwZ5PK0RTx6sQIndD/I/85XAKuKtK/wQk0uNKRutJyk43BC3cYbzkaSqe9vryuCTH/fxsZjio3xVewbaxwVM5hn67mSaoX8cJH6mNs4aWO0L8lPuYLB5LbuIg== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3279; 23:U9sUagwALc3Lw35K7G3mN+yuBexJaX1SaUlGx98/u?= 6MytCujrXIBKyPjoCYOlmCf/ijazsRcFKS2Uo00eXxREnMGNQOHe4CgDanrY1Mr5HiIf4ACHyR85k9cV7xrWvnoL6QutfBDT5V5tUY62F03WNViK8/eCL8LLYD66IpRCKfCXe+X8qnWWRH3czP6lBmZXQ4gyjz/4Jm1g14+aht77rgb7Gep5XtltEMzwmm1/tp4Q20TyU06fmCvJNmpBWdKxjcKxvh/0xL0kwcROnl1jifoE1+YRCs62dNm806NAtYbFLPnQmG0gqbH13vQDM8m4RnxNVr/gb6y++Mh+6+CgMPk/41Dxm9BTZhshpz5Pers1HU4p2AdFRmHzEOXjPZwsm8VRpgMB6lVMCTPWHKF4bNTKsGvzdSFNInZJulKJl9kjKRnK6uD5CbnFwyvg84mhWyga+fnzGbp46jrYNUdHuAbOcnzm8/Ft0eA0Eyj5Im5WUOp51oCOLJ2AcjLOdMrji+YfnslvnU0v+nPOWrHX+Ay37yOY8o7DtkFMGa8cmdpk38f8ikrWIPywcih0tTedBiofrnaOx5X5Xv21dy75FZ4eVSPazHPEwzqEEsjKruSu+wRHvbJcbu3+dFq4h5eE1EFUz07XBmHH/ZCt7Aggk31oqZV32jo1bdKlddJIBPu4dH0JPqGX5aT6Zv8Gnaa4wo/yu/FNlgLlsHaxBsYDloyfWs86uV/MkUvu37FhqgEkJZrK6HgNUCcbY+ck+HQ0QZ47cvGb7IRqgYLrzw+6n65aBnHy1wpE1kaVZHCWBWhebfNgMc1z63yjo4pz92MfeBXjCahW9M7aERWwGCnK6Y30iX6uGZxGimRPrG9C8blnYPU+QtQwkzd9pDb7i8peP53VPZIu96T3NYeqceo/qTZrnlE5ziwfGoKn1skbKhf64jfkXhl9mqi8G66UduoYkXJ9DbsJ0gZAJ/lT7STRGTlfEGw+Eok8olBmiBR4PJoJWbwa858xj7mA8MAeBec X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 6:hXwtGDCOQqbtAXXNO/hVkmAQtulzXRhwiQXTThcJGhqF9j0v4sy6lGX0moqyJhA/VyD4qNZAmHPiBvRlmtxs7qZ2nu2m1Pu7LO8c1jVMyAFoQYYc6VSSKtM50VRuvTIVDCgA9UxpjhmxYckjv3pfy6agSfRsh3dcZwtjQMm7+679dvgkhAzyUTWqvTx6N3fRr1rvM3hFZVXf/mc4zXq9jSyF7uCV7NvtmTaz5jRla7VORLIMVB06tXq+UzTPRGdDQ5F5CUukqL0LnWnBumAQ2lUHpuTRycqnXkRAccpD6NFb6iR8ezyeoRAeae3ZcyyzV9GLeCWpgX4vGbynjgAWht63FKxzU4RklEV/pgKCn9o=; 5:9UwsurWNbr4WeWsJ3vBZgNits7JlpgZRtm9uMrZxsE6DrY4JdzIz9agpQAfRlEHQ4+e+QTMv4w7LrdqokWMGB4TxZg9sn+y+VZgtNR/BxqoGAuM3zYINA+KJzFsIZrgvURG1G0d63Dft7GkhvMit8hR7nk7rZqs9JniQlK76GKg=; 24:HZMNoMHw+35BlNsN6PoqSIWKcVKXuyHNsaNpqkhWdkU0zx95tQ7wYySbdoRe94kP+M9Y/LpzBSh4XdQaJs+VznccY6RSOVPDB6KxcPEtM1s=; 7:+tXW2Lea2SdFFsC6eoXp4py9SY4+8ArC0czi5cJi337T28oSjBM57MvFmKwIWciHAHmDdXQpEmZtgn+KYcXISsOSJzkQG/rBlq+Q2KXCiTVSKZU6SCCZkyluizoV4/j7+srlC7HxDhX3Sb2GrwJ/2xrPt3uPVhRsifF2Q3JolozVizkzNZzqNHMHKVQx4bft+V/14OCp8XEBHMc2wdYbyucNUEqvEP++j6vG2fKTmwu1/TDgWMxgjr5agRY0t91e SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:00.6247 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b07a17e2-ca62-4d2b-3536-08d52ae755d9 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: MWHPR02MB3279 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.44 Subject: [Qemu-devel] [PATCH v5 07/29] hw/i2c: 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+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. A "I^2C" was manually replaced with "i2c" in hw/i2c/omap_i2c.c. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- V3: - Replace "I&2C" V2: - Split hw patch into individual directories hw/i2c/omap_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 26e3e5ebf6..e9da7f9f51 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -340,13 +340,13 @@ static void omap_i2c_write(void *opaque, hwaddr addr, break; } if ((value & (1 << 15)) && !(value & (1 << 10))) { /* MST */ - fprintf(stderr, "%s: I^2C slave mode not supported\n", - __func__); + error_report("%s: i2c slave mode not supported", + __func__); break; } if ((value & (1 << 15)) && value & (1 << 8)) { /* XA */ - fprintf(stderr, "%s: 10-bit addressing mode not supported\n", - __func__); + error_report("%s: 10-bit addressing mode not supported", + __func__); break; } if ((value & (1 << 15)) && value & (1 << 0)) { /* STT */ @@ -393,7 +393,7 @@ static void omap_i2c_write(void *opaque, hwaddr addr, omap_i2c_interrupts_update(s); } if (value & (1 << 15)) /* ST_EN */ - fprintf(stderr, "%s: System Test not supported\n", __func__); + error_report("%s: System Test not supported", __func__); break; default: From patchwork Mon Nov 13 22:35:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837598 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="p7LiEt7c"; 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 3ybQgT2d5cz9s82 for ; Tue, 14 Nov 2017 09:44:36 +1100 (AEDT) Received: from localhost ([::1]:56631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENSz-0008Po-Gh for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:44:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENO0-0002Te-6T for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNz-00075a-6y for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:24 -0500 Received: from mail-by2nam03on0064.outbound.protection.outlook.com ([104.47.42.64]:17184 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 1eENNr-00070c-ML; Mon, 13 Nov 2017 17:39:15 -0500 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=RX1qyba3QRDHPY0kSmogy3Vyo3fHdkUD27Yqr1WjvRg=; b=p7LiEt7c411Qh7hoTyOV23EHr/7GAtQq/Bvdwaf2MtKYW5rZXfr9aZfIYECZzYDw7rd26y1BAtdZUq2B26eNkgAJnOTuCTx/1d0+nNSOHqac3SlxpJgD5wV7EExpcgR/3Byo1jaGDS0xVlnXeARHJipYDTK+BnOwE74gYOlmGoQ= Received: from MWHPR02CA0023.namprd02.prod.outlook.com (10.168.209.161) by CY1PR02MB1336.namprd02.prod.outlook.com (10.161.170.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:39:12 +0000 Received: from BL2NAM02FT044.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by MWHPR02CA0023.outlook.office365.com (2603:10b6:300:4b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:12 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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 (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 BL2NAM02FT044.mail.protection.outlook.com (10.152.77.35) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:11 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45494 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENNm-0004VZ-NI; Mon, 13 Nov 2017 14:39:10 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNm-0000RI-IM; Mon, 13 Nov 2017 14:39:10 -0800 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMd4kD012561; Mon, 13 Nov 2017 14:39:04 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNg-0000QK-7M; Mon, 13 Nov 2017 14:39:04 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:04 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(2950100002)(118296001)(4326008)(39060400002)(50986999)(76176999)(77096006)(189998001)(5660300001)(33646002)(36386004)(36756003)(5003940100001)(9786002)(63266004)(8676002)(50226002)(106466001)(478600001)(81156014)(50466002)(356003)(305945005)(48376002)(106002)(47776003)(8936002)(2906002)(16586007)(316002)(54906003)(110136005)(575784001)(81166006)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1336; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT044; 1:UO5Jvm7QtXerQjEhxCtPy43ofJxOjnDUAQ9XgZBSGWSGQkjXbGkmXDyvTX1BeXoXG53iffaSr7a3FrWNfLA+hEO6dpMku8X5BTabb8YPQENaKPBXjiY2umGBopwUUUyi MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0cd4031-6428-4610-4897-08d52ae75c46 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:CY1PR02MB1336; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 3:WVu52q3fwgxZhM8qBeXKZceHos9tvSns5GFUdMrZWxWVHddROjo4xG448FrpOFyELets0yLoCYXN6L0Jtuwn1gZEVPJz0ZZuJ7qz7bnUwbi3uoJoUhioByY4JPDiGBsHf6dYH+LR1DL3Fh1a5iGyyduUi0rq5InWW/BCkH2BRJbyDk8ooiJRtUU8T8JzDuv/s4/yuyRuIMrbkEm6/h7/sg2HObRyhocxikdq7pNMeDvkxpoGHH49QreDeIRznQ/JJ4xvGPPoQAw6Cvjl18WAb0F47jkk6Ojso6Thfpb5NJwrAyccfD4TnYn4auZtdE2dM4AEIg5RZBH2nA5LFG1CgabWpJgPJ6tjxwvkew82igw=; 25:GyBHW0WG17aJj0OeAn0aUm7FRMnv06hXOLE/FY9K7iCcdQn35Mg+9fXOTu11Cw1Gjp4gkbQ6hOr5oEU+oLtkAE7cDbTM2PZcJYX3UzNGW3DNPrbs2Yux8IoP62ffvzUc808KhmAvMWjs0WyDBKNpp5DPxndUNGJewqef0Tl8P5rsNp56aCUzxkYUwuxU7aG6UH/vNZg82S5FbocsOqU19ixyrVrSinkP1R+8R7GKJ7owIs4BC51hh/HRNIQ3JVVRg/F0myuIlvzHg9NGZNO81SafzEaup53FQHZKpRkHPydSTfCfVs+znsu5qeKpcvrDTzO2RIgVR5ahcfu4RjoOvlTrfR8d7HvRsIOfwMuhwUs= X-MS-TrafficTypeDiagnostic: CY1PR02MB1336: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 31:VW5xgFxJT4/DZwVp7nMhs+31N6elfEFzY77BseG1Zv6Ufu5iudLqWyM27EOVP6laMGQzrS6pFnCkPGqv3MQKMYME7KlXRGaXoyC96XF9gt5NDNbAMlsm4yyAtZ5Z5mvFWTFqK6kewYT0vasdt1vne+iG0OMaq4qgCnWq9IeBvWenwcOmxV7Jm7gfcO2WRuwZBGnX2Dw4iTEKSGwd0dhPmy/8p+tW88WWDtCIb8VA500=; 20:vrI3NLG42TFairTNTWRpReRPaPphqmT1ewlbDZDeh9IfWdQ/KHqjsmVafvEBtLtfi0koHbo0Xx35cPsElxy0xHoIAQAni19LQvYtWO0fAiB9w/ELIDP3KsKaf04yyhI21095EcNmKv3MGgFCQsWPzxX8r+oA5qQXMhwj2RIandb1AO0TlzXl8vBaCzD4FhUo0LZsOiUVxNQVklhNbeBcIC7mdnOmx359wDP/arrnqwekbjXVTtAr71GlihxGFpzvLxONxl8jLgzqez/gTesqud7N3jKtHsxLmuamrNaOA2Q/KdhDJZBlZ3uy9Mr15OaNTAhaPdaQ3979EDqNpKhNwhD6R2vPskVHongD0bXHi67hpkZ2IM4wnc6b16BXHchOYtFNKUekCaTqr6jdyw6DMQ7IXaGzYCU6VgomENI0YJyvNGkXWDRRL4JHZnaTQggz/yYaC8Z43oReFKSgSaXss0m4ihT3+fBbWochrHIfWOg0szeOVjLP00p+hi7KDSQJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3231022)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1336; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1336; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 4:WBUOSos3DU7K9EPpsRIqpPFUPBoe+tfZlX305vEULGQEA5G1zgwDSZ0QdzhDwCcqvF+DzNsMaWMFFa2y6wR0l8sZa1Vk7qVNgKSCdfkPJfun50cdeIClho2xPOBas3qWkY6OcXEWpn+Di7A/zcmpwO1TfOSenxfrVuscdfZ628fHSESyJx2/FAoBJk1jvgxSwv6Bq/D9dRWtoKuE36G3B/EMEBwK2ajDJ51I4LaSJeFLyaI5LNFhEL8SWY2LEIfhEjpkexuILjXw7wsTl1dZ8sVj3rYXZegLdxosJQm8eVZNnwVF50KYxAUYsLSRof5grz4JcSDcsokTl7jQ3Kncmw== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1336; 23:ZFEYfkVTibawctFX34rOcVcIMFBS+5OBR40uaOqIl?= rDMPqYF2piVwdyB1GCs9iHH0pTvQP3Q44e1YdjgP0u6TrqPkbFKi2QjgkjL7yDIdGH34KrQxQnxowWFVJIdACCjIZBOsfnqwaxYD34xlCMhhfi8U1+F8yqMpa0Mn1Qifkg2Uap8DuM/1ld6IBwaUumnxe1TkmnApOb5f74VsoU3vlkXN8MY25ejFSbEXkyce8BTB2uHsZYxUFtEluFzNRBjahWYPRVB212S6dwoLcLDZCH4PQaw/hJ9VQsAKJfs/LMQvDdcj5ptojEKn4iguNAKHcnZx9IHB9QTsViGfRQUPWIQJJEGhszmPt/lEJ77MM0aBKR//OMkNZHeok2+/2hPGhjtVcGPd6gXvmZprwqwRVPQR7iyxNOK8UPuiozJ1CiSIs8wAOXrn5P9qphF4imeBDVK+9th41WflzDJDQo2EpWT/gs6qqjNtcW5jQdC5masPSurZYhsCSuWS9jAzx7RngF2+/Qs4EWYxX8GjwbbY7kehHSepUKA/gnoMXTk4JGnXgXTGJ3NGLVBxvpnS1ruLsJ7sy1MQVF9K0qPuHGXbFQj+QrvtkTf1TLqCbWakvMCkEWSy2Wx67bIY4oL+xiqzfMDi8N61GW+iD8rIpZxM2Ef/jjS35MkdMwyD5+ou9W9gl8qVf2XHDQKtn6U0XU99YRI4bkfnl1CXoDVp6RQ1VXTy9jvrwRWjMXp5oR5Fyxqvfhle44gVPKLN2+YaJHGvQKb1gRY1+QlrvrYS1dnsSRj2sbQkP1ugn6I2FCiL06du+yN1arCJZFhOIBfB+6WTRxq1sOUO6IT5w98u3d0Bcsj5M5V7xNY3pl/n0OVp4Ps6jqXJX6Hwd3iENK2YZtYVYT2BwmbXh0/XFYXa+kzv6tQv/6Jef//+sVA+yMFiaDD/avNUcsJScA6uoo55gt9FkMhBk7BOEZF/1JRODaMW8loJbD2VMHuWMnQ+J5iQ9iz3wcmFSWMJerrLFJaiUbRVjif68SJ5HA9gswi7EwxkUH4qmjLUDiKfYYaK9g3Shzg/y5N62Kib03kf/E2JO6Z X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 6:KX5vO6Vqqw6qQe2P7NMzHmOV/eDaniUP0S0GNhYsIMCr7NzXA8dzvGIAmiaNxABo2rr4WMIb9Gs0Qef40w0VAAcrzsPFc6cw+4cE2xxwgU9v7r0mTzCgdjf0JJOtq7hjg0gXxa+elKoqOJUblo7WS981+UyO58JM620PkzbH+VFQZ/f8+dbPv28Z9FPHnl68X6Blcm6aMXkXq9he4eKbAIkXqI3X87icbbrUMmuNPWpQ9Ft8d+NlOPzIQ073YVhqicsfXP6xM5xJ1RMyPzdEQE3Byi+rKm/7qQlk5Vi0effW0miPYts/UbFCayoIIDnijkta3ZrAgVFKmKB3Y6ba4ZVoZdHRiwQHgWLHAL3wsyc=; 5:djiRaKAuSqrvtbav5bYxbicZ521OGkhqsDNYYjLX8f0KB1I/GGgeqnslGFOfa7GWUuQDSN+ktlMgn9gNVWixYcJC9CeNIYy6pUVZodjSDKtFfF4YN3onDYCmjEzZJTN6bfb0EMk98EP2asRsLt8YbifpNfkeN4BSt/Cjq2naFUM=; 24:n8bfjshxZsnw/fsWtWrh7MoSRvHkHomQQ00lSa005fzlD2UQeSTQmFNad/SuR2r3c327f7CyrZDpnklrqPaingK9BpqZvnnpZy04T616T20=; 7:1YSDtykZgMtR6diGHsdlBvHDPIzFMPiVztL8UbUuQbqsfzznTDyi9wqUuMgyZS/yu5XVl03Y4CBWKZxMnCxkN4R6sC9sl5eO3wHzk8Q/pmoRd0//h6D8wnlJUwLY9MTGQY7ACkLASKGRBALmvm6O+HqwsE5XrhVgiCusR8DHqlcyKuQfEcI/j1HPduh53vbP5MNZL9NbPpoKrpHrTszQ+jzUJhbkgVaRDjFCuHW7nL1y2DxYkPYJW8JDX42E8vLR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:11.4058 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0cd4031-6428-4610-4897-08d52ae75c46 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: CY1PR02MB1336 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.64 Subject: [Qemu-devel] [PATCH v5 09/29] hw/ide: 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, qemu-block@nongnu.org, 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: qemu-block@nongnu.org Reviewed-by: Philippe Mathieu-Daud Acked-by: John Snow --- V2: - Split hw patch into individual directories hw/ide/ahci.c | 6 +++--- hw/ide/core.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index b72dcbcc32..b87d1903c1 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -410,8 +410,8 @@ static void ahci_mem_write(void *opaque, hwaddr addr, /* Only aligned reads are allowed on AHCI */ if (addr & 3) { - fprintf(stderr, "ahci: Mis-aligned write to addr 0x" - TARGET_FMT_plx "\n", addr); + error_report("ahci: Mis-aligned write to addr 0x" TARGET_FMT_plx, + addr); return; } @@ -1053,7 +1053,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, g_assert(is_ncq(ncq_fis->command)); if (ncq_tfs->used) { /* error - already in use */ - fprintf(stderr, "%s: tag %d already used\n", __func__, tag); + error_report("%s: tag %d already used", __func__, tag); return; } diff --git a/hw/ide/core.c b/hw/ide/core.c index 471d0c928b..211d67a625 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2765,8 +2765,7 @@ static int ide_drive_pio_pre_save(void *opaque) idx = transfer_end_table_idx(s->end_transfer_func); if (idx == -1) { - fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n", - __func__); + error_report("%s: invalid end_transfer_func for DRQ_STAT", __func__); s->end_transfer_fn_idx = 2; } else { s->end_transfer_fn_idx = idx; From patchwork Mon Nov 13 22:35:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837595 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="evGhAcsu"; 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 3ybQc14tvKz9s82 for ; Tue, 14 Nov 2017 09:41:37 +1100 (AEDT) Received: from localhost ([::1]:56612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENQ7-0004sE-Mr for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:41:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENNx-0002Kv-7g for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENNv-00073j-Rb for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:21 -0500 Received: from mail-cys01nam02on0044.outbound.protection.outlook.com ([104.47.37.44]:19632 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 1eENNq-000706-KA; Mon, 13 Nov 2017 17:39:14 -0500 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=3sCVdQ7nZhopq35xrouOkeRHYdSgCrF+tRkwdjsFnrc=; b=evGhAcsutnVwlKOL0XIA+yhgb4B3DZcsmG9qjGeRPi2YKEXTfcmBfbNXDXCFH+6a65r8VHTvPx0BYG8EpQv6SXCe2CzdQfnM5yJAhRwPnNkXEmwg5FTmwAVpo4Wk4UnSp3vW44sm6Bz833tfOg2HCbgsmxxQs3eI/unwL39dzSI= Received: from SN4PR0201CA0041.namprd02.prod.outlook.com (10.162.76.27) by BN6PR02MB3378.namprd02.prod.outlook.com (10.161.152.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Mon, 13 Nov 2017 22:39:12 +0000 Received: from SN1NAM02FT002.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by SN4PR0201CA0041.outlook.office365.com (2603:10b6:803:2e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:11 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; suse.de; dkim=none (message not signed) header.d=none;suse.de; 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 SN1NAM02FT002.mail.protection.outlook.com (10.152.72.94) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:11 +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 1eENNm-000497-Mq; Mon, 13 Nov 2017 14:39:10 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNm-0000RI-K5; Mon, 13 Nov 2017 14:39:10 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMd7W7012573; Mon, 13 Nov 2017 14:39:07 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNj-0000Qm-6K; Mon, 13 Nov 2017 14:39:07 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:07 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(39860400002)(2980300002)(438002)(189002)(199003)(77096006)(39060400002)(316002)(8676002)(81166006)(81156014)(189998001)(47776003)(8936002)(4326008)(2906002)(54906003)(50466002)(110136005)(36386004)(106002)(118296001)(36756003)(23676003)(9786002)(478600001)(33646002)(106466001)(63266004)(5820100001)(2950100002)(76176999)(50986999)(2870700001)(5660300001)(305945005)(356003)(50226002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3378; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT002; 1:dJH9pQaw2lhXx9dO0AHeF3f8WNESMQfn2u6Zlf5foK8gemqh0YGRGD74a04ODpHvQyUs+hKG+XHtI/jja8IRExdRgNpjSPnLwJICgu3WdnU5bRNXUyNrLxxoj5mP9U5P X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3fd7de9d-39e4-4995-ca9b-08d52ae75c35 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3378; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 3:aoz8aIgTag48MQ6vWcuMx1wIvZf7z/UXdyFHxv+EDbTKux13LWX+5q4idoiX4T4E86IRMQAl8icd1/68iMzwOZOSmJbldIZ/P0yaQmRjtGUMGfdxAER9j+dvXpYJTSGMMc7TJ8SxEsycUs6mEhfX18TfxFx6ZOsO+O2y06Z72zNY2fhciiAF4sHYkv0EpqVccXE8LAXIw92PGmUWQ6vZvYKxnai7eSm6hBztl1I4mslHj63Emvjs25fFdDSpcmP+BN38EU+lvKRqOBEYAnq8vJsH8Ab4NpW0SRbEJtdVbc7FAIvrVmLigqEtcQMXg/atKI8py6dIpzKxTn45UmVHVLVXu/6DTsRVeIlP3z5zSs8=; 25:JKGJXPVhlFeDw9tEFivLcpCBaKihHmo7IuSwywgUJZDPWnAA8mMvRuz7N+0AdNBmxbdax6MeykZIls9QETM6qNQuTAUVQ0ywRlyz2O/Mjv7ThN5CuG6cD41W84e2815iRUHCJE6YBrICcRCLPJ8WC/hmw6xkO6+v5c/vbLoduZsKlvf670b4RT6aRj+21lY5+G3gKr81wXLjjWcIsD8vjZ0diHdr46WJmwxUHY3OzBpY4oKqPUoiVdvr5oW1MOvh0NVsXxfD4uTa/zaqANc/moTuk0+NwwbPfqG1hOQqCbE9DZAxcRZ6XMuNdnLA+k22HF2Jlo7977S/0arSMBnwta3sCipIV/OGwH1WI73Sh8g= X-MS-TrafficTypeDiagnostic: BN6PR02MB3378: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 31:EHpBmw7BWvGPe5mzS7IOYccrCSnGUe1ybyL95kYZtA0ufec9CF9Um/dmm6paFI8TTU33PXacyWKYo9gNBeAnzVRaBvA0/EOM11xtoTIf/aD1MUhWbnp0/JbyoUvBTveupD1nV6GxhpWh/Tp73cU00rTn/YDztFY+1K0xw+9HAS9Pyqe+FzmdwKrT6UgWSvzQhU7b1yXaeomfrBPMgs5Nseha5d6r0dWr/vl0YG4H4M8=; 20:4XBfYGxEcQdOERaOSQyvc00bbZ/jRQYffydwgifqA/6eRCAixCYMhjvguCyWsPD9jKzZiPQHDiU3vAOc9Fbmno0TbZVS62WzUfAPVjhDKRhI8j19FaWBrP0qRU7tnQTCGb3jD0zdwhPCyi3EKW5ZluWO5+2nH18cdqwI1I+N39ERggW/PD121WscgF3y7K17HONFgJ8rZbXZG6TdtdvHdCFw6bgrHwvCEGeDPjRH5rDF3ZSuiv0Ap8+oet342zh2r1qywHS7k3IKkHOLOPh4IJs/qH6X+Z2q8uRCxvZFdCuVvFzYDco9ltU06oSXTmK+4Mhf7k1MwdnSj6B4wkoRFdC9YBwsrx3l6t6HMWZnG/4iY97M2NIfZ5EBf0WBvA4WTJGRq7CUdIQ1f3zaWRA/8O/mN1vufXX6O/jf1R3CX4wdbRTWTNGG5f6VmUOcL6kYUgqOyjEN+7oXVvAlk4ggR3GcF8KUCA4HNmtKX+HtToxEPPRgXu/FdJaffbfUQJ4A X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(190383065149520)(192813158149592)(104084551191319); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231022)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3378; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3378; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 4:dvuVogH+z5Posl712GCu46nOJxQK8J8bY6gkthbJhASBmKmnghcnRy+kTh3St6mch5C6royI9/2YOIdSB5lBPnO5NFTAvVueWV9aI6WlPiyiO7XRvHBBZpo+4vLAJEg/tvrDRhmOwqSxoYWS9oLWHhSt/bfozkyRxfzWC/2n8BhYdLh8sOA+/meGkWJKukjIPKCdbG/rzgRUxrURNAXQ3yP4AeO8WWHnes3g4PHfsg113qLEaeuXqUAhNsYWSje0puu0h8BAwdcO3oeJnmp+j4LzBbN0uoM64JNUVDR+NMaPURIwths7p/U5eeWLAmzLX/HLsLukLTLh0t2J41vlE6yJ327MyxyKLJP30shJQx+/Yp1OAGj0TKkkLooPhL8FU+P0O5SP5aDSK36DKld0TxMSSgCM3zK6oBWSb+r1K2c= X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3378; 23:OBmxMVeCaEBCkEIwnWXIBVnWTruQdzLYu9CDycGlu?= hWF6BS+H7BSEnJo68lcLZ0kWADwYjLdEjo/P3slKABVfTWhFQbQuonHlWO61b8bBtFIvDR5hL/7BQubrcxQMZYAmVksZn06pCMylgnvGv356F13VGnKr8rvs5l4KXROW4hVftXM1AWOZokcJyXYPnXTQK+b1nV8bspIa4JqI6RKer3nblhSpeEuyPicTCkBRvxfNUPqZASxn72/mIL6LzbbaIBfhEB1VUAJSll7oz+phGORqe7nzU71a8OPq9qNYZ6yaHT9wPXeXaGI3pySlCq98wmQPX8fCoTd0udVruk0USJMoYxH89JxIidjzRcFyOM8qiKrQjSaptpAlWzcQwe49aGGUtGlkSJJdHMaWH7p/9RyC5xFuU7MCBcbGeO3zSiKihZbjQLHmhCc6GjqTKJqKcEWVeWJznPYpYHElTmwtwYYiiAETdwaDlmj4Npxowr/2za8nZJ7wo2pE1o6UeXiYGZ2X0jWNIS6hvB9BWQeeDNeWzY8ab56XNcoNDyynssBj45SOqnUrBBT2O7i1YZEBvHfhJ90mHaSoOyjuzBGpImHT2jiXxK93eeDdsdHfqt0y8Yj8NSS0/Lybu5VOzJvbEEs2CohSpRLu5DK9uzdhBTbd3bfo/UBOoK6cOGWAQmhN5YZHvQnkvXYNY3+aaiDxN0WCcUoja+dPr1kl69cEQ8o+0t/QDvAHRvivs7bEFHFmxmpASQh1EwPgXl4FQwAn8N/MoTv6jEZNlQYyFoFFkFxoy6sqTJEjRUKqAaZIRnBioqV2/BVE7oac9DhdMJj6eOVojeDvRdS0UvhrzKy70rpygTKcDWjwyLLHz/nlB0g/xejDuXMYFh4bH+2zQM3URyWvhP2ieQcCWawMTP1PueZ67tgIVNEx18JL7yJTqJz3IGS23SyQCfpLVUyDwLzpeUTtdUNz/PfvMOtbxJjoApM2ahwtYrZbemg2Ub65NGPuf9ZCSh+e/15Obcuk582 X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 6:3t+IPzVpGAIV988hcqgMFdJvA9yi9RZdvzcNHu6n1PV61tDGAvD2xSWC6JTS0P/9VGefY6+m8HXjG/N23mrBsbadbHjtAVoJw4eBoHgbrD1g2GT85j3p2JzU8FvAmzJhLHQh9ocVoyPVKlY03AZ36qCm/GIHZ1yAVeYDSBQwgVAhSGd+ZTRS1JdlFq0zSSpdyl+k8hMlb8jai9PUvfjkSpidY/cjKEOp418tf4PbMJyaMptb7vQLSwzujRRLc09SH+dgKWYui0q9nMDhnYWeD1bELu76th70ndkDUBSKrrZNixW5rhlhWqxhcTcw6r+vMiFFi5sAVNua48lmI2s1z/ZENhC5ovDtJuF9Xn+2xIA=; 5:WOjb7MhEF1MBrGaY1uWGCVzuYuACnDwifYd7YMlvWP39BLmszlDymw8JRh5ycPYUvnIa8rb94ZAiv6DMp+mR2aRFhhd/ETzZHABJ3aPZRznIVlr2/iZclNBh91uYt8W6qSidbjNnMVR7ITQHVn1jsgSqixz8Ny01jWqTICVmcYU=; 24:0e+RcnHNTxgfv6XwUw8dqR12L0tn2JnZHpd01BNED8P1PnnH5S/MaELdEMkMxyy330N0exsEuZ1iJJ0YQOaorF71UwdYS4oScltENqRO/8Q=; 7:u52bVMwJ55+JNHNCYMEZOd5zs3Qymmxt1b8in/ZHkQo8HLRIOpGfz8nVc/mClwPvx3DVvt2ZELf+8wtRVq9u9ZCjo2RFZU+B64jEemETmsq1KGISfk9x5+9i2rNhRaFd84n/hJjbBBBL33hlAdKoj9K1Lo0JjkWZmmMlvAAYJ+bitMR+wbHDMAhAyBI1hYpe+uut/6anaHcuXOF62iES6JNJL2kEhkf8x22v9hWPGkhFwgwib2mAzdZzvJ3QU00Y SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:11.0477 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3fd7de9d-39e4-4995-ca9b-08d52ae75c35 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: BN6PR02MB3378 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.44 Subject: [Qemu-devel] [PATCH v5 10/29] hw/intc: 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: Peter Maydell , Cornelia Huck , armbru@redhat.com, alistair.francis@xilinx.com, Christian Borntraeger , Alexander Graf , alistair23@gmail.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: Peter Maydell Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Alexander Graf Acked-by: Cornelia Huck (s390x part) Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/intc/arm_gic_kvm.c | 12 ++++++------ hw/intc/omap_intc.c | 4 ++-- hw/intc/openpic.c | 7 ++++--- hw/intc/openpic_kvm.c | 8 ++++---- hw/intc/s390_flic_kvm.c | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c index ae095d08a3..a5478d3e20 100644 --- a/hw/intc/arm_gic_kvm.c +++ b/hw/intc/arm_gic_kvm.c @@ -316,12 +316,12 @@ static void kvm_arm_gic_put(GICState *s) num_cpu = ((reg & 0xe0) >> 5) + 1; if (num_irq < s->num_irq) { - fprintf(stderr, "Restoring %u IRQs, but kernel supports max %d\n", - s->num_irq, num_irq); + error_report("Restoring %u IRQs, but kernel supports max %d", + s->num_irq, num_irq); abort(); } else if (num_cpu != s->num_cpu) { - fprintf(stderr, "Restoring %u CPU interfaces, kernel only has %d\n", - s->num_cpu, num_cpu); + error_report("Restoring %u CPU interfaces, kernel only has %d", + s->num_cpu, num_cpu); /* Did we not create the VCPUs in the kernel yet? */ abort(); } @@ -411,8 +411,8 @@ static void kvm_arm_gic_get(GICState *s) s->num_cpu = ((reg & 0xe0) >> 5) + 1; if (s->num_irq > GIC_MAXIRQ) { - fprintf(stderr, "Too many IRQs reported from the kernel: %d\n", - s->num_irq); + error_report("Too many IRQs reported from the kernel: %d", + s->num_irq); abort(); } diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 6844c1aa83..7fc239715a 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -539,8 +539,8 @@ static void omap2_inth_write(void *opaque, hwaddr addr, /* TODO: Make a bitmap (or sizeof(char)map) of access privileges * for every register, see Chapter 3 and 4 for privileged mode. */ if (value & 1) - fprintf(stderr, "%s: protection mode enable attempt\n", - __func__); + error_report("%s: protection mode enable attempt", + __func__); return; case 0x50: /* INTC_IDLE */ diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 10d6e871fb..7b1cafcc50 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -34,6 +34,7 @@ * */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" @@ -173,7 +174,7 @@ static int inttgt_to_output(int inttgt) } } - fprintf(stderr, "%s: unsupported inttgt %d\n", __func__, inttgt); + error_report("%s: unsupported inttgt %d", __func__, inttgt); return OPENPIC_OUTPUT_INT; } @@ -547,7 +548,7 @@ static void openpic_set_irq(void *opaque, int n_IRQ, int level) IRQSource *src; if (n_IRQ >= OPENPIC_MAX_IRQ) { - fprintf(stderr, "%s: IRQ %d out of range\n", __func__, n_IRQ); + error_report("%s: IRQ %d out of range", __func__, n_IRQ); abort(); } @@ -1221,7 +1222,7 @@ static uint32_t openpic_iack(OpenPICState *opp, IRQDest *dst, int cpu) src = &opp->src[irq]; if (!(src->ivpr & IVPR_ACTIVITY_MASK) || !(IVPR_PRIORITY(src->ivpr) > dst->ctpr)) { - fprintf(stderr, "%s: bad raised IRQ %d ctpr %d ivpr 0x%08x\n", + error_report("%s: bad raised IRQ %d ctpr %d ivpr 0x%08x", __func__, irq, dst->ctpr, src->ivpr); openpic_update_irq(opp, irq); retval = opp->spve; diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index fa83420254..60c784ae86 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -150,8 +150,8 @@ static void kvm_openpic_region_add(MemoryListener *listener, ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { - fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), reg_base); + error_report("%s: %s %" PRIx64 "", __func__, + strerror(errno), reg_base); } } @@ -184,8 +184,8 @@ static void kvm_openpic_region_del(MemoryListener *listener, ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { - fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), reg_base); + error_report("%s: %s %" PRIx64 "", __func__, + strerror(errno), reg_base); } } diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index d208cb81c4..e710bfdcda 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -83,7 +83,7 @@ static void flic_enable_pfault(KVMS390FLICState *flic) rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr); if (rc) { - fprintf(stderr, "flic: couldn't enable pfault\n"); + error_report("flic: couldn't enable pfault"); } } @@ -97,7 +97,7 @@ static void flic_disable_wait_pfault(KVMS390FLICState *flic) rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr); if (rc) { - fprintf(stderr, "flic: couldn't disable pfault\n"); + error_report("flic: couldn't disable pfault"); } } From patchwork Mon Nov 13 22:35:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837597 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="gAw47eoH"; 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 3ybQg83hR2z9s82 for ; Tue, 14 Nov 2017 09:44:20 +1100 (AEDT) Received: from localhost ([::1]:56628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENSk-0008Cf-Fy for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:44:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENO8-0002eX-9C for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENO7-0007AE-9l for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:32 -0500 Received: from mail-cys01nam02on0089.outbound.protection.outlook.com ([104.47.37.89]:23148 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 1eENO2-00076i-I5; Mon, 13 Nov 2017 17:39:26 -0500 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=OrynN4WZoZoHYgqML/BL2R502hXxxrywlbwEAlffRvw=; b=gAw47eoH/Oeoqd+iQFCO55Die/58G8fP9bQKhNsaGacxmN29b9q8iH/2nxj3Y4kiCsi0l38hR+GTW65fJFi2PmdodEwuZ5NPXCjHCzeYu2xc9980jCR7HJDMm0ipDtqUFXxZfWjEs7nbxI6IF9IoxLmWaZSTwYn9ENiA7MPfzk0= Received: from MWHPR02CA0010.namprd02.prod.outlook.com (10.168.209.148) by BY2PR02MB1330.namprd02.prod.outlook.com (10.162.79.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:22 +0000 Received: from CY1NAM02FT028.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by MWHPR02CA0010.outlook.office365.com (2603:10b6:300:4b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:22 +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 CY1NAM02FT028.mail.protection.outlook.com (10.152.75.132) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:21 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45582 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENNw-0004Vf-UI; Mon, 13 Nov 2017 14:39:20 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNw-0000SP-RE; Mon, 13 Nov 2017 14:39:20 -0800 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 vADMdASq002777; Mon, 13 Nov 2017 14:39:10 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNm-0000RF-4O; Mon, 13 Nov 2017 14:39:10 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:10 -0800 Message-ID: <018c3824777fcbcf0db013862272b9fc0e84e147.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(39860400002)(346002)(376002)(2980300002)(438002)(199003)(189002)(50226002)(5820100001)(8936002)(316002)(110136005)(36386004)(47776003)(189998001)(39060400002)(4326008)(106002)(54906003)(50466002)(2950100002)(9786002)(305945005)(63266004)(478600001)(50986999)(118296001)(76176999)(2906002)(33646002)(5660300001)(356003)(2870700001)(23676003)(8676002)(36756003)(81156014)(81166006)(77096006)(106466001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1330; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT028; 1:RDMJ92UYj7aVtxhACzuDsKPAUDkg3NdF98Qs/ecZaq3AcLJLeJ9lRc51s1y60QEOwGZ5ll8nGXCdGuL9C4zNKErhx4I56r8MZEA3++qzzYlHftxhMl3cltuoZ/f6V9nT X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c27d11de-4bb3-40a9-39e9-08d52ae7628d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BY2PR02MB1330; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 3:IHviENTuoxdzCatUFM4lz5zcu5dsC5Z30oK6szgj8MTlw6EcOvwCZtb2IvrXRHfaFzx/0vir2JIcGOD1e/mtW3qMDM6az2La1EAD39GUMS3HiHTpQjeeh0Ld74mpwF+JUUIX21Br9/a2xYHLEHPC+PLlX16dbU6uWk7QhP04HZo1g9cow3frxo3V7VbJYmAi9kCOqAxDS55ZbvT0rN2AOa0+3a064l6uxzUh4zUI/E0+8snCLQiKUnLY1D9NZYZh5EyHVQia3vNhRO8gMrcV4e+SniH+s7MlgQXhzg1FTbC1wRn04Dx9xc76TIlRDaK4griuS8kZkjXrZsuvoh3UDaYXaJNVOoB6OqP3Ui3NyWc=; 25:mN2t6jK0KqgKOgtTzUohVD5YPSMSsOJG11K9FvN4aVSQZMO23jAfKp49uKPt/mq9XHnGuV0WM1iH5rh23N7Q3E8+fbDoc89caB6jBN/qyoNdquehIAfr4DPYEeXV4cStMGcJbwR+E25oFO5dmpVPPYhumCPfvAbzgMr5+Z+vBHm6cWxOMnL9ZoSifb549F3pCW7WC1gzF/o4UeWbnu7tHpwXDNLU01tJfjOkpXl2RdWsOsXNHor4k8vNry9pdbqa7lMv3BSzmhFBKr1a8NgGDcXCIYookGHQEKlHziN9lg2WxIR7JYfCa1DIymLf9jejXLdcdi4GJmQe+GjkqG/d9yTO06Tk9ufpKfz2BMT8Ggc= X-MS-TrafficTypeDiagnostic: BY2PR02MB1330: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 31:ZPtjXjTx1Ona43Vq56W2YLL3JGEmn4ftLL6wz1JD/bTRteFEiKJiiEWX9DkFtXsZAreiSGs1zJn2pVwN5eCkZSEPVZf+GXIRHIH6FjFFCym2DW2b/QPYGTUSzrMeit/snFFe2/ESuiHVHRt8Uxtkt7LMDIZoN9GwGIchCFX6pojgbivGM9U3voHdbU1gYuaByewSoy6NEsLfDE3p0ic7uNJcrmbMPROytPsGdu9D76w=; 20:UwhmjSl25XsZN11ywt0BjQObNc/1Pzp4ioJagEpdKMAxr807NzN8C4/SBzNiUVHMutPrauDWr9OLyAWzIgVQZ5OR6CpSy8m0/fPGPrdOfeLczZX6jduPrWp4/2/KjfE7CRFzuvoh1iAKsj7CtxmHr4jPBxGTO5gNUI1qzyAWg7mvXI7dIdoD/axHIIRgngVYZpYbF/HOLGHThCRWpgsB4gUGr4fvGILbZavnh5Jq61Z8O9b97ezkWNs5XwyPArkpTBkcmQQsyyaUXC+9odyDbEnXBc+FLEng0gmA5nPH/2mCNZxcBBGqoKm5tUuXVL1P6Z/mBabyxlE8e1QL/cXbo2II1JUOQgyqNT0jOfPHzaqu1Jf5YnfQbmfgVD6bqH3dxWe1vpqh17StJJSHkcsqIDQLs/ywBIPXydRz/TA42A8zswrxLNxQI8UhZu8nqxU4VXg38vS8wgYFgfdSWz+lADM8uI9I/yjKDsAda3PLr8Lzr24eT8g0d+8idFwq8cGD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); 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)(3231022)(93006095)(93004095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR02MB1330; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR02MB1330; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 4:P8lMMJOPdC7qY49YpS3JZqBv5q0cydoyvA4oriw6dsFPAzDyDCJQn5jdNEQrYJU7zMsG8RCstCE/ygaeEG4jm6ypy9s66jYsUc35lf9/3ZtheAGZPyVjwmlvGa2tRg1UXGhQK8QarJjAQ/F9SjYTeMJpRv6VXdUlgt2Mo1PBgcpepBume9pG2A9EPGCyhhTNDW2bsIgZFCxllwAz4X6w/nzdQ9++ditkJE+tpF/Vsyr3sxTXbgXlIbNJsYWxFbpTby9LkqyEIR5qDUBpFt5H53lYxXrn6XxWxZrhzg1Y7Ffxfcda+QEYXGaBuA86oRKd77rRKZS1U59wXcVwoIXvCg== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1330; 23:JOK/180T53FSLMNZHUVcjQyA5z2+qi2Z8UJ2UBrFv?= UdqcwzRs9Riyjk9eh4t1g/Fs3Jas/+n8Q5ASx5XoDdpUSoTH3HczQOyippW6iQh/uTBXg1VZLjLm9aKjw0oiezIk3WbzQa2WAipT8GwcLz/KFdNNmID80cGWWnuOc9S8E1z1kNbiLv9IcU9T6mubCUzckwu6OXQHwfzwgF3P0Oy0GZLSWo33WL9u1vlcL07I1sz5XgVmqoxfnzHSO1BJZfaw0b4FAMMX5Q9+4sNaJkZJzgfhn6VrJcPqI/NqHhyZd5dkCMQskbjP73m4Wb0u4oY/L7vtnAfSKI0MIoLAnWWIlCosIyEaVaf35R14tfyKBBZbGSNsBjjUADPTMh9RKV3gKdCDNi+4hUVZoawvPfWbCUtu8wl+v3+xoQN4lPasqZ/+VbUjBhg7rTHHrWtzSlj9fbsrLPQ7Yb51Kh0qSF3PMNj1cl0OfDcEdH3WHQ/UuyNESH0+QlKmZWsg8YTOyyUt54mspwvEiORd7QFwP0ygEOCZsFZNZ+Guu4tC6cTf5uM45EmAWNKqNFGV85cepeCJVRcO7oE15XMVqinKqinl9fPxARMhBJX724BIzu9wrJtxIEg4xmD+6n+I3S5/HTG6k3eOpgBJSmGnvKk/dlbU8dNnB63ztdvK5yCx+J/9p0ti1VhRNTJAR+h+3qkJYQXx90OPIlvonLVv6V/7JwAqiDK7kuVIr50WDTwEurFtYgfFxm557xf5l8yTpbIjWh4q+DxYkJNE4PJ9D32qCKj53IIzUW5DnnI8SFcVJpIFnxk9VyJwf8IXsmcPC4qv2LMFdQgfP29W8H/3HBr+VXmgSMsJr8BdPUNgff4wfW8p9NFmt/zvo/gqgfDVTVdMe5q5Q3vnIAAMVS2mcFJ89f6bUo8ku0LiY6VqRj6LNwUe9t0VjDWozO9sM+bVW1b8NWozZNIGEgHChSe2TZmImHalN46bkyVeWGTZI8jbjeVO18KPMyig5JIWcd856oFL4QkZlWrUoVPCjb2mN5U3d+SLKkWQCHj4rux9NB1ZcQekbE= X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 6:i6eLgw2oBkKlCiNTYMZps+yEK0Y298pQq/+4N58aE7cauMBbmvrz2TeqF3UtIBFSReeaKCVXUUe5kR13PuZBJ8jnya6Mi/NUgesg7AbyukiLIAdQawiLI/fFaRO/x0MLUow4UBqbinLVngW+yE9jrre9Y3xu7ASUbEoOdjostnYASVrNknhqGJ/ywKELC9+KiQEbzrJouyDIvjnpXmY/SJOboc2UZEq5RoxPF2FlHx4lsJzxvefGPIrnCcpRoenuXSe/5mbSdZBI25v/R+x/FAs/jKNMWqQaGloXfEO9dKkYZ+H8alCORTAzw9YYKjg7ZTvfYML9pUIoLmwdDjXADjX6wpzQuXKYvD/6p5B7yXI=; 5:hB6614O9Xzu1/rzqGRxvilUMDC8UUWT+BqFgbp8GShkgn5nVXFGYHvQX/6ssqLqrHyCcILNFy88bG82rOhUKpL0UdoWJd5C+dWBDZJXID81UcyuinN5dRAW1UM63kj1eVNZsbE3jtXy/YxD7H7jO3bajIin3g/P7pkzhPja8rzw=; 24:L3jo7HgqfGBDqYnIjmDEynZKk4b+YNw20rE7z5TgOekDmAhYSrIPvGNi/0EdB6v5NHVufOFEjdQxEEgGnOmNnRWSk4OvrfwPR/2KqQNEyKw=; 7:PwGN59oaAL32WOk0ECFCrah5jSB8KTNvhDrt73wx/vP8CpQ06Yfh/9MapFL8KOEr4g0OPzAjla3Ras0/GggZhHgofe87Cdtk79C4on9mY7+XR0gfj93bxaVmfQ1gs8iLzVt5EbNH1P0y8t49hde0dHH0+KxAdIdLjzroDgVtHnPr8xKZrCuVvbKHW5IatQwXZLQlDVwjZ/0HvjKm8xJpH7/4xKc7CPxz8B+G9T4d1oZdRn1lyH11y+Fr2g9rvWZ4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:21.8277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c27d11de-4bb3-40a9-39e9-08d52ae7628d 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: BY2PR02MB1330 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.89 Subject: [Qemu-devel] [PATCH v5 11/29] hw/ipmi: 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+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 Reviewed-by: Philippe Mathieu-Daudé --- V3: - Remove left over include V2: - Split hw patch into individual directories hw/ipmi/ipmi_bmc_extern.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index abab3bba4f..8c0535d3dd 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -28,6 +28,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/timer.h" #include "chardev/char-fe.h" @@ -194,8 +195,8 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b, if (ibe->outlen) { /* We already have a command queued. Shouldn't ever happen. */ - fprintf(stderr, "IPMI KCS: Got command when not finished with the" - " previous command\n"); + error_report("IPMI KCS: Got command when not finished with the" + " previous command"); abort(); } From patchwork Mon Nov 13 22:35:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837613 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="5bnRBelE"; 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 3ybQy92KjKz9s06 for ; Tue, 14 Nov 2017 09:57:21 +1100 (AEDT) Received: from localhost ([::1]:56727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENfL-0004W2-AS for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:57:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOC-0002hs-Ce for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENO9-0007B5-7s for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:36 -0500 Received: from mail-by2nam01on0078.outbound.protection.outlook.com ([104.47.34.78]:51891 helo=NAM01-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 1eENO1-00075r-6K; Mon, 13 Nov 2017 17:39:25 -0500 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=AWX4c71g+kzdY+bxhaz0/0IDVev7o8AOiZms+K2qTmg=; b=5bnRBelEWP0IBgP3ugpTKV4Bv0Vd9260ioEnSBw7I7fS6ixd3YFjC9ImWVo85pPPfyWP9/TFzFfpxltQ0tq7KSODr6TrW3s5o9rkg2AZLf83pounvgJrzj7DK8UCozrBmvZLpgAq9X+P8GIr6naAK1hH8lp9vxMb8kUIQ7Al8YI= Received: from SN4PR0201CA0032.namprd02.prod.outlook.com (10.162.76.18) by SN1PR02MB1343.namprd02.prod.outlook.com (10.162.0.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:22 +0000 Received: from SN1NAM02FT002.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::207) by SN4PR0201CA0032.outlook.office365.com (2603:10b6:803:2e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:21 +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 SN1NAM02FT002.mail.protection.outlook.com (10.152.72.94) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:21 +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 1eENNx-00049D-4O; Mon, 13 Nov 2017 14:39:21 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNx-0000SP-1b; Mon, 13 Nov 2017 14:39:21 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdDxF002785; Mon, 13 Nov 2017 14:39:13 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNp-0000Rm-81; Mon, 13 Nov 2017 14:39:13 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:13 -0800 Message-ID: <46c461836a838351cc117dbcedb9102c480fc9da.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(6306002)(9786002)(110136005)(54906003)(316002)(39060400002)(8936002)(575784001)(50466002)(47776003)(4326008)(5660300001)(36756003)(23676003)(5820100001)(305945005)(50986999)(63266004)(77096006)(81156014)(81166006)(2870700001)(76176999)(106466001)(189998001)(2906002)(50226002)(356003)(106002)(33646002)(8676002)(118296001)(478600001)(36386004)(2950100002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1343; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT002; 1:ieFboX95GEhxDvB//k0DDBuwgkSEiiegpTRElUH2SFHWaZLcVo8LFryOHcK44YLzRSrdGYKjBjGu4ioh4QcKmN5xenDoJOi2aA46a6Vv8e89Khel05VYLOf7sowgTx7y X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b63cd61-eb34-429b-aca9-08d52ae76241 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1343; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 3:b1B3F+3/d/qfQ2M8UJ5czRw6CwMMiUYZKaTm+u3OS24tTKFrnD00hq1WsdGGsBr5FZ+do9oHCqRr01gWylC6yT8lXGNwjf03Z8j0Y2qTlTa6gm0oCM1N5ZGPRV3kUaZ7x4xNihqFyPpTOC1kqcp266o69NQOdvJMtOWOymPES5sRSgiBYCQuSogy+5lhingZdD224EN5rLWJU9+pRcDf8KN9MGN310HsNCSU9XrgPcfQjT2NHJGXlp/EX6v6+F0dTpUMd4eO5iHzH9dH+FghiHPorUXNI47rmt/MN9I8+8Us4EIzneMEcIqQ40QQNrm1Y3a1ousXL1BqDQMnIGDMhGc91vH59vcaabTLjzKVW+A=; 25:Tmnw2mSKgdCjosJaQY5uEGWxhp+WQnG2VJ0Vn4yzc1fghvRNgwg+H/r2ixb9jsMtHK7ZBB5hzq5KuwBRQDFGBE+z4FTTaBbACtAxIL7bk5JfWAKjU0Lfuy4RjSZun4YTbhPZpNCqRUSTMQb/qmfstoq340SL7caqSg2HTcTD4wf5bauUs0gy74jVF5wGFDTCaFJjMi5DLGHO52LqMDDdUkVDXSSoAWNectJGAD8TudfA1V1IJKKJFucAUUtqMkV/+dMDHixnIQ3PifSgOLxTihEhasbWRRoe6gNWLH4WEFTKFn41YYFl2womBoojNYCoouhK5WIPeDS3UktKEskUjzLcMKQ8wz36gSRiN5zsT0A= X-MS-TrafficTypeDiagnostic: SN1PR02MB1343: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 31:puukb/fc85vgJghMdjjUaEYW3eZb2k9rTxRWxnM6zFRDAN974wsM3DdjggXb7N4vmE4mJ2mw1u06ksE79odMZD4uU/FYNxDoKZV1ZlVgFo0RDZh6w6XcUc8kr4qaiLQq8l4ftLiDqhFai7n1xoQGnx8g1eTbMfRTrH2uBzpUg1i0xkbBJDq0REHpctaogFrjUC9+kXGJuLMdqDKyw5FuPaCFaQnKVkuPUyK1eN9PAhU=; 20:+q8apIPQjnh54jobUDv6VWRLuPz+MeZKknHdcAqx5tDU4VyZqI4zSHwNPzQzV5qXX767faOd1vkG6xnnC42ej1MnYSA4unZdm3U2a7aKGGRW+QOtTSppEIvOHHiQrPz9KqlB0KgeEgho3XbCJGKt9L+cE8Q4r0CsVf2ZvMlqo4M60HUUZeQw9Ef2O+IDSG6KWds6+UP9Dy3iLkhLAcR9XKcRQGvwrPkE57YzbXW4sDhHltaWtIru4CEIbKghJ1tSfBX0wW4dkhnYoUQILV4tlWYCG5BlbyxyEAckSZDyYs8oF6b73dE2DrUtp/ntRLoeOZrXgqNaczotzRBPo/XpQsgn2Hx8cboQeOrpRxbNmoDxeBmgndfJEH9WxB7xHSbdOH4eEPWtWUOyWHxKXUkYEh1YQ7jwjRG3y2dGKHqPcQTaALRaubSL471ViWlYC/0qua08FBYGTBHvwh4vgZpDFQgO39mnGhrH6PYT8kHTLP81HPsI6mwbf6UnisGE6xDa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); 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)(3231022)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1343; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1343; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 4:xNgRLTrvhmDLG0/Tpay0s/mOdujCtcBd4mD19rVq/VdnVkzuHRH8K83dAmPIPDUPjMC9Gk3fnTxfxbJeuMFxQzPtlhAmmjdXMbDOKN8jCAbP1emhAUjHDmRg/81t5tj3Da/Hb7G5xp8Mcu7uDN/o1YHRF5YUeoQI2d/dkLk1CJNeRzyjlxN/3f5RJteK8LpX0yMxILB0P0gfJy1TICVrVuCzBbq0eQXSYaw4otzq7EIet93JrYJp20B3sN3x7pJIZSXq6jPpPo2qrbPIPPXKftxpVA3ge+v/YLoxTWGpyJw+Di1lTg69rKg8AeFE9xm06lVeb4SZyCcCiMpPeSyS/UOs6B9gewWmxxSYfUbCpAIypq8TmAfkWlT+ZtkFyLYQXs7SXTGzBURIidljXu1WCBbqQ1os8pwLlikfR3KRYR4= X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1343; 23:MXU3cMRwcj6Kxx04pFzUvUpIFK1YJ4NaTiShSIBhv?= 3OP47QgYgmK+7Ee/OhlrrCqKM0MB3B3fsgwOkS4OjKOucPLgU0VH5lBJwKHYatVOqwBRl/qelZvhjqZG9mlYPntoANL02fesnhp1QAp6xYusZNvSZTIp2TskURX10/vUGQUSHCNG6+oYvr9bWBUqXdorQ13/esFbAR1DWZ69M/n7dwOS16tEKtkXk8Ja5GTDDDUhINAT9BGfvi91zQZb+Nkd/6qoysvsbbwz89K218EA1X+AolRJ78cxBLxO76F++vF1TYMgBS02jHjjkWpRjdPyhMY/K7yLtQk/Rq4e/y2WXhxc1AzcTDmThWjwJEe9Mwxljr21Cz7qp1cOk1oKyau7kCniZd17r8jxzZqBntOleL6zMnjuUFMpysIsUANdLRYLP5+HsnmipW3JMNdjh/MCz1IaCfaJQ0YS2iWRU3VUZyjtMpX2vXFv5D/jL3FUrF+fE49/OCKroFq8ARC4Li+UVXPTY2MiyExkwPIW+SxmlBEUYoXP4nlqCp8UipYqiD6qi+DvCQJ/zdE5fXCg4/KTJZZWROlKAbjQD0Xc2Wa/7DpVIOnFOfZ3gehEfNIaTSYDCIxHS2sFOjJliExlbP/yl7S05zRUAWDM5C1DUmNIKoOYi5GYwyMweuOG6fS42gqYWJtuW5sSIjkatGjMshg+N1yY9GuSOyhuymt/FVGJ3Ncr8TYDwgIB84wXV52FrkESb1MG4CbSOkKQqZk7jSr9rXb2cpJaQKfj24FidpDk5jTXJ4s5HWQBa612WQHZUxQnEvQh3ZjVdPbrgkVoJpD9zQrF38lY6GfU921X2m9SymLfkFGoLX4KqUpKUFuEOKcgxRPZWGrAYyqw+wSb2Y3krCb5MQyHR7VFEXhZxliCQBiWnHh8fqtBuXm/llZpvUtPZhQwyYifq50f1mRlNDUVu5Uq8UDPvXA9nlt1cFEGkN1dLEt/VuerOu4zpkRfyc2vtuchWf8Hiw6FzvJ5DxWpqvxb8d/ohaUI7ZOvJAi49Lah3Vm57qv+AlAMJswPdg= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 6:Gaybz7w5xyUwCK7owulCW9X93tgbW3uH0ypzRGKBxpvciVCYyOerWtEozroABoePiCOd0L32uDGF6TXm25QoxKeQb4kuMLMxUJgoRS06L8Y4GTNVUL/yvUTZtTT0Zh+1oEEQds/qqs4dg92qSdwuHFAOWh/W6vFU90wOv8Ht9SW+2ofcStizN0wk4iprNkDwkctseHlggtmPKVc+Mx2fOJ0vK/AmQl/GeVL673kMy0wVJnkJVFqBNAfV+ggEnLEdU+4i6xErd64qH1Dac9bMwvgJBP/RTIwkfN7XBD7QZKSu07RzLfKtY55ymPgSEFgvT+x2naVWVd4fTAQwojxPQedDWq2drhautVFAVQC5uq0=; 5:rmCVrzsLWR48Fp8E7HfWA7yxKpz5LnqitYOQWclXMvPA1BUwUBOHr6ZxxxChj075lkMQ+TvVjehMf6f5mADjd4bK6jGUFNdlzE/ZM5ar7QexCchjpZbNvMHDtkkCzYIHwKas2wf0jXee+huoryJbNxZ7JO5QmVE4Xr6k1mxn6G0=; 24:Tfw1qndqtH5w61NW43HmzTikIJdyDHsSMQK81FWuEhp69wyGMqKLnA0H45Bw9sZ3yiajafb0Kw4eanMTKzF59NwnoPi12OvEjVuR4vyqflg=; 7:Zf73XPWMJKccWbFfAnFDX5aDBKnpuFMrcbvGNLpSp/6mEu8ZgKP3/uKqZJZ2iN2X+op10kB6n++MEnNKrK8wE4zONmzc1maY9bLy6wcub1c8UeIYo+v14r5UPoN64B6p0dZJQ1hFDVRWRbFFgffuj3/PBaD8u0c0ZouD6mEX6UmAWlYBxRzy50/yMBh5QVops9i2OB8EoyGwkR93TcYIo52r9WcSH32KwdVBQMEEj9xUVBsge1y1aymg9Y9jtH7Q SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:21.4576 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b63cd61-eb34-429b-aca9-08d52ae76241 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: SN1PR02MB1343 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.78 Subject: [Qemu-devel] [PATCH v5 12/29] hw/isa: 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+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 Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/isa/isa-bus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 348e0eab9d..0f2e426d02 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "monitor/monitor.h" @@ -186,15 +187,15 @@ ISADevice *isa_vga_init(ISABus *bus) case VGA_CIRRUS: return isa_create_simple(bus, "isa-cirrus-vga"); case VGA_QXL: - fprintf(stderr, "%s: qxl: no PCI bus\n", __func__); + error_report("%s: qxl: no PCI bus", __func__); return NULL; case VGA_STD: return isa_create_simple(bus, "isa-vga"); case VGA_VMWARE: - fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __func__); + error_report("%s: vmware_vga: no PCI bus", __func__); return NULL; case VGA_VIRTIO: - fprintf(stderr, "%s: virtio-vga: no PCI bus\n", __func__); + error_report("%s: virtio-vga: no PCI bus", __func__); return NULL; case VGA_NONE: default: From patchwork Mon Nov 13 22:35:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837611 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="P3J+SiTB"; 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 3ybQvf2FQwz9s06 for ; Tue, 14 Nov 2017 09:55:10 +1100 (AEDT) Received: from localhost ([::1]:56715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENdE-0002qR-Cu for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:55:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOC-0002hr-Bh for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENO9-0007BB-Ae for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:36 -0500 Received: from mail-by2nam03on0075.outbound.protection.outlook.com ([104.47.42.75]:65048 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 1eENO3-00077B-BZ; Mon, 13 Nov 2017 17:39:27 -0500 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=NiF/S2xGh6wKn3a0JKKboX32Wjj+Xb7a+4Tr6TJnzUE=; b=P3J+SiTBNZvnKinHJCVK7eWBX6Gmag2uS+JC1qCCbOsmBnPOeVf6bXFFvqg9x+5z/K64b6XBcmI3rGTIbF5z6U262fL7lqqC7zHqSWZ+RMPBTZJgLrKe7YAOsm+l6EoPPSvi4aLt1+fUJ/o/aq3+AFbrtSovVLw2Do8ieece2ds= Received: from SN4PR0201CA0012.namprd02.prod.outlook.com (2603:10b6:803:2b::22) by DM2PR02MB1340.namprd02.prod.outlook.com (2a01:111:e400:50c8::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:39:22 +0000 Received: from CY1NAM02FT054.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by SN4PR0201CA0012.outlook.office365.com (2603:10b6:803:2b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:22 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; walle.cc; dkim=none (message not signed) header.d=none;walle.cc; 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 CY1NAM02FT054.mail.protection.outlook.com (10.152.74.100) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:21 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45599 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENNx-0004Vl-69; Mon, 13 Nov 2017 14:39:21 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENNx-0000SP-3G; Mon, 13 Nov 2017 14:39:21 -0800 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdGWp012597; Mon, 13 Nov 2017 14:39:16 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNs-0000S5-BO; Mon, 13 Nov 2017 14:39:16 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:16 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(39860400002)(346002)(376002)(2980300002)(438002)(189002)(199003)(23676003)(110136005)(81166006)(77096006)(76176999)(5820100001)(36756003)(50986999)(81156014)(316002)(356003)(106002)(305945005)(4326008)(9786002)(50466002)(8676002)(54906003)(189998001)(2906002)(63266004)(39060400002)(106466001)(2950100002)(478600001)(50226002)(47776003)(118296001)(2870700001)(5660300001)(36386004)(33646002)(8936002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1340; 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; CY1NAM02FT054; 1:VYUqGWyoF+ZzZ7l1O8uQl4RVg7d0xKS/RoYcdsH47YzIgXf9cVeUqI5SAWyeZMndtUzMBr60A8vPfDMsF2Z8cz1q8LzSbhgo/csSMtwSnfrSloGtRqCCDZjkg3KQY0TI X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26f30aff-eb8b-4ed8-0500-08d52ae7628f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM2PR02MB1340; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 3:mqEnJtLTfqiKuzuPoFxVdwG8IY0/BqWvbGAIDmP2e9aU8R+tC58RNwp2WDQmFeuBDiMNoErED/9WV4FepUXCZF/I5GNWIzbyqGQpbyAJVBzm2qFjrYUZp4O03sC60fXidTpTRd7mzSJkjEwwiHItelGx4bfLyvhHXmwGCqjrjCwwojYIvozwTYvpCVMqfFSHywa2IC7mOdpZtAon98pidU9+bQhqqRCS69DnoTmlpAVgm0VRBYIXRJVia53PmZ3J5KO4IEy7EGjgEiiEbyi4fib50mfoofpEokvkHm4mV8IZ2vYxDRgWDAOU09Ak1wiG2JV88ZAInMbPAvzHhm7NxzOmbZI1waCmCS9rrhIh9NI=; 25:4l3LwDifl0CDNaZH4VVPwzuFDXJSRqwiMIz9nJTtkpDClYWOqqbuSnj2HIRw1k/fHM8l3qLmr2LoEHh/184g3P/k2GvZbNq4sL8RoKlNf9CqRYyUAXWwkdbpaYLoR9PaadnvCO1JgJLFBs+OS88+91yPkgLAoR1qmtUWSEMKoa9aCIVnyf61btIJaLko5hFelHU7Yp2J3JIw2Zz0obLNnBi4ckXn1c77017mlpif+w6ILLcaPahF9kO7Ib/iUiqCeo3AH8vL++7cEzExP5Dku85bdeHCRWFHyJQAjdyHTmIK5r314kDaT2BsSk75IW9l7VEBzMN6IJVV04DvqipDR1UZD1k7Hm9YCLroQ3why+Y= X-MS-TrafficTypeDiagnostic: DM2PR02MB1340: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 31:MaFci/FDWfpsv5nSQKRjzR7dJ7p6y4lnpKvdU0AF+RmpHJaCTGch6G0f7VZgsU9g9NGO8dn2ZGEZsEDTcoFJ1HL4m+fD0AqWgoVuzeWYQ4BEqX7z0OReBWLdOq6SBDQwoT777ht17pgodkG/7X/bfPOP2BwznxCqHhJBKVwRDn2Kd+ULbTbxA5Ou/au07ZyVPz8T8jqFgYsZqTj3qeuVcT/fEKU/rB52JxAQPwU/M4c=; 20:n+ezo0X+9BIeRGm4vTZJ7Rgryt0I7b6uw7h/m1j8CXOgF38c8Gdf72eBiW2BqDl0hyF6mDlsXsHzYLRzbSmoNVha1DFUwsvRzgez+M5jlZb2GBhklgFcIB3bOKOaqVb6y24kSvkJTVJrVdyDeIqQspXwmvz65YTtApfaw/pGcZmhWN79b8ENznS6SUjPHGu4GGRxqWddXueo2ZgcBEh1S0MAuXDqeU2gJOcqXpFNETfwlV9Qc2z7ovBNzygQqkILvw5Fzb0XACG5bno4HKhEttaX9+GV5NCw4MUpVp7BbkUphD9VwUzeyNhwxMYY6aZ3C6gjLjWVNhBcbUJuDLGAxg3zvireIJzN2SB061MjoCCLjUkgoAPz1rKx40rY4hJYdIstjXKqZFs05JOda025/zUmMaN5x5n4gWyKq8Hrowz6KZpUDAi6vkjB/wCgMTMtSgeSKImMWaOyuic+/iUN4jEWMakBq3ERpCYVjvX3gMhOAtlAAIVQ39xpxh6/4v2f X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(93006095)(93004095)(10201501046)(3231022)(6055026)(6041248)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1340; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1340; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 4:YKwcngudPYeeDLwpNFuycXvlNadfT6uYcPOwmSifHr5n14M6LKcI/JBjS4ffIwOY1B1/mN7wY9P/pwwjL1MdtQJh2VtIQuo6e9sjCezOQiweXSFdoZffO7EPGUB+jki0GWuGgsUlB/sOJ4qpTssgPaPulkRTvyq6zzrZ0isA7QylEt53NKcFZ3XzH8Uc7+SoAJ2rqpUgR8Qj2fX53I2G/LWDKIjSQkME7NfYuznh6dwLLnYr5N/SAxYCmMSydiTfIN+pt1nFIXwOEDQdsyfLrb3xgRxYZW6lRt+qm9prruq8FfQQob99qxc8kwqHaQY4vQt5Qas36EjFEVY+swRggw== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1340; 23:nWWlkLzsUNTPZDWl3+lhubgnlmIrGTko7xPXUth77?= dirMzeTvxoliXx2ei3pW0SZhjQlv5jZriXeYfmWv2AFAznRFo0nL4GlYVq0QHcIVtikk/Jgowiv6muApF+AYOlmqthdsiboINlFiHbGOHrrktdCMESyZtbsIRSmpDtL8X0yCSuovqY4Tsuox1Qs4WSkj7PxJJx98Q1Y5Tlb5EikYfluVhcRTUMvNH7i6o9XRrCUZxVI+QQuKBHvd7rC6zPAQMk6yvWYC2dkvHByEFV3yPKIbDZD4pi4VRpDP3wM0RF0BCJGzRVixVKC8sCtyHtnZuP5k9EwgzyOCKmr12oVXJddjZ8qQNxBOF9mS/w13dkpazdOkq4Ah29E/JNuvvrhwJdxLNvxwbmommeVx3J8isumA7XeEN6JqvmP5FyEUc8VL7Ik3HVCsNlKIZMp88z4T8r0/IqA20YC7zSzdbuk+cvpUVxAccwDXAeAKvAEWwbx5Hgww5a/iCHC3Z1iIISdpwKFd02mG1CLBazRLgNGV3yIWhhwL60IEWyt93Ah82uwoRvutEvNeb2ZQykRr9VkppcauyuuZRIhNjd18Vp6rEc67xXiiFqCuRXS0doUHc42vzWVxnE8kwY8PDefe8xAmK/qxg2bS+r0hZGvq1tkTKxOutHZbT6S4b2Zw9cxgHn+o0LU5oP6FmCHPLv5OWCRJGzX6ae3Qp9M7wiGXxeW+fuvOwP9n1JyszRZ5AKgUDhgL34lrh3yiuTknDh9GuSjcpk26hWCBPukwCWQ5xeS4VFolfyA7WpiTUBFv+jfoclIrWbf2ywsJYyoq/E84jhMjjsHJqpPBzuRtdS4EUXTFGZcVImH4jW8HjihIRsPOOlog/UnwJMjCocK7nWqAXd11kx7wwiw6+KYsyGn2OaoPd3mGwTvM2NCfEjDj9GlEyrufD0TyVWc7RCtF4tGqMUZYDzfE8ZAwPfuq9hJvG7AYuHgRxBozYfOZpRlCgpWvQcp9cP+dU/kQLfhHiu4y4sOxrFD7A21hfrHLmXNmwLf6dBZkw8NiWAkfDDwTresIk0= X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 6:fwrK0qo+i0SHo9ydgAu73uuaPOfXyScAdlFRnyb5HZj1VOvvgaz605+dq3YwBm+sLYt4QWaVqz7kemJ9+hvQEx4vO/96oU8XYPId4iQ1RaWrSY7/agneiAEyU4Rrp+NYDcWcsXH3FT0gl9nLyz5msuD0G0+2Cn0q2qBX0xDN9zrcGWeLYvRWTHNbvQJIK/hdLq7x07LRprLOzbk7fMv3tL545sNF699oIWsLbaysnIpKC7OJmQFHFyWiRTvn8C+etfLH84SAZiYexhyZ0eAPPWEbr85wSh+lqOkRRQ2tnpHlwNFb3yTBcKFmhzsvFZ9JsZCy2s4QdSS9R/GZoq4bFOvbVa8LoFOl4v1BlZ1swis=; 5:5gCl2IQRL7NWgg1wQaEywMY5a5dg0A892spSePNoVBCyUI1hWTCFlk7IG9aW7fYhchASpyB8x4X5zSeCC/i88f4ycXr3ovt3GDUQpWmU1lyDqxZXfBXJOCcflqOG9mb4/SfKXgSVFxqvky4LP/M1vUUcb2/hYbzcvB+Xd7ZB5Xc=; 24:aumLKHKGQ2K3jmNcyEianYRfNlllmQiKJKyBOX5cRGc8BqDYn+oFJEUxtwM5jJkoViqd0GZFmUt5zcx0LIuxOVwO40/lNYEyU1agVKp7B10=; 7:OoHv53mErsigvF8US/9emhgD40V8VPZvj4dQzLZCDVf7GwQOlNyCots2MJRxE75D0rbjtNEa3GGWTifP0I/N+rqHIV3NsAtpxg72moe+cir5g0Hxr4GXZL2T88zEnRdySUiwoRBabPHSgQ584sqdGJiXL2Vqo220cbxTExvm0yqpRYQPGcgHb+E63PYG2JJZynzZr/zVstMng3V5ETYVIyoAl/D3co0AGZCrBnXUnYyakUsnSfsOcVbFpNldNhlm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:21.7613 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26f30aff-eb8b-4ed8-0500-08d52ae7628f 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: DM2PR02MB1340 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.75 Subject: [Qemu-devel] [PATCH v5 13/29] hw/lm32: 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 Walle , armbru@redhat.com, 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 Walle Reviewed-by: Philippe Mathieu-Daudé Acked-by: Michael Walle --- V2: - Split hw patch into individual directories hw/lm32/lm32_boards.c | 7 +++---- hw/lm32/milkymist.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 002d638edd..527bcc229c 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" @@ -148,8 +149,7 @@ static void lm32_evr_init(MachineState *machine) } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } } @@ -242,8 +242,7 @@ static void lm32_uclinux_init(MachineState *machine) } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } } diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index d4e765f2eb..85d64fe58d 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" @@ -145,8 +146,7 @@ milkymist_init(MachineState *machine) /* if no kernel is given no valid bios rom is a fatal error */ if (!kernel_filename && !dinfo && !bios_filename && !qtest_enabled()) { - fprintf(stderr, "qemu: could not load Milkymist One bios '%s'\n", - bios_name); + error_report("could not load Milkymist One bios '%s'", bios_name); exit(1); } g_free(bios_filename); @@ -184,8 +184,7 @@ milkymist_init(MachineState *machine) } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } } From patchwork Mon Nov 13 22:35:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837600 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="gA8cepP+"; 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 3ybQkC4m29z9s9Y for ; Tue, 14 Nov 2017 09:46:59 +1100 (AEDT) Received: from localhost ([::1]:56655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENVJ-00022S-O0 for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:46:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENON-0002pK-7w for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOL-0007HK-HQ for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:47 -0500 Received: from mail-sn1nam02on0049.outbound.protection.outlook.com ([104.47.36.49]:35151 helo=NAM02-SN1-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 1eENOD-0007De-U0; Mon, 13 Nov 2017 17:39:38 -0500 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=l6OBUP2qRgRoUgl0zKjUx9as5ar3pCmENjqrRbH3Xe8=; b=gA8cepP+yTp9pcJaCgcJ9R+yhNPoAAGxBO11VUILGkoOn0SS4O1Hl+ykBMlgpTi1+72CP2bvIDDeCjHaJr3tjr53hiMhvUoU7EhQp9hog+kwUw/NiBz4wltitZL3rM8367u/ekBxM+3hVQd7GQxtbQyKqR/WYRP1v/O+pt3iqRs= Received: from BLUPR0201CA0009.namprd02.prod.outlook.com (10.163.116.19) by CY1PR02MB1333.namprd02.prod.outlook.com (10.161.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:39:33 +0000 Received: from SN1NAM02FT031.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::208) by BLUPR0201CA0009.outlook.office365.com (2a01:111:e400:52e7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:32 +0000 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 SN1NAM02FT031.mail.protection.outlook.com (10.152.72.116) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:32 +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 1eENO7-00049L-F1; Mon, 13 Nov 2017 14:39:31 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENO7-0000TQ-9g; Mon, 13 Nov 2017 14:39:31 -0800 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 vADMdK0u002801; Mon, 13 Nov 2017 14:39:20 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNv-0000SL-TI; Mon, 13 Nov 2017 14:39:19 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:19 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(106466001)(39060400002)(4326008)(2906002)(2870700001)(36756003)(5820100001)(50466002)(23676003)(316002)(36386004)(63266004)(110136005)(54906003)(575784001)(478600001)(305945005)(50226002)(356003)(2950100002)(33646002)(77096006)(118296001)(9786002)(106002)(189998001)(5660300001)(81166006)(81156014)(8676002)(50986999)(76176999)(47776003)(8936002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1333; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT031; 1:YZTg0GADHKzQDr9Qu44T3gAI76CubTu22D0RSYDENDOD49/xDxQQ5Qks1V+TZ6ORZ94pDSpL3VYkXTXZ9IF5wk1Tlg2ULNi5Vt6mLMHimzwPiNSrono5NXsyX95S8BKN X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e20ffad-20f3-47f5-a9ef-08d52ae768c8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 3:3UO48c+LlJJNGgW8yFhMkeS+DGYW1Yh8q9wpy53ed/HbmuHaBuJfItwEMgd5mKkTzQvSjzgoAzrYonCAWyW14Cc+7HttaFwz64WZr34dBDgEOVu8tUtGbpqidvwMoKAvcKpTiv7qjfj70oBfwY0KRA7HDrzu1BDcm2nuDz1Y7tI5XDuK5kiHUj5D4RIstj2fnmW9tVH2/4Wd8c8uXsPzR+1qCFYpPm3DSV9ofKr/bMTw8y7UAzxHEOTSXWCufITt3k28UaVOOG9rchemUxvDz8vIM92/Ii8ZqpcNlT1KLxX5AHHEgoUv1GZAEWyF6xZCQNWuu0kibTsK3kSyrsbw2ogx0FGQsXARNhZP+z000g0=; 25:SmmMlIULIXZuVmw+OeXwc/ueP0MtJQH1cShjAvQIUkvOXYb7NwpNnEbhqJx5UEOTlHoI34Ow0zqskY/iiVG8Ces/pQemy5pjHjFKa55XW65s4wulBa6+5D8p4dUj0QeaxqzAdRPR49AojtRw2DwY87jPukWEUFPaiswH1SVdB3Eeglepj67yLPc0r6Ae8VqOXqiVDIsM5YHz4KgknAYnGU5rzuS1z+GcueklNB3ecltG/KdyVHbbsY2Y6r+gCTne2HZMMippCnPMfbJV0BPuy19K7uNq7/50qiEAoJxSVQKUP2Kgc04MCk4dpBUuuvPZB3frkFd3V0CDd9WpdzabZYcUG8Gp3vB/Ylg14d/+pL8= X-MS-TrafficTypeDiagnostic: CY1PR02MB1333: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 31:wWp/JuxSz+zbXnmfCg48vAf8rJA4CdAXRvbacAkO1nbGe2YD7gPe3/k3JMvPD/l0TiDgitPNZp65PQJC68ed3rStNYmfM4pcanHh8+bufjlc9/1pOXPqDBTd1KSjNPmBZgXc4Bg/hi7rAPyam7qw+FAXa8MWjnHrgW7UEdUnhk9pG+JIHd4NdxhTms/d2wI3iLCCDSswtzGzWxEuntagcudVwA1XZboaYgn7QIsbZB8=; 20:lhLtkcIxNXFxDMoEVTGlU0ySH0+tIcCyAcPAKCicsGw3fRp2hLCt37bOGxud02tWuiCqYHlF8sJ1ePYPOr1GB14t9tWHf9JnOkpC8NQV3EJ1WGKehFvpEe/HpHXYnSFefwRDVbffrUqBRWT/7I4bzty/WJYw2bkJTFTj/DMgT/7tYyiqkggZz6Wo1PSp6t0eSmPod8kCdXh4kKQF/R5NEuNGCdgxLcOR3QKxCXBVhL5kO3jWpZiH0tJ4xB6BhiE+j9Jhbzhr7JRx3Tafk0F/Q/v1TIygRB1mT7bvGy5hmxn03YOQnUvVMZg17E+utdI245qP1yBQNlFWy3uqy9owXzsHC8D3qOno3aQ1mHqDy/L9fcLWx6w6aPcs+I6aINrXV4YtHtLo7NN4J6Jp3PH2wkv2lcnulkBwIBVwMswD3M+KMXJWiatc4MbGhC9SsyjfCz865jUIUk/lx5VWwfq23N+/rSbXUM1tR/O2Igzv0hyY4tmX3VpAKHpSCH4CfjQF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93004095)(3231022)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1333; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 4:8SOuXikWBZnAGAcZR95xYImS/ClTsak2q/39YAfYgr043JZP+n1bb8YuuteL8oWHa/JEDK4/ideBfzy9LUFj6UGa1R/Zz2WnDropQ0h3KzbE2OpPQ8xJKsNKnCa8iyZ2b7CbaHc35aJf+qY6gXdj/DBMUu7Fk00rAFoGTzuXsmtA4oUnHMaysWqK3/2CRJggZuSIpoUlLgCnBmPiUTXBIzw8GTrmF0ZzHbSIeA/i+7DXVsZzwb1qJZ9CDpEz7OOVjIircgcKRqOyqzwOSxIY7txVlMlynx+zE2KFlDqi2sV9aL3R/u369Fe0x1JPSoyN3A6E75EoelVAHYwCxXeapg== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1333; 23:U5zfwZQvj2pf0APK35T6y0QPoUCM23AcdTBZlqqAr?= 2e/mQiBcZp1I72q2ZWjIBU5OviHax8YcFiw022mcDLPgVfKmjSw/GIecSUWrk+owgzMYhsg6vpY8OjIrz7L9aMCIMAGvDLGZjuYiUrmRjDCGG2DTcXf4VC704DMvWpVmYYn6IW6m4ye/b61X5ne0EjHliXFq9Yat7ZeAr/f2AY4leqyYmlof9Fq0+0cF+0E7F1w6K7JbXPUd0OSLRG+OyMd4+vdHYDx/t1FDHST0uuUw0OLHqUXX0oad9+joJc4kDIaw38hLupdg+gPtatNfN6ULKbmP++67RuH5Z/j0I0QjtkhXyu6SfBpAb/SwERl5S2QsnoEByohkXHO+aL0O0AXUUqPdTChZx+YQh6T70hLWgUzzl4NN/SS0zR8iaDTVyCxhh11lJTsZogGUa8LpWvIy93aa4QsynRZtDBNNJS6Bg5YFnWRiYuaN1YLmYF7iYAfTgVqhuEON6vJMKMDKGNWt/cWPBsJrhIMkOnsL+iv6LR2su3ySIyRoF7YH4dSMLLZer//2SEzle5vUkxjAdu5NDcIOlP2TEyUDrLMA3U1xXWeyNUEFsUqeGloe6AGntRTf2FZOCoHIm+hM9r68hb9lHcRNgYfXDHQNE1vcqnd8raZ9SqzN61GjVa1U1uoH2kNLvgy5iqT/DFTByxroHIz7Hqt9ibc4lgRcunPxG3WCel93LDqarhwmm/ahLLlT6kpgoepuwWtCt/kNpohmm0a9SzFkwZgGXdEjQH7P8w5VZ2G4SDCe8V2zAAq8SejLq9V8OAhKa3gPyVq/BC2m/5mabVrTeiNKQRPDrjbnwn6g8BJGTv03Z1luF0PKp63vAk+NAMMVxhLvfv7KRUFhdVE5AJKZ8KDKYE1w+G/OukW0MT/AVEf7uLs7htWCYWZ/3DsK8EhpBjdZOUIZsyIfSDMzytsS+6ltpH/+892RWGGMqIVqsUQMe9tkYIHHf7eDaK1MdcpQ/Rrx7vGgT3yntAFhyEadMYeb7/wkOnYpUCXUg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 6:fTCjE06Ca3GbgOQz+WWYtNhFmDu9uW2ZeNaU45HWnnl5e/LsmMobA4hhPD3tx2F+sqWQk6ZfhH1qLu9a/tqyj9r8c47OV8HUE7ZJCzr1iGBx8IZMa/ts0jAEr+fLVNZbpypepBbfyYyX3JcLSlBozkI3bu6FIjuJQoj8ngO/0iuYB0aG+UjZvmbgZuL3arsEe9daV2bnL/2uG69DNM5NIVvnA3hibGKrxEMvCA6l3+UCXgiZVGWui4lSfmbZFjgMd415fSRqsL1vqPeWIPld1AyzQxaCPC9E8vClbwyrmsqURBt7NaF8tG2tm8TLMpGOp0qIAfR1A6AfQJUI19w4sPmOsKLM6AQb3FpQz3Dg0m4=; 5:lUkvmW1Gx2WJeau4DDlNbu1UjMZMZxnkMUu4V8es4T+hI785hKK0zaJPdrFtDGb1LXfuQ6guNF9XjCvZuz/YYLQfbkH2EQBSpwnWP4CUev1j0kCe+w7+HTqNMX61wp0klBWp/CqwnZsnTQESX+j1arD5PofMlZPMszqGixWOM1Y=; 24:uXL+zK3wsE2DtMEsIWSV+xHCxarXoP2HE464cxjMArpX9VFzIMUJBwrzThRkJcfUL77GUR/IetX8YAfWONM3PDnrGmlmI0wjqwvVcWNm/FI=; 7:yDA7pL3Qa9XeEkdnrdaTMT9G6gqqmbrOEy/ku/rWznJkEU9ZKrlqML4Z2rFOD2dAGRMWT3DF6qfjhGCtBKfaN9bBo7ieCd8ENEmc6r+nWwQI7MfvQPY+udoyDHxsGlQvD0J1+3lBfHse4PPZdGfQlK5LterlOFOgZigXVXcLD7FbpHUPoNqmhhrqaVa60sq+Z+DcdJRuKri7B2siFocTCYRgHKZdI1J3bvw5bBnzNpxdMn1e/y/Huem+KHI2es5P SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:32.2367 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e20ffad-20f3-47f5-a9ef-08d52ae768c8 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: CY1PR02MB1333 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.49 Subject: [Qemu-devel] [PATCH v5 14/29] 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_Poussineau?= , Yongbok Kim , alistair23@gmail.com, Aurelien Jarno 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: Paul Burton Cc: Aurelien Jarno Cc: Yongbok Kim Cc: "Hervé Poussineau" Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Hervé Poussineau 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 146cf0fccd..344171e40b 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); } } @@ -338,7 +337,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 fe4f17389f..18b5ff733e 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -267,10 +267,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 ec6af4a277..9702ff85ff 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); } } @@ -1034,9 +1033,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 e5d3654586..e0ba5efc84 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 3bbb1827e1..2e2f9aa5cc 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); } } @@ -195,9 +194,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); @@ -238,7 +236,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 */ From patchwork Mon Nov 13 22:35:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837615 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="BzCIF2Fh"; 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 3ybR0T5BN2z9s84 for ; Tue, 14 Nov 2017 09:59:21 +1100 (AEDT) Received: from localhost ([::1]:56735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENhH-00068Z-Rt for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:59:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOH-0002lG-H5 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOG-0007FZ-Dd for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:41 -0500 Received: from mail-by2nam01on0053.outbound.protection.outlook.com ([104.47.34.53]:55072 helo=NAM01-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 1eENOB-0007BW-H6; Mon, 13 Nov 2017 17:39:35 -0500 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=obxq3g6PedzAFxmej/Tt9dTotDLqxxsaNp1uUhcUcQI=; b=BzCIF2Fh4jnbP9rWn1fosxFMPbC7AxcM8lrUYVPkkE8qJthWQ77mEb1Ybd8LmlWOzH7l45Fo0pXJ6/7Ks4S11ko2R8Osx/0KV9ZMtrKN+Vp7MfbQVEFVD12wYV5Beiwa2jezvg9WmA1Rukba6HhL0VdRtOAqld6J/cTCpGlzhRc= Received: from BY2PR02CA0112.namprd02.prod.outlook.com (10.163.44.166) 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_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:32 +0000 Received: from SN1NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by BY2PR02CA0112.outlook.office365.com (2a01:111:e400:5261::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:32 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; moxielogic.com; dkim=none (message not signed) header.d=none;moxielogic.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 SN1NAM02FT062.mail.protection.outlook.com (10.152.72.208) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:32 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45666 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENO7-0004Vs-Av; Mon, 13 Nov 2017 14:39:31 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENO7-0000TQ-85; Mon, 13 Nov 2017 14:39:31 -0800 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdNVo012612; Mon, 13 Nov 2017 14:39:23 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENNy-0000Sc-Rq; Mon, 13 Nov 2017 14:39:22 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:22 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(4326008)(81166006)(2950100002)(50986999)(63266004)(106466001)(50226002)(5660300001)(39060400002)(76176999)(23676003)(2870700001)(36756003)(118296001)(2906002)(9786002)(305945005)(77096006)(81156014)(356003)(33646002)(8676002)(478600001)(110136005)(50466002)(8936002)(316002)(47776003)(36386004)(106002)(54906003)(189998001)(5820100001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3377; 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; SN1NAM02FT062; 1:nl0lW57OreVEz10Jene3c9vDC1XzDntcQbjboA2U+NdgS+xK3+6S+SZsKh6tm5vuPZuu0Fn8nU2/sUjUzaouCjujQ7Yw8hHKDAZs1yhbxWRSy03x2aVPzPfxSEaCDm/e X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3cbb3337-44c4-4525-b47b-08d52ae768b6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:49bKDfBKKZhhX6QmRWXaHQoJXnNuySnC1j1xKVGgJc0sMY/VF8ZKRK3OzVA7kXfvD8OS4c7f1adOa47SlSqohYPRJ+OAD2S8vRiDv3yLnZEB7C5fXPb+9G0aaYgOieYml9K6NcFYSO+CUNETms/ebYICcfuM5Hy9Jzl2rK289NQV8nU+TOfLGSeiDC4UORkBkjNZ+hUS9OkJeGAiDcfRoAtw3okxvXwC488TgQhDfd6C1KsV606RqfwXwqE5Nz2ktYxQ2H/Ol9L4Bf9dPsBL4Br612p84Fq0gPgPHY0gDL+/oGz4ZnBHFyOI2qnIw/aJ0IsO7/sV8lg/NGLeAEdxu1yqu26OnhFU1a+8GkqfhuE=; 25:JgU1iQM/WV/kqMl5vVUe9PtLuxLW0pLaXpTd6Qmf3D4VCanyZMdd1Hs6BjZn9ZBLi+2RTnO1L3vwZMmOgYVwzx0bekxhj/thbUAYNNMp6nwfSNNa3zmOQeMt4tlua38vPM2GHMSWTPtDX4Ao8MJLbL6tBWDflZ+OFBUCvfRubtJ/kQtmbnzhbti0VOJM2Y0Eu07ZTHzxf7tfX2pRt1gRUaJTAC6JLX5cQRhQ5Tz16fccbtXq6kcD7GT4ALL5A8xj7B+j0Wqu6l9UDBngRRBtT44yjpRGeFh2GBq6yrJOAJhOwH+mH66aPv9tn0NmE7uyLk7sGLOg/2TrSkAfWBLHl/j8CCsQYo7pWP5UA5caFeE= X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:tiy8MO8PpugesEB9WiwzJSLcEpXA60RYW1aJwPcafxcizX10aV0YkWxin+IuqFUSCntyK3dpskILXVTTi3O/cRDGwCI+BIYToechGZQA9G+bFHcrse5ftVSg/y4qPEOHq/1NF4q25VZCZLJN9kChGUUfQDjdFaLRghF+av0s/RDWKPvnNbUgzRoaTNnJWf6eoUeeq+kWLxZuKZLehE1NaZIlvRGq0NY48P32n8JtDnE=; 20:5mOf8gCXCF6xv9sPTCgdoz8wPt4SRO8lcie+8PNpr/xnt57+qsaXvJd+Rl3vfBVpjXvp1VGyaaxSXLTTl7rqBvkEbbkHQn/sfTXSkYc6n6LCN+Uvj9TVTkcZeUt30yzW/oMo6R1sAjdJlE73CX4d+jTPlB7E+oz08ge7H9L3xXcxgibFuPQwu2C8c01cvQzpJbXvKLf7Qs7cFyzkA2twSnLXodY6xZ/v3I68adTvVOps6hluis4Q8k9CKcMPpU/CGfcTky153r51oP/whTIZkHfxfZTKV1S3t27sCYTZZerf6tbMXMhMBURlKsVW9JE0aLUDwPoQr4MjuNBZ9wCMgdQ+v6pWhVJHsFDHDjx+3v8NUbaT/QPRkYz9c7ieBUSoG822AXfKzQDEKnYBNP8flJ6QVgbZLPDTEQ8a6snSv/VF8bweCVBIdN13TXyymni+czjHMiHfqoJop8reGltv1xJKjHHm1xv7dxcsjrgkvvyIqXMPMBzqVGFdjKkl8c3f X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93004095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(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:dNlqY9vQTyVg643y9U4PrbK9Qi1e3Ju1s1DBWJ4OA+OVhbW8ke3friRE4MgZWDH/+Xo2gqgwZmo4r/RCn9zfuMqrQZHEvhLtkoIsLGVg9RqNgNrgbn7a1ZwIe4J8uOGUS4a0HF17EZg8vDR7w7Hf2bSivZlov90Q9GVOzopYENTCfar+lZmMZ0jb0alt+LMQHEtN5JHKdMZ3n/my3ZgMrHAkj+AqzuRcj96r2LjHHF/e27ppON/UfL4/klmyN+h7aLJDzeCTMnHzzn+zUesbzw1FKX5zlO9p8fp/JqLSn6fESXwffCXOSFCt7lT6qKHXHnpmzxrZEKPPjoRTW41yMA== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:GCrrre8+yWspqahGi8csMbcxG+jqKF4pCZpXqrTfN?= Xin1S64gpld5vw6eFGflxyIrU9BCEWu3murj8rSf8g2uC5YVEC1SCVl6n7Swh1XlqluUnJgEOIHt5cziL8QzBCfyl8W0npG+NRNcytdNvYuqfQ7CU24kCLHqJAcEN2KlDNphWdOM/dbe3aXIce6EbxIqjSaGYx/9IZnNymB0lfSz6oepqUDFWGmXUSPu85pafT5D7eyOaozFEv+1Pa/2cL6YKL7ujGQcoeU+Dq2Nl5gvvP2vtwLjh6uWtudzB1ea86YIjSWZZxEZ3MtFJw8+bnXbcQaxHiTlsePNx2vD1KLRd04NPJMxfKp2egChAStMQtfhbo1V3H9LhML3rfGUAuyZMzmjy/fiAsXIqMhH84D5VuocxaA9dnaOerxiWrBzQDKRqq0qydwn+H5ay1A59aFMiNlkmYrQwGVhdTCxwpPu+KheY2U5X+WtN3fp4WNKiqKZJQhTsr3RWOjgZGpDRlNgikNnoWeICbfVEb6rOKDQJMVU1Fpba3esBQwiqAb+aNsNPzDlAWzK2y3gIpok7hKwlNusemL4sV/GRASVJ74C/FNZqw6xveFIrw18Y+ccHJjHdpjT9xwpKiTEGMxjiMpdVWx8pzLCVBOWEDyO2BL+EgPXa38VnNWf6qzsdlA1nx1ymDHRNAGVtIf1ttXdUn1uaI0x3r1Y2cxJsAk34RlBF1oQrqpN0gfOweMt9gS67RJzRkqq1OhkzasgzlWMk+GyDtxIYwQu3qsbw2b1cBs2wTv51qklQC7yVVoJrBhNdtj2uQaHs93vzFqwuqyinRLni34oA4JJPf2iKkdOINgsFE0WaBK9FejCI0SyRU0/RguFZmQ53B2FKMLv/lkLZMVcnyhyI7G3vaPz0ffdG9SJOeNoqz6itH6kayYGdvRX3HT17SzWZUf9ol1K+ifJNtr0wjaKfDDxVUQYqL/j8R3Jkx13ft6NwADVs/SyTqrUNw9SJDv8U5HqsYnjYbU2NyZnSE5FpLQR6HMMxWDOSFeVq6Jvf5kTBDwAiZsvM4kUkc= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:7DjkHpB/PZ9pjX6oGGmH1qqoayxx1BtHr0ctNTKl49gpnc1RvImD0Iv3WTpKTJPHOWhtLz08dtHCyFCRsgSu0Soi1BCtJpozGjmOOuqJCcerZaInDPh3FuuG1N8Lvmha6q6hTVnit15Rg/cZdl/SzF0Seb3aCI9AvolOTmUgQQepwFbdJAxmDomZo2BmaoE3KTbQLVsf9jKrv9fuumvWzYVWzjCVhsUV0PqP0E5MOQpIFTwYBixDKC4/3UXsYJnlDn7CXjrE0TG64QkSK2egLgM6OGP8uE+exA4nSmOFASRe8SyAgEVXcxPfHW8mFYjMfa3jZn1cRa1PuXjybSVSw4vYmFEUPGUYym8D/Dr0XVk=; 5:pBVunw5R+IOmDvC6xZMsKDJu2RUY9NChBbg02ugdzSJutFp0ueQY9K0+uWvI8r0cSMlXeMf23xoUfMVJMYigx/Q1Sl/L6w6u/umJ4FF6ma8siSs1s8tjaToCzdRvZvZXA8tnWQghfoGld3HXVl0lr5QSZujfP1V4GRS9hlpBpjs=; 24:8bDav6zgVOS+urU/kT9etqQv1Caki1l/jDqm8HdWXOKRlY9MRUOYFvtpq1ZAV4ji4ZTuR7ilQbUfFTJ21QU9AFb8YXyghZ1GYnDCpN3Ln9M=; 7:izE3vfhQ98LyUuYqHYNxGDvZ7UtXxJ3I1itv3mO1KSjkb8zhgKVPPr7KnlfvD2ELCwQUS0NauZrFddqiTmcbqtYf3CgzU9P4fojw3UZ+/vx2xPSlnw2XcSAuQWxvlT9fGvg1xSBU0pG+bcOzbARsnkXnNaDgDOzA+enkz3ytefai363pUXVmTYjtXSltPdg1zrXy7IEs0gvNShxUEgvsC1sO8QDRal5lWWGUf/21FlXdYzsnYrL1ZZjXSZ8BwZV4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:32.1815 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cbb3337-44c4-4525-b47b-08d52ae768b6 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: BN6PR02MB3377 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.53 Subject: [Qemu-devel] [PATCH v5 15/29] hw/moxie: 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, Anthony Green , armbru@redhat.com, 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: Anthony Green Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- V2: - Split hw patch into individual directories hw/moxie/moxiesim.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 3ba58481d0..69eb8360cf 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -25,6 +25,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -61,8 +62,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) 0, 0); if (kernel_size <= 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - loader_params->kernel_filename); + error_report("could not load kernel '%s'", + loader_params->kernel_filename); exit(1); } @@ -75,9 +76,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) initrd_offset = (kernel_high + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK; if (initrd_offset + initrd_size > loader_params->ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loader_params->initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loader_params->initrd_filename); exit(1); } initrd_size = load_image_targphys(loader_params->initrd_filename, @@ -85,8 +85,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) ram_size); } if (initrd_size == (target_ulong)-1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loader_params->initrd_filename); + error_report("could not load initial ram disk '%s'", + loader_params->initrd_filename); exit(1); } } From patchwork Mon Nov 13 22:35:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837601 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="ufCGo/pq"; 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 3ybQlQ3kQBz9sBZ for ; Tue, 14 Nov 2017 09:48:02 +1100 (AEDT) Received: from localhost ([::1]:56664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENWK-0003rs-6u for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:48:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOH-0002kw-AB for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOG-0007FU-DH for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:41 -0500 Received: from mail-by2nam01on0053.outbound.protection.outlook.com ([104.47.34.53]:55072 helo=NAM01-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 1eENOC-0007BW-4V; Mon, 13 Nov 2017 17:39:36 -0500 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=RqY/2IgXpI75rDzHX5gN/MrHmuHW4Ex2nAeSXbK9zFE=; b=ufCGo/pqCzso21q0mWBt0Fq0h1OQK6Et4EKoj1POVH5VPKvLBTEBSZrjitr1jQ/2gts7/WopHxLYB88cj+OlKaa9dGmRDDyu26boOeYzCaUKW79695KylP9Isy/N51NQVIfmUKxaIPiDXbEC/peaWrn4POSmNwxMf95ciX+K+kQ= Received: from CY4PR02CA0047.namprd02.prod.outlook.com (10.175.57.161) 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_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:33 +0000 Received: from SN1NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by CY4PR02CA0047.outlook.office365.com (2603:10b6:903:117::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:32 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; denx.de; dkim=none (message not signed) header.d=none;denx.de; 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 SN1NAM02FT027.mail.protection.outlook.com (10.152.72.99) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:32 +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 1eENO7-00049J-EG; Mon, 13 Nov 2017 14:39:31 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENO7-0000TQ-BM; Mon, 13 Nov 2017 14:39:31 -0800 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdQ0K002812; Mon, 13 Nov 2017 14:39:26 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENO2-0000Sv-14; Mon, 13 Nov 2017 14:39:26 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:25 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(4326008)(81166006)(2950100002)(50986999)(63266004)(106466001)(50226002)(5660300001)(39060400002)(76176999)(23676003)(2870700001)(36756003)(118296001)(2906002)(9786002)(305945005)(77096006)(81156014)(356003)(33646002)(8676002)(478600001)(110136005)(50466002)(8936002)(316002)(47776003)(36386004)(106002)(54906003)(189998001)(5820100001)(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; SN1NAM02FT027; 1:LwFGzyDKpVTBySj+UFi54gxaDktpO4NsTuUtIxjJn6ic7nx3GRRpDO9QE9S2f6tpob5d/oceA3bfu9suIogaLezm3KHNhY8iEHpz2IJkRaUpNPiA3f2Ku8Xm0TGWLWBp X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c278c6b4-a679-4b87-7cda-08d52ae768b1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:ifsh+K8s/QoS38eYQfeVglTO5W1D/fWDUPxg4TDozxnSH89klyGyCKvkcySXHUoGKsevxZeIoRODhINAlHmNi7bEaBVAtIakvYdKdObhTq9ocyaL2eRdXlUiel9A1rTQ5v9ATghM1eFsTE0Ac04ePYgDb8xt+rYb94CePd2Q5K0pdAB39p8j4fvBu7J77BiIyd4NzngaPIBWK1njfM3oy0WMrKTGRDcmy2kE788smUCRf8KtacO1aGNoiFwlCYYDnC15KNMXNpPk8ZBrjNaOY2Cd7mz433gBT3wT2BX6/v5zI9/xRkOjqk7nabbdEdJ7wvE8GMMKKZa4sSlzVJERALh//aD1hU2HXC21Pz3SOzE=; 25:Z8rIQqWYSS9ndwfzyn3nvGHSI26c7IFmSJz4BjGSmWI+nyKYqSNr8r44Y623yTT0y9Vyt+hhOJu7EoHbmEAyYlbnKBb6TDktAjC4JmjfWzuih+tN+mpvPo+X0lsUMmITzn9X5F2P28UEsuL044NyYKTZJVTNgAkNRMXldbOQcrMG1ug/eTx2htjT8S3sVBwzdkWUNoJbCczu5bdmQQB8y/JOXDrMH6fdw7QQFa6oi8m476McG8umroyeKuZJ3g9qAHeYMGpAVH4uAmcTrBWNeAio6fsaeMVwXI6oxl1ZFjW4QZqvrO5+V10A16OVuZHq7sLntGe5mt7VTpxvjd6R00fJlA4GFL2Lrhc2Gqjx9wk= X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:VuEeB0ufCDDXul1dtfBlxNnVLZvTmEBFIG7W/VijVnH6sRn1V+lsGqHckxUVPJRL8mPBsfa/vt6VFLVukG87Yj+fC8eRtnGEo2YXCN4SXWhj+K8SDVsvfjITUdIslwGY5LWXWcgi9qA9vxcD0ou5BjSxlMI6C1Af9k0TI1sXha6amgTcqnEnmpQWjTraVWWAZwL06K2DTnQMfhPwawQDTcrFTYwt6bn9Qn2iPcHVfXk=; 20:7ONS/7+s/+k8thpB85tDKDNqS6SP/AtRC3ynaKS3V5PbO8jtZPVHjfWa9SLrqu0SY/LjnKd/AeOqjDvKAVRNghgWdi4Yur4VcEDTeUeqyvfTwfa+rrpU1EYDab7B58srnq8iSZuBzXHx1g4JS/osxryxjUBE7mivMlm0H1lB5O/qxqzhQgQlDuzu4xFmt4+PwOfAUPBJm5VS4ywuIPOx03wjObbzcbHE0pgCRRtJidUvr6g40QOhBBtQvgYoRRVAW2vRa5oAPJ5JDQ4e4akP4/SxFzaH9I3xQOtnRdwiA7mqPmF4iYyKWjwoHx/+lqGHjTiowxxRrnYJY1mhtkj22i91G5LxZxZ7pfyR8iM0DDU1GJJ2X4mtNB0gQlN1Cucigbo8gQABBNWa40G2y8UCRBbWn2V/YfawxX0ETrpwmC/J6kC+IhxNsr1vBkeZfxjjmLSdRkK+U2opmNdCSMGqUDeVVWDrKO+u/Q8QodR7teuctnmt0//YU4Earit2UOBP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93004095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(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:I/5DFLgvG2XPOnFWyBhr49STkTPWvcWvF/B86G6yEcg7NwAl6iNmHxDUGpa2NqixSr14Xvv6fPyzm7tPfFJotRLEUbXvm1tC94m0/G0/Tkjf+t46ls6O+hlzK3mX2hIfKu8qeYJ9ymFpdbKf97ujTqTk0VqCpa/J8Sw4pjBVGG8Kqo7qhRhRJUw1k9il9q8smPHtkX6+wz1zpOtzrdux4vM0ZT7HJ3Qazf6pNWxuxbUEwY4+sDLgyYA0lMO30VSUk8AGuI7n0S05ijsCsJSWMfFaIE8Q8MfnJoYVjV6fo2zWNqjmfXy6VXOt8ZVSJvoWFqKtF59wo0DLbAODYvQ5Qg== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:86+X4PilCsZMPUQal/+AT2X7Yh5Kpje7HMMbuG5a7?= oyjlgCmydNjG1rIqsZLBljo8hwwgfvnw9siuD4E4464obRc0k9u7knkc01dKJSFQayd8NpxFw3i4pDwHAnOrb1XG9Bg7b4EMC9W9bjtWf09lnfYNedpPCtZGFdEa21eGLb2T/BGihC6IFtvoiK4RmGT3GncnWJJFM42DGX7o249ou3Oz1+Il3jSrCxG++izJqCHJUHfmK+/SUoG7p0EQ6boxj9QYpc4lXSPPpl6PrcZaDtOfvFwWKFxYxRN96JHf875iewJp0gX6zrgsMnS6LA32mu5SD+jQPDfCTpKCB5iQOm9Ovm/julKUkwVSfTWd0fDZZxPZXZsC/W9fytlCUaZ6iktBXPLFFU8bD7VIWdKGdzShzXMmbV9wblikalq7zxCHQpyK3qKFxzn61WeU58Cw07sVMBYyhq1CyUHZLB6CFsCimA7O1du7Fb+isjh6J7LJzcQOXfcEhjXuGT/MNKfXBbubCzBBS13vDprHY+IUfBy0cAyWdtFnyvJr/zX3rqJ77OHo2D7ZRkBzbQ27q2kaba+YA2qVBYF32f4CL5VJJD31Kx5ai3sO8uFkdD24LxlJAxHswnWj2SYlHC5e5P6ZdIiJVJOG5RQXmVrg9V7SFWQ5TSbq9ZHxJQ67raggFCxAIwmLiHvAD/SxcfxuoEJIkEZcPJee8mQlToUlfLSktDM/gA0UH05E6LK8Ybf1JXt0n/SDBqnY0/HcQJ35/R0k3j2tvTTlGef8pHWYKdF2aB3TGGjdd2DtofQQgRamH2QhyqePsnVfJnDVj9m0tXYiFokJKUAc1c12VRSgbw/tnkaOk04f9q+YbtyYdWZjDqQ48A2x3B8GvIucqrLhZY4CDzYj7Cn4pB5rn6bQ+i5/myMp6RU1Ah3jwGVpAqPfuZPjJnJ7AcmZwSYbaHZhw6ZzlYXLHdC/Ilozys4qoqYMe0cL3PRIak/fmm5pvDQPQPvW1DbLs2hedzokkDEVwq4 X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:ijl8XXQTeC3bT3ANZ/WK+Ia1C65Bb4aKQc5lVfje8MbDQFWFHZXqUZYmCRGV9iBE/gjtk9CtbLuewzc07TqJA37VHTl9b2c/X+RgkxJ6MlOZNGYAMQ7i7Scror0rjQ/Egea19+bZmKEZhTKEem7+KRkFLCgG4D1T7FlY3BQfiT/1eDNltOebwbaA3KsuGnuP8KcgB+GGALZJJjr1b6Hr7fM9TJsMwq1ofBa5Au5NSLU5zrvZyZQ0Tt1XoQONiZ1JQR2Q2K2DvlM2OQG+9Cp7+wtcbf/29reWsUW1b/GIPv+m1FkcaKDL2H57uLE6ZNp+Q/YZKr7aNCICCKKPLNLCTJNI2UZpcGoLPO0h0ysbA5Y=; 5:c//43ck9y1ms4SfnvWbEGKfCNwgNUutEGgZ1HLfs1sc/OBW8zgeH+elYtV2FcUm9dkXSFGmCZN99b1rHdF2FMPzvVvy+Od0PKcDW7/py+mU5jT9M+dIXMYk8ysX9xp2Gs71k+ykFGQdKdvgx6GYmoyUGEhmQKnyPQQlzEzblQLM=; 24:TQlabSeOoHUs43TZw3ErTwiQrfIbLxCMCATMqhE65IWwv5Whb1tUr7Gv13KyMO7wuNKTdMTfFtO62i8931LeXXhfKu0MM1bEee4a75ry56Q=; 7:qRoHApgrLWH1V0GWpoRCAom++yCJ7DPj4g9+hAt+VcngPvQZiVFIRVL9fJs5GwasBCPSBcoJ/LnDNv2eqJKB6KV6ec8l/9oGbAvVabOk9RgJVTvjZJr4pPOo7FV+Up+X42CBzHubwCOgV1C4gjn8vdknfclbge1IrKx9qO1TN1SJKIU1tyJYYDB3NBtJBBoGnavmNp1+tWamaHpM2l5QTYwXfmEiZ5t8RyYlMv2hAfB8iSJXx0JL1dyebaFcbj+q SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:32.1942 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c278c6b4-a679-4b87-7cda-08d52ae768b1 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.34.53 Subject: [Qemu-devel] [PATCH v5 16/29] hw/nios2: 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: Marek Vasut , alistair23@gmail.com, Chris Wulff , armbru@redhat.com, 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: Chris Wulff Cc: Marek Vasut Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/nios2/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 2b31f5b844..c896e8007b 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -96,7 +96,7 @@ static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize, r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); if (r < 0) { - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); } } From patchwork Mon Nov 13 22:35:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837616 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="fnVwT9Wc"; 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 3ybR2Y1hVCz9s84 for ; Tue, 14 Nov 2017 10:01:09 +1100 (AEDT) Received: from localhost ([::1]:56748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENj1-0007Kv-AL for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:01:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOV-0002y1-GD for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOU-0007Mb-7x for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:55 -0500 Received: from mail-by2nam03on0071.outbound.protection.outlook.com ([104.47.42.71]:56080 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 1eENON-0007ID-Dm; Mon, 13 Nov 2017 17:39:47 -0500 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=VVk/zPMAQCNBRjkGaGOjd6jVBL5OqIaeup4ZjLbWDlE=; b=fnVwT9WcniVrjfy0qgs2z9DAXcuEJBY7BVZugD0tbzDlsutFaHGzYUI372pl1xB9ysOR/GO36CGx4lR/kvMKceTfs1JJt7gNHvV4JwWQop8ZJf8Dc3fGo9j80uexQgrDws0cPwZXoUF9DIU+l2hIuejI6Ha9flDlp9Rmv2BFJLY= Received: from MWHPR02CA0045.namprd02.prod.outlook.com (10.164.133.34) by MWHPR02MB3392.namprd02.prod.outlook.com (10.164.192.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Mon, 13 Nov 2017 22:39:43 +0000 Received: from CY1NAM02FT017.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by MWHPR02CA0045.outlook.office365.com (2603:10b6:301:60::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:43 +0000 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 CY1NAM02FT017.mail.protection.outlook.com (10.152.75.181) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:42 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45756 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOH-0004Vz-OO; Mon, 13 Nov 2017 14:39:41 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOH-0000Ux-Hl; Mon, 13 Nov 2017 14:39:41 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdZUA002831; Mon, 13 Nov 2017 14:39:35 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOA-0000Ts-Uj; Mon, 13 Nov 2017 14:39:34 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:29 -0800 Message-ID: <83aa5da9c3f6220edf68b49c6f16bf84108616ab.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(5660300001)(76176999)(50466002)(48376002)(33646002)(8936002)(6666003)(50986999)(8676002)(81166006)(81156014)(77096006)(63266004)(39060400002)(106466001)(106002)(2950100002)(4326008)(47776003)(36386004)(50226002)(36756003)(5003940100001)(54906003)(16586007)(110136005)(316002)(118296001)(356003)(478600001)(2906002)(305945005)(575784001)(189998001)(9786002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3392; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT017; 1:/tZU69avJIPP/EpmAfgwEYzUgFS2b0AewGmgJLaXUv8WyQz5hTOIry3CrC62qeAiyATJJmP3Vk+ygWkIpn9BcKsT1jK3Y2OUR+Ezk11Sfs3eodDh/Pz1Ppl4idJsZilw MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 428ef95a-2b8b-424f-d05b-08d52ae76ebf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:MWHPR02MB3392; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 3:GAMTw8nRCnvzpMZd1ljP7cpEHvzlHm/YezH4l8ppFBB5i920+bfcRA4rqXJCVFZoeyxl9zP9THP0JMBdmVlyPgU0SZmF4twLDU/57c5nWcOC/TnY9C8rfKH1L6U5T6qhCemYBCiekXGu17h4pYLjnek90GtJGDlxVhv0ApkxQFqFHep4ZgwHR+W4B9ltL4GqnGCLXiBYkcSm8IPBM6Z5Ikuj/KRi3Kk/h1b/R1sWGjZM0hzctuLInbdPIuBob7W9GPpRySTYR5AQK0FgxANmmLZiQZReUrxW7uzJ6mTVAi/GEkps7ZEJPbD9fNdmdtIHaUlDL/ZIXZH9qYofw+dclW2VmSoA1GVDP9/fTqzVA/M=; 25:q7yuxWL3mqdP37VzuUGMiyD6v53msWJ0dZZEcSt6siM8k6N+0XmAP9e+LfbfSsUucnQc5mBoK0XQVvyUZWec1QyqKXKOibgTVYotwoHCEBXK7ck9UPxyNlOQDIwD4QdwAaLjfsTv7shFmtNSkfaA9OrTbky2bzFWbNX0YyGTpm5q7r7yteCstJbc4oEYlnO9y6HOPYHu0IpHwtwJCusuIeTwmIVak/PVM8jqlqbmPBFiwSVjUY8PNhsoo9eWHxFNyOYpsZ7tRGIMx3uYAtwP8kpgCUGbi79gSU4tQd1y7rH5V9+X0wEe+q6umXWpuS26tWe3GZxv4nDYH6y8DtLBOw== X-MS-TrafficTypeDiagnostic: MWHPR02MB3392: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 31:/sxWWsWVnaG25GzPcBY2kMAFrfqE6LpqERos84DBXPEgY9LjEbKZbHkLRDlWAeVbq1UP/6a2V2IcaYUCn6S+ZzKzLcEyvHBBJjWRdchL4wGyiHfRHJiODbnHJsBkL9tXFGcnb8YfDLwrihckP04DU1+hwJ7sWWNEUK3Rzvl1vjlB4nUjSJvMTLRGYcRLH+bf07ltM/p/phZZZIM/tqRNB4EHO2hOXG4mVW5lBsqTU40=; 20:7VrcXyDyfavLH1apvrEpD92TetuOtsZoAOlMk9RiwFyiwe9jWFTulT7/vA92KOweIsbNDnI8VVyI1W+AqG/bQASjizvaVDVkWmWw67SiuzE6Uj9m/tQe7v1OnEuU9zUyo0h0L5QGytNCndBaVYsgy7oo1TIIA/91TfbJnrlGHQEnTCp0bwwhCx/OmkGIL3mQiO36pghDqa6azWlqmRkRIW66gDEgBQMOHGDN6oqoD1aeTkdfOsjkszsUmJ55czDPb3Goqfz2BXya9IBGmcw3sYXn5Zoiv4/YoEaf0NN2lo/NFSpQFru/viEmqu+1VRqXET5UZQ5VWnmZz7Kht1ptUyAvOPQ6a/czfIv47WK6Ds2szAAVARDdEoseOvuozDK4kSurKB+l/X3O2aCTB+rV3cWNwXRTzavCZLDA4hJaJFLAi33U242KSttEqVPx4auHU0rN+PpMgz+10MDaQwo+H4PssKqOuPl1ssR0lKVBnxHf/BVOxDL7bewhwaS9tZRt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3002001)(100000703101)(100105400095)(3231022)(93006095)(93004095)(6055026)(6041248)(20161123555025)(20161123562025)(20161123560025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3392; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3392; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 4:upnmC0gA3lLqyTgJTvU3wuJShzU8juFUSNtGZ00QDrNFnzV31+UobfoNP38HXT/IrVNsD/TnGAa9TtgXOZGr+eITbncniH2eSOrMEIZdqmOym6/EVecvJ7ZWIbNE/3Zz5T1hHdK3J1Vct7D8rcINYZdnQh68uWLAtYwQhcYQe3vFjgGCxT9tiw7t3uIABx8pS8wsmJfZl3XCXAoARe3OOkuUqZSRRTV8GOHAmNgyhX4inBpJMn+z8aKbRLxiUtN4Q2a2L1jlP59fx1tTIfL6Z4PoMPclgQqppanySQaJDPsg834JUomWERfJBgOXd1qTT+8tNM/ud7b64mpNRrL/vw== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3392; 23:b5F+TAvR0vSwY6wQ36nm7v3OJJEToJ23QTI9/IlIV?= HgqDqGKgYsoY0eSBObmpe4A6lH0b2ix5FQj6SRKPnYGAfVczjTM+SK0jUQiIXSoLesWmBq6HABZ5V2jIIQe/kIlcLvK8kIJRejzBvs87gJPS7LGsb7Jl67aiiZaoh/iRcBe/UKheyR+cPsL48b4TfJaoo/pFPoapSrom27g1VhKKQ4BsMM5zzLEg/enxInPz/75tp5FRB5gbdeHrXaYfLMlYVi/7IQfE0fdX/z9IsqmWOf47bJCItnVH0pPipgFNuJnDpvqfnIP3pjRUTs99q10lGr8tk98O+G/E+qbFcEndvN/3Gl9siv8YHhiZt65vG7L5Oc5Hn3ifWhXCSa2fD7J7hZ3BIpbCaB0UHQM/imyPsR/psWJo99mcV0+0GE/6KY9F/VGhCqs5PyVfVSbGFN7dx9huyjgNj7buo/yEePM/weeClBAj47gbs7VcHRAKT5gg/2uYDTSTPDGmfO+6gEynEkv+T3wnBwQmONO81p6sB1ldQ14Cxj4zTn+O72DCXcQDKBUFXAvzvB4GAp38QoEOxxDFsWG9PrMjhHDUnctXYvzELl7BFfVTYsqTa7veCc2br7/V07ILxInL66vwueerdMxAE0WYWeOuMPZtr4YPW/NvrukaTb8dsbOC7S9Xtuc3zjmxORTrIZo3LaPCKMpZ++nVAUt7etLSg4lcsv1zOzH5fcdVdCS1X+Gk8dX+8sETNgpzhcVgiW/oTTZFF3AAVoNOGEiQKNEkGqU7w0FIYwkQTRXmGdMwFvT6O/l5O6Fr6W1SQc5sJofqIBRxZvWPJb7jfesIH6Zub2nfC2UZKWSuQLxXfmQ9CVk7UtMXd+sdEn2MF9MDCoiQqXKAyQEu8xqnt8r8NPfaOq7TCoYfuSVeo0gbGYcal1yVLpW6rGgMMHXzQ5UZyBPbGP2cYRd/UmLJH0PYpJ0Ak778PDBSZXeaG8uMBSY8W8BddaVQbeqZMX/rM78sTHFE0J/j0wxQIdZAP876JhMeiO4DNo3WSx+KUF6mz8bd619CwasN+x8KiaH6kScMBaPDUxnVxpwzbCvwGsYXBCyP0MrABYWcQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 6:O6lSXvTjvICAPxe47FAEjkLHaVzHPM1nteImOARQk0uX6cSnUxXVlDGzCv2PR8sC22DGp8fEkK5lVRCvnWVp7My/l00waNtaDs17AashXTCRTDp1vHglI3JpuQ92R8e7/wc/mdii0VLxz+rsLKdSQocpB4o1LjMALUK2coSPUHC82PbFWgkA/SoRcUQeFuhsfR2SQEiKEh9tT32id0Fm/tPxsJfAhcCnZePtVj4BgkOc24h1u6xGry9nAc1QROxpJDzFXIZfQdeKGKI6EFDjJ5EBm++wVEUkIV8XAQNTtWJuOiOKYk4XDwUpa3PnmkZLenIVHdHq7d398WLAvTzQAW5YKGbMQUkQA5kueN6VDFI=; 5:lhmGdSYq8NlUwUkgCDHA+FCIq4GuIEOx5b1Qe/03mgjdq73ong74GYIWUuJBqS/rUJDv0w1oeDOIVFEkX+RnA1FF01WKCn3qb5il8eIy6LkjFNznQi40uJ+veOwRttGujR3VGexKJHbZqkP/q2LDKlAM3CAetTRBCqCu9kySAF0=; 24:PLy14AbiC6z6otGMInN//0UhOQADWA/GOvQHAB4+9RBqRy4ONbx8IRqIjdzdZD/0AJOwc7v6W7Fo8uRH8ISRyg30Xt06U8Izh7RtUeXHExM=; 7:J9Bvn9tYYZQh8z6ADUdUM/QQzAQYIdoZyJS+GfEsTy73ymciQ46cKc/1CiaS48paIdJM6sQwSdoqGbG1uJlhtQN/ZRflV0aHZ3LysPGsXRdsrfuOEwqXEGy2Y5N/P8EGNvsts62TmTUhn5nIZ5Jiv11JDJOyKsGmJi9X7Qnw9jdRiwoyklKa9y52jCtgqzyLVKsBAXxsDgk7BxYsHUzuYHELaBPmOMsRRgsjSNXyDYBmNQnAACqsKaufrNI83Sx3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:42.2607 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 428ef95a-2b8b-424f-d05b-08d52ae76ebf 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: MWHPR02MB3392 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.71 Subject: [Qemu-devel] [PATCH v5 17/29] hw/nvram: 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+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. Some of the message in put_unused() was removed and replaced with g_assert_not_reached() and some of the messages were updated. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- V3: - Add g_assert_not_reached() in unused function V2: - Split hw patch into individual directories hw/nvram/eeprom93xx.c | 7 ++++--- hw/nvram/fw_cfg.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2fd0e3c29f..6ffce745ae 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -36,6 +36,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" @@ -105,9 +106,9 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, QJSON *vmdesc) { - fprintf(stderr, "uint16_from_uint8 is used only for backwards compatibility.\n"); - fprintf(stderr, "Never should be used to write a new state.\n"); - exit(0); + error_report("uint16_from_uint8 is used only for backwards compatibility."); + error_report("It should never be used to write a new state."); + g_assert_not_reached(); return 0; } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 753ac0e4ea..1c66052f1f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -518,8 +518,9 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, QJSON *vmdesc) { - fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n"); - fprintf(stderr, "This functions shouldn't be called.\n"); + error_report("uint32_as_uint16 is only used for backward compatibility."); + + g_assert_not_reached(); return 0; } From patchwork Mon Nov 13 22:35:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837603 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="ceI4zP+a"; 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 3ybQnf48PNz9s82 for ; Tue, 14 Nov 2017 09:49:58 +1100 (AEDT) Received: from localhost ([::1]:56673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENYC-0005X5-Ho for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:49:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOU-0002xG-PE for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOR-0007LX-KL for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:39:54 -0500 Received: from mail-by2nam01on0073.outbound.protection.outlook.com ([104.47.34.73]:58242 helo=NAM01-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 1eENOM-0007HZ-My; Mon, 13 Nov 2017 17:39:46 -0500 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=M3PgPRa10i3NFmo0PWu2zgoMB1J64iqhXMoHZ3NZBqI=; b=ceI4zP+a2z84PCvF1dLMi3bJnnQT+ndUrZWaSI77b0mxRno1QkOehklplHJJ4yZ7uG8KcZZurluyU2SM5gnyEFCQBDsLLrWD7ydFaubd8NyUDePEZPoYDpSGheW8GqAbuML8CmM365ca/+oPMmiOjMhZ7ZJC+wfOlJQ0AiqypKU= Received: from SN4PR0201CA0022.namprd02.prod.outlook.com (10.161.238.160) 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_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:43 +0000 Received: from BL2NAM02FT057.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by SN4PR0201CA0022.outlook.office365.com (2603:10b6:803:2b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:43 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.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 BL2NAM02FT057.mail.protection.outlook.com (10.152.77.36) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:42 +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 1eENOI-00049X-3F; Mon, 13 Nov 2017 14:39:42 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOH-0000Ux-N4; Mon, 13 Nov 2017 14:39:41 -0800 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdcHh002839; Mon, 13 Nov 2017 14:39:38 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOE-0000U9-5T; Mon, 13 Nov 2017 14:39:38 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:37 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(4326008)(81166006)(2950100002)(50986999)(63266004)(106466001)(50226002)(5660300001)(39060400002)(76176999)(23676003)(2870700001)(36756003)(118296001)(2906002)(9786002)(305945005)(77096006)(81156014)(356003)(33646002)(8676002)(478600001)(110136005)(50466002)(8936002)(316002)(47776003)(36386004)(106002)(54906003)(189998001)(5820100001)(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; BL2NAM02FT057; 1:sk5znVeIXZ5mMm8cWk3BIimYz9CTlD4fbRPFZGuxiqm8qkgHhUVKmHH220ElbZ6tQeX9Fe2AuVQBhylUJGcTjuzyhCvtbmv+62oZRSkM6k6xtSBuzmjaBkX43/eBED7T X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6aba06cc-c800-491a-8f39-08d52ae76f11 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:9R30+Qwyr1uqf0KG1ocnbUe2vi0ne3Bi4TmKjmz2ZTh9Z8zD8yu3vyNlyM5n+B1C2CG8RbC+GB7BvkJ4MNWsgIDJjWUn8X3xZdMoRsPcW7GcOBkrcw78mfF+vZqCJUQBWNM90ky8XXlmp5o5ecznVjutfEfOA8HwlXER7DU6oNucK2F/K4Zb9id2aH52CNLcr6Z0Ux9d59QzGAxCZJFUxfuN5tEOmD9qO9BZhSDO0XL73KtN1mIR8sQVzTgKgTAGVvlv/gV/mLf3iZrURj2czbSe9qeJYDElmodZkvHVV4MKPvNeP4vQePj1ImAEFJ1hy3U7k+DU7y6b+GXknRiB22v0UcNngzVNUl6+cYy1nTI=; 25:WLHmP7XqpMqSDIvGqDbbr3aU1Wwxo6d6YjjjqQ5ISy21foP+22VMMa4rsdMuJF1RnS8sjfX7d0W3QLAMpemjNl4ku4EQvaDD2f9tP3/rxYsvpAYzGzeJOtxIInl+SSFCC2+4ad9XiR7kAP4G91x+JkYPfsJf5wD5X7sZNjWiOp0WZSCEVa6cj1aG77MPwFiC0tRlbKtB9rzKCoZafNOPJyOpikGFIERqiIoev8dkXphUa6zWBaIZ5Q++bdLsdP1KI9emRaL+OniRa4gL0GFlTfHKMincg905EkifeJEEi/Oavv1PNnH1UK9P4q9WMmoeMGwax1LpA8io7t96fcP/nDw6QsdsloGNU1PfFS4eLws= X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:evFUaEgoMN7ryxEKNd7tgNZo6A8fbbEBUpXtVbMFDsmYDVsvgjhWEMsrOqX5xHvil8PHKHvXW8Rn/X9fI1UFQthh9FZxENAtn/Rm0iQRe2184zDt230hYCxWJRtOyU3t74LbJc1rcJB8pJ/u3JEAABbPRxbPIAeqMDtMNxJSzYizjk6HyKi/dk6Kdb+8wxpx2n9ADCdmCx618Nl6xNgc0qrQI/Q81qiI13DYqjt4HI0=; 20:DtK7yPSu8OUnxttcMtwZsqjAbKjZWO+GVos12m99BkLZ6UGp24kqJpurA5A1QGvAQVWU1NMF/5AYjjvfZZOtn1JfFYYyMMHvfCNf/GJhrbhLXlRf82Ux7NhsodLTDZg7FrWJelXJTmcZA5NfAFpESXQVqMqUErO6FaIf9latr4UY5PIl2Eaflb9QUPZDFVBFfBaXKIC5TV6dQ8Dq8UTcPDutK2eZDfKXcQ1/T7qTBb2Y6Fts39pzvIUPt7aIWIFBBuVqfdlY9ZIeFkYyqi/scGpIPL6xppkJ/fUgWbToB0spSn1XzzaFTT870W/PWxEIZ2AJbMR8wBlXLY64dzLNxkM3/xsmXCn26kZxeti8iVBK7ChpyrzsurNfPjxqAMGTCkdRuUEVXLWLFFTwWbW1f8qpstwXgeVV84E7c0IXh3esgSg66qu6zwGCvvTWroRRUXSEu03gPJQALkVTDk1mdIPKPIfs7g0xk6E4zwB29tcIb4k0NcCwmt/Y7wHDM88x X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93004095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(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:yVEMn++UpFNh4YoiQIMJWoZU9nDHz7PjuzQ+dFSbBsXk6Z70/Yde6phAqMRRuH9b9c24wZt/XVRra42Gl2FabE4YQoWUzDTUy3EWaTGdGF4DnRpeV8RvAdSX7x4uSHFwMoOzNIqgTh0EoyJvfIMFY3HwR1dV/fs+95Gf1uj32/LBgHruUyA0Tgu3qskcMX5Jk9RTGdyJFcOF1dv+nPI5VBCKJny1eTzUMerIPHV8Y3XgnoYqxGTRn97f/TpXsMfpQl7yK4kC4KWs+7eo35PXnDAQ2pJ0OKXpp6LB2n50/XjfgMzr4JS60taCgh8J7av2eBisSrv2+11ts5A6VeqbYQ== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:2Y/1QTy5aMxwngu2qkfMtDPE+aCTHPlK0b9MronEZ?= 5+lwTmulLp7m5+kVzN9hc25H1vBYMAvVuGn8qaB6umhWuss7OUZK2nZIryfjSGBPPqCisdD2gPo3ifhhW498eq+Ope6ZRIpTFrXbrERuzwDdbPOiA9wg/IH1risBA2Q9PgCl9L4YIm8422QubzUTzq/7E7CPZ6/sVqd2i1T7fZasvXFRjXDY37E1WSssNq4YA4B2QTEJNbTpyJx0dZ3JrMM1XNJlLepJK7XweQLUMq1Ep9Rug0geRmD8zwdTWfXs/PDbXz8wEkphNHi8g7HbAn8cxoyD8dpWY4KKRBJZBM4hIsenAzfLMFaalGr8yVkcsoAADiHte6R5kwYBRrPHl9UYJE5N3ChgyRxcCCljYQt9kSmdsgwESeEhijnbiupeIN1Qea0tF0/aRX1cg3T4GMADbwdJpXDYIh+MbfPGYz+A089f+9TedDLyNFcAzAQb/BYUXqWfc1VKNumEIezrOSTvyqs8mpZ1kyyfeJHbjxBsxRIYEnSq4VDO6HqtCmyzbM0lMNDrUxi5Axz+3+F3SrV12xivYYhJ7XIJXEqXejCsovzWr3TF2hdlC+et0/RfR7cUhe9+3CJ3+7/9Xrp/wwWaECoZcw4IH+InFoqOIZI0fWaQYvP+sojWorIvleae8ZcBFPyhJzJXfa8MvtmTtP+oze4O1pXoj1rUiW7T6cDvCv7uhNwqiUnyPLSy8ugsjNATk94OhFLQEwXYqWDRVf0zo3rkLLNlqoIrYp4o0CPT7LWxCc8VT0D/Ds54qHNOOdYypgAxCCZuxgqCYcwraISPaFo4aKKAXc3QSud8FdMv6rOcUF+8234TMTS1myrvtfUrsIeIjlGQv0tQqyNlPuGDhec3y65x8+3mPyfQFsD1aeWuaPD/C5IG8wZnIi4KeQDpS2mudBenTk0AgFc+VpqGLTd+JpGijA5GH3FUp+dfmfORtOKKNOnQ5ybGxXXlXnV2GqkVLcacqTz6qly+SiG X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:s/GNRmor0EGFmXQcl4VVTaoJxNrow0hoKglzEY4rWvP5MK/aT/D8bR490C86rw+fuwBlk6yWqmofcUAeU4/8B4HY7oVONxXex9VEwOSOxiOaK9tMJ4jMdFpW9+JfxDaqtk09lZH3VV5Ii7Lj1J5qtxxTsFmErIzH6KHqQ7wYE2A2llWxL1/7xcnFRAQ8fJPFDtNzVq39vlcduPvqhZfsDDCsXCMTzalsmREETYH16SBO+2NFHed/jr6GCm4mhdGCg8VwofthGy6xalZYObYvlPDKwzuYAHfoGcVWnF1NU0JthcgV7aRklIJH5G/IgwCvtoOkzUhd6ZbxJUtHy9e3Xc4A+vpXDFjDtnDzhbQaSvs=; 5:J8ZSgshj1Ba6Ioq+P7WtMDXKeKvd3zXzrBkC+3dICe3xJz4hwjXFd1Cpu3Y3ZLHeezwS8PXr+AtJ2uCJL7CHlcqTe2nDqbVo7hgA8skqcATlCXh84hW9iVK+j2v/IVdvEahC+Hvy0GypJyqsjP23whcz+YAEdPvgIv7JbnXUxco=; 24:wxVKecaP5lhazmkX1seAKxA3+J4Jy3i+GC/I4HKlH14sCd/d4TgzGGCTrOufykRjFFzUYFzN8UeLUelwx/zU0J2UGv0ZvCfMCARfj493XZg=; 7:lQQb91Fp7hR96lgaU5tY7psq9xV0pjMkSjyqPnjIWFrhYuKX0faaWR0jQcuS11IEGXShTweUSUrd2SqFxXe95vCZPUgac8u2vjBs6f1o9tG6fsgdrJuTyGwODxBtpbjpD1VoqejLFfpr7n6TZlTkEW56Wy/18WkzuPs4bj7ifYvyKcdYvCeeiMqicLqsayJQyVY4BBISIVTI+dzJILHbTdhJiWIPDyja1aqNa7GIYHq/4s4mFbGRFJIb3m+4vWWi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:42.9526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6aba06cc-c800-491a-8f39-08d52ae76f11 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.34.73 Subject: [Qemu-devel] [PATCH v5 18/29] hw/openrisc: 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, Stafford Horne , armbru@redhat.com, Jia Liu , 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: Jia Liu Cc: Stafford Horne Acked-by: Stafford Horne Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/openrisc/openrisc_sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index e9558f1ca4..c755f11efd 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -114,8 +115,7 @@ static void openrisc_load_kernel(ram_addr_t ram_size, } if (kernel_size < 0) { - fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n", - kernel_filename); + error_report("couldn't load the kernel '%s'", kernel_filename); exit(1); } boot_info.bootstrap_pc = entry; From patchwork Mon Nov 13 22:35:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837605 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="fKgtcuyh"; 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 3ybQpx3H8vz9s82 for ; Tue, 14 Nov 2017 09:51:05 +1100 (AEDT) Received: from localhost ([::1]:56684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENZH-0006U4-Gr for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:51:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOf-00037j-40 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOe-0007S4-0J for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:05 -0500 Received: from mail-bn3nam01on0056.outbound.protection.outlook.com ([104.47.33.56]:19088 helo=NAM01-BN3-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 1eENOX-0007OQ-AE; Mon, 13 Nov 2017 17:39:57 -0500 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=rKaXFOS4KAo8UWMN294RGwqKKlOyuq2byj8SBO5gqDw=; b=fKgtcuyhI4MUew/+HFG4opSTlnjs0X6a1PBvJ4lG31o/1N7sRiypsPdgqXTauDfNHBYHcBkF7BN772MscwIhXNxjtRLvyoUw0+Sw3IKOpqipm3GIUSqNDSqikqLP1uEirnFNYV2VuYeJQp4XnulqQH1skRKGscyViCBeorIVU1I= Received: from CY4PR02CA0043.namprd02.prod.outlook.com (10.175.57.157) by DM5PR02MB3275.namprd02.prod.outlook.com (10.164.148.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:39:54 +0000 Received: from SN1NAM02FT019.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::207) by CY4PR02CA0043.outlook.office365.com (2603:10b6:903:117::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:54 +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 SN1NAM02FT019.mail.protection.outlook.com (10.152.72.130) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:53 +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 1eENOS-00049v-Jw; Mon, 13 Nov 2017 14:39:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOS-0000WC-HC; Mon, 13 Nov 2017 14:39:52 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdgvw002847; Mon, 13 Nov 2017 14:39:42 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOH-0000V3-U1; Mon, 13 Nov 2017 14:39:42 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:41 -0800 Message-ID: <2153fb50fa4599a802cea8abb71b6dd967090cc2.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 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-23462.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)(346002)(376002)(39860400002)(2980300002)(438002)(189002)(199003)(106002)(5660300001)(305945005)(189998001)(4326008)(81156014)(33646002)(81166006)(2870700001)(36756003)(2950100002)(478600001)(316002)(8936002)(23676003)(2906002)(110136005)(54906003)(76176999)(39060400002)(118296001)(77096006)(9786002)(50226002)(63266004)(8676002)(5820100001)(47776003)(106466001)(36386004)(50986999)(356003)(50466002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3275; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT019; 1:aqg5PvptfPrgvFBx3Oo5qEgAxUoJquJ2loqTgVZRT13Ew4rMvkM53OUouzQXRPTHv32V32UZy+Gzuv8jts8v+KETQaoQshcNeQddce/2DUtB2dEhtc6FAIDNVj9gGGcg X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff916a34-e203-4639-a4e3-08d52ae77582 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3275; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3275; 3:lZPUFK3tK0k8MRWQOGw5yYSRngOmJgDloOyGOWmKk4i7PHJ59eefS515rObSf7zrJjazxsOKETKwl4OIsFm1vPIY90P4NegUuVkYvPGHwHC1+KQ5yO8U99wOWqQ5uiSwNnFLcjN3xCY59d7cvJ6MsXdzsKE2g/+QLkem/nOFVybmCWR7q+korBOcxtTaGoeWguPO8X83gnPwo9m0/qpji+34w2R4m2L/z3NVSqqkCBld8At2IzIbOHeGCYKByOxs2+NleG2eWIylEImciuvDroK/PqH8MR8XSAGYPB4oFYMw1czAcG8vzjcESXJIbkChuMtt5272jphjF9k1Hq+WD7RuMeyROGn/IyZP4Q0g+Kk=; 25:LXyfVDRGePEl5ZLBzquMTi14v6ZkrNAlQyuUFjhlAoxD07Dk3LP/WSVZYHXN+egmr/nO+7ww8UgCnHaNx0XT7FBS73/1AYHE5kVfJWAIm1sfO0v8N8mjLlajuENm+nlgE6H966+LBF6vaStyhwclwE+Y+F3Hd80TMTLYpUzIVYA6dY+ZImRKqH20rHWsUn1BHGaLFJRQJ7QdHQBaZ4hGud4kiXETvTNOz2KC9Or8HN5jxLeOP0O0eiiK7Chow4xhdgTFOC1g/qNu0zqYVNVfODCTe3kJWBrAQbKBa3Uz9vCRcQM3aRIcqs8xmJ07qbZFcyNMk/YS+1dlxpcyPpGsIg== X-MS-TrafficTypeDiagnostic: DM5PR02MB3275: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3275; 31:uuRfU8TnSwbGOF1kveFzYGu5JomvDtdLMDEO4ZSnclLS0/R8t2ZK+e1tjKYTY9qSaxwe/HN4LcjySskL1li4c7AiT0NoHUUwS1dQPHAASe0cPrt0CSQfyv3vVRAUCmrdZEbau3IIfXzmpnMBNuvy5S/VSunCfhN5sBKuZWHRPjMl1w9tATDAIq72NK7OBLnPFi3DDnQjMq+YZc3ziymlir6SjokKvH7FQukqHYzGRFg=; 20:MkZRrWw7Zh1GAK02JOx6uBJ8Pu5fSXvCYltcEgVY2UrTmnnkPEmtHJD0ioXZ/Sl5QGa2bvoVQTI2w72S9PmufOSN1CEhQpxslYFelfwj65vBEunrztZuGm+4a5Yf5FIkQxmPs/pyV3H91AA8Dmja3E9LjmBTlinK85cXkPawggsWLaS6MAXP2jetqCDClX7i9MAvxrKpn0USQ5FNQeWKCNnRMV8ajVyVq+u+Vk2s7LOHLPSlSjCvFSEKYhq+8CGVUufnX0cKt5776SydG9e5xqlnWudA0W8P7YOTnikaepdfYlG56wZonl38W2Pbu7L/JKDeOL73bbOxiXWvNIfPYIz6ASqYcw9FMmJ3Zdf/2TWNJfPksZS4xmT1/rRoYiMK5l3upI+GcJ1+y9GHooRCPOq0EjdJd2l9bWwVVq4UvLwR/p6gSBAF6sMtIgCq2uakkHVlmMMjMazkJ/t2RVHUX3yz7X6tz5Odgj16vICVOLEMo+4rppt8jw+d+sHBBOVR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(3231022)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3275; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3275; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3275; 4:66pJJxg8EaHB4hD8Rb8O1WaMp3fBOegww4fPgFBA6r9D6dC86hXHoWNsiBQITBSxYkK3XMFz0IylAMWAgXNdiSo/gdvpyct3ylYG1Ee6ifxWTh3OF6OXPzYqEjgFFejLNfej4TZ1z1zmnLSOZoThgXZo0bEGYBu3X1jLbCgeCjPpT+DtPApOyCGep/xzwAPWprn9UHl3l+zEUTsR3t6s/jLT+ldWGt0ZAlr6x97DFrdOFYCStuN7dfv1UFor+aAD9CqvAEyKPD65Z4RD9tNTHkT4XllggaAvN9kmLrNN/bqlXtRFARWBD7LseCBb/DzCtgtsJOA4b6stKtNbbHrvbA== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3275; 23:iy3W10JeULc3nVaZ4wqtGYpo/IRe82c+Av6i1WzDH?= 5DXWw7JF2FFz6CXjpTK+Jxz775cGV2HXWxbLvsJoXJTflv9QPRB4147KzBZBWyQa7pq0+GJODIXcJhsg9ApAXwRlX5zdSMmVto//bwX+LguDoDcXMthV+MdB41w4bX7mLk4kati3CDB7ktZtPrZrdbR+EzM75kNiaUMsu2G9lBaiIuwaYH996P2eyPA/pRp8HAQJbfpcMv6SurYKfmDsapKlU/o2gRcKCWvfoM5QIpdCJs4dgQaG9qsxQ4saNUp+ASV/fVGkamVx0wwYFmC8HIVal7fUdYemTUqn560xyrHZflxoG0pSfbU6FPVbTydipCPj/DvVnM3LxPHOBhg1fyyPDu82Qtrq+w35RXwY2OWOXSbHsJ7ME6K8jdScjZGT0lRyPNENlmJpDK5Q4KjTQQg9ax65fQLY+PJurDx707MfAadAC+9hcrkGwOs5n0CMF2bpJE9k29DgU2Knkpf8DnOv+YVvNEl5gw76iiG65vqr3KGaISs0iH1H1Dw1UR8ncCJRHXCI4NMlqPmf+p/KmcMftxo8J5RtZSOXZr0y3dy7sAPyJD3EJCtVyAyRG18k9zPiD5zEiQlJ+yotb4EKkCyad0agKTMYMvaOVwWd68x6q62bwlOecPN0EyBBlsBKELHRBucbaR1Mp5VbBgs9GmX0Tw+FVREh73j4RuGUiNHGNid0bdNLgFHRXzqqyculqBknnbBvgrSXsbq5neWDdA0x7Ri0Kkzt91chWNgCO9QmE8LgKJU6B3Q1yFOFuox+mdLyCUM7+op6TlIZ8USl77wIAsOIL+TIhxSEISEOQN0zGvI6ZcUy6AXkvuq5jch+tLg4LKa8pEU3qte4NBmhMGkSLAgqVoud9koC2DU7snEEU0Ug5QvRYgXIUp8VgomnO0QD6oPlbuoJzOuELyZNyEz0Xtyss/1cG3xJTH1rwFN44o5bQo+WaxSi8dBPcSDT2hZ7cbWVa0g6N+oNrn67aCs X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3275; 6:H8fbsmkgyLNkjOrhHamv+0Y8qntFRdyL5H7X2dhUsM0iNAOJL73K8P+1e0MSZg5La1LQbDINddUsI980jEfPO+xoTNUOAlqJFEng2Oob7YaLDW/Y4fMC/WPp5zV0zcbiyslsnAPik6ml5UUrHeB2MbTNshLzwYF20UU7au0G0+rhJxxOLVzFshVCV4ElWyVRg+RuPjWphSDIbp4WLJ+8TzXDH4b4RRglsOye5fcZ58P8kTvUc3usXYhW0KP8rXrbPa9xKK+fSKgXg8XY6ADEMy79v18DhGlgDiocgBUuqLIhSqMORsINKoO+ld3ObFQHAbzd+pF8KnSz5GstR2jq/69GRn8hdq4E5TKFJVXWhsY=; 5:B3qJ0Qy+XIHhSS0EIuvjbHH+PAhzqrScEDWcAx/BHt7LFUZJuEWkoE83pxHkHhWlwzJVLWIU/HEhrB8LODII0LtsYi5jb2JEJJzOxpay+OeWrzQ4whiVtu0a2EUpQ2fzzXWzgsFqCzvFSf/TD5yGXfFx+7BYtHl6Weiu2B1KttE=; 24:F6vNPh6SHtFbsnTferq3VeFYBEtCcmQ2qYpokzkTAL+gIaNnxuRm2KpLHnd7cLG24y3Rpmh94ZMYm3YtyoMnM6sE9qqZkuOOowc1STJY+qQ=; 7:GqARCMF+/eiwK/fomLvqsiwCFm8dZEeEN8kBY4pTUbqtH2fsY/Ofxc8O07Cny4VKfw/u4Uw39OvSM6umOS9BqGYFx5Im6DM7qRoeSO1Fx+MncFSzBxMeP871IqN9JqFKOtTxbLF4xLz6Lp15uj1nI+GQ7WZn1BlS8VR/IVGI9vOxHsM2BJxHxa5ywJ1EIJa+8FirvbV9JTKvaIHNfSHS1oNwbKlliwnaF07qNdBH35rHhEOps+Do5DyAe9aHWDKG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:53.6195 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff916a34-e203-4639-a4e3-08d52ae77582 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: DM5PR02MB3275 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.56 Subject: [Qemu-devel] [PATCH v5 19/29] hw/pci*: 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: Marcel Apfelbaum , alistair23@gmail.com, "Michael S. Tsirkin" , armbru@redhat.com, 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. A trailing '.' was removed in hw/pci/pci.c Signed-off-by: Alistair Francis Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Marcel Apfelbaum --- V2: - Split hw patch into individual directories hw/pci-host/bonito.c | 6 +++--- hw/pci/pci.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 2ebeab5d90..6f2e589bee 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -38,7 +38,7 @@ */ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" @@ -449,8 +449,8 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, hwaddr addr) regno = (cfgaddr & BONITO_PCICONF_REG_MASK) >> BONITO_PCICONF_REG_OFFSET; if (idsel == 0) { - fprintf(stderr, "error in bonito pci config address " TARGET_FMT_plx - ",pcimap_cfg=%x\n", addr, s->regs[BONITO_PCIMAP_CFG]); + error_report("error in bonito pci config address " TARGET_FMT_plx + ",pcimap_cfg=%x", addr, s->regs[BONITO_PCIMAP_CFG]); exit(1); } pciaddr = PCI_ADDR(pci_bus_num(phb->bus), devno, funno, regno); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 5ed3c8dca4..948d4e04ee 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -525,8 +525,8 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size, for (i = 0; i < PCI_NUM_PINS; ++i) { irq_state[i] = qemu_get_be32(f); if (irq_state[i] != 0x1 && irq_state[i] != 0) { - fprintf(stderr, "irq state %d: must be 0 or 1.\n", - irq_state[i]); + error_report("irq state %d: must be 0 or 1", + irq_state[i]); return -EINVAL; } } @@ -688,7 +688,7 @@ static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, unsigned slot; if (!root) { - fprintf(stderr, "No primary PCI bus\n"); + error_report("No primary PCI bus"); return NULL; } @@ -704,7 +704,7 @@ static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, } if (dom != 0) { - fprintf(stderr, "No support for non-zero PCI domains\n"); + error_report("No support for non-zero PCI domains"); return NULL; } @@ -1128,8 +1128,8 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, assert(region_num >= 0); assert(region_num < PCI_NUM_REGIONS); if (size & (size-1)) { - fprintf(stderr, "ERROR: PCI region size must be pow2 " - "type=0x%x, size=0x%"FMT_PCIBUS"\n", type, size); + error_report("ERROR: PCI region size must be pow2 " + "type=0x%x, size=0x%"FMT_PCIBUS"", type, size); exit(1); } From patchwork Mon Nov 13 22:35:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837614 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="yxZKVfZ4"; 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 3ybQzc5Tphz9s84 for ; Tue, 14 Nov 2017 09:58:36 +1100 (AEDT) Received: from localhost ([::1]:56734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENgY-0005VO-Ls for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:58:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOs-0003YL-58 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOo-0007bb-Ng for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:18 -0500 Received: from mail-by2nam03on0061.outbound.protection.outlook.com ([104.47.42.61]:46625 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 1eENOW-0007Nw-TL; Mon, 13 Nov 2017 17:39:57 -0500 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=ioUUt0Glyka/OqpF4Rzcsc7Nr861Dg059qUhIotLBrQ=; b=yxZKVfZ4uDCooZKiH1eIlEDkWaafOYRxEVFGczhOE0rDR0xsiHb/5ZmHDjzbmo9lFC/g+YPqcz9DZ6YVReM3k3266MQd+tDHJJtctiCkQzdtgbfNiEMRdKLgjiMUXhp4uS4vSmgF83I4knsoG1gZURqXfnVnNwKWAKgbZSZ1I+k= Received: from BN6PR02CA0032.namprd02.prod.outlook.com (10.173.146.146) by BN6PR02MB3380.namprd02.prod.outlook.com (10.161.153.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:39:53 +0000 Received: from SN1NAM02FT047.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::209) by BN6PR02CA0032.outlook.office365.com (2603:10b6:404:5f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:53 +0000 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 (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 SN1NAM02FT047.mail.protection.outlook.com (10.152.72.201) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:53 +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 1eENOS-00049p-9D; Mon, 13 Nov 2017 14:39:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOS-0000WC-6E; Mon, 13 Nov 2017 14:39:52 -0800 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdj4l002851; Mon, 13 Nov 2017 14:39:45 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOL-0000VF-3t; Mon, 13 Nov 2017 14:39:45 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:45 -0800 Message-ID: <6cb7a17813bdc7df94d3efbe5d0b54d90e14ed98.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(47776003)(575784001)(16586007)(106002)(63266004)(76176999)(50986999)(189998001)(54906003)(110136005)(33646002)(106466001)(36756003)(5660300001)(8936002)(316002)(77096006)(9786002)(2950100002)(36386004)(4326008)(48376002)(5003940100001)(50466002)(478600001)(81156014)(118296001)(2906002)(356003)(8676002)(39060400002)(305945005)(81166006)(50226002)(107986001)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3380; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT047; 1:Nz1BfrmXxAIJd4atOR21cwQ/dKcwQncLluOh/xTaDPX+wvY371U5yAdVS/3crE+jZTwZY2w1PKVcKjry4ZQy2tk4jCdz2X6qj07DX3hFqXmQwsoc8qztxqyTzX8rbNvD MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45fa191e-b1e9-4873-543d-08d52ae77531 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3380; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 3:35D7e1ZdwaFVXUE8dnwoVMob2ERU0ZmqodyHjkNSOaz+rfu9QmjmzMg2NNCEPkgKjfMHdWaOHfF4y2wkEsnKjge8KvKI24TEp8roRVKxLMX5c4PRZFBCdE4mxKU9FxGsiIfUbfrjQ5Qu2GqQCdmvK+2G7ouVOicTmcEMMn+B1BA5SzBPPENF9BoHyquthGVYQhakE+lM4vJT6QL99Zc47lIcAYxC50pl62B6lSZzbhZ6ErkAnMuS3r7hclua7/2/jvt7mY+SYnBIT11xaM+SlTrU16x5TD5J3OG9i7f4Oar3Z/xZoIPQwCApkMUiYx9ctb4c2LRf5MPAVYslBWFAZRZTBkHMnHZEsuQq8SAp3jA=; 25:nMGf2CNIHhqBFHYLnsqty06gzjOwrgpG60zhthCdgdivsFzbYZRND0CKAaLHpRIEkSF3EjHTyrBsY8SS3V6Tgx300F9iUdQUiVQZluOJtEF7HyxKD6rkwzAmvzS7KSBdWisx/TDce7U7aDr6q/+KeTuzOcbyKZ1Bpd+rpIkslIFjRBbn58eESvXiOCRLTgr8R6F5yj9LbKTT5emtYe2eoqA2W6vgGAa1c8GNMU68v+bqQGfLtAQ5WdKVxt0H0t0IxEbFleye5MaHaCYR5FpSSY8AokAq2Svjencf5nrv53qtIoBkTXd71EUVNPKpmnlI908w1hFnpqT6C2T2hBVHZw== X-MS-TrafficTypeDiagnostic: BN6PR02MB3380: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 31:JKrHkx7smBeg/rnnVzStl+xHkV1e7uX7sx+ZHANukhKFvcFONRTb2I18UZMzclDf5u2NgztzSsRRIJtRCdjsdJSu8ssWC1imt+K8Y0SC9aHYCiCGhOVskE0x7NJg733ShhHzUgoacO866ZPMJ2m+z1yM4ezr7l+5NA/goXdyogeUOf/lQ4kjeY6KUiKeoFwiaJWdTnofmT48cBeab5KoWaBpVDCzZOTbna2hz2+F4q8=; 20:7TOV1bYrkvFAuoNo4+DQ5cJ1PeXmPNI1q4oKGvXnB3VMM7lAWIzq3mOlUtUtazDcjeUCN0N7q7eQ2IPmMprfmo0XCKY62WqwfpUGQ1im9W9BGmFTzLXEy3EcVKBZRoD30mGVUMhq7Ac3unY/j3FU1kR97eXMrXhZESrzOnfPkZhpCSq/9lzRc4PbY2GRHn94da9VOom9RECqnE43Y6wrTo4J+QMRZhHcb+CI/pjsf+i03X8nAb1xV6d7BPRCMBaIbj0ljBOBct6fr+KaE2gKppd+p8uRlPb8DvOjGE4mdhVeW3WEocd2ZlbvXP69xVi96phRAxsz1AAeDaxpNumpWQ2WmNA3fAfRptnGJYg+ChryyfMqJHnW+aVtiS/sJwUgpthmuKmNp9s42NvJ3hgBFC5Etu18VBcADESxTbT978fc+EAv1BntoLq6Wft8/p0HtKtasYJptbQSN+F3xWKsDU0Ljw6mepXQXszc1W9NZ5YPh6F4uuR0LQFqVvDMpQwy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(142945433499172)(788757137089)(192813158149592)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231022)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3380; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3380; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 4:3URWjnNy4f8J0cRm+1+Vqd8aHWW+1WoHMMyfMn7vOykmsrrO1GBKy1wTp2lHBdfsxAEi4hF2ZDS/5/pfMPDBkDyNaL/V7ldlhi127v2me01NUzdya+6gsMnSedeec0nYyqzRBVBCVqQVAm5KJT8Z8PSTDnwcmo9TPTi/mtZCz+/TprJ95BkyIeWYCHtoChojlhor+wNtnwJGsVYcZrkei+5rZtfgaFpxhhCMUeQEC5eNFMGS1OXWWZspPqwnWkfAkHK/RsWGXN59Cg1fnXBTuSaBe6GbumBwvRSnx6UjA5kKPwZERYkR890RsFuYzhNVDh3+9eHVTCoTaxnpR2I/xjQejXXeA5N5vqK1XgeNb3G+GiBo9U5ZvdxLtVhlE6bazH2e7/2MYLBXbqKm71KhCA== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3380; 23:bvOMk4H09VqMpGz4fDC2ZdMTor+OnNLiGKD2fsdbH?= mIg4jyBXvUgVrTT7+mXfFQD2n3q0pjAlyamcC2aJAfRNlCnCCVxTt23xpxdbaJlzD8+KAjek8ETYinkolQCw6ojhyDv7pL/U9iw8bNfQ4R6L3YgX620umiz7XHSz2r3KwlnHmbbrRtMIowMJrlPCZX2KCsvbRiu1EePyVKzG+QKBNVEWIZSMElfuu1vJnIRBNwMoP43apJXXYemU9vl6A2/RqUCK5ucnQLed9A0qYopWHaPB4u2x8UPryZ35DgWEHNCxr2Bp9tq0qmeILnbcjNNgIaj8pYPeOpE9debaV1wy3Jyf4spByH/0vytuOgWzp4NzZU7TbHbT7UkuCcF6J+4E4mGdTm1+HM1Zc92bwev+Eg4M+QD2mCTuvlUA02zOzaC4R8wfOdczqC9aJ67nD0WTxG3QPCdeuZYsEso72hTE4ifeZIMcT68T+qe6B7CVPGZYUbpZqmfie3YOH67FUXa4GBjbAw2V6IjhGYtFDvl91eR4J1HvrpeoxMqJEt7l+RIqRzfPXG9TsNz3lzdH64ngS0TRcpwJNcLizheQnDTyIls/RnBAYpvO1XV5/KpYHxsXuuYhH+5tRWjpotPfYY8ZQJomAgdheIZdJK2A1+zn9o2ePsY+oRIUWQb/kUDJwHqKixibYk+0c7Gj4Ce+5aVoso/LAS9z+CNvUI8BI1+NDGZkIkgYenYNhIi8UvProaOJIZg4JQ3kBjHFwCoHnAczoRSXXnlNhQNLEPeUbAThLobOsIPTktqa2po9Yb52fHu8uxDhAOT6tWpfHx99PFpjns3fkih0XPvriKyXkNv0M8eGv6riTx/GsMxq7oXLZIkinqSf7pDb4MSP8SNb9QIuI77N0g3ty2dKRi42kh1m5haSMYRF0gig9ccW9vreAAvCXzyp+Nn8YKVZ7QjIPkKJA3gPzJITcdKSCO6LO568Qya38rBNbdUn/ze5Mu1G2jQFUahdceUOMqCRhWbuIMcDiy7+71SATGI5Noynv1bOoIpeU0l/8jeEGBFYqKNTrk= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 6:m/SaJtd+nkhjXnCnkhsdHPKniRxZTqV+oTrw855xfa/+npKBTIA4esJN5qVWu2SuMLF+F5wxlIPzg4wGHNDjFex0IT7IDYyP/O0D/rFS+8beqhyOOFz7XcADrGsLtmLEypiImHdH8N/fBeFowxkQ4DowRXjzouMQ2Kl/b+OVBX4rcgFlsKz9KVyx/fzTo1tVlFf8ZTp41261MMgT/m/99+V6SuOUbB/FQ2yaaULu9iaP+MhfHPo/kjPbe7aQlrwqPV0i1x2BxR3aQ51ENTY0tWVKDvp8aXqx1Ri/dmwjsehzAcO2fbkpnTru50dkiU1IhFfk6N8WYqY9GiJq6FbvHbqL/aihIO59oYi9qSzMHLY=; 5:86oziGPAXRSb3t5+wlqfGDq0nr4tzUno7aHZIbKVp3ueWoGatZSyUwDv63ZMNNQ2TTzpmGvRYdYc4ffZNavbZW2kdYh5ucEBO+73iEB7zHgLL+pSd1+pr0wswMpovWzWbAcZVW4qV+ILWEbs5QQdAeRSMuoldewFwtGBGbW4dlE=; 24:w7YN3OyLgklCCCLoCMyNPaQNxPGK2wU+P9Ps59Bxwt7jtK6wqV925uUVSF89Q6DuX3FJ7o62GC2mE624V37s1B+C0lqwb9b1g9Iic9Z39sM=; 7:WH0hxqEsxKkkdiV+BkyON8RbsXFIwxz3G1RqQlRNp2PMMh8BpvxaAZSSXo6uj747Sm4hrO56NSP3K8JD6pzUNxZnxyWvXIvHzDTDqiCDlwE0QeEUSXnQ/LfvvEGR176dIe8qWEDlMt0zv0lgvQbiqEnilFMcUqotRw088R0Gam8eE0MvsO10eXeF/biHikIKyka0ShbVWa00vzZzCVYi3UnNUfITJB+DwtATADYiBDGTWX1g9gS6T0ab2eE+btsw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:53.1022 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45fa191e-b1e9-4873-543d-08d52ae77531 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: BN6PR02MB3380 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.61 Subject: [Qemu-devel] [PATCH v5 20/29] hw/ppc: 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, qemu-ppc@nongnu.org, armbru@redhat.com, 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: qemu-ppc@nongnu.org Acked-by: David Gibson --- V2: - Split hw patch into individual directories hw/ppc/e500.c | 22 +++++++++++----------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544_guts.c | 5 +++-- hw/ppc/ppc405_boards.c | 15 ++++++--------- hw/ppc/ppc440_bamboo.c | 22 +++++++++++----------- hw/ppc/ppc4xx_pci.c | 3 ++- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- 9 files changed, 39 insertions(+), 40 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 5cf0dabef3..5de6413c90 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -333,13 +333,13 @@ static int ppce500_load_device_tree(MachineState *machine, ret = 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"); } ret = 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"); } } @@ -353,7 +353,7 @@ static int ppce500_load_device_tree(MachineState *machine, ret = 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"); if (kvm_enabled()) { /* Read out host's frequencies */ @@ -720,7 +720,7 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Params *params, 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(); } @@ -809,7 +809,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) cs = CPU(cpu); if (env->mmu_model != 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); } @@ -955,8 +955,8 @@ 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", - machine->kernel_filename); + error_report("could not load kernel '%s'", + machine->kernel_filename); exit(1); } @@ -970,8 +970,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) ram_size - initrd_base); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - machine->initrd_filename); + error_report("could not load initial ram disk '%s'", + machine->initrd_filename); exit(1); } @@ -1012,7 +1012,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) kernel_size = load_uimage(filename, &bios_entry, &loadaddr, NULL, NULL, NULL); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load firmware '%s'\n", filename); + error_report("could not load firmware '%s'", filename); exit(1); } } @@ -1025,7 +1025,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *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 3fa7c429d5..b832417a56 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -270,7 +270,7 @@ static void ppc_core99_init(MachineState *machine) } } if (ppc_boot_device == '\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 010ea36bf2..d1f4546613 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -218,7 +218,7 @@ static void ppc_heathrow_init(MachineState *machine) #endif } if (ppc_boot_device == '\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 @@ */ #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 addr, value = 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; } @@ -102,7 +103,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr, } break; default: - fprintf(stderr, "guts: Unknown register write: %x = %x\n", + error_report("guts: Unknown register write: %x = %x", (int)addr, (unsigned)value); break; } diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index e92db2c66a..fae9c76174 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -324,8 +324,7 @@ static void ref405ep_init(MachineState *machine) kernel_size = load_image_targphys(kernel_filename, kernel_base, ram_size - kernel_base); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } printf("Load kernel size %ld at " TARGET_FMT_lx, @@ -336,8 +335,8 @@ static void ref405ep_init(MachineState *machine) initrd_size = load_image_targphys(initrd_filename, initrd_base, ram_size - initrd_base); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - initrd_filename); + error_report("could not load initial ram disk '%s'", + initrd_filename); exit(1); } } else { @@ -607,8 +606,7 @@ static void taihu_405ep_init(MachineState *machine) kernel_size = load_image_targphys(kernel_filename, kernel_base, ram_size - kernel_base); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } /* load initrd */ @@ -617,9 +615,8 @@ static void taihu_405ep_init(MachineState *machine) initrd_size = load_image_targphys(initrd_filename, initrd_base, ram_size - initrd_base); if (initrd_size < 0) { - fprintf(stderr, - "qemu: could not load initial ram disk '%s'\n", - initrd_filename); + error_report("could not load initial ram disk '%s'", + initrd_filename); exit(1); } } else { diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 693c215108..12f92b9f2c 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -12,6 +12,7 @@ */ #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 = 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"); ret = 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"); ret = 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"); ret = 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"); /* Copy data from the host device tree into the guest. Since the guest can * directly access the timebase without host involvement, we must expose @@ -186,7 +187,7 @@ static void bamboo_init(MachineState *machine) env = &cpu->env; if (env->mmu_model != 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); } @@ -220,7 +221,7 @@ static void bamboo_init(MachineState *machine) NULL); pcibus = (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); } @@ -261,8 +262,7 @@ static void bamboo_init(MachineState *machine) } /* XXX try again as binary */ if (success < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } } @@ -273,8 +273,8 @@ static void bamboo_init(MachineState *machine) ram_size - RAMDISK_ADDR); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load ram disk '%s' at %x\n", - initrd_filename, RAMDISK_ADDR); + error_report("could not load ram disk '%s' at %x", + initrd_filename, RAMDISK_ADDR); exit(1); } } @@ -283,7 +283,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 4765dcecca..807e91b8fa 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -20,6 +20,7 @@ * 4xx SoCs, such as the 440EP. */ #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_num, int level) 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 6f8accc397..17d6d1960b 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -573,7 +573,7 @@ static void ppc_prep_init(MachineState *machine) } } if (ppc_boot_device == '\0') { - fprintf(stderr, "No valid boot device for Mac99 machine\n"); + error_report("No valid boot device for Mac99 machine"); exit(1); } } @@ -594,7 +594,7 @@ static void ppc_prep_init(MachineState *machine) qdev_init_nofail(dev); pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0"); if (pci_bus == NULL) { - fprintf(stderr, "Couldn't create PCI host controller.\n"); + error_report("Couldn't create PCI host controller."); exit(1); } sysctrl->contiguous_map_irq = qdev_get_gpio_in(dev, 0); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 5ac4f76613..c1cac864c6 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, r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); 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; } @@ -215,7 +215,7 @@ static void virtex_init(MachineState *machine) env = &cpu->env; if (env->mmu_model != 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); } From patchwork Mon Nov 13 22:35:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837619 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="1lcnfV3Y"; 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 3ybR4w5JQ5z9s9Y for ; Tue, 14 Nov 2017 10:03:12 +1100 (AEDT) Received: from localhost ([::1]:56758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENl0-0000Nb-Rv for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:03:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOe-00037E-PN for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOd-0007Rr-Je for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:04 -0500 Received: from mail-co1nam03on0085.outbound.protection.outlook.com ([104.47.40.85]:24656 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 1eENOW-0007Nt-Qb; Mon, 13 Nov 2017 17:39:57 -0500 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=6sWQyi27uHIY1TM8CKvaqAnO1QdiwXyPrWQWalNx3pE=; b=1lcnfV3Yt1RQfbXKUFR8ZLEiDy0hwEt+eB9rj5+e4CR6EJ++kur8MBkjUdVM1CYkcB+2r2NC7Cxe8HbAXCN5wka9yTtX2RWKYAbGtCchfupBvSCVf5p5xbjoMAU/uHhLWBHy1JN89MF93NROIghsPBrQZF8+WE/p6QXeVUI9IsQ= Received: from BN6PR02CA0077.namprd02.prod.outlook.com (10.161.158.18) by MWHPR02MB3390.namprd02.prod.outlook.com (10.164.187.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Mon, 13 Nov 2017 22:39:54 +0000 Received: from BL2NAM02FT058.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by BN6PR02CA0077.outlook.office365.com (2603:10b6:405:60::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:39:53 +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 BL2NAM02FT058.mail.protection.outlook.com (10.152.76.176) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:39:53 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45864 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOS-0004W6-KV; Mon, 13 Nov 2017 14:39:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOS-0000WC-9j; Mon, 13 Nov 2017 14:39:52 -0800 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdmWa002868; Mon, 13 Nov 2017 14:39:48 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOO-0000Vj-7B; Mon, 13 Nov 2017 14:39:48 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:48 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(39860400002)(346002)(376002)(2980300002)(438002)(199003)(189002)(81166006)(305945005)(63266004)(189998001)(36386004)(5660300001)(2950100002)(47776003)(48376002)(8936002)(106002)(50466002)(81156014)(8676002)(118296001)(2906002)(4326008)(76176999)(9786002)(33646002)(39060400002)(478600001)(50226002)(77096006)(36756003)(106466001)(5003940100001)(50986999)(316002)(110136005)(54906003)(356003)(16586007)(107986001)(21314002)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3390; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT058; 1:et6rAp7gA9JhB4EWWx81dhfWAZu3Qk8hu9OlLDEBxg3ygjepYmhSvzjW0eRaHxKpiiCfq8uT6daptz12QE7T0ewfr/rt9JuiYbL7lVuqH2AekJbHMXp7CLdUmo1RI1X8 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abac19ba-3553-4163-cf3a-08d52ae77528 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:MWHPR02MB3390; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 3:0iPR1hY9BiMto2OyWrYp9p//45MvMA0F7p+8dBYOwhyFv2Q1KD4YEYjSi5od+5dtBduMDULg/IJh+ezfWKRXm+aR8zG9bKXIQ37zBOaDyErFnBj0W+af0DfZDNLvzZsi5cVHhNaMGlewGAD7d4Mo0Fj4La+6kXi+taTMt6jWCDjYPGvGb7hd7sh3AdAawiJYi6g1KM/MMPBh8chVl/G0vHqK/+SXxO5ES/9ofqBXPPkkWjUuLzPP06CGLjELl7z+BYgVa4UgF4Lsu7HohlXJgmfm3xnM9ynIGi2eHiwGysxY6x8EqlTxiC/spM0wVMIG5nrjvhRIew4IIMtb/8SwAiTgjNyWy8I+WkNz/r5Sh1Q=; 25:FHhsd88ZzBBMu0pwoM4+J/2fIH/x3Y2veqdEr6BfOuaQNqW4VdLEaWrFXo6ZJkE34D2lL1Ik3LXINUmTaJTMtF+D+Ynob6igyOingyw2LEEWk+Wj8fiejlpqAMetDwWY6stOUXPcw7KFc5RbICI19BqSoEzPN4J3tW9mGozR9oKZptC/ybnr5xGYgzsW6VTcvVBerZSYnuPortN5sPUPXBanvkCP8wbFwjW1Fw+1urkfR3iuLUeAVfCSpom4j5+cK0gLhmG/j3iBCVWnhossXl69oc53IHp1nFL2dClNTvBvyPSji6vsVafjcO49zFL9He9boh9KDHIl/covsE7pvCADruPCbnQg0sTQR7dY87k= X-MS-TrafficTypeDiagnostic: MWHPR02MB3390: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 31:XN3hvMy96EntHbvaGz+S4eVX0YXsVpvFCqgN1w+GmCnc67txQSAPlYPS3F/1AK7HU6UjnUSsuqQgpxlA5lhEyIgUBXKNrqPuYOCdYt5RPn/K37teNLBkdkfSiyLNx/X60k0wfxV68zMY4J+xEZRcJ4e0GXAl45+PYHz904cbuv4yOeBxFzV8D2CFBJg+JYbkHNddH5pGbslinlIHijBOZqPmInF2t+WzMd8QZ+vECf4=; 20:DbXYLMFlXr7O5x005SdU2EdYlBH4ubAZuD3N2bZrVg9JOzVr5gg6CEKcF0z6dhgXUGb9sI/mNo16QozeJqLXR+S8vOqJt+46T0SJinjGkfNqfzEqzeGvMuKb+gj0ortxXOKDItKRVF6JVC6JAiQi17ZQMBquXoNrfZVT4lWCI01BYd9ReV+S/aIzbh5Zuf+C5Ru69Fszyp9SVuYXz7gCWkW1dsTfk/yWoa2Jbgt8O3jpADn1uFZ4xLgOTz45tq3LVEQcm37aXRHzNEh0m6GLPiPqXC5WRdC5lbbM2F8+6DPrntr3ltDcdOGbM+VBoU/Sv9JJ6krq1tHG9qsU4EdkI1NbgLEUzqu8+BvgwfL9cfau59BMnQnw7XbgPcTexqzWotGZEAgSSMEbU8NSgiRWpX19Jo2rWb/igTf8TeVRlNa+bFqXwzD5MjsUT7gvkOqJ9R5yM1JOtde81KYUuHwehPluQY5rxBLVBA0ESyr6P0NLxVIqTndSGOp1FIX0pM03 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93004095)(3231022)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3390; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3390; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 4:KokkTrVH4OqgcZ1QEByk9+zWF6Ch3H/mpUDT0dVvpTmy+UseXc1QQMMsgPN0Wl+6pYJMKCxlAYxhk3JLJ66Ia0anI/RAIQPnUDp8ZP/A467ptbJ+hGjnD7cUPmjBdWGO5cbnJKRPbsQuKtw7XisqvfEgGetBYNNSknukHFkbs3T07M57i29ypsHQiYkhzg4T8oVZ53XNmySZPYfSDHwPYW9rAWBk/NYAJhNFQdV5OmvZElfJq06jYT5nU2Ho6LrbdIl2qZYViH77e5lOnVjCP6oVrIC6yoejGe4VBI0cNK9fKUen5yE93suZlJHWSYj6AsDqoE+/0TOxyacWdToArA== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3390; 23:QzK6CzrxuHiJQ20XPj44p6ZGiMqN6NZPV3XREDLkn?= Fis6t/pZB+fCR0xipMLHUOivL8aG/q8YT5T4wQMeoboOA8hgMfNnB2y6j299jl2/mVFa0GKEXNcPDsVioD3I+X6mt4G2XFpx8/C7kXpdRbLsDkazhox2lJf/YzNmh8Ry3V0ZwrxaJXzE7vL9VHi8sRBnkLOr9cichUTvyKqYqzHaNDmspo0l1p4MYTdprNqwIElnPGpZZ0zQ+5j9qUHjFlL00/wa7S1pCSik9Skox6wD9m3k8kRgD07G9PIttdHLMD57+Z+zbOiQAP3Ls5ismY6q+J8+uK9LVIyXgLHfMmxs35CNxHx9fkv91EpsSsbdMBdcr4pnJemARUhyY5IB+FyUSCLRc168q4L1udBX75lNsxXJ8Jz9ZWOjhdKk0S1qUDMiS2mo/qLaog/UFJdTGn6+Dl9MyUD1HXiWkTJwuVNcem2IvU1W/1t+rG9u42ElNOigXXKgqnofSEk4ugLCAGGwB5KIhhv5ayg/2U2lXdIOKEXRUjjuBmsix5qjdHbuN1hU3t91pGV0zYl9+5tkSVv2sFkYHEvNmzrqUSWgpc9ebwpyhfmW+Rdb8x+y5qEWlr979aSfFl14XSnv4p3O/mbxfOflxDjaY2lcn1VRfutALSnTChwFT2qSZLG9A96KsPfQIcVu58ilwHGNUEkBwoehrg3+xb4wRV16JRTYU2ka2lc3ZFxMYE8YGW3nXSttpKY/auHMA7FOmdm5UEJ33pIO2AIiTimu2g6LkaVBgMNXyx212hQIRXOfWS7tAZHsuanx87VTRbSgYk+yyv+qNX5/AObpXGqJPwSBE20vS6V3YarPYyvHM+B9pa88/4paf900nBwqmOufp94iWwE+zfXPPLOY7Ds/L2NntHgk1xgIPbCRZB6/2w6p/czo+AOI4ijDhmm/OrRHnVgH/CvOLUjXfl2ETb8yChAI8oOhwVZpz0Mo+2OkZ8yFNVPeKLWg5kRqMOC4qL4nPxstF+PLzefKzde1mG0XjFdWTxJNy0GNKqehDS65j0Jes/6xbUgqk7pApzE1T2JLzK59IFTZnqq X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 6:sene2CoMyS2lmiZq1xZHGKixF4fgBEP6DBLXPHCQeQCJh2V+DuNqAxhiHPkf6ulEtkjy+1yJA/fSErBPEF67p0n7WeS3cyUztjsJNsvkuZFPHPF5KawwMy4hAOKUK/c8mzh/qaDxokDz+gruQ/xnI8aNaMWk1jN9R9lwJsigNV3s66cfyGgUkk7bnS45ctWPPqhAgNS1u61L+SpUMQ5dS22+h7nieSVKsH1rPlCoyBcv+saItQ7S+e7wgyx6Gr+E7zNLwbOO2Oxi55DS/KGAFBFphI02G4MqI3ZDlGqN4PyQffkJr6A+a8LDG2sDQQBUpnkr5lNI8biMrviTiG9VXHYfI+xoYm8KENbIpNRpx6s=; 5:rWOn3yAOWUVUd/+F/wXV+Z2bwhAfUQQOS0wI5IgAG7Q+N+M+tmzPMKeFJp+mwNRoRlRebaUYk8YCLp9c8q/Dod1hwoXmY95BM3KZ18TUALlLQWhSuTUV0bqdvcc7CQP6NRTk81nLGwc2cMfQagiMmj2M5GArVRQcbX0RRnq7iMw=; 24:45I9Zv5sflUIGIiskYSbJHX2BkAHQUGqRyh0A/EAP1eJeE77ydjlK/Cm4Gw7oU2cCp5NPDbphKdI3xf5nvM5uzEID9kqAQSdTLkRLMrTwIc=; 7:LyN7xighAhtfjXL6Q1db9V+OtxweoOOT5bdnW1lWm4Nj/Ga6qQL49MWfHsEfdfa1dsymJe2YampI7O6anlHKV2OhSwuwP5d/rr1Z3XxlnvS9K+R4BnCrTp+u7mXUjkHIeUGKuPfkM7ijgJNimGMlRyyS+Lwnh5fnj8gJ97fiPYBYpHdA2NOSNk8jjfrDeRGw0N3cNf6SzWOc+n3EQmmyQJpE1gfcl+RjJt022ZB9zmrOiWpLE9o5a81vd+dXWNEP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:39:53.1557 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: abac19ba-3553-4163-cf3a-08d52ae77528 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: MWHPR02MB3390 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.85 Subject: [Qemu-devel] [PATCH v5 21/29] hw/s390x: 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+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. One fprintf(stderr, was manually converted to a qemu_log_mask(LOG_GUEST_ERROR, Signed-off-by: Alistair Francis Reviewed-by: Thomas Huth --- V3: - Use a qemu_log_mask(LOG_GUEST_ERROR, V2: - Split hw patch into individual directories hw/s390x/virtio-ccw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 184515ce94..c1dac3325f 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -426,8 +426,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) * passes us zeroes for those we don't support. */ if (features.features) { - fprintf(stderr, "Guest bug: features[%i]=%x (expected 0)\n", - features.index, features.features); + qemu_log_mask(LOG_GUEST_ERROR, + "Guest bug: features[%i]=%x (expected 0)", + features.index, features.features); /* XXX: do a unit check here? */ } } From patchwork Mon Nov 13 22:35:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837604 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="iM1aBnUt"; 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 3ybQpb38dGz9s82 for ; Tue, 14 Nov 2017 09:50:47 +1100 (AEDT) Received: from localhost ([::1]:56678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENYz-0006BK-G0 for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:50:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOs-0003YK-2X for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOp-0007cA-TZ for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:18 -0500 Received: from mail-by2nam01on0042.outbound.protection.outlook.com ([104.47.34.42]:55486 helo=NAM01-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 1eENOk-0007WW-4y; Mon, 13 Nov 2017 17:40:10 -0500 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=3D9f0Ji5BrzqsPCESXSQjjaH1NICRmQLtYa30yJWLOc=; b=iM1aBnUtSFkdMktOak4MR1aHdEwp2brPUKBqZIDTGksE1vRqsObD93uCPYIxBH8SOExLsDYx29+7nlcLx7j58YXrnhCJJRkK93xHyykoy+0tvLr8pEoY3ve7cZKKmbnjzfT/AIbpIO8LNXPvXi3B4fxckp3QW1DbmPwEdToPwO4= Received: from MWHPR02CA0033.namprd02.prod.outlook.com (10.164.133.22) by SN1PR02MB1343.namprd02.prod.outlook.com (10.162.0.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:40:06 +0000 Received: from SN1NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::201) by MWHPR02CA0033.outlook.office365.com (2603:10b6:301:60::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:04 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; suse.de; dkim=none (message not signed) header.d=none;suse.de; 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 SN1NAM02FT035.mail.protection.outlook.com (10.152.72.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:03 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:46318 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOd-0004WK-1y; Mon, 13 Nov 2017 14:40:03 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOc-0000dB-V3; Mon, 13 Nov 2017 14:40:03 -0800 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMdpbl012670; Mon, 13 Nov 2017 14:39:51 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOR-0000W7-8B; Mon, 13 Nov 2017 14:39:51 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:51 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(9786002)(110136005)(54906003)(316002)(39060400002)(16586007)(8936002)(50466002)(5003940100001)(47776003)(48376002)(4326008)(5660300001)(36756003)(305945005)(50986999)(63266004)(77096006)(81156014)(81166006)(76176999)(106466001)(189998001)(2906002)(50226002)(356003)(106002)(33646002)(8676002)(118296001)(478600001)(36386004)(2950100002)(107986001)(21314002)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1343; 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; SN1NAM02FT035; 1:jdr7VteKzgpolSQn0tgm2VCRosFKTVybXpQLpIWmtpgf2VbLhGwPLSijQxyyy5w/U5dKnJxXtmgjsafch6vau/7XeSiIXEdEzFXVFy1StsDxkEiWlV6nYYqfsExwwOBc MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f51ca6a6-f6e2-44fd-bf1f-08d52ae77b97 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1343; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 3:vxrp71TQfL/iKj72gLLqA0EuftSTG4vwlzXJb7XVCPPEBw3a8J8ArN3eSt4fMVXqCdCO0bXYb0ioLY1iSEbPBPtu5x4c4WjswxE6E36lT2uE/gflaNbK/sNm4ncC9or6tkWCHsBhCiRDMHdEeqXuk5oc70P1d1xYrBTerNQXUBdgVrFBStimJhN92RR9yhu3+TC3ekrgimf0owLDvDEjAX85kFQxn4vWVna+8MqGgc4hDx9/fruTuMBdWuDphik/C1dVPMkt+AK9v8mHMgVqnCh6F7SfYWVR+jwdQd+1mMxgiGZeVafgZ2e0WGvvhm2NX45yu69zFCSYtGE9Vh7Ak6Dl4Nlq9IRcnQHwh9L257o=; 25:BgowZ0djnJ4AwJTJwricXK8eL389yzPNHxDqEEBaoqXLb57+9qKwOyUwZLCk9NpEf9kveSuLDVbuYirp092uS45yliIMRfvmLdZoZe+eZEON8fZ7uRh4Mama78ORyydsPEKQcNrJkepiohwErzrqEbkLAG8uZZgccTkZcM+e8iT/3euJICT5GaLU7TaGrCPXi7YMx/NmuRSE4DTyP9L57uOiJOPtJ6EdvzXI/mo7L9tiLoG79cdTQQzYiD3jdxyj9rrzJTmsxYZiAgc20t/z69Xgu/8H1R/ybtI+YpXL1cg094ZFaTTcztbwiSQ8Ydy6TGR7rZNm/Y3RpxNZoFORVCU6qzopwliiEV7VkbEv7OQ= X-MS-TrafficTypeDiagnostic: SN1PR02MB1343: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 31:Caz9to2S0kwFUfzBM8405mVRkixiJPjCIKcAksaShUy9J2XPGWQ4tmY9eBmcX6h3qMeUT+GZ3CMNApBGmTlflt8RSA1GJPOL5n176Il67O0SO+GuRsjSePAhUxvb1gBlwwv+oCaEFO0B+UbskDYxY5ivcoq9Y43YjzZCTTgeHwTZm0E4+NhraGLwxctYZ1h15LMeCVC4YxAQIYFwjC9CyuMW6rG6P8qmd3dVR+3I4Jw=; 20:MtyyKv4iizxjLIIkd/nvBPZzyn8vtB4xs0UtOPaMUokMH2DBCJicHuyZvkeIHNKglF762/afMR1443wnm3T804Ic43eG04JXvVzTTmNf3waE6jcgmTo4grkPk2hJqQ8SqXxYEVPXYqoZAmoH7NsGz6bCPiZyp4hDaAHgV3r1D7Lot+WGH1iEeTnLPpC+rIHAPxQ5L+re1CNQc0KgdSgUvmUoqBFn7UbhINSnM2+T0SrpVyPOYE3pzUqGFDVfyGsQaZ6sZgsZsdJ1L9iMJqdSrVRecqa1kn/i1KCkEU7Qts9Dfs9k5fwz1qIiYuRjYjnrHK4BrLDcdP4SP12iiU78KWix/QKFzplIeq6vZTEhbpg+LEWH7YIVu+fIpi7NOvs+8NiWrnPpGCI+8oqwg1pb0pJpfh1hbf0MRYFN+tzQUrDyBX8b2gXEoGwqlqLSjAP2wCeBBJ+VqTqdjSEu8FTLeDfFB+lpnO71MLx0OZ31I1XFpKhFdyTYb+FWxfzqmB/J X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); 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)(3231022)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1343; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1343; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 4:TQHqDZH1NNGZ+iVae8XvhcyM4fO8/vim3zUx8xERddgKWCmJEU2/TUAbzXETWFCDTmEcCP7384ZDPiNhSOxw8tBC482C4B7kjISU2vGStvAiwhm9x1KZ0oTl2u5i9p95+ScEnWvQl/wxQgKU9zjQy6dhR6/5RmInLkUMPchhJGYhsB0FwChtqBBcZvXGwWtz4AiqsFLRGhMI5GZeT+syvVGR3BKvfq4Gui3Vnui2Bw0StNCEOmcv5x28zCxqOXYn9coo3lldb3LTrNatMT+XbKqCq7WOG9GCOJFd53ae5RXtcFNJ19xKhv9mPg+pA98su4GtwrMl2VcHQGkMxFa+hw== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1343; 23:MK4A4j/ccxIIrVKYgNiBuOpquy9rEEBaxZggmwXl9?= vJkQY27yLy/U6014dViUnDbJqBpFLitJerjMHOfjX5uLJwlofn6ra2OWeIpfOTyzf+IT59+nJFVyvpeDXa+Wa232PaVuWRBVE9Eh4F1LrIYl9VlYMhBoLYHmnMLq20wD3uKtZ85JBJzyjElGckdUu/ThKsB9yBDtG+EVQ2wN7BHkdbY++zJZPuapqP05hgTUHZtwZ7SxThWC6R92MypTSZ9l2Zw/DNVNhn/05NL4mPQoM7oP7WSMq9jU3XGGjRWCu7IowRjRRdHnsyd/E2q+UfFeMLu5WCbejTCnIb2TtQoT28yR23D07ZJEU0uJXsI0tzDe/WtRwMrruXUHTqVenHkDZhqMlK+lTjVF9wDULFwG5RCFSFWX8AQiLn4Yk37QIv7+39SrMHOcqAt0bj5jvURpJlKCMP98t7yb4iau1C4khlYiENnfDlWbHCt3GXDbqA5xI45lOQtFvvdg8uF4B5/lPwlSg6YxPqnMuDlLPcEP0S8d2VwECIg+vZLmH+/gyDHtMxefCXYjaEXKiEa9T8wUwq8lomcqhURxMV9sY0CLiOCYxWlXPto/3itLIUQRBEEk+AOfDYpmCpnWQtzhEbYd8aiTySk8Sv91XhG794S2qEleMJQXB5C3BNQqAcKO5wbu4cGsHWxaqN4tBxIZ2Wp6H5Cp9B6CeR3BP3zp7LxWjHncMhCTiTB+OW2ui9O5AmQ3Dp9X0JHg8/ndLFVrz9Sz/tSlF299c0jDPpADCujcEbtX+ww6bldwljD8GmbBB3OPb9eU1uKIgLHctxn37svsjbuL8aQpziCWDLmz6GenZ+nU122mMdE+AO1QzL7MQP0VeX4sxChjS5RhJ9XZ0NjtLHenxET+pQvL4oFyz7ZzLOmCqmBy4cc+g22EFxiJGgT12sPq2RC+0N6e71zix2yvnvf8CLkwi0yLpbOHSagSgwyEx41F6a/PTzg4fFHKI2IJP7K8JXA9n6GSE2PDIr6SmeM1EY7P7l6tIGEZxk2Habg0VPG3ggftMWGa3hU/eNIEqEmqFZjRO1SNUxbdykJ X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 6:HYZB99KPTEE+TmNl3MewK75v6Z4JIHITcr34Aj3d91+vgcYtsTT9WPV2IS4U3psp/Ir9AVXJzrVMIZOLEKmv1a761AjmuEY5Ix6MNg3wYV4bAb3+xA5FDzKeZegrS0ePSwfkwK4pRoVB/fzP1sDHrWrW5oaM9iXQ3zdWiahho/KM+pphqzG93CIf47V00GmuyHbyuzQqXHzfnMipiPRrqRtA280hB5r3ZsiP9UVYul8DZzdwMBwBNoXCj7mAMD2DT+l/wUGCoGLG6LG0bWvcbbK7r+w0XJ+vwyXFitMXafclub1ToL6tCAPFoSsHOu/33gWP+SBfvr4EYK/arSfvnnUhIyXDxLUhLDpNFk8YWT0=; 5:nJ5HmepNDUWaS+8TQSTgKteV4bzgzUVUaPU5lVm6qWTHmcSnv3qOKUW37hYnhoR25GwiQtmUTqkmh7uVhy5GwfTi6P847nEIYc6I5zoJwRgrSvke2pL055WC5k+yaBlD+edXhnR74m8jJoZpceNQqmqHNciwDUeYbK8eAbIhZ20=; 24:zeDvA7L/6VL5txnDixuod/b7T1zx2v6Q2inYDE8+WB0knWay6aQXW76Q9KA0LR+51GH7w/2iBAsmBZPfKFEVi0b+72a0tryTGmrvDIJOU5s=; 7:tUdJroEhHtGlqF75XH8V1nf6aY2WWm5RuRWXZXtMafGQgCDG7OqbJeq40nALS/uxBbsxtwZ4PMD+OXJikyPX6sFOEqwjrOg4WeZDrJzpWDxrhuuMwclYSX97/4vPZkb9SVKwIWlTItnjRVtVtddNsQXPKDbFIJZl/Bxg/cG5NE138b6UQAzCR04JiIPJky/O8Jc42rDJUgkt8u+Qza01PVG8EmG2IR+2nzYFolLBqrtwf2WwK9Jt6wtuseJN6HVY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:03.7616 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f51ca6a6-f6e2-44fd-bf1f-08d52ae77b97 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: SN1PR02MB1343 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.42 Subject: [Qemu-devel] [PATCH v5 22/29] hw/scsi: 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: Alexander Graf , armbru@redhat.com, Paolo Bonzini , alistair23@gmail.com, alistair.francis@xilinx.com, David Gibson 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: Paolo Bonzini Cc: David Gibson Cc: Alexander Graf Acked-by: David Gibson (virtio_scsi part) --- V2: - Split hw patch into individual directories hw/scsi/lsi53c895a.c | 4 ++-- hw/scsi/spapr_vscsi.c | 49 +++++++++++++++++++++-------------------- hw/scsi/virtio-scsi-dataplane.c | 6 ++--- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 191505df5b..7c9a930e2f 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -14,7 +14,7 @@ */ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" @@ -1501,7 +1501,7 @@ again: This is apparently sufficient to beat the drivers into submission. */ if (!(s->sien0 & LSI_SIST0_UDC)) - fprintf(stderr, "inf. loop with UDC masked\n"); + error_report("inf. loop with UDC masked"); lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); lsi_disconnect(s); } else if (s->istat1 & LSI_ISTAT1_SRUN && !s->waiting) { diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 360db53ac8..8c4eabcf3d 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -32,6 +32,7 @@ * - Maybe do autosense (PAPR seems to mandate it, linux doesn't care) */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -179,7 +180,7 @@ static int vscsi_send_iu(VSCSIState *s, vscsi_req *req, rc = spapr_vio_dma_write(&s->vdev, req->crq.s.IU_data_ptr, &req->iu, length); if (rc) { - fprintf(stderr, "vscsi_send_iu: DMA write failure !\n"); + error_report("vscsi_send_iu: DMA write failure !"); } req->crq.s.valid = 0x80; @@ -197,7 +198,7 @@ static int vscsi_send_iu(VSCSIState *s, vscsi_req *req, rc1 = spapr_vio_send_crq(&s->vdev, req->crq.raw); if (rc1) { - fprintf(stderr, "vscsi_send_iu: Error sending response\n"); + error_report("vscsi_send_iu: Error sending response"); return rc1; } @@ -330,7 +331,7 @@ static int vscsi_fetch_desc(VSCSIState *s, struct vscsi_req *req, break; } default: - fprintf(stderr, "VSCSI: Unknown format %x\n", req->dma_fmt); + error_report("VSCSI: Unknown format %x", req->dma_fmt); return -1; } @@ -518,7 +519,7 @@ static void vscsi_transfer_data(SCSIRequest *sreq, uint32_t len) trace_spapr_vscsi_transfer_data(sreq->tag, len, req); if (req == NULL) { - fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->tag); + error_report("VSCSI: Can't find request for tag 0x%x", sreq->tag); return; } @@ -527,7 +528,7 @@ static void vscsi_transfer_data(SCSIRequest *sreq, uint32_t len) rc = vscsi_srp_transfer_data(s, req, req->writing, buf, len); } if (rc < 0) { - fprintf(stderr, "VSCSI: RDMA error rc=%d!\n", rc); + error_report("VSCSI: RDMA error rc=%d!", rc); req->dma_error = true; scsi_req_cancel(req->sreq); return; @@ -547,7 +548,7 @@ static void vscsi_command_complete(SCSIRequest *sreq, uint32_t status, size_t re trace_spapr_vscsi_command_complete(sreq->tag, status, req); if (req == NULL) { - fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->tag); + error_report("VSCSI: Can't find request for tag 0x%x", sreq->tag); return; } @@ -639,7 +640,7 @@ static void *vscsi_load_request(QEMUFile *f, SCSIRequest *sreq) memset(req, 0, sizeof(*req)); rc = vmstate_load_state(f, &vmstate_spapr_vscsi_req, req, 1); if (rc) { - fprintf(stderr, "VSCSI: failed loading request tag#%u\n", sreq->tag); + error_report("VSCSI: failed loading request tag#%u", sreq->tag); return NULL; } assert(req->active); @@ -827,7 +828,7 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_req *req) uint64_t tag = iu->srp.rsp.tag; uint8_t sol_not = iu->srp.cmd.sol_not; - fprintf(stderr, "vscsi_process_tsk_mgmt %02x\n", + error_report("vscsi_process_tsk_mgmt %02x", iu->srp.tsk_mgmt.tsk_mgmt_func); d = vscsi_device_find(&s->bus, be64_to_cpu(req->iu.srp.tsk_mgmt.lun), &lun); @@ -932,10 +933,10 @@ static int vscsi_handle_srp_req(VSCSIState *s, vscsi_req *req) case SRP_CRED_RSP: case SRP_AER_REQ: case SRP_AER_RSP: - fprintf(stderr, "VSCSI: Unsupported opcode %02x\n", opcode); + error_report("VSCSI: Unsupported opcode %02x", opcode); break; default: - fprintf(stderr, "VSCSI: Unknown type %02x\n", opcode); + error_report("VSCSI: Unknown type %02x", opcode); } return done; @@ -953,7 +954,7 @@ static int vscsi_send_adapter_info(VSCSIState *s, vscsi_req *req) rc = spapr_vio_dma_read(&s->vdev, be64_to_cpu(sinfo->buffer), &info, be16_to_cpu(sinfo->common.length)); if (rc) { - fprintf(stderr, "vscsi_send_adapter_info: DMA read failure !\n"); + error_report("vscsi_send_adapter_info: DMA read failure !"); } #endif memset(&info, 0, sizeof(info)); @@ -967,7 +968,7 @@ static int vscsi_send_adapter_info(VSCSIState *s, vscsi_req *req) rc = spapr_vio_dma_write(&s->vdev, be64_to_cpu(sinfo->buffer), &info, be16_to_cpu(sinfo->common.length)); if (rc) { - fprintf(stderr, "vscsi_send_adapter_info: DMA write failure !\n"); + error_report("vscsi_send_adapter_info: DMA write failure !"); } sinfo->common.status = rc ? cpu_to_be32(1) : 0; @@ -987,7 +988,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req) req_len = len = be16_to_cpu(vcap->common.length); buffer = be64_to_cpu(vcap->buffer); if (len > sizeof(cap)) { - fprintf(stderr, "vscsi_send_capabilities: capabilities size mismatch !\n"); + error_report("vscsi_send_capabilities: capabilities size mismatch !"); /* * Just read and populate the structure that is known. @@ -997,7 +998,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req) } rc = spapr_vio_dma_read(&s->vdev, buffer, &cap, len); if (rc) { - fprintf(stderr, "vscsi_send_capabilities: DMA read failure !\n"); + error_report("vscsi_send_capabilities: DMA read failure !"); } /* @@ -1013,7 +1014,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req) rc = spapr_vio_dma_write(&s->vdev, buffer, &cap, len); if (rc) { - fprintf(stderr, "vscsi_send_capabilities: DMA write failure !\n"); + error_report("vscsi_send_capabilities: DMA write failure !"); } if (req_len > len) { /* @@ -1034,11 +1035,11 @@ static int vscsi_handle_mad_req(VSCSIState *s, vscsi_req *req) switch (be32_to_cpu(mad->empty_iu.common.type)) { case VIOSRP_EMPTY_IU_TYPE: - fprintf(stderr, "Unsupported EMPTY MAD IU\n"); + error_report("Unsupported EMPTY MAD IU"); retlen = sizeof(mad->empty_iu); break; case VIOSRP_ERROR_LOG_TYPE: - fprintf(stderr, "Unsupported ERROR LOG MAD IU\n"); + error_report("Unsupported ERROR LOG MAD IU"); retlen = sizeof(mad->error_log); break; case VIOSRP_ADAPTER_INFO_TYPE: @@ -1053,7 +1054,7 @@ static int vscsi_handle_mad_req(VSCSIState *s, vscsi_req *req) request_handled = true; break; default: - fprintf(stderr, "VSCSI: Unknown MAD type %02x\n", + error_report("VSCSI: Unknown MAD type %02x", be32_to_cpu(mad->empty_iu.common.type)); /* * PAPR+ says that "The length field is set to the length @@ -1078,7 +1079,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq) req = vscsi_get_req(s); if (req == NULL) { - fprintf(stderr, "VSCSI: Failed to get a request !\n"); + error_report("VSCSI: Failed to get a request !"); return; } @@ -1088,7 +1089,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq) * of the structure. */ if (crq->s.IU_length > sizeof(union viosrp_iu)) { - fprintf(stderr, "VSCSI: SRP IU too long (%d bytes) !\n", + error_report("VSCSI: SRP IU too long (%d bytes) !", crq->s.IU_length); vscsi_put_req(req); return; @@ -1097,7 +1098,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq) /* XXX Handle failure differently ? */ if (spapr_vio_dma_read(&s->vdev, crq->s.IU_data_ptr, &req->iu, crq->s.IU_length)) { - fprintf(stderr, "vscsi_got_payload: DMA read failure !\n"); + error_report("vscsi_got_payload: DMA read failure !"); vscsi_put_req(req); return; } @@ -1158,16 +1159,16 @@ static int vscsi_do_crq(struct VIOsPAPRDevice *dev, uint8_t *crq_data) case VIOSRP_AIX_FORMAT: case VIOSRP_LINUX_FORMAT: case VIOSRP_INLINE_FORMAT: - fprintf(stderr, "vscsi_do_srq: Unsupported payload format %02x\n", + error_report("vscsi_do_srq: Unsupported payload format %02x", crq.s.format); break; default: - fprintf(stderr, "vscsi_do_srq: Unknown payload format %02x\n", + error_report("vscsi_do_srq: Unknown payload format %02x", crq.s.format); } break; default: - fprintf(stderr, "vscsi_do_crq: unknown CRQ %02x %02x ...\n", + error_report("vscsi_do_crq: unknown CRQ %02x %02x ...", crq.raw[0], crq.raw[1]); }; diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index add4b3f4a4..e047361310 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -97,7 +97,7 @@ static int virtio_scsi_vring_init(VirtIOSCSI *s, VirtQueue *vq, int n, /* Set up virtqueue notify */ rc = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), n, true); if (rc != 0) { - fprintf(stderr, "virtio-scsi: Failed to set host notifier (%d)\n", + error_report("virtio-scsi: Failed to set host notifier (%d)", rc); s->dataplane_fenced = true; return rc; @@ -141,8 +141,8 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) /* Set up guest notifier (irq) */ rc = k->set_guest_notifiers(qbus->parent, vs->conf.num_queues + 2, true); if (rc != 0) { - fprintf(stderr, "virtio-scsi: Failed to set guest notifiers (%d), " - "ensure -enable-kvm is set\n", rc); + error_report("virtio-scsi: Failed to set guest notifiers (%d), " + "ensure -enable-kvm is set", rc); goto fail_guest_notifiers; } From patchwork Mon Nov 13 22:35:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837607 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="1dpGkWEO"; 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 3ybQrz1kF1z9sBZ for ; Tue, 14 Nov 2017 09:52:51 +1100 (AEDT) Received: from localhost ([::1]:56696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENaz-0008S2-9M for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:52:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOo-0003QI-JU for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOn-0007as-Fu for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:14 -0500 Received: from mail-sn1nam01on0058.outbound.protection.outlook.com ([104.47.32.58]:64048 helo=NAM01-SN1-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 1eENOh-0007Te-UZ; Mon, 13 Nov 2017 17:40:08 -0500 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=ffeJIWsqd2ZCCY0V+CMTHt700F/DxtyN/FUVlJuAC7A=; b=1dpGkWEOinaeZeXAZ5aecd9/JAuMuhii20lUpv0Tt5saKrBNtLvRVUl0MJRfWrg9KmqBt3gvsi3kU2WetPJVQum0KdjCHgYM4y8C8hwd/tdXAmd+oQ7RpHKG29Ufn7fqBGwsLGXcloj5crmL4sZLVvpWHrbNNHOUxXf5IErClQE= Received: from MWHPR02CA0020.namprd02.prod.outlook.com (10.168.209.158) 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_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:40:06 +0000 Received: from CY1NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by MWHPR02CA0020.outlook.office365.com (2603:10b6:300:4b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:05 +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 CY1NAM02FT035.mail.protection.outlook.com (10.152.75.186) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:05 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:46440 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOe-0004WX-FC; Mon, 13 Nov 2017 14:40:04 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOd-0000dB-0T; Mon, 13 Nov 2017 14:40:04 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMds0X002882; Mon, 13 Nov 2017 14:39:54 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOU-0000We-7p; Mon, 13 Nov 2017 14:39:54 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:54 -0800 Message-ID: <0526ef6a38766e6b8c80c331c07af4bdd0bd6384.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(39860400002)(346002)(2980300002)(438002)(189002)(199003)(5660300001)(5003940100001)(8936002)(478600001)(33646002)(77096006)(76176999)(47776003)(50986999)(189998001)(9786002)(575784001)(50226002)(16586007)(36756003)(110136005)(54906003)(39060400002)(63266004)(4326008)(2950100002)(356003)(81166006)(81156014)(106466001)(118296001)(106002)(8676002)(305945005)(36386004)(2906002)(48376002)(50466002)(316002)(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; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT035; 1:aW5KX3csvk9tpT+oUYfDACHPMsdUnro1zfnb7/zbe/fk8Y1cXbmBGcP0Rhfm6ms60EnJ5pP0VMy9Q9k9Cm8c362Tc+o4LZ8/9X+oP9Oe3NeMKrflOpUrZN4UxWvOgm47 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a09c3527-837b-44b7-c8b9-08d52ae77c60 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 3:lsDwfYFzy/4z+aAfLIthC7gPXspIL2ecuYNvJhpS05wPz9rJsumfE1COl8ZKXI7riUM0yJweoP6MltsWRxj/5KcL1YhYI2e18GG9iVRIdOy/VjtFM9sw9LeR4dAvuISNgWLyeQz/dcubxRwC7ybelVh9BVTl54MEGb2vU/ek7pvNuuphCpnuau4L7notBdeJtrZ0F/oRndFcl/T2SisuGN3fwtqNOpUJ8NucwAIJWXPGfMazk128vCFGjRrkyRzgiW/XBoJ7QKkCX4mw+z9QTkoa9NuZ1xxgO6ZUhvUZuyRiualIFOmD4xS5V0wgHROAeCleDMiEBCqsdtPPunHtNf9qSLkQNdPcgVtuIt8K3mg=; 25:lmgz1+FASCl8HdbT1Ta3tPJg7yXg+4NWJ1XENuJlb88nJzj6pEhW22Ykyz0jzYptylIV0Ltq+n8r12AVdOLklzwKk3hzgu4rF568t/8pQnwefUilWKKMMCnJhEZbwdDwkDvLEObTdn2p0U5nlMnfe8+30TBmy/NlVKlXA/eHZycMMNqhcsXYcnlDmptrBMNAzlaKIhCuhLUwf08Cjf2zXKPuJPMSAQt4MT0PI3HL6n50WoSwZcYHTn5lRQm/u1ItegXxkrv5/iIs5Z4/X6zQmnsQgCAVRlIJi1b6U5ShKaOttF1swoXuXCWwLvGLiD+rlrVXYMP4y2In2mDD3YMXYUGhqGfPx9Syv+gtTLWHCy8= X-MS-TrafficTypeDiagnostic: BN6PR02MB3379: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 31:IyvtIrBW9AmlVQTYhJADhBZdmJlQlBwlf8k9nvwr8RJ1JUdQKYAq2n2dQ/VoiA2u0QE3j7aWwIYOp4A4g3bG3PWPponu15xZlsTVTcXs6W1a17xwrgSZo+WbglaCmPIV6rKuuPc30udi2SIvEObTACGp7yh5I8hioy2pen2lfPMCul/hhGfB9qPMiu1z8ey+slzCDxxlB301Z4Ljs6HQoaW4Q3Xx7OzT45OKtoFpY28=; 20:Hih4Pq1jsedBfLAxBr/ULUEOLVjfmtt/b4NYWdlbLY+ZW2yJib1BtjUZC6yOCgA+C52bzm/d2Thy6MAi8O4H10ya4h5YTxXomG0jZHRsV698LHiLPpXqSeSYj7kMCbIMMx7zxXXwW6RX+bJRBxmdqlYpkZqcCvhe0We1pFafdOsoAFkucYjVeQ8CF8jI0JTpUZpk126MnwqT41O/caMZH071/DmYA2jzU1jcktzQiLoKkXrJ/5V9TIE3wWc7x6c+xQcb/N569w3OqaNMZz7ZmC6rS001Sr2HnTOc2jbdd+R3pM0F3oAZdMXu8YcL4XYXfSOiH59I27+xciO6QMaZCMeV0qqHWmAwtjXf3F1F9pR+n/Av470nkGItOHbYXxLdnVdOLjAvkt5eS9NFtyHJcu1e5P2FRirHnYb+6sIlFWX5FlomMpzE9f58RHyJBl3ZSEvinWg6fOenbgePmttnoN3+S7PNaBOD/wFvt0XaOhiiCKXHmGZ4NpBFjsCD/oTS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231022)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(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:a3T9ENDUVs0/qY94TTnB7W3fYR+do0M2FsSsy1WICx0mkr259IZfym+SSP3t96/B/2lAnGzX4s8A9woc5ZVz1oOkhGDLUIGi8mmrtongFed8sHxgcSlDk+TiJzQZyl5WNPIlM9uhFTlGbRGjFwr1bphAE+/Zao1n7Ai/VkZm7LC5ZSYzhpYY3NAl6/QhFq4P1XXi7UrkLs10WaGskRsH6TokEyxPt29IgUvgVlk17n93g4cPjMh7TB+NuSeDB6mknOBK23Ly0NwfAq3O8UnuXq0ztlLMhJXmpCz8/6Pnp98v1SDjvOaI0jHX2t9wJJIGZTlH2K06WMWC4x3NhGqRaA== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3379; 23:uy0o+L/i09CFoP6TgKEdRkOiaZDWgIR+v7z+Rak7v?= EDPqsLw8Gll0FwbiFO0vx5L0PyDmwuK6dBwUTgXMb1Pi0DHS+Zp1Ga6qq2qkf7BsjPzIOPZyGCjWUmSyKonjiYGUAQOfuMVvAG8CnsSkOHNE9tJrlHrMAED3jPYIvhv5K/ccFc74IVbZkKug9VCE196sVb31N1pn+fhAz2xb3iF9v94elvKspt0LjqZ9YjK2roteIBYPIQ/VFrhF7cWZ2WbIfkbnxbdspGNro9DRzyQqg/yk+0dLATHS0wxD441J1Vozo4PxKfLgs4tOI84KF17ehI0xvBHso/02218YreJUlYqzCbetkYj7qanBTu2tzqR87cNQcsd+eiGXVfDPslEumj/KyGI0pcdjiLjB8nudatTBnyl3EQN27DXoHhg8+lzFXwV1AFmQbxUszk8a15u5Qgc1dy9X6HC63VFOdUAaO6ScPlFHtTfe9HiCGIpdhBUStq7WHsRMEQeGlgiLvvKYVvAgNZXroByPdlgYZF0NOgvc0/0CUuZJP9IIIztvbxxDlMfmeiK8i61tg56QS8ZdWYGdIZO9LTjhP8nbJn3PXZP0PvHZjOSwlB9iPkPHBtuVEtsYEZPCakBwUAHQmocYM4Kxs4n11pLj+0PEu34nIX1Jq7IxPhqUGQdm2kif1GO9Z0/wFPdHFW45Dpx/P1DVpTOb/o06o0cjdSHXirxWZFcXbqyFMRie/2+OmMGQbmvhfmN9wYaukvjristCU1GUxpm3trvsz9Pu4+ukNIuH5q+/DizO573p7sEpcEu2NwAWM+qqIKdHIMAThPl+WyILGOr4l4IufRcRvcGUUT5+6R3DylqKn7UYtNs9aRcLss2yF7E4O8okQ0RvyB6aLwtIxP2EfU4O7o+Iwpc7K0twSpdAUV2ScnDUG2DI+ZowzU4BRHfW0sdXMEyg0sCqvnAGDjCE1N22DExhEqXtfHElwQvzbiVhFBUJitH2Sc5+xBh1sd89J3FPS58UJ3xj9tW0ahuLGRHEzlT3Rwg22MfP79matdsbo9/6cekgRUjXo/FLCGHegQKleIgGtIJQcOM X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 6:+MYMKlL7OV3XnMZsmMpbkTcf7XAei6c+27SBC0O98qu915s3OP/08+unKGmYtkFBx/rf9C2OaVgJ8yR7RI4mF0MoVCPh0Rhl5XM9rOOVnD/uP1wgQQrcn1xCTdBqvuY0eVrt7Ys49d6agsgXf7+qwX/dsuF9E+angcRw3uOglgukcCi7ofFhlyVP6cY8VSZEBsfWYpiwaKLZhRJ7wQfg1IS3sFeTx6zrgOHDDKNriM9wpgA62HJeCOayCSx8rvf/d5e+qhaC481JCwmciyBrklR5YSvk2w4ovLQcqEuKeKHakJDq0LBJRmDMxGljwlu+SOPw0p+VazyuLrmeGd/etmjHZ2Gu/Oe2aTN1eLf3X3w=; 5:xZgg7U9scvitEAkv5DVLMJcok3+v0+jVwT/LA7bPNvZAKsCEz+V42pQ/BqdDsRv/UwDqDwJsOgjR/J3GR+fG/6H1fHUBpk5cVmFOwkvNANcYhgs+jBkLae4zvSK+RaPiwGWDk4gwRyuqbRnmWUUtb6tEVZXEK8QHGGZ7lnhg6DA=; 24:BInmgVOpmtJmZCaixsYbKbxsG/432wj33RAds3YSrizrguu7IafYZsQ405bDfksdc8qCTVd64ICb1Z6hDZZRJl6/4nKrPllU77QUtTV+CFQ=; 7:4u17BmKtwZ7y7OCJWPdEoGqUYv5OBGevj5USeSD1++X0Fd2cDVqEOHFAmDc9PmrMPnJiFFp/QCtxNzzWDkEMXBfhtuRezWuLmvaClJEczkH721DNIN71En2flL8KejuoBJniRY0wG50h4CEVHIOXAfMDJdbxQOqgbxDHE1nf7x5QViBQIwE40fTa49eMqnyEDXnrpdG0Ct415U9Fy2GkkZywywmUpB1zcfuub/q+My4GOF8hESAXKPZD3T6oDrBR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:05.1885 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a09c3527-837b-44b7-c8b9-08d52ae77c60 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.32.58 Subject: [Qemu-devel] [PATCH v5 23/29] hw/sd: 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+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. Some of the prints in hw/sd/sd.c were manually converted to using DPRINTF() instead. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud --- V3: - Fixup some DPRINTF() prints being wrong V2: - Split hw patch into individual directories hw/sd/pl181.c | 5 +++-- hw/sd/sd.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 55c8098ecd..2b878a0c5e 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" @@ -146,7 +147,7 @@ static void pl181_fifo_push(PL181State *s, uint32_t value) int n; if (s->fifo_len == PL181_FIFO_LEN) { - fprintf(stderr, "pl181: FIFO overflow\n"); + error_report("pl181: FIFO overflow"); return; } n = (s->fifo_pos + s->fifo_len) & (PL181_FIFO_LEN - 1); @@ -160,7 +161,7 @@ static uint32_t pl181_fifo_pop(PL181State *s) uint32_t value; if (s->fifo_len == 0) { - fprintf(stderr, "pl181: FIFO underflow\n"); + error_report("pl181: FIFO underflow"); return 0; } value = s->fifo[s->fifo_pos]; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 35347a5bbc..5d7fa3e418 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -700,7 +700,7 @@ static void sd_lock_command(SDState *sd) sd->card_status &= ~CARD_IS_LOCKED; sd->pwd_len = 0; /* Erasing the entire card here! */ - fprintf(stderr, "SD: Card force-erased by CMD42\n"); + error_report("SD: Card force-erased by CMD42"); return; } @@ -1282,7 +1282,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, return sd_r1; case 56: /* CMD56: GEN_CMD */ - fprintf(stderr, "SD: GEN_CMD 0x%08x\n", req.arg); + error_report("SD: GEN_CMD 0x%08x", req.arg); switch (sd->state) { case sd_transfer_state: @@ -1564,9 +1564,10 @@ send_response: if (rsplen) { int i; DPRINTF("Response:"); - for (i = 0; i < rsplen; i++) - fprintf(stderr, " %02x", response[i]); - fprintf(stderr, " state %d\n", sd->state); + for (i = 0; i < rsplen; i++) { + DPRINTF(" %02x", response[i]); + } + DPRINTF(" state %d\n", sd->state); } else { DPRINTF("No response %d\n", sd->state); } @@ -1580,14 +1581,14 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) DPRINTF("sd_blk_read: addr = 0x%08llx, len = %d\n", (unsigned long long) addr, len); if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) { - fprintf(stderr, "sd_blk_read: read error on host side\n"); + error_report("sd_blk_read: read error on host side"); } } static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) { - fprintf(stderr, "sd_blk_write: write error on host side\n"); + error_report("sd_blk_write: write error on host side"); } } From patchwork Mon Nov 13 22:35:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837621 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="HOnkQwuR"; 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 3ybR9255GNz9s9Y for ; Tue, 14 Nov 2017 10:06:46 +1100 (AEDT) Received: from localhost ([::1]:56777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENoS-0003Rw-K0 for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:06:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOq-0003Wa-Ni for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOp-0007bq-7s for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:16 -0500 Received: from mail-cys01nam02on0060.outbound.protection.outlook.com ([104.47.37.60]:55840 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 1eENOj-0007WK-Sn; Mon, 13 Nov 2017 17:40:10 -0500 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=U7kKAWV+BDHAUEro3mmyB6A2LU8BTDxou+qlPwQ5wIo=; b=HOnkQwuRqdBiARDty4VaIzLKL++aLow1WvaTp0/mgEUi1VY0ADQRGCE3ZNyI19UCVHwdBDguGZ4WMNONSghhqz/F/OKvPj0w4t2qInv1Qi0FwWqMawx4JGGvl23KsD1mAECv2fckzGNtCiR13VtIgZGT+DPPWQl6cLDpRKjDUtc= Received: from BLUPR0201CA0034.namprd02.prod.outlook.com (10.163.116.44) by MWHPR02MB3280.namprd02.prod.outlook.com (10.164.187.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:40:06 +0000 Received: from SN1NAM02FT031.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by BLUPR0201CA0034.outlook.office365.com (2a01:111:e400:52e7::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:06 +0000 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 SN1NAM02FT031.mail.protection.outlook.com (10.152.72.116) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:05 +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 1eENOf-0004AG-2J; Mon, 13 Nov 2017 14:40:05 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOe-0000dB-FB; Mon, 13 Nov 2017 14:40:04 -0800 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 vADMdv5h002886; Mon, 13 Nov 2017 14:39:57 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOX-0000Wq-DS; Mon, 13 Nov 2017 14:39:57 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:35:57 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(376002)(346002)(2980300002)(438002)(189002)(199003)(33646002)(8676002)(5660300001)(106466001)(316002)(63266004)(189998001)(575784001)(54906003)(50226002)(81166006)(305945005)(2950100002)(81156014)(9786002)(118296001)(47776003)(4326008)(8936002)(356003)(2870700001)(23676003)(36386004)(5820100001)(2906002)(50986999)(76176999)(106002)(50466002)(110136005)(478600001)(39060400002)(36756003)(77096006)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3280; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT031; 1:DjG28QSVqblI4UetcsWEGAAEYF15qos7zpgYOEvWn3mmdyN/EAwq6SUXwfo5/indpT0PshlLM9BiTBOJjtDQgTSA1Cr09T4AaSAgH3jXRZ5SieXYZYt6Kk7+EyRtfU4t X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2d6a89c-d606-4406-594b-08d52ae77cd8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:MWHPR02MB3280; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3280; 3:sYI6OcJkwiG9XNBV7c+MahI0RFthPPitRtcL46vt8NiFw7pSVWeKURjd/uy5ASDZi1jZO23qZ4oCbIdwEstLWgtFtmGOUsgrbg/eP+zbuBgtXDhGNVCUc6L0AuXQsb1GQ866y1/mNEtmByzbOHlhdO30uyFugV7k/sYeA3tTISW6FtDHY7RKZJKi0zlb1bQV6O3+eNKas1m/TJq9PpGGYZkVCmzFeQbrG7zNUNSDuywBbmHdjF+QlP7x+iZ4n0gPDPEVPAQK+Vo1cNgkQ6qV10euOS3wvytjin2i9SFzRfzR+9cE7usLaGdbjxW7eR7Xfl13hGT36mxsbFra9Tp3mXHPNzkq93vg0cxIazpARLY=; 25:ajrQw08jVV1kjEXikP5FS1XfE98I0E2yO0ta5pdX4bftj40xGU6wRQHQJqol+wn24pb2P4EMdFyW1M28ULvN9P8KFyWvgwUlwDdIuaL5PFMWgEVA7mrvCfIKQwF2/ESCxANoIKUEjGz8xDSkChYEy3BjxDmfscJxEJonA9ZN4MjNbsU+88q5knfN6fqlVPzCP65kvwJb5vDqYwW8OOmBJD69/4m+ldbnWGsOb2vKXjworI+L2tEocaxNRWHJaDbtithcXDY8vQBkFx8cAXEmCDbP+ZfnSh8VSyglZt67NiBmK9mBSh652k26WcHd0nOYjY4VCXxWnd4ZrnS1D6GHmZBTRMRYcg/2fIJ37TtwGeI= X-MS-TrafficTypeDiagnostic: MWHPR02MB3280: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3280; 31:SA/12ZufGQwxCbjrx2fCR3wCOCclnDfugpy9uLF517QC1hbwnc7rcAFtnqG4UB13f0iDRuHW2lNv7c1Ej65lJF72EK/xQEiR+ygUeQSJGgtTG3/FXX7NvIi4VhcWw5Oz07lWJPz++fUMsOTFBRlYrrBm3gc1nz7L1LExQnhP0yjByJ3p4Dqtos2iUuHhWPaixI1/BEIw5oMG+N93OzYjDQ+qrrIMLZZlEMIwRAXoakk=; 20:s0IhG48/W/qeP87CR8yfOy/uhAzoB3GdUgZHHnL9DGixYxI8NNFM1rH+ivaDlRj2TKHFKHEYda1TUjDVogPY+RdzF99jBOz5BYKZgpb4NsBPALbdamuaWLWp/LVSRgmWwp3gVE8PrqhpW8DvW2Sd5+Ziy1OudovsfqD9rQlwsY1nIPkqzi68kyNcpPVbEgp+SAVM+8cmaMBh1xCp80jDOHq2JbQVClVa8WBwWCljV6EFrgzp9z4SivOvWjl/hhWo2v4+/N6nqld3o0SE7kgEzS/bM/ZUj/e2Ql+yDT6DyDLOuPh7P/7LJvMyDTHsm8ERT7tVeuILwdHpQw2hQuffqKMWXfqXeIEcfKhoZpX2zqZ0zBZzjo8nLCj/1lvecd/ckZPigEZmZ09+PujhFw3J2DGhMuUY6VtOllLuYUnThK7zOm0X1ohc0IBmFkuj6u59nBsYs/nKowuFMDaF5FvHEs2HTRyjffrOcxF9pl7NAEI9HcR2EEAIzQg8C3onBbSu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93004095)(3002001)(10201501046)(3231022)(100000703101)(100105400095)(6055026)(6041248)(20161123555025)(20161123558100)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3280; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3280; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3280; 4:GUM70DKTDtRHsIcbUn6ks/xTiT6ay7iWRUVuDCg5jHcQkwoVjxVrVIt88SO9EV5vbbYmCj9DvZ1cyFg8rVhGL27EyR9NH4ZhQVcHnRZoFs8VTp0iaCh2M3kice21HqZyzanwqmNp4LmFYgPeXBxfLJdlK63AjeTrab3IeFTZUv7tgWe+SS1tAbAeo6phIClsyf7tfuzAZkvx/IZi1NrfnqIjIe2PjDWDrMPfVRWq07HUjO0QgfAV84SJwC1T6QMmXBpZLBAmML8JX+nEIBMbjGIFLJJAkn9SHvM/dnpqvodYZbGVcZfyHLaSZWJvdrCg1oY2XMCCFdBpBKTfFbuybQ== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3280; 23:M4yXLvrrk7hQD3GgwDEXQdYa8BIUYro1NVxmVhrIF?= BHe4L5iwWB48op+UlWxSqeUwpGbFU08yYOyfCtqYMrwwHRM3HjB0XS1VoshRwz66HKBlPQvlMAt5GW/8J9f+SiTzXfVUXt0d612v61bMNZFgaVwHAopF04USo/dfrkJc9XiLLs9vIKuR0E4D00ZnDw2hi3U8Dg5eLpSs3ywqofX7zjv6UOiyHx1tuhR5NCwFO28dcO01CoBY8yMFtUBx+A5HibZYPOOQ3H+x/8iU8cRoCsmCERNkmDgcW8eOqEkE3SneBPzsyV4MlkDmv/1ZTc/TdCe3dVUCVNJitxSH5BObmLTwvcOvgA0ZACFDRMpDVz8U6j8N2wVsF4/CLb0xgUB1smUrxtD0OMBCy3FOaj6QkBjxGknU9B1R4keNVYF/7MePPgae+fTy59PnYJun5op0Cpfzyao6Mk8N1X1f4QMy/03rv19qEltT1uaiUA/5P0L9zuY1B2dSDrl8yN4tg+c8w+RrsyggmqtAOK8QoCV5lCDSH7MDkJ0eT+vvDn3b0fqGIjUxPxpxU1+6fEoQFin81S+xLj2TkGqlcUBTNDntiXCKy63OdS30K49veQWfxLDuYgNjHbDyYqy5DsWiHK4eKSmlG41KfPRK594/zJtiJr1VESJWGWbK7HvhvBTQnWylU3qZHXNTzQPvUbVERvuRwkWxiOkY9g3Sw3zfoH3dHF0vxa4ZxaGZtcWaYF9kvj+y5PD6/jDp7W4uKma8VnaCRjt2NyYY5SP/xxjwhXh0ejPs9XGA4Kcm5MWrj6HP0nWuOGgpcxweAx4T+lvEth66LtDy4yrhfuoIUHkcWbWb4l7+51G153ZdFI8pZp5QMsPN1LqVC/Oq5jWpKf4y4UkJDVRu+UbChraElR3SmXpMHUPfvpHRLE+4AMwoANONqeH1nz0/A2Kb7v6mo0ESaqCEV0kWjHeNH5LogU5oedK8laLIgKT3T4KenbkNupCdlP5yREIBxBPfj65fMeVpzOjhB1wzngEHyAqtvFtiFV+Ag== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3280; 6:S5wNM6tFkRebInrsDyoxsjanWS1RwoiyCST0j9zhXT7cCltYLI7FM7QClCBdzPxTDtDI9p3mgBgMOJ8orTL2gNjoiAx57Y4pFgUUjMea1AmRxS6UkivUim8p1jJhWVPlvyj2W/kLVB+Ml0jUf2dhnZZh9rQNhAyVKTjNRGm7POrSflitAYzQMbGE2/5N2xe/NgMoSvSZpyFXGu4uONTftSSnvaWKypuc9mlkpRUoCctXZPlvgx+Jd822HPIqNVc35lYnw1V/IltJFtYTlfjNZtlpW2N0N8/aoIHLeQvp7WuQ+rw6UnwAnj0tGkaUrNAL0EDMsgoUbwb2iU6Vc2RiYa2xJE88UYL7SNdTKwoa4U0=; 5:RhXg3qqzRT8xxapAIHwNxCG2ZbDAQ/CBmRzF7rUP4eKISh9rWxXmNchEf8KwfbWguK/BrJEnobTSvnQdENaG9wfwKfHx89F7pSQHjmne3m2CzLPQtEIlzqRAekE8ejRVrQVQaPrdPZq0iHmGydttYdQ9Kgs76ukREPXGCYdCFF0=; 24:OkNcSpia1U2PX36jMoFrkANrwARHfpY4RbXwDEWUUzVOD1GvhS1r/0z+mSQVAdw9xnbNO9GCSg+42KaTUs+Jwcs8JeucDXkH/ikDg3uvXiU=; 7:yEUnEKwmtZvOiAFpPNWFVuLxdHaQJSkFYZx0rSZeP/KUGAZp9tORv8jJPA6wzgTpEUBN8LpN2ofTylcZ/sBP73l2HYIyrDjLxeroRhFVZknsV94WmPYK7Lfp9c0sl6NmxA4AA6Z8DKfOALhFvTmLT3fBCBM274tMs58q7u0Q+W9ESBrDJ3YbGHODdRhlvmKS/3z3BlYsQeoHrC/3jPtIZ4cHEZLWP1Yo10cEkj9Ev2CPe8930TL3DY1aSD8Is7P/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:05.8627 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2d6a89c-d606-4406-594b-08d52ae77cd8 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: MWHPR02MB3280 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.60 Subject: [Qemu-devel] [PATCH v5 24/29] hw/sparc*: 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: Mark Cave-Ayland , armbru@redhat.com, Fabien Chouteau , alistair.francis@xilinx.com, alistair23@gmail.com, Artyom Tarasenko 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: Fabien Chouteau Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Reviewed-by: Philippe Mathieu-Daudé Acked-by: Mark Cave-Ayland --- V2: - Split hw patch into individual directories hw/sparc/leon3.c | 16 +++++++--------- hw/sparc/sun4m.c | 16 +++++++--------- hw/sparc64/niagara.c | 4 ++-- hw/sparc64/sun4u.c | 10 +++++----- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 8c66d5af24..bba3aa3dee 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -139,9 +140,8 @@ static void leon3_generic_hw_init(MachineState *machine) /* Allocate RAM */ if ((uint64_t)ram_size > (1UL << 30)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d, maximum 1G\n", - (unsigned int)(ram_size / (1024 * 1024))); + error_report("Too much memory for this machine: %d, maximum 1G", + (unsigned int)(ram_size / (1024 * 1024))); exit(1); } @@ -167,19 +167,18 @@ static void leon3_generic_hw_init(MachineState *machine) } if (bios_size > prom_size) { - fprintf(stderr, "qemu: could not load prom '%s': file too big\n", - filename); + error_report("could not load prom '%s': file too big", filename); exit(1); } if (bios_size > 0) { ret = load_image_targphys(filename, 0x00000000, bios_size); if (ret < 0 || ret > prom_size) { - fprintf(stderr, "qemu: could not load prom '%s'\n", filename); + error_report("could not load prom '%s'", filename); exit(1); } } else if (kernel_filename == NULL && !qtest_enabled()) { - fprintf(stderr, "Can't read bios image %s\n", filename); + error_report("Can't read bios image %s", filename); exit(1); } g_free(filename); @@ -192,8 +191,7 @@ static void leon3_generic_hw_init(MachineState *machine) kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL, 1 /* big endian */, EM_SPARC, 0, 0); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } if (bios_size <= 0) { diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 24c2b8a555..e9e0ef0630 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -260,8 +260,7 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename, KERNEL_LOAD_ADDR, RAM_size - KERNEL_LOAD_ADDR); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } @@ -272,8 +271,8 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename, INITRD_LOAD_ADDR, RAM_size - INITRD_LOAD_ADDR); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - initrd_filename); + error_report("could not load initial ram disk '%s'", + initrd_filename); exit(1); } } @@ -681,7 +680,7 @@ static void prom_init(hwaddr addr, const char *bios_name) ret = -1; } if (ret < 0 || ret > PROM_SIZE_MAX) { - fprintf(stderr, "qemu: could not load prom '%s'\n", bios_name); + error_report("could not load prom '%s'", bios_name); exit(1); } } @@ -747,10 +746,9 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size, /* allocate RAM */ if ((uint64_t)RAM_size > max_mem) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d, maximum %d\n", - (unsigned int)(RAM_size / (1024 * 1024)), - (unsigned int)(max_mem / (1024 * 1024))); + error_report("Too much memory for this machine: %d, maximum %d", + (unsigned int)(RAM_size / (1024 * 1024)), + (unsigned int)(max_mem / (1024 * 1024))); exit(1); } dev = qdev_create(NULL, "memory"); diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 7a723326c5..996ce2ada0 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -152,8 +152,8 @@ static void niagara_init(MachineState *machine) dinfo->is_default = 1; rom_add_file_fixed(blk_bs(blk)->filename, NIAGARA_VDISK_BASE, -1); } else { - fprintf(stderr, "qemu: could not load ram disk '%s'\n", - blk_bs(blk)->filename); + error_report("could not load ram disk '%s'", + blk_bs(blk)->filename); exit(1); } } diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 1672f256e7..1fd1c3c861 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -166,8 +167,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, RAM_size - KERNEL_LOAD_ADDR); } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } /* load initrd above kernel */ @@ -179,8 +179,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, *initrd_addr, RAM_size - *initrd_addr); if ((int)*initrd_size < 0) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - initrd_filename); + error_report("could not load initial ram disk '%s'", + initrd_filename); exit(1); } } @@ -327,7 +327,7 @@ static void prom_init(hwaddr addr, const char *bios_name) ret = -1; } if (ret < 0 || ret > PROM_SIZE_MAX) { - fprintf(stderr, "qemu: could not load prom '%s'\n", bios_name); + error_report("could not load prom '%s'", bios_name); exit(1); } } From patchwork Mon Nov 13 22:36:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837622 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="jGTBwK5v"; 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 3ybRD0316Lz9s0Z for ; Tue, 14 Nov 2017 10:09:20 +1100 (AEDT) Received: from localhost ([::1]:56790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENqw-0000Jr-HP for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:09:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENP1-0003tw-Pp for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENP0-0007jO-LA for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:27 -0500 Received: from mail-cys01nam02on0059.outbound.protection.outlook.com ([104.47.37.59]:4312 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 1eENOv-0007fB-58; Mon, 13 Nov 2017 17:40:21 -0500 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=rl5KAzJZqZewgJ+HsEVNsvuWhgCBUIgxENXfZNIcuks=; b=jGTBwK5v3PcECFK0omPthO8hpuyQDZvQ1aO4KgWXBzQXti6+dgBUBfWoJC03UeBOuWfHf8CYKOCDpJzYZDR8+b+skYoy+9z3S5abAjBogAfvtFBi9GmCJeuhZhJvvltyL36WSXyUkEyPvWkgrOtaFHJdSYNahULQ2Gg1tJxo2QQ= Received: from BLUPR0201CA0030.namprd02.prod.outlook.com (10.163.116.40) by BY2PR02MB1330.namprd02.prod.outlook.com (10.162.79.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:40:17 +0000 Received: from BL2NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::209) by BLUPR0201CA0030.outlook.office365.com (2a01:111:e400:52e7::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +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 BL2NAM02FT062.mail.protection.outlook.com (10.152.77.57) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:15 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:47806 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOp-0004Wf-3e; Mon, 13 Nov 2017 14:40:15 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOo-0000sx-Uj; Mon, 13 Nov 2017 14:40:14 -0800 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 vADMe11p012829; Mon, 13 Nov 2017 14:40:01 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOb-0000ZN-1v; Mon, 13 Nov 2017 14:40:01 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:36:00 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(39860400002)(346002)(376002)(2980300002)(438002)(199003)(189002)(50226002)(5820100001)(8936002)(316002)(110136005)(36386004)(47776003)(189998001)(39060400002)(4326008)(106002)(54906003)(50466002)(2950100002)(9786002)(305945005)(63266004)(478600001)(50986999)(118296001)(76176999)(2906002)(33646002)(5660300001)(356003)(2870700001)(23676003)(8676002)(36756003)(81156014)(81166006)(77096006)(106466001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1330; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT062; 1:GG2GtfZUn8CK32NIJRSmWluUpQFDnAm45Wsg40ETHBvd1S3DXhuSxtOzDcfmEJTOF5WRnr/AK451JSZSVQAxkBOF2szb0LrO70zY3hP0RQM2RdO/hNt+dDfkx9Wiu6BB X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ceb0433-2f4e-4507-02e4-08d52ae782b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BY2PR02MB1330; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 3:ZgVpKNWZGZql6rGgF0wn1S5CteBzJf6VGTFLBH5R50cscgs2zk3tli8zfHF9+5Vt0h+Dis3q3790Kj3CfJrFydZGrfJewHK2tW4T2ePAHyUfAUbxCjszPajftzE7NursTKZLq6/yImSpya281IspJdvWe4o5+RE9DHsjNjmpDIgi1N76XWj0TWtlTwUCFJhtyC5VSQ7NjIEEFnuIr++PdS6Ukp8fquaJ7b7HeUBIz4p8ZwvFJ0sVCwOdR+BX/2UrTxO91yNoPR7HNTJI0k9FB+KxCE8S+az6yIlvr1e8oXJBumvaBcxYyFQ+rscFCIOrmt7wHzQfwpvYfLTczYA7OPnzRxObg2+wLzkyKZU8UQU=; 25:qnKfcCq6S8AiWTqoWIWjD1WJrkqT92wBe9QiRoeYMLOan6GQSfv11u7c0pcwYcbf/WKLL03rkFQbI44NfQiIm70AvYxW1xrOK09toh/AaUAn8lqGpAo1/i8B5PyCBq5YTN3+/lUp9zfB3p+6D/BbjcgTrVniYkwiBItl8B2Fr8Pyc0R7Acgvmj2OTJ8YiAfvuHEL/NBoDkZUSnrl4lqY1LWhcl+ectTSropomPWeiiQNZ55aMjtVQN2FPIrN1uR12AVlZCrqzqt4fvU3MEkOYUad9/XgQFXByrj2Zuu0pYZTch+VB9Hvx4flyedp1d+pbvXBLsA3pxoW/sPl6SJl/6yQ06feBVKZLMTGO1HEGjg= X-MS-TrafficTypeDiagnostic: BY2PR02MB1330: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 31:VpRiMXCxmWujyoGLMFQyoGEpXaVb7uWhIjCTIxup3j/V2smaDar+j2kfZk6WFhcMr25CK5wyP44erpX1XbXEG/JUCYVyCkQLHW8nE50nepK+OMrRKFWIxzuGHJowYSRVpKhbnE+eqBtDNfvaiYER+47X20qQ6Ai8qPFnK11y4nw9WH98cEFk1LNwnSyDyQObAiDbH0GZX9nNu1jigeSdVFOn/My9phHtUw7hlcP4HSM=; 20:Ei9hQvXxQ5sV1dJde6iPdMN0/dbYur0uGbDFMzRbyhetX7YOWexTDEZa5rmXryR0uz+gj4HiKb+AeEWVeUJJoV/xZVPoejegKRxXJgOPZH/2rYqoOnexOqL1KDEy+RdWR61r+ol79l+eNg8lRRVTJB0gOxRLH0uy67ZOumrnSo0rvknsSa6nnXXTnhbJlwwPYSAxvwgsrbHSH8zlBFPrFaa6uNvntTE0uByhnggjNBxrkD36rsfT6oiYXDfuBWiHWFpN/6XK63hOKgN19PjJ5mTcuowj/MlWLJ/qAeTXeYlKol+pfty5geyOFu4B21eKvv00gy5nNl9SleH1zvSPCdFjd1JkxFvNtihyBoHwk6CVv4K5ZS11Lzf1UxIiMUQ08VUXzRHnWR/RWsfy97T8Vm6wro+O5PDWhJuRXxjOjpOy02/JH1cL6oRQ9KiHdMDJIiP8Eo8dA4/nlAJUCEbmN4zV2Eujn/y7Th0nacG8xVHnuS9Qv/y351POXVHNFrtt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); 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)(3231022)(93006095)(93004095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR02MB1330; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR02MB1330; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 4:VHoxYjMBONrT2/Eeh63w69t1qaucjEqwGICTxaxseFRQvw9XTXledyixPZwcb/uh92sqPX16dR014MBbU89vk6Nj2kHDs5ueULJqFgTHjMcnVgmV8Vli7yHVH5my386Bfix/+gd34vl0rLDrx4LWMMKtZCyTV+JgBltRVLE3ZrHyUwJ3ef1jf6BrCZWjUvQG0B+LMhdX0i4Cy/+8dT1Z/rVzKTxqr5krYBtp0B/uVPbLlqkgpIvkpEO4ZOb29VuggEFwl5Lzw7KNYjOBLzvXYg+qNkI4HZLJNwEjr5kYXnxfYh3RRh2GlC38uV+O4DDDC+kIwnxr3k2BPdySsfKiFQ== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1330; 23:8rLa0C2YgJRh1LTPQCWbetaHbkUKdrq/3q5vW56ah?= Aid7dvzE50fuNEfy+7wonVdasUSu3MDH8CA2kaYq6VPJLzvLm1gj2LHhkFIIjlLThfL6/HocHVwVX884+NYNDvYEOEul6McNS5CNAxaVYZQGQfjgQjwOtVSPXzCszT9od2n7hPskX9XcaAQDTEY5Riw1cRgFcQAddmL0GK+sy59dtut743v951xHD9DG+Fu7gRT57K9rTpCdMNc2r+OgBptNZFuD7lXOTa/ZbYJbmHRHFtE/yblASIwlpHy0NB5/ZYHbv3/ddccELaBfiHiPvYO4JJ0dvmw1CS6m25xWg2bgMwNXTXhqeGZeNUj81RzvSjTEXf0Bq/4Kh2Tx9yVOIMdnlaCtBBidrkrSIWRWhBgyGT2uHye2zUyVO2ZU99gTWx8KVGuWpShgurxHR6JlcMpb6mgbAo6s9jt9rgzsCnCMhtoCFOnENmlExf78YRao66upLM6oGBjUBnvfFtkHH3nHqEPedf5Tppsz7hGD0YWrHtRoXqduB68tZpeRAz0imi7Da0fOd/2FwkTmz2BHp8Op2LWzgIfryXgc+cyMIwVs8cUIKEpQGZCvQA8sYZ3vd0TM4Le1DgMjGhoS7FL7XcnE13Vi1AqXRmIgsqOpkAmf0uUriHmT0kf9jIwmTTVLZpziqpby1MGw4RsLooqL9ViCZoImpd1/ALm3LRb6KDDAcZR2W/Z5l9p4DfrWDlNZ/5RWXVkauwpWydP8REa3T9zRAok4duL2+BiYo5lTl9Yu6PiXPe1Ogd5BaYYaeSEEdRiGYgvgsPi/BaVR4trT9IsvBR/xddxgKNPUlwOe5UgeuGPWF1j2y4/29x3LUvKnULWWuq/NvL4obuE+iNhdXsvz56xyjv8Y/sWvFKjdu0u/0ofwCoTOF2I+72N087BZ0LGwjqLwBIjOsLA42K9z/h0ppSc+Qe9Grhr0aKCL0OA2b1Sv18H+hXAyBTmIChS0oc6y6IayeMfCDVBn42MT43InEAHKZC93NP8BRyM6B5YIu7na5FNd2vogomDOjVa9Uc= X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1330; 6:xgHbeFAPv5GxSEmzmMeu3hnbB1Nk8gVjsUh9sk83RWa+qayzSiHlTsFbYHHhkzOcRwIP62tVkofcTlgyxCV7nlUa2gQSoXXVrw04GYaNgod3LKcThr6r21ZM0x8GL5bbi6e5fCYcJjcNNVDTvPvc3gBdCATaRfr+Wn9DQhqa/xgWSNM/3WT0DaHbBBt1CbGXIBrQCCJH6hJMvZvQXBcfScBlGTJ2vDfqQD0kcJOjVpO0bBp6Fljck1TWOQ1HsQCNJUdsoVw79k2q35+JDAsY3xdVdRTtNn9rF2+iNlPioCbyal1L3iY0+9zzTAVv17TNuwlUt1ku9Nrw9Q1TxMCL6RzW2iDSlBzRJ/9yOANzs8c=; 5:abWHRaR7fSb33AJRBFFs4CR8UwCgQfVduoUGvnHNDCPbHuRnlb9JD026tg/ZkK3NT3ohdtnvmRghZHw2ypbYs9wIgl1yvuXLzi5/qlbuI1hBEYg+68pPUMuNeYeb2/+0IZYpNidFYZa3cCv0J24DsSojiaj5KmhN1PBgpWsyEAI=; 24:mz1cKnI+CVSBLfZyh+PO9XGLXa3gK3jzphSh1EUxC7j7wtzzCdDWPBlGLPM7Js72gYUTb1T44pnPTVjNTVxoIVlhr8N1nAU+bARnofH0X+s=; 7:mU5YAx8lbsHlKI+soQNz3o7R4ZwYqdHF4oTghLYuFqzLRv3wXL7kfJFgrAAhsS+FrvJQKw55oAIn/ULUQ3/O/C2iYS+HE5Oy/louD7vXpYAtGCO0ztaelnanRx+XP40wnJSfP1fGUyRlgpXLuOCVwW/dtVRZ0/RDyRMvyNbOI7N4buCL13IhALZQ1vwlrbVVFD3VGIetLTGCgH1WqKPwpPK1J+JRC+6b55KHbo2IJx1a01V3aHGNhVVKiwbXT1P+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:15.9111 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ceb0433-2f4e-4507-02e4-08d52ae782b9 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: BY2PR02MB1330 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.59 Subject: [Qemu-devel] [PATCH v5 25/29] hw/ssi: 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+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 Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/ssi/omap_spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c index 34163e5646..98242d1e8b 100644 --- a/hw/ssi/omap_spi.c +++ b/hw/ssi/omap_spi.c @@ -20,6 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/omap.h" @@ -295,9 +296,9 @@ static void omap_mcspi_write(void *opaque, hwaddr addr, if ((value ^ s->ch[ch].config) & (3 << 14)) /* DMAR | DMAW */ omap_mcspi_dmarequest_update(s->ch + ch); if (((value >> 12) & 3) == 3) /* TRM */ - fprintf(stderr, "%s: invalid TRM value (3)\n", __func__); + error_report("%s: invalid TRM value (3)", __func__); if (((value >> 7) & 0x1f) < 3) /* WL */ - fprintf(stderr, "%s: invalid WL value (%" PRIx64 ")\n", + error_report("%s: invalid WL value (%" PRIx64 ")", __func__, (value >> 7) & 0x1f); s->ch[ch].config = value & 0x7fffff; break; From patchwork Mon Nov 13 22:36:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837609 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="0tyrso4Q"; 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 3ybQtH5VD4z9s06 for ; Tue, 14 Nov 2017 09:53:59 +1100 (AEDT) Received: from localhost ([::1]:56702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENc5-0001ma-QR for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 17:53:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENP0-0003pb-35 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOy-0007hm-HE for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:26 -0500 Received: from mail-sn1nam01on0066.outbound.protection.outlook.com ([104.47.32.66]:49078 helo=NAM01-SN1-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 1eENOt-0007dr-Ax; Mon, 13 Nov 2017 17:40:19 -0500 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=/O0IU2PRp3vQdfP2MEMiimaozIhOZMhixXhY72PmrUw=; b=0tyrso4QzFZPfwIEREE8v0Or2Ex4nPJV6jHX/s3rAf1GJ4Djx/9WPUzJXtmdIn/OKFCSvlWckWjDNQSxEE/rm23cmMJbFnz/NnV6BlibeAxdZOlVg6AZkr57sCwrkOFDWyn8fYHBsGwXRb1XvS6HThJ35Uyv5dIbj5m97uZNFJM= Received: from MWHPR0201CA0098.namprd02.prod.outlook.com (10.167.161.39) 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_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:40:17 +0000 Received: from CY1NAM02FT023.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by MWHPR0201CA0098.outlook.office365.com (2603:10b6:301:75::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +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 CY1NAM02FT023.mail.protection.outlook.com (10.152.74.237) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:47830 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOp-0004Wp-Ds; Mon, 13 Nov 2017 14:40:15 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOp-0000sx-AJ; Mon, 13 Nov 2017 14:40:15 -0800 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 vADMe5XV013039; Mon, 13 Nov 2017 14:40:06 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOe-0000fT-46; Mon, 13 Nov 2017 14:40:04 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:36:04 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 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-23462.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)(39860400002)(346002)(2980300002)(438002)(189002)(199003)(5660300001)(8936002)(478600001)(33646002)(23676003)(77096006)(76176999)(47776003)(50986999)(189998001)(9786002)(5820100001)(50226002)(36756003)(110136005)(54906003)(39060400002)(63266004)(4326008)(2950100002)(356003)(81166006)(81156014)(106466001)(118296001)(106002)(8676002)(6306002)(305945005)(36386004)(2906002)(2870700001)(50466002)(316002)(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; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT023; 1:WkG3v0OLsRvhVWcPqbJi6en03O8bDur8cgo9HQQpMmgggg4e/YGDzEXGR+LjncRjpK+JMvJmMZGjVESE+igOGQDssVS7FMrfB9Plw3sx1n3CVaagT0Ul7ds0euhB45Bi X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c3f7cdd-9884-4188-f38d-08d52ae782ed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 3:KxaWzLTLzJVnkbky1h9ORM/SNxR9vHe07WwV6zdhoTkAysJTIBr9jLftjQIg8muLlG7Wvjg9Y/ouKWOBJfE9KZhwQcJG66ZCTThvP1/svlSW0lqJLGuOfFzQ7pzmpyu+r0jsnbLkAp6OnX724/3HX6iMx1kZiVQT3GFPQ/4euwoZgAurSeBQvM4SBdyoizPzRUi4KFKKZe/b4n7COw7/jv3tYJsXpjV0MT6Kf0lfPZLMdFAZ+x90xiZPT8SW+7I+eWfPtdybGYG8ZAhKNPrxYnzww+gRJc0RiNvGtOuKzX+L8Br0rd3PYAVqv6FyzAy96qTj4hwnSUj2QpzZT0bra5bK80LC6Y/a5w4a4fBxNhg=; 25:gTfJlD9rS1rbwnBMd8rUGpAOUuMZzdMRtsM3PxEkGGUNaXeH8DBZIQ7/reH9XVgvuJWeXNB1kvhuR379JouWjorzWuqidXYaFxfBsLxsIu/zySjmuhDWvlZPml7hCJzwvcwPs8JCUdY5fgfGayx0LP8VFJm3Q8CzZsA0cMy5Vm11r3n66uaGyQ/D8E3OO/Py9zi+3hx6OYk0yi6RIedugbZ4fjsQ/tLhNaqgSjs5Vn8rbbT1JnCZasiIdWbZMJ6LFCpkQNpU4WFmxaPBZdSLg3ioGyqmQmKQVKk/MJ4pLRLXhHdyv5ghXv3dQSAbkBJDoZBWKZrwDcoN+tD1FlDopg== X-MS-TrafficTypeDiagnostic: BN6PR02MB3379: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 31:aYclmNnoNeyfsxmZxgS1vL8r2xwzz4HHpY9KYUxH6wvsPprX5MMM91eX4NRcd6pUVR1P+anq9dXV7nSIqf8KLLnhn4AoJlsJKLYu59UkVLoPqvKqlPBeekbvzrxAziOOAaoVx+z9f3XAsggm84GUThoq8ASBukqb/5uygawz4PnoaYFFD0z8OS14r/5lj5Fj7uzoGOZbnG4OLqgUBfKJ+sc5BM6ZauHu/UUcnj+Y9sY=; 20:SLTgRMS7cPru9nKb0GN5SplGuVnratSmggcv1Oj1ACiD1oepAqw56lwla8rjsvu6KYcTfUM0afOUpSErhG5Q69q4ndobcNzcCvDflSj+PxXOfjnMKbMmhGeizTb4ThN8fbpT4u9rHkvuhY01XuPo6iaQzeU50k08B/9fte5I20oBF/YPbhK5Il6HtuefWDdZLxRaZH2hUAf1R0tC/cYkMiTBusiBJATi7miXq1+VwPd5p6MhYhIoiYgwvDxFYF33SrtvWbI6bekCTrrjn2Q+OnHP5BzeaLJWsaC06sAS2qMGLxnyM0zVuwTanmWWAfVcTG1GlXrQdpYO3zM1VqqNWO/yzU4GGpbor1mnAFQRNeoAX6oIzAl4t9x4U04MtHuFJn3y76STgzBnxhkkjgEYQEUDRnF1mLxFbmKcF0/Upo8KLxjK92n8SlfKZyGG1gaqRCFDSxCJ52U0Rtnhco9ZUUQUhAoLI+M755O/CF7O/zPgq8zNjHkcI4DLvz52Ullc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231022)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(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:TCpzUgAjEYAhIhaKmIcvyJ1jxvSRsL1NKtRUgIoAqmIXHWID/qamY1qBljv2fxJ6dsGKFTuqZYepb0zewqgjoEX9rI3q/RgBHQC/9245p1hU7mk6TqlcOflzvEkDJVIKat4PDIARnAcfEyKB9gP3f24jUjDa1nDlOg/GeVfzJ23/wgD/459btK9pzJbLjz0nzK/xCYEhreKIb66TI9ayl5S1hB/1XtcUh/KlfjDMR6tixE+0Bh5Uwk7WWzLxEuwBaciNNayKo7uD5jNIISKcXk3jb8tLfetD84hYd35z0OoOKlQ57XuRiETly+FTiOnLh5v8emFB9oQtIwfwciGUFsO/nM6WEsflbsYJfM6czo26yJgIdj59GnBxFnqFZIJZ/pTrXdhMr0fzuX5JncFuXIjRz5Jfa+1il7oLmWSAvBY= X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3379; 23:1pZAicU3A1i90A+vdJtdf0hGVw5yotyOE+kclYgD0?= h10BZ8IR5ql/vMHdVpgfXVoT1ANlUCatXu8FlMnakxoapn60sHTcxQStI655chVoEhIhWvtclPc0QuDpRroV23BahPqBtQ09LbqiosObXpeUjsF1jvu1zs7eXjObOR6Td3Z/4YLT8zq+3k1PKAU9+lxy83sAgomoqf6VZvamFpWna7qgaLqKQZ09LML7ncTF5qRxhbL0U7vI4vIbNNHqaxr92Kiqc16kReM533t2IuBvNJORBsZ2wod8qXrYpQ7Ue87wP8y97gozHR3G5J3kzF9xDr1FkAGRIoz3YRmUIoBAc2SdZInbBwlUi0nsMcbeie+o1IYsP4cmNaVF8jcDUhOM47k9a3j22fXQyTaTHpYPIgBniRIyRn5GeiVbtQMBwGtWp+fG/ZBeuEFaCLiiR+fzqZIbcu1hLMaF5hWNerGBtud+lrPJQ7O+4mcIh/NA3ecn0XY77aKz498aXCiPe09Xjayy6oKPapKSxVBFnU4qjGZqBgp1GQWYoqSc6DP8eBiD0Ngb35ZE5z1NbyRGDifhXcZJGUIXZtgoN8mehdrwI5CGUjXSiR7iQ1lStXEcQrJZTN++Ya/LDmXVK0uDXKPV3hHeQIvJBdvuTGxt2tZOGjpVqOGwFf+lyjSXN/fMfwdNU1vKkHQw0uJjaU6SMiD5I1YTt6ItnfNW7uZ82g70fpQo7W8pDoRKuf3Nco5FZml9sU7M/IezxcD4Ru8rSAix4WDFwRics7LwT7pJWVr1lk3RRG5zyoYB+kjc/vsuRqubF/9ZHe15XGEp4m05ogmeY9BHa2bOlYkjx+gbJiMlE1EPpSBL/TqN1j/ciC69ZheKxeAv99gEFE7LJYqS5Ru1UH/MpcFO16tAAvCRrM0B8VoW4bUWO2j34LEsM4Ety8yuN1frN9nLvJqnm4BXXcCSQkig/Q0tpGdEDZVlTcfrCtqxn9eLB7G48nHWYXmgLANp0OYm/ZaHMYIWR/SU1Naa8ubh02X+GvlOQdYXlH1MKSjCsIwapVmRPzSnEe7iTf3WtbE1IgZCBKWOMmv150C X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 6:RI2p2FvSXGg20MzlHEL7iYVKjCJJrY9MKbEr6ouh1FJEkEUUW0R3uzZ6972PjLLztDqK/hejEW0IuYj151oHzRP4fCuORKR+dbNRVdP/aIJa1nXqUHzdu8lDaKPAsiE8jkiUF7CfBn5iBqg6Sep2AKhM4KTHtwyN0KzScqTs371vNYiRsNRs8XmT75pjC7pU95NcNvSEsgjQUaQfD3cROSUdKoIOQ1w22GfDjb5ZPHHJFJm7C6YLzZbfX/fnHUutmAo875mlqEpNzkDGQH8huravoj4ignZb1B6lB3mh5kR32tetz2rpkL1bAZgmEObHUYX4/faHd/Yi4FdT/8PVg0tokRzf2d6Z86or9HEFty4=; 5:RQV7JE0RIGXYtn2QtAsrUVHSwXhaMTFl3zVE9ZX0V9Jh2i+p+fJ44omd4v1U+BuM6b8v0IErQhRU0pXkQmkim+Nq18daBFTGBgEQ0nPzKgXPOjbeaHaIbTX4aJcJqrXgtxmJSgvOp1iNY6mAeQ47Z/SzyppqjIDgsGvE/HlG8Kc=; 24:lfY6epEJmavjafjZsG5p2wX5DysskijXbKrVg/BSGHibeAYEoFPGV2R06LNKzzrPDhzUXKfwEuyfa0jyqv4WwubbtU71gfTbPDK4eQxOR5E=; 7:0h48fOFeb9qbANuPf26ZG+Scxv2twXukyyIrvep3g6P/e/FWoWwjIS7vcpojJjw46ACJFm43WtrzpA35L4DduFmd/mf/dHaLAJvpIfKHdktpGT7Q9hPzEg3IxFomR3iQ5cT5JITyMuWtLKDBv5+ICbJ90rlIBHHsDUSZP6nDXTPl8xEfy0l9TYejKjzGy0vRkpuL39nX+4Kc0MUobVtNmXHaHiDojXd1rFiVa4jqoHE8EjXIj4H/oPfRyVDXjUQq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:16.1800 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c3f7cdd-9884-4188-f38d-08d52ae782ed 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.32.66 Subject: [Qemu-devel] [PATCH v5 26/29] hw/timer: 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+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 Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/timer/omap_gptimer.c | 11 ++++++----- hw/timer/twl92230.c | 2 +- hw/timer/xilinx_timer.c | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index ae2dc99832..0f064241d3 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/arm/omap.h" @@ -356,7 +357,7 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, case 0x10: /* TIOCP_CFG */ s->config = value & 0x33d; if (((value >> 3) & 3) == 3) /* IDLEMODE */ - fprintf(stderr, "%s: illegal IDLEMODE value in TIOCP_CFG\n", + error_report("%s: illegal IDLEMODE value in TIOCP_CFG", __func__); if (value & 2) /* SOFTRESET */ omap_gp_timer_reset(s); @@ -394,11 +395,11 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->ar = (value >> 1) & 1; s->st = (value >> 0) & 1; if (s->inout && s->trigger != gpt_trigger_none) - fprintf(stderr, "%s: GP timer pin must be an output " - "for this trigger mode\n", __func__); + error_report("%s: GP timer pin must be an output " + "for this trigger mode", __func__); if (!s->inout && s->capture != gpt_capture_none) - fprintf(stderr, "%s: GP timer pin must be an input " - "for this capture mode\n", __func__); + error_report("%s: GP timer pin must be an input " + "for this capture mode", __func__); if (s->trigger == gpt_trigger_none) omap_gp_timer_out(s, s->scpwm); /* TODO: make sure this doesn't overflow 32-bits */ diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index ef116c636c..18880884c6 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -614,7 +614,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value) break; rtc_badness: default: - fprintf(stderr, "%s: bad RTC_UPDATE value %02x\n", + error_report("%s: bad RTC_UPDATE value %02x", __func__, value); s->status |= 1 << 10; /* RTCERR */ menelaus_update(s); diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 59439c05be..a80bba846b 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -127,7 +127,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size) break; } - D(fprintf(stderr, "%s timer=%d %x=%x\n", __func__, timer, addr * 4, r)); + D(error_report("%s timer=%d %x=%x", __func__, timer, addr * 4, r)); return r; } @@ -135,7 +135,7 @@ static void timer_enable(struct xlx_timer *xt) { uint64_t count; - D(fprintf(stderr, "%s timer=%d down=%d\n", __func__, + D(error_report("%s timer=%d down=%d", __func__, xt->nr, xt->regs[R_TCSR] & TCSR_UDT)); ptimer_stop(xt->ptimer); @@ -160,7 +160,7 @@ timer_write(void *opaque, hwaddr addr, addr >>= 2; timer = timer_from_addr(addr); xt = &t->timers[timer]; - D(fprintf(stderr, "%s addr=%x val=%x (timer=%d off=%d)\n", + D(error_report("%s addr=%x val=%x (timer=%d off=%d)", __func__, addr * 4, value, timer, addr & 3)); /* Further decoding to address a specific timers reg. */ addr &= 3; @@ -197,7 +197,7 @@ static void timer_hit(void *opaque) { struct xlx_timer *xt = opaque; struct timerblock *t = xt->parent; - D(fprintf(stderr, "%s %d\n", __func__, xt->nr)); + D(error_report("%s %d", __func__, xt->nr)); xt->regs[R_TCSR] |= TCSR_TINT; if (xt->regs[R_TCSR] & TCSR_ARHT) From patchwork Mon Nov 13 22:36:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837623 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="eE7FYFNZ"; 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 3ybRFP6JlCz9s0Z for ; Tue, 14 Nov 2017 10:10:32 +1100 (AEDT) Received: from localhost ([::1]:56794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENs6-000278-0r for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:10:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENP2-0003vl-DM for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENP0-0007jc-OT for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:28 -0500 Received: from mail-by2nam03on0050.outbound.protection.outlook.com ([104.47.42.50]:23147 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 1eENOu-0007eY-IQ; Mon, 13 Nov 2017 17:40:20 -0500 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=Yddjkp1sNuRQmKA9/80oGuS4nDQtluQSBfLJkWFNgmk=; b=eE7FYFNZzDpn+nuVVmM3nlW8CtcT9fRpnrIokZ9G6onqDpgB1OYHY7T4rtbKTXN0hA5TsDExnps5qykM6brV7GwMYHqBMcDwxYNqfgZfAMbMsZzOYdGtGBy7QWKd0B2gFp2U+SnWANMnQeVPTVPMdcVm38QP3RptDglAE38d0Wc= Received: from SN4PR0201CA0071.namprd02.prod.outlook.com (2603:10b6:803:20::33) by DM2PR02MB1340.namprd02.prod.outlook.com (2a01:111:e400:50c8::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Mon, 13 Nov 2017 22:40:17 +0000 Received: from BL2NAM02FT034.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::200) by SN4PR0201CA0071.outlook.office365.com (2603:10b6:803:20::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; citrix.com; dkim=none (message not signed) header.d=none;citrix.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 BL2NAM02FT034.mail.protection.outlook.com (10.152.77.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +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 1eENOp-0004AM-FQ; Mon, 13 Nov 2017 14:40:15 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOp-0000sx-CA; Mon, 13 Nov 2017 14:40:15 -0800 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 vADMe7Ld013133; Mon, 13 Nov 2017 14:40:07 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOh-0000mw-6c; Mon, 13 Nov 2017 14:40:07 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:36:07 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(110136005)(81166006)(77096006)(76176999)(36756003)(50986999)(81156014)(5003940100001)(316002)(16586007)(356003)(106002)(305945005)(4326008)(9786002)(50466002)(8676002)(54906003)(8666007)(48376002)(189998001)(2906002)(63266004)(39060400002)(106466001)(2950100002)(478600001)(50226002)(47776003)(118296001)(5660300001)(36386004)(33646002)(8936002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1340; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT034; 1:V5dyZjdLH+4qg5Avb99s5ZL2jq5mQjSTYBxUGMnVr/1Qa+goQ7pgeLjEZXbFZdVccNWMAy2eTyMY5MR0kL26EL9C/ep6DmTyIlgG3GcC3gmehj8OhRsG8+CuadcaDlqy MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7788a9d2-1e7f-465a-2a88-08d52ae78317 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM2PR02MB1340; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 3:GXWduaulSl4NKsjM4/czEGf5rbDBlinfNVL4HZvqGka8vOW5E1WEG7kPffVQgkQR6ul/NaipeiyrmJvsLohpm4ZKAn+egmVmz0l2eS5Eb7IKF6VaofVqEme+Hb2O2hf8+6o8eRg4m3IMldnbAy486Brrnwp6O0A1iYXowXXDwrx0Vn8tIiFkgJt1lcELfZwghAc8vOV4k6LHop7opA59aX0i2/368dUDCL5gNe9dN8yL1Z+PZrx0Bt80MxluN2CYMWaVrS4lMZCbAckJMjZN/5GznhihNB6msLh6sQ66Is6EtHJbVslVzRafJjSpnJuoQyip/uBMTzFVQKg5PyXbCDcdAyThhMle4vrXaTGytk4=; 25:F0PvFLGaumuEM7Fvyi3LO2uSCB6p0+OndRxZkZ3sKa/kActXzUYdKpSx+oQ1yolw3faPwC3RrLVwONpYAQdoDzQiJ7gkzjXwC+uwlm0iCwHX9N5RxQT6fA9oVxh63CBCeRvjQUBYo81lJQEpAui7+YRvsfbR+srdF5REinPPYCNV/Bu5OKLmKjWvoMPKPoBMhnyLGjEgFZQIpgOs8RB/MMSjfQMVqalPt+yWjat45zcCAj6pnrhVRE+cMcfX8AibcK/vVqRSytNUEWUGWx11HV/61YNLGiYqco4rEB30p7vbnduZYklPoPYdqoGmCsPKU1tO8JmtQR5tQ9jdTPkrg2o7Hf+AbRHn8fhTwrmnVJM= X-MS-TrafficTypeDiagnostic: DM2PR02MB1340: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 31:HDMQbRKas00+QkxH3Tv2cGF4bwb++SwMNoSVmt/y52NXWtKJtfepR1BoeEiQX6O93pbxf31zPmaXGhQCpEt1p/xLqDSpxA7W02y/hJ3ciHoQUy3ZN5s5H93t/kF1ST7T7wouzE7WFpx+U8xIFRIn3mAAxeaTAeJ9jy6+oUN4b4vjFqSfi8qMf5Nuc1lX9kP+3ZHVdTFgR1lvp5lUFnb+FaMHKMBJkuzggwekevKfuPw=; 20:Z6fcX/Ii37gkSEi6jblPGMl6m85y3+k7Cx9S3L5x1VLqSnMwn0w6FDHrl5XcaD/aW8j4QdAQSXlGVhnKEIs57UU/x+3s6oDL5ZR3Mu9ASPRuprPNpBdj+FRCqvhzYfVO2JdJdWBiduvJrpB5sC0qx3JWxVZwBgvYH96Hmcl5jFmKzfLhJqmREb5aLOU/klpFRxgUc/zed5+FbZn4fEBZgmMDW9R5nn/NQgtOUfp7rhdHCaZ1g5om6yA35g3y5O6GE+i+0inynwLU7ZCB7RQWTDfN2My3RwWkgEme/Rgp/0CUs0HItLWkYUU2ipQn/tI6vVyIDmN3Jsn5C20kLZRMPrRQjHCzjOSrTcwaQj+HgtRtJP0SpQZ0O1YQcbOCZxiOtDuf6Jv5GNX8XcraCMSW2L5f6SIwCjd6Gg0T2ITcttqOX3fPZGe9mNK85m74qEc875XK6nUBgn9417KOlPKoe7Yh1JQNuPhbPV+5wgb4iFod5Z4Y+oolBnW3IIg8Il/l X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592)(70601490899591); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(93006095)(93004095)(10201501046)(3231022)(6055026)(6041248)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1340; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1340; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 4:k/n/u0jh34bij3JMSlZGxFW6BUrbJns6d9+k3aKzNCOoxec0gTeDhNBxtpKjqdZI4o7aQmvZ+RQrBMg5R5FR9Ry0cY7Thidd5M1RdN7f/ZYjMs4p9Ab5JRYaiYMGTzztnUfR0SZ6vwg7RRVdlbmw4EU+OWznPFv6XUtbcr73ynQTm/OVN2A/LAGmksTsD41I7gPsYTHvDmAr43RHgo4J9k8OnSlYsFjEKKsVSbZy1HX0scCZL8anxw9rkJHShhyVLw4I+w+EYwifvZVaYV68GIGHfBwJbsxD2TZPXhNGqo6Tcn7MvYJ7j8HgE6AoQtmWRcWDEm4S66EWjE8gnL9hqvfXnfMqnpqLoWaHsi9Rh1kZ7+ZahsBt1zcxnIMWGugg X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1340; 23:Lo1AIAF3YtkSYBf+YIdnal8GriA5cknUKGU3IY+O2?= ykPF6ylfZrpErF5GRSrSwisKHk9MjmdBwuErOvaMYWhvc7/QD7dAW1/pDElxQdbL9V2PTnqdx69PhZ3ZvPcjE6oAcx+0/GC2QzoUGl+DBcGAGNN9IxpmIvDvg4gt/ZeTW7aQsHW3+oaQwx/yDnI65KxMLtqXg0k+8Kc4XecE2XO27sW2gv7RXLZ7CU9Q1F6aEIIB007APHnn9pGsYspBcuEMngcjO0ZIhWhf5XWbl698cJlQ5j1Ftitrc5aIyYpXVg9fu0yXcS36TdgXm4ncsbNxdScVWltHCYA45Ox+nz6I/Uf71iO4BF1DqVDaL6nONGskQdnawLrHHCgfxo4j0UCD/RMH40UUv6BDk7exxj6qpcopFL+wDrJIg4OnasX3WLbud+ZrAiPSN57xoiMr1+3C/OeBNTPau74OkXeSxCEmT1XoiSQpJLeKziTfnsK2luIAs2R8nhMvpSOwDG/ebaH5EpdAk/LiyHFp30lUzYY5s/OlbrD+IJr29M8WSejjb9rHcwtiXNCMeodQJDnAmMicJIreXxg/dePBSSzsal0IM/RLSLPTTUfH1wmA77/y8czdLrzEogfozauTYwxIwyk86cWWOQW49s9o8jNxD0J/GohWTJiJu72VpgsKtEUF9nBMr5EJO0JAzXaO7yTBD9IqZbNVqjKIItcW1iw/ZuuxutDztlRq7H9rZlWGqVlslcnz0s8K0JxDgtRVWfggztpS/QiGaVpFrwWaiyf5QfopQU+yRFpZ/8jxoO6pHa6EwDqKEPioECclNBdepg3M98ud4OhMoTmYpkTo7uhaUBfXspU3L7cmqhzZCkYABJr5qdl3nTKZNHXFMi+6OfE+pKpWCaYckRDHqm3g3tplsQmTl/mZDJ1DoDfBSKoD1wIpSJFSjjKUJ7kNywXqj5+1bo+DJ5TNod1wRuJaO+/m1vuls4DVIljFPv8qqMMtTvzPtLIWYEQacyFbtq0pbuaItiVuyN2Wi9ju3FqmJV5IAjlSg== X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 6:yIh4i269FEVcXlyUj9do3IFW2iul3x2rh4YJHSU44uLyA2Mqs1CYkwa3hcEcpzwTDZwD3tJGnFrOfvhPwubOxKiYpz53SypUo/pAWek7JYR3GNZ6v4fdpPVUl0ZLJmNzmswIIYMx0WFN5Cc0sFIs6F3ul9neLAAFQVEQLYcF8MQTQd69FkJjKBSFTZRS7Dqj9UOTI45vow9klBVdmsmVjV9eZa05+eZnvWUTP6SJlxXrE1KWzA6clnmV/cWepHW3vBBdK/QdPc+tzuzWhxrM74PyH6WpSHaMdnyqqnw3eFvAlpKyEsI8x9mRR5FoJ/FQjRIz0lfGIskODlRDh2pBWBQcge5+RZWs/fTE6F93Vn4=; 5:KXvGiGetlrGCznIHFwwW4r67lrmfySb1HQLCSfeWxq3dO9a6j5QEqFVcg+VXxyrDNQzE0cyN9fQ2RJ+v0gbGqZfAMniS2aSmiIiAS7X3W1BVr/NSekttLpqifDwkQNeChUxKFpQkh9J77lM2TjqcegJTtJnN83K/l96gWI5Hffc=; 24:Dhkf2D4kNYvbyAwC9kOI63fuwcDJOdMAGUXjoEHJI2soMP1msYut8IfBtuIMqJA74xe2zmVaws0y/eVUhChL1WrddYUDNe09b7wR8gVJA4U=; 7:Ne8xBaF6Vu/464MZ1b99URxh1ZdyuTAqGi/kEoc/eiVSlbW71zkQJEWtl/G8dVKoDCoCLyckhK2+2JQAl62o6k4uMu45au5VF+gizI5f8+ezBzsejgc6wgNwiE4BQPOHlJEG7RzXoLXPOseKmpou7w6SCcUstIAFqGkSnhoqkYwfSfo6EZkKJWvTB/icu3IXMNLFC2GnGf107+sX255eRhWGUtEczGIf52AbdLZRkf12IMV/pXKlJgf3dW5lzxIj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:16.4501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7788a9d2-1e7f-465a-2a88-08d52ae78317 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: DM2PR02MB1340 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.50 Subject: [Qemu-devel] [PATCH v5 27/29] hw/xen*: 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: Anthony Perard , alistair23@gmail.com, Stefano Stabellini , armbru@redhat.com, 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. xen_pt_log() was left with an fprintf(stderr, Signed-off-by: Alistair Francis Cc: Stefano Stabellini Cc: Anthony Perard Acked-by: Anthony PERARD Reviewed-by: Thomas Huth --- V3: - Don't change xen_pt_log() V2: - Split hw patch into individual directories hw/xen/xen-common.c | 11 ++++++----- hw/xenpv/xen_domainbuild.c | 24 ++++++++++++------------ hw/xenpv/xen_machine_pv.c | 9 +++++---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 632a938dcc..42ada2ac05 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "chardev/char.h" @@ -47,19 +48,19 @@ static int store_dev_info(int domid, Chardev *cs, const char *string) /* We now have everything we need to set the xenstore entry. */ xs = xs_open(0); if (xs == NULL) { - fprintf(stderr, "Could not contact XenStore\n"); + error_report("Could not contact XenStore"); goto out; } path = xs_get_domain_path(xs, domid); if (path == NULL) { - fprintf(stderr, "xs_get_domain_path() error\n"); + error_report("xs_get_domain_path() error"); goto out; } newpath = realloc(path, (strlen(path) + strlen(string) + strlen("/tty") + 1)); if (newpath == NULL) { - fprintf(stderr, "realloc error\n"); + error_report("realloc error"); goto out; } path = newpath; @@ -96,13 +97,13 @@ static void xenstore_record_dm_state(struct xs_handle *xs, const char *state) char path[50]; if (xs == NULL) { - fprintf(stderr, "xenstore connection not initialized\n"); + error_report("xenstore connection not initialized"); exit(1); } snprintf(path, sizeof (path), "device-model/%u/state", xen_domid); if (!xs_write(xs, XBT_NULL, path, state, strlen(state))) { - fprintf(stderr, "error recording dm state\n"); + error_report("error recording dm state"); exit(1); } } diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index 027f76fad1..f5514ffec2 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -25,22 +25,22 @@ static int xenstore_domain_mkdir(char *path) int i; if (!xs_mkdir(xenstore, 0, path)) { - fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, path); - return -1; + error_report("%s: xs_mkdir %s: failed", __func__, path); + return -1; } if (!xs_set_permissions(xenstore, 0, path, perms_ro, 2)) { - fprintf(stderr, "%s: xs_set_permissions failed\n", __func__); - return -1; + error_report("%s: xs_set_permissions failed", __func__); + return -1; } for (i = 0; writable[i]; i++) { snprintf(subpath, sizeof(subpath), "%s/%s", path, writable[i]); if (!xs_mkdir(xenstore, 0, subpath)) { - fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, subpath); + error_report("%s: xs_mkdir %s: failed", __func__, subpath); return -1; } if (!xs_set_permissions(xenstore, 0, subpath, perms_rw, 2)) { - fprintf(stderr, "%s: xs_set_permissions failed\n", __func__); + error_report("%s: xs_set_permissions failed", __func__); return -1; } } @@ -235,7 +235,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, memcpy(uuid, &qemu_uuid, sizeof(uuid)); rc = xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_create() failed\n"); + error_report("xen: xc_domain_create() failed"); goto err; } qemu_log("xen: created domain %d\n", xen_domid); @@ -248,21 +248,21 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, rc = xc_domain_max_vcpus(xen_xc, xen_domid, smp_cpus); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_max_vcpus() failed\n"); + error_report("xen: xc_domain_max_vcpus() failed"); goto err; } #if 0 rc = xc_domain_setcpuweight(xen_xc, xen_domid, 256); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_setcpuweight() failed\n"); + error_report("xen: xc_domain_setcpuweight() failed"); goto err; } #endif rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n"); + error_report("xen: xc_domain_setmaxmem() failed"); goto err; } @@ -275,7 +275,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, xenstore_port, &xenstore_mfn, console_port, &console_mfn); if (rc < 0) { - fprintf(stderr, "xen: xc_linux_build() failed\n"); + error_report("xen: xc_linux_build() failed"); goto err; } @@ -285,7 +285,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, qemu_log("xen: unpausing domain %d\n", xen_domid); rc = xc_domain_unpause(xen_xc, xen_domid); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_unpause() failed\n"); + error_report("xen: xc_domain_unpause() failed"); goto err; } diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 69a52a9f93..44d67b87c4 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/boards.h" #include "hw/xen/xen_backend.h" @@ -36,7 +37,7 @@ static void xen_init_pv(MachineState *machine) /* Initialize backend core & drivers */ if (xen_be_init() != 0) { - fprintf(stderr, "%s: xen backend core setup failed\n", __func__); + error_report("%s: xen backend core setup failed", __func__); exit(1); } @@ -51,18 +52,18 @@ static void xen_init_pv(MachineState *machine) const char *initrd_filename = machine->initrd_filename; if (xen_domain_build_pv(kernel_filename, initrd_filename, kernel_cmdline) < 0) { - fprintf(stderr, "xen pv domain creation failed\n"); + error_report("xen pv domain creation failed"); exit(1); } break; } #endif case XEN_EMULATE: - fprintf(stderr, "xen emulation not implemented (yet)\n"); + error_report("xen emulation not implemented (yet)"); exit(1); break; default: - fprintf(stderr, "unhandled xen_mode %d\n", xen_mode); + error_report("unhandled xen_mode %d", xen_mode); exit(1); break; } From patchwork Mon Nov 13 22:36:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837618 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="b8fHMaq/"; 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 3ybR4j0Kk3z9sBZ for ; Tue, 14 Nov 2017 10:03:01 +1100 (AEDT) Received: from localhost ([::1]:56757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENkp-0000Du-5P for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:02:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENP2-0003xa-Uz for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENP0-0007jk-R6 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:28 -0500 Received: from mail-bn3nam01on0088.outbound.protection.outlook.com ([104.47.33.88]:19280 helo=NAM01-BN3-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 1eENOu-0007fL-R9; Mon, 13 Nov 2017 17:40:21 -0500 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=2MDvpXGkNYb6BdhcNWoPiBhQz/C/5yWOMQrFiXnUiHw=; b=b8fHMaq/feIs22WLp+1Vji7s9gh75+RJexmdeiqWcZ+H1V2Z9Sn3zECdNmPXJaTStY/5Df/VsmqXACZ1oAT23ZCg0o+xPk7Xnwp6m73RDppBR8dHZvn9CzfCQGs7lRy/1VPLt1lV1nfD72kZf+Lko18I3qPzZu5F1veWTjCfKPc= Received: from SN4PR0201CA0048.namprd02.prod.outlook.com (10.162.76.34) by SN1PR02MB1343.namprd02.prod.outlook.com (10.162.0.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Mon, 13 Nov 2017 22:40:18 +0000 Received: from CY1NAM02FT021.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::206) by SN4PR0201CA0048.outlook.office365.com (2603:10b6:803:2e::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:17 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; weilnetz.de; dkim=none (message not signed) header.d=none;weilnetz.de; 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 CY1NAM02FT021.mail.protection.outlook.com (10.152.75.187) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +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 1eENOp-0004AS-IZ; Mon, 13 Nov 2017 14:40:15 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOp-0000sx-Ds; Mon, 13 Nov 2017 14:40:15 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMeAY3003189; Mon, 13 Nov 2017 14:40:10 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOk-0000pZ-9o; Mon, 13 Nov 2017 14:40:10 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:36:10 -0800 Message-ID: <55c70157d3650022c60f73da5a4ab238aeddb467.1510612380.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(9786002)(110136005)(54906003)(316002)(39060400002)(16586007)(8936002)(575784001)(50466002)(5003940100001)(47776003)(48376002)(4326008)(5660300001)(36756003)(305945005)(50986999)(63266004)(77096006)(81156014)(81166006)(76176999)(106466001)(189998001)(2906002)(50226002)(356003)(106002)(33646002)(8676002)(118296001)(478600001)(36386004)(2950100002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1343; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT021; 1:c0dLTOeE7gPe5dJknn8e8nRavYFif+RTY4VVqiX0x883HPkml3WpwXNHUlgUzTXU4/wvWa+041GLY8Az0qBgJkMxT6/y9EK5R1z5p1uT8rc5NFj+qMh6NvWE8Uf/bQj5 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa49ce60-f2c5-4ac3-17b3-08d52ae7833d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1343; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 3:r74ZtQiYokkwQ+ztHv/p7NkpnI3QWHna/LsxQzJJVGjRLyf5bql9idz4O+UjZcmS8hkHO6Z1r5qjzmcv3ezgeg3gUtn4yxo1CIePXSZ2vyudbfzyZVRPWSvMaQytGk1XHrbqZGQgJXmEXZFDsa5zaxSqZiRRsFUHBPBD01/bCXpV7xmodBtn7S1N/BrDQjbZJYfWZedNhUcOAgmpZ5PBipapCMzZq1ovr87mLLA3w2GQEpA4yyaqAvTIdp3RzD+dcsX8D/AuNTaqwEqMjJv41m9aDIQrN4HcI3o8CZsbyR7eoH/pvvUGWm8fWEnAIPdl6b1YBLpwVyooJvHGfXUBTOYQaI73aH2hArzr1Bm6Lm8=; 25:gtYPqEdJBwAVRqKZ93MRIyBT3/WSfRlrxfZWdIvpnRaYuNHunvgniucDKj8IzmpVRwLLpSnP6pWj24OAnVFxKKB0DVe+yjYzi+xoHQbl63NFVt3aznAnLkkjk2skv05aNLpErt2wNvf7Go1FyGzgUrYsIodHmM4gNM717bmk8UDiVb61hGviB25w6QvSPcqPUut6J13HQ75EOgCQnjrFvdRWyqUogZZJ0kQXjR4iWZz+v8Lv0P4v3V0JfNjJNHc0j777KdxeJWgcx36qqsdEViXIigxovGHE3XxEmSwY1N5ScePM9ynL3jLM/U9lrAn3SikfOWFZXPAIGvRJgfIxo/IgVZvKbQJq+vubwjvPir8= X-MS-TrafficTypeDiagnostic: SN1PR02MB1343: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 31:wg3AC4yQn75ocm0311W57gDjdeEpV3Xm2QheGb9C94q3oxo0RlDztFeQ1YCz4IBxBRpHjHF5nHIjPDgtFZa/S/FFjO+e9nPk6XXZuinmJsMnrCM5hmtE97Iv1AGLIsY2qVdGGurgKjy36TR+IgiUIJMbRzO5vfXUCxanQJ2c7oWLoArhC0nbjxa6hvjATJ74Hhuryz8JS93H+IafMCdam+t6yHNhLLcatuLOVHfnu18=; 20:KatPZflVXQ2+9Zkipvn84WSqe6FbXU9dw+xhu9tESfjD+dxEbByTnSKUKLOc01JD9znbcLK+jXk5KSDtPaToYDx3ZUwC8wo2M3nIIT1i9kLY+c59iz+ZlP1Y2G8j4uNFU305e8gzJgtb0DirR19tJOOxCYrLK36X/5J4+DkzIUaMhewtfER1ZhQFydDL8cyy4IfnmdMNvlIXtWyGbEPoi7KyeR9ugnqPkbzzp7uWnkmdZMjeQB++q2HyEZ54Nzd9lezN4mvK1pvtUWdOfxi0reVauiGhfrrrB/YPuzEwBfiYanNkkAr1M7IqbkMnBDVvWw1x0aLlHvGgzOFHkYJtF+R4Jr/GYc9qk3pQohIjFQORwFhEoSau5xlkQjNiIvKcsCiz2Sghqz6PEwvb0T0j32k2oXcGC7ZxCPmz1CBnRBMII4TT703zFFttdMxqNW1yzUspj91SIL6c0l+XJlBSYCJWqi5SzEdGnt8qERnjvjuBoLyatr/zIVSvZt/gfSjo X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); 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)(3231022)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1343; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1343; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 4:G4iNuRqi4y0rVp/bAzkGGRtx0qj/+JRe33wkFJ/5ka6LVWbVoQrKyFpXPrLe+xx+NZVVkWUalFiMRlFGAxbiJgDiZDRiJgklk0cNFm15lUh6NFyC1BR8/s3TYzsANkU5P/ZubUUMYNY35Mi4AUp5btb3jQc2FEw/HYG90rZB2kIrY/otdkdNxXwcPcs+1MuLF8UV3r/VPvM43HyNjoCR7DFqlXksmOXhc2vvaI+ScMI/ZhbPjXQjQ0dKmGK8H8IAZZLjvds3JWrMxjxpShxG3Mox2re24FiBF6MiiPjQnpB70MsYW6Rg9udbHi24bkcWgR2r6rko1+J6Xx3Tc3FFQw== X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1343; 23:20pgmFoR+tkSqTlSZgOeY65SfQBP4glork7qAIBoA?= DBIClKciLrMK6yGT+PiCHwHbUPBjexpdX3dj1+k3RBQ8kbk7T6859azxcbZHPQwr2CxhdYHP7J24QIx1kmjfP7oVWPfRh221LXUMDwTEGxonWbdfummgJboyvuWCYx/ALZMYSR7p9ZLAnt4k0p1BBQiTVqMgdFPPdp4rrs9qdYp2MGpRPFBupaxuDCVS6gORQLiPK55W/t/bReQbenu+SZ0itNNED4N1UsIoHV4wH97811RZMfBRmz6En+Qh0ljKYTfzhhKkh7xFzDGDmsiK+iIzyAI/6b1oaDoOetRFA8sblZ+Brl+1HFP8FBkvAK0Su03WUhRcDFjndZuGvqH0HGyL+nw5YQ4y/qVcjz3ynGdG9iRtJOR7EJWswPrewquAidqC6hTpFpPHiRi/su+r6lD63JdZo5Jvbd8ObUBT//rDTVpkzuB6Ce84YrNkjSQ2vs1V0SdI23Tsh5v0saAZ5UdfaT8PfUbVvOt5o53Rl1JzApuIpAvqh9o/3hQRPjEb/1ZsIMtje8R3mjFzK33kjFKZh3E/wi9PSHsGPn+WegSMSyC25aR052rPQyRfRhVmUCIUidHRQpqdvZqezlhTckBPF0Dt850MJ9Ypm0zBzYwCumFm8ysTM774D65JjPPlZxVgpJUYMl98MYPglFSsOxPKAcI6qj4dHJPMr0Vryzj5iUHxG6dau9KjHiR1s4FY0+WbQs2TRm/im4hjhSniZb4wyCJqsn25/52l51tKosUSH4q/oZk17A+rI3BNs4rEj+rUTGYKnYCFtFA0droz3gw+WDBJm/UKIbNMaIs7x7e/xGC3UuOMKMxArMrg2i+9eGZXu/b8qwbvoZr8dEtc2sUUlJn2UCEXntjD3PiPDdBwcMyrTPQlBq0RxZ7IbScZxumDPsQPbFf4qAtV/tJ1WYEEuwtzXJNw2SyiKClbprc/wUQmop9PaUB5xTq0ToJk64nqM+JIqhZaMVAGo/X+rU/vHTyafw8+NezD2kqBL3NyA== X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1343; 6:+eFyAk4zg9kHeqz9cPrY1+I65BOkPCw9O/aro7mcI/HAg9womdl5Dlnn2c/pRyHbWUrk0pW9B7oYyLFVsIgfH6LkAxGzZBf7KESUr7VmAjwha/k7chjQ6+ZHfoGVcZP73a43NeKSTTycYyHH0H5dtRargLzJDq5zLb6jKxI/Ijl3xB1zWc0jNqGk3e8hTB3CmVOF4uJfn0sav1JegPV8DrtXzMHTbKwkvSLyMW9TQNL27fSV7M2/0tdOELrZMeXdnEPFLxgl8x0qx5AHudURN4v6yZt1FSSH9tD/YeKbWbgaLZemzLwe2IWugFfYHtW1aDj6CRk5usKhV10VVChIsRMuO1DcAniqhnGdV63KU1g=; 5:Ex5pmLBxqPKQGY1Vo8NBEUIHrTL+ZVZIlsiPi7VEDdRLEEFrfEfZFq+EhWeTWFpgWx1levHOTiEeeNf233OSzTQx/jc8Jji6MqPO5JJGI7KpHrj2RX959V8Cbn9+56VhJhscJYjxPJhpptGHgyOpJwZCYSPjbbLEnwZCRZTp/vU=; 24:VsMhMx7m5Nq7T7YxnBJC7c00gRtSr/fu5+9BvnDfH+2M8EE7W44B5oLwi5KIQmBQFF7NRRdq0debOQ8sAVLbQb2v0UYf35sYOhwqd9a4R4o=; 7:d4roSnas9FInlbbPN5GHNUKg1NdvWr9g8FiUf6DROg1jOU+snhfgFh6VwVU6d5i7SIRUgWkFDqWctD78HbT1ZJsiSCPVTCJidFReYB99YDAZJy1k7wXVKikm4bdChXfKcv0xnlVCJxvrOkw3w1KPb/X7hQpRdM358YTiYejfd4OKUL2bZ0YVH7BiBFN3mZKUoJXxzD2w1rs07xa+UOEtCRlQ0vc/z6wv2zxBmZePg4sOwmFHGr/N6jfi1DXDmPJf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:16.1674 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa49ce60-f2c5-4ac3-17b3-08d52ae7833d 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: SN1PR02MB1343 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.88 Subject: [Qemu-devel] [PATCH v5 28/29] tcg: 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: Peter Crosthwaite , Stefan Weil , armbru@redhat.com, alistair.francis@xilinx.com, Paolo Bonzini , alistair23@gmail.com, Richard Henderson 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}' \ {} + Signed-off-by: Alistair Francis Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Cc: Stefan Weil Acked-by: Richard Henderson --- cpus.c | 8 ++++---- exec.c | 14 +++++++------- tcg/optimize.c | 8 ++++---- tcg/tcg.c | 2 +- tcg/tcg.h | 3 ++- tcg/tci.c | 2 +- tcg/tci/tcg-target.inc.c | 4 ++-- vl.c | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/cpus.c b/cpus.c index 114c29b6a0..d73df01659 100644 --- a/cpus.c +++ b/cpus.c @@ -258,7 +258,7 @@ int64_t cpu_get_icount_raw(void) if (cpu && cpu->running) { if (!cpu->can_do_io) { - fprintf(stderr, "Bad icount read\n"); + error_report("Bad icount read"); exit(1); } /* Take into account what has run */ @@ -1113,7 +1113,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) r = kvm_init_vcpu(cpu); if (r < 0) { - fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); + error_report("kvm_init_vcpu failed: %s", strerror(-r)); exit(1); } @@ -1143,7 +1143,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) static void *qemu_dummy_cpu_thread_fn(void *arg) { #ifdef _WIN32 - fprintf(stderr, "qtest is not supported under Windows\n"); + error_report("qtest is not supported under Windows"); exit(1); #else CPUState *cpu = arg; @@ -1527,7 +1527,7 @@ static void qemu_cpu_kick_thread(CPUState *cpu) #else /* _WIN32 */ if (!qemu_cpu_is_self(cpu)) { if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) { - fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n", + error_report("%s: QueueUserAPC failed with error %lu", __func__, GetLastError()); exit(1); } diff --git a/exec.c b/exec.c index 97a24a875e..59e0411d0e 100644 --- a/exec.c +++ b/exec.c @@ -1076,7 +1076,7 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr) } } - fprintf(stderr, "Bad ram offset %" PRIx64 "\n", (uint64_t)addr); + error_report("Bad ram offset %" PRIx64 "", (uint64_t)addr); abort(); found: @@ -1689,7 +1689,7 @@ static ram_addr_t find_ram_offset(ram_addr_t size) } if (offset == RAM_ADDR_MAX) { - fprintf(stderr, "Failed to find gap of requested size: %" PRIu64 "\n", + error_report("Failed to find gap of requested size: %" PRIu64 "", (uint64_t)size); abort(); } @@ -1719,8 +1719,8 @@ static void qemu_ram_setup_dump(void *addr, ram_addr_t size) ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); if (ret) { perror("qemu_madvise"); - fprintf(stderr, "madvise doesn't support MADV_DONTDUMP, " - "but dump_guest_core=off specified\n"); + error_report("madvise doesn't support MADV_DONTDUMP, " + "but dump_guest_core=off specified"); } } } @@ -1756,7 +1756,7 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev) RAMBLOCK_FOREACH(block) { if (block != new_block && !strcmp(block->idstr, new_block->idstr)) { - fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n", + error_report("RAMBlock \"%s\" already registered, abort!", new_block->idstr); abort(); } @@ -2184,8 +2184,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) flags, -1, 0); } if (area != vaddr) { - fprintf(stderr, "Could not remap addr: " - RAM_ADDR_FMT "@" RAM_ADDR_FMT "\n", + error_report("Could not remap addr: " + RAM_ADDR_FMT "@" RAM_ADDR_FMT "", length, addr); exit(1); } diff --git a/tcg/optimize.c b/tcg/optimize.c index 438321c6cc..93bfaad556 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -122,8 +122,8 @@ static TCGOpcode op_to_mov(TCGOpcode op) case 64: return INDEX_op_mov_i64; default: - fprintf(stderr, "op_to_mov: unexpected return value of " - "function op_bits.\n"); + error_report("op_to_mov: unexpected return value of " + "function op_bits."); tcg_abort(); } } @@ -136,8 +136,8 @@ static TCGOpcode op_to_movi(TCGOpcode op) case 64: return INDEX_op_movi_i64; default: - fprintf(stderr, "op_to_movi: unexpected return value of " - "function op_bits.\n"); + error_report("op_to_movi: unexpected return value of " + "function op_bits."); tcg_abort(); } } diff --git a/tcg/tcg.c b/tcg/tcg.c index c22f1c4441..ca5d841c23 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1035,7 +1035,7 @@ static void tcg_temp_free_internal(TCGTemp *ts) #if defined(CONFIG_DEBUG_TCG) s->temps_in_use--; if (s->temps_in_use < 0) { - fprintf(stderr, "More temporaries freed than allocated!\n"); + error_report("More temporaries freed than allocated!"); } #endif diff --git a/tcg/tcg.h b/tcg/tcg.h index cb7b329876..eadad66f7d 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -29,6 +29,7 @@ #include "cpu.h" #include "exec/tb-context.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "tcg-mo.h" #include "tcg-target.h" @@ -948,7 +949,7 @@ typedef struct TCGTargetOpDef { #define tcg_abort() \ do {\ - fprintf(stderr, "%s:%d: tcg fatal error\n", __FILE__, __LINE__);\ + error_report("%s:%d: tcg fatal error", __FILE__, __LINE__);\ abort();\ } while (0) diff --git a/tcg/tci.c b/tcg/tci.c index 63f2cd54ab..6c851d3450 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -35,7 +35,7 @@ /* Marker for missing code. */ #define TODO() \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ + error_report("TODO %s:%u: %s()", \ __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0) diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc.c index 913c3802a3..2f4b56d3ba 100644 --- a/tcg/tci/tcg-target.inc.c +++ b/tcg/tci/tcg-target.inc.c @@ -29,7 +29,7 @@ /* Marker for missing code. */ #define TODO() \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ + error_report("TODO %s:%u: %s()", \ __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0) @@ -403,7 +403,7 @@ static const char *target_parse_constraint(TCGArgConstraint *ct, void tci_disas(uint8_t opc) { const TCGOpDef *def = &tcg_op_defs[opc]; - fprintf(stderr, "TCG %s %u, %u, %u\n", + error_report("TCG %s %u, %u, %u", def->name, def->nb_oargs, def->nb_iargs, def->nb_cargs); } #endif diff --git a/vl.c b/vl.c index ec299099ff..985760b76b 100644 --- a/vl.c +++ b/vl.c @@ -2232,7 +2232,7 @@ static DisplayType select_display(const char *p) display_opengl = 1; display = DT_EGL; #else - fprintf(stderr, "egl support is disabled\n"); + error_report("egl support is disabled"); exit(1); #endif } else if (strstart(p, "curses", &opts)) { From patchwork Mon Nov 13 22:36:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 837617 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="JOdwLf/k"; 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 3ybR2Y2gKXz9s9Y for ; Tue, 14 Nov 2017 10:01:09 +1100 (AEDT) Received: from localhost ([::1]:56750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENj1-0007LK-Fb for incoming@patchwork.ozlabs.org; Mon, 13 Nov 2017 18:01:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENOz-0003p9-W0 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENOy-0007hr-Hi for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:40:26 -0500 Received: from mail-co1nam03on0054.outbound.protection.outlook.com ([104.47.40.54]:12640 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 1eENOt-0007e1-HV; Mon, 13 Nov 2017 17:40:19 -0500 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=VB3PqBubYdBgHtnb6dS/uOSJJ+VmvYPGj5XXWWI7sJE=; b=JOdwLf/kwrLUXSw+PCeTiTpBvsRhzxnZXDaywaqPp4LrL0eRlV9tIyNT03nWEjmVoJU3yJv3LR1v2eG7s61pnFGLxnsLgaGr5TWPgi9VyOvhHW7uMZu3t/1yTXbc82GAzmh+aJJ22RMPfcco9696RSQ8+wQzRWlgHp5+gEgg6Vk= Received: from MWHPR0201CA0020.namprd02.prod.outlook.com (10.167.160.161) by CY4PR02MB3384.namprd02.prod.outlook.com (10.165.89.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Mon, 13 Nov 2017 22:40:16 +0000 Received: from BL2NAM02FT025.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by MWHPR0201CA0020.outlook.office365.com (2603:10b6:301:74::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Mon, 13 Nov 2017 22:40:16 +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 BL2NAM02FT025.mail.protection.outlook.com (10.152.77.151) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Mon, 13 Nov 2017 22:40:15 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:47793 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eENOp-0004Wd-0N; Mon, 13 Nov 2017 14:40:15 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eENOo-0000sx-T2; Mon, 13 Nov 2017 14:40:14 -0800 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vADMeDxC003210; Mon, 13 Nov 2017 14:40:13 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eENOn-0000rJ-BJ; Mon, 13 Nov 2017 14:40:13 -0800 From: Alistair Francis To: , Date: Mon, 13 Nov 2017 14:36:13 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23462.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)(346002)(39860400002)(376002)(2980300002)(438002)(199003)(189002)(2906002)(9786002)(110136005)(54906003)(16586007)(118296001)(50226002)(106002)(47776003)(8936002)(81166006)(8676002)(81156014)(50986999)(76176999)(4326008)(478600001)(5660300001)(305945005)(50466002)(106466001)(5003940100001)(48376002)(33646002)(356003)(36386004)(189998001)(39060400002)(316002)(36756003)(63266004)(77096006)(2950100002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3384; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT025; 1:NuQbqmVZbPbueuYNrM3/fFzBOTIxIUXQrTR9n6IEBBhTgRjcKumVr1WohS0Fk58DUPzowgvJB/0X/8x0HRFb0CZuXwitvG7xU+Kqo/08wCA9mncrzGKN5JRsSyhc2sWZ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7bb532f7-67be-492e-54ce-08d52ae7828f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY4PR02MB3384; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 3:24eC3XBuM8xzpp6GySWkZFHWVzrQ33Op05q/VhrMAxC3Z+F9A2TlCRhPH4XcwL/m4+b7a7QvMYuOmBS8TJoefakhPkmg8Xf2APTIs0EHzH0J5u/NF2GwObeC7PY6ikzHKs3U67d2FCA+80mqS4KewYa9b+k1VrI4kyKf0rh6EB55REDCAX1PfNOQh0hnu5/91Em79Pn3TyUzhlVbN04gOCHw8reBysxJsvhlZBADJSxl7ucvKgS8v1yq4nWGthiWZKfVTnTgPUOcnc5CCldlbTq2aNRWuCulpu130KHQmUpfnPwUoRo3H2a510E8PBxs3jC2L9rQOhtYUeOVIC94ZqnYlHdnn6h3XjR08fJ3NNI=; 25:X117TvaygZDtgi7E9mdNTc/hHIO1kWFMjqWsO7ePsCZzZ+QksA7GBB8/zeIehI4418MqYqF5hYjjK1G+WjqCo5872ZjLzi5fh5hYhmt7TSvmgWYLVNc3sLQWcj9tbojsBLoirA77SAwfNzFUPPtLsZ1FWpwcDfJXOf8P4lelMK9f9RRzheFpRAUgvU3nqP+yAl9Q1xUTB6ddFoQBfDiJOn+Hf3xcRFQgragx8h07TCZnOFgvwCWqZ33Y8Hn6QHJJuiwEHjai2D4xZmsjGDGHPSfcgomMDTnJs69ARwQriAOULP0OgiA+yjkv66lesm7v7ZvmbaQaZUhYxKeXifizXw== X-MS-TrafficTypeDiagnostic: CY4PR02MB3384: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 31:ODkPfWa67OJeGPEOxErbv16cwZ2m/+t8kF6xNA6m9wMXuPvGMTKGrZNP6+NopKiK0xHgQ480++mj7h/VzpdFYWxKJhRKguqgZUKtyGzEkZQZH2w9nxGHMumoARfWNDGIfWRqUPx/z99ocLSY2RTcpmDZlNtEzUBi3EKIUGpsA+hTbj92S2ErgGoPIvBHzFf6rmpLSsw+k9V5DtB4ATDoMiYGI69T1/e7jWoCrG9XfDI=; 20:/BQ1juCgRxcz0l73zmkabXLIyhHRbsKcoOhBs4tyDBeeAdkmq1aUhfdEB0G4fqmueSvoTIaIz3SWw5S7O416OAbXIlRgPGlveFki/uzb/R7mNKoOHBgMpclhWJ/VhOLhjTbrlFOC/zwcpBSHhhy8JElC4aOnZjaeXYNFwee2AYxIL+yWcvYDL0muhw8OBfcwHcPIgsJgl498Ih8+D8F/quNrs1xlMqmsnqh7QtIsjUp2ZXGDIMQ9pmNh0knwZbiFvk9uHU/9mO2s8cokcum8re8VDC+gcXpyhWumfB+L9XjQF7QCWnjG/99qhwz2ch6gGTg9YzkpK6wDcRqr83uJjBT6CLNwWmMkVD4bg/NVJpYv1DQCUT6AU29WgqAlb+wqcEI1cVNlSgi3WsmgcKRz7UlkMpUnAWWyQPWLqI8DHkwetGy6XoXwDxGNyIOGFboIRFFoFdmrtPrS2Bjrin3XIN7vjoxX3/P16Qt+TdBySLackNM8kNTeIyL5eeH1Vlmm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); 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)(3231022)(6055026)(6041248)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3384; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3384; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 4:OJfmhR2F45yg0wbxZr6GmalKMIgCgXzvoRs89aVafvq2MkT9Nzuu+wwue0Pk8XxsNbRPSjXq2RmvtWjt/9HxFsVQQ6bpab6WHyWgnsCDInhCVFy/lkIr97VZ3gaupsRv+1vgPOGGC+t4BFET7A7M/i9VgJcaX2SvKUgfPenqI6hO8TQetAbF1I1vL8lYKfJmGlRMu7Rg5XZZYIQichbgeIv3tal537YiYN3ZK55TU8iKr46HeV7mLKWWM/9OyGL1lH8/OJcCmJgYYtRHIBBZLw09ctYHMyvEhqmXrY57UuOFIjPi0MHCnDOARNEnsoa+ X-Forefront-PRVS: 0490BBA1F0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3384; 23:WuKVil+DjEZ3rJLUDhtfdl10JLlaBFPy2lOXMaSIC?= krENfF6WA4//bTngIdq1inQck0/VaGi00OoccSEtzk0s3bgP65NXR8F6CU3tb4kBTbmxcJAvsYVw9ftq+L6QlCphGZCdL+Pp402hQWdN8T0OtiNwN6ncyySkdNO5/zFnxODljDIpzoREyR2PKORyEA9mHiWvqci6rjfKuYEo6cqUeYqGG5t8haEVG19E0c0fAAg+eswmJAHHZVmuC2zNFLHctgzLygguILIpeYv/vIUxtMcqKJi99TI8716e9Fg4t2KffHHuzDMjFTZ6lMcj1ov0iU+dVJ+LPRZ/OmJMtUYayt4hLocaRAWKfx5FikTv7g2NcDeoWJm/aNq/x0Q1NUvlGS5XKzWan6Vhfg7xqh3Jln1UPUOInnrkIJrQhx0TjKlta13RJsiCx9b5ssVG6z8M5jXhv96tgHaqsE80bCzkMOIgDzjw9YGDAkuuzAUFhvEfh7HBYZtGa4JGrHdNO9Wtd+Jv1WvhrluyRvs0JBzOBFiEhejUlm06LkoNLZWPilNuxWfakIKL8nQe7Lmiw/lhduUYXpSMsGuM9O9iCr65KDu7vO1Qszh3/q8K0r6U4iC0L/+VK0gimnZBaPSEH9I1U82zyaszPlYXS1XQr0oI6c66O82h7NTHky83L9EvbMltyjw7VvXG/CkPdrPZ3rK/oaq3iwWR634rcxYDcMBAvILW9izpCwFCt2ztl2cuI9tzzu/1RhYIYx6ytqkekgWJGnO/+M8eL0CLLNLxeBLH9U0VftQ6kaGbcr9kUnOZ6r5zZ/x0gDPJNdJeuIHwnm/tC76QRkl9/p5hHvZGNkCDyheodFmCdkyxmnA8grhDl42MzZQl+VGC/tsUX/d9oziowmtnrwYGZXPrDd/YHJoycRgP0q4ghns+BfyGOVva6xbmA2rtfXj2gj2gA3pu+H4UBvy8OZOIbTfzs6j7VKbT/cMA4oAmR8+Gy8/Eu6Yl4RvSnChX/zLEPdCj0kT3uv3IEudKNYd8MawLPwjx24xdksTmBQwW6EntpjCp8w8ytI= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 6:Ss6YWgAPTnNOD6MvTIDUCIs5WE6QiXzyKGMB9cnHxDIBj83pDBGQAVSy6BlyS5qQiwqjOmWEuFdy2gmIs9cESg5srMv6yXPlnhBCQAgD2K4N27MPQcIc7+tEQ3hvVg3JRJA8KYHFyMNw5aUY4lF2ZrfkaGzFLiEEqqICnDkT1sdu2/OUrb9MsMBIWtF7qxyATGPUh2BG0x2143Nw4NDAQkHdXPB1kn2xPbHT9nAfJykh3Nei6Om5FOZAC9rW7um1u4wv2XbRZU+nQB76dvl7X5J5bnPrUPooK7uDPLnRB9ZuvWwmrT8j7dknyW/Kp4itBTPAreZBpDrdXmsedUnj/yHSnHY2rIKSP/pAEoegHWA=; 5:lcL/y4tCH7F6bgFE00g+quoK9hWOWQSb0ef85Mc/UBAqsuDrwvxO11BD/3OzERUshNHo70AXhTBfE8dRecil7sTjp3S5PNj90n9F8xNOxR51KnCml8bzgFUvso7VRypX9bnq3vBzmS06Ho/OnNszEbFMvF1p47bmnVDRJnh/kdU=; 24:NVzAuHx12omE7SG1iADcPsppKyAf94hJ0hqPTBC/QB6D4t8csQ7tTB4/rQHH0PGCEZyoy8gd7VTnEqqYWJ9E3ppf2u2pfvyY+dpEsWHZvfc=; 7:xe5CsG7GCLhKL3SGcdA6nSo5ZkKZzQYjq5b+jK/eQPfo5hzVXxshd+JLDvhsIRDyWdiUbsR4kSnEw1QWm8Ua33d4z8X+rOzUhiM08Y5Mg4+HPuNf6/cLhUpFT58F0rQVmyh9gXvS0BGG5kI4a2DE9cJAwgYnEmWwj/kg2kH4euTCNrFaKdiuoWHhMUfPVMkFxcpeOydaQLdUYuLHqFQVkxqZy/dIhEuNjzqxPBSphVfCSdm9RExKlSKoSN1ehYHH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 22:40:15.6536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bb532f7-67be-492e-54ce-08d52ae7828f 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: CY4PR02MB3384 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.54 Subject: [Qemu-devel] [PATCH v5 29/29] target: Use qemu_log() instead of fprintf(stderr, ...) 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis --- target/cris/translate.c | 2 +- target/ppc/translate.c | 22 +++++++++++----------- target/sh4/translate.c | 4 ++-- target/unicore32/translate.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/target/cris/translate.c b/target/cris/translate.c index 2831419845..d2dba748cd 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -137,7 +137,7 @@ typedef struct DisasContext { static void gen_BUG(DisasContext *dc, const char *file, int line) { - fprintf(stderr, "BUG: pc=%x %s %d\n", dc->pc, file, line); + qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line); if (qemu_log_separate()) { qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line); } diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 998fbed848..8eafe30624 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3945,11 +3945,11 @@ static inline void gen_op_mfspr(DisasContext *ctx) * allowing userland application to read the PVR */ if (sprn != SPR_PVR) { - fprintf(stderr, "Trying to read privileged spr %d (0x%03x) at " - TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); + qemu_log("Trying to read privileged spr %d (0x%03x) at " + TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); if (qemu_log_separate()) { qemu_log("Trying to read privileged spr %d (0x%03x) at " - TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); + TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); } } gen_priv_exception(ctx, POWERPC_EXCP_PRIV_REG); @@ -3962,8 +3962,8 @@ static inline void gen_op_mfspr(DisasContext *ctx) return; } /* Not defined */ - fprintf(stderr, "Trying to read invalid spr %d (0x%03x) at " - TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); + qemu_log("Trying to read invalid spr %d (0x%03x) at " + TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); if (qemu_log_separate()) { qemu_log("Trying to read invalid spr %d (0x%03x) at " TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); @@ -4108,8 +4108,8 @@ static void gen_mtspr(DisasContext *ctx) (*write_cb)(ctx, sprn, rS(ctx->opcode)); } else { /* Privilege exception */ - fprintf(stderr, "Trying to write privileged spr %d (0x%03x) at " - TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); + qemu_log("Trying to write privileged spr %d (0x%03x) at " + TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); if (qemu_log_separate()) { qemu_log("Trying to write privileged spr %d (0x%03x) at " TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); @@ -4129,8 +4129,8 @@ static void gen_mtspr(DisasContext *ctx) qemu_log("Trying to write invalid spr %d (0x%03x) at " TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); } - fprintf(stderr, "Trying to write invalid spr %d (0x%03x) at " - TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); + qemu_log("Trying to write invalid spr %d (0x%03x) at " + TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4); /* The behaviour depends on MSR:PR and SPR# bit 0x10, @@ -7372,8 +7372,8 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) break; } if (tcg_check_temp_count()) { - fprintf(stderr, "Opcode %02x %02x %02x %02x (%08x) leaked " - "temporaries\n", opc1(ctx.opcode), opc2(ctx.opcode), + qemu_log("Opcode %02x %02x %02x %02x (%08x) leaked " + "temporaries\n", opc1(ctx.opcode), opc2(ctx.opcode), opc3(ctx.opcode), opc4(ctx.opcode), ctx.opcode); exit(1); } diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 703020fe87..32b72b4701 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -427,7 +427,7 @@ static void _decode_opc(DisasContext * ctx) } #if 0 - fprintf(stderr, "Translating opcode 0x%04x\n", ctx->opcode); + qemu_log("Translating opcode 0x%04x\n", ctx->opcode); #endif switch (ctx->opcode) { @@ -1788,7 +1788,7 @@ static void _decode_opc(DisasContext * ctx) break; } #if 0 - fprintf(stderr, "unknown instruction 0x%04x at pc 0x%08x\n", + qemu_log_mask(LOG_UNIMP, "unknown instruction 0x%04x at pc 0x%08x\n", ctx->opcode, ctx->pc); fflush(stderr); #endif diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c index 384aa86027..1d4f3dd2ac 100644 --- a/target/unicore32/translate.c +++ b/target/unicore32/translate.c @@ -1936,7 +1936,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) disas_uc32_insn(env, dc); if (num_temps) { - fprintf(stderr, "Internal resource leak before %08x\n", dc->pc); + qemu_log("Internal resource leak before %08x\n", dc->pc); num_temps = 0; }