From patchwork Wed Nov 8 22:56:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836035 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="eXWT1A3k"; 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 3yXMHV6Hbxz9s72 for ; Thu, 9 Nov 2017 10:01:42 +1100 (AEDT) Received: from localhost ([::1]:34305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLo-0007VT-SA for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:01:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZKy-0007SL-6z for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZKu-0002rh-RJ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:48 -0500 Received: from mail-sn1nam01on0086.outbound.protection.outlook.com ([104.47.32.86]:48096 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 1eCZKu-0002qB-G9 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:44 -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=eXWT1A3kQTWolvn3n+7jtYQccIzaLWXKrso9YcM4GlBZqtISgNeIHaHngIk5EemUcBXLsNqAHuRPbq8pRVg8TNLmIIPYbWeJ1LBEDyS2ndifGPmQn3csVdt+D3vhQyM5SP8eN0mrG9aARvwU5o0nVPP1vCiNwgoGZBlUYXY6hnQ= Received: from BN6PR02CA0097.namprd02.prod.outlook.com (10.161.158.38) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:00:41 +0000 Received: from SN1NAM02FT064.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::205) by BN6PR02CA0097.outlook.office365.com (2603:10b6:405:60::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; Wed, 8 Nov 2017 23:00:41 +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 SN1NAM02FT064.mail.protection.outlook.com (10.152.72.143) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:00:40 +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 1eCZKq-0001KR-8A; Wed, 08 Nov 2017 15:00:40 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZKq-0002E8-4n; Wed, 08 Nov 2017 15:00:40 -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 vA8N0QMJ008112; Wed, 8 Nov 2017 15:00:26 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKc-0001yf-AL; Wed, 08 Nov 2017 15:00:26 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:28 -0800 Message-ID: <093ec04176290ed7bf8279b669b15ff71465d21d.1510181732.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-23450.000 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)(77096006)(48376002)(54906003)(8936002)(106002)(6916009)(118296001)(5003940100001)(106466001)(2950100002)(50986999)(5890100001)(50226002)(478600001)(316002)(76176999)(575784001)(50466002)(47776003)(16586007)(2906002)(5660300001)(81166006)(305945005)(81156014)(189998001)(33646002)(36756003)(63266004)(9786002)(2351001)(8676002)(356003)(39060400002)(4326008)(36386004)(107986001)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3387; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT064; 1:PgsHyPGgARNHVxm7tAyULjW8TEjbSSwKZQ+qYLDijNkfSduG98P7nPe11zAhUvdgDB+dS/aas6ViOsKk/HiteUSZzRZZRhMl25yyXsRmOu9o1bXdMY0euTy0np+CHole MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 917b1ab2-2ca7-4a7d-d56f-08d526fc88a7 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:FJb+JraoMhFPbuMr4LgNsY2FNkHyl5U0K8/QLuUvfFUjPHZNbuNYNqEQkPBYozHEmAKIi2CI9ZI/913s+EbzDHXzxuGCVOBFKfcZbuUpgPeyj/EWquQK1xR+MmA+ziJQjKRCM9YZE363ILg6oEPaV4IUiwJU640leSbnpx2Nqx/cRvyiz16QYbMvs9BkOI2p4zkBS8VCQyb8rv+ODWcx6P1rkchUzQy8T6PjHCycJkOlnb2OUXG2IYMSjTo+MWIKVWiPrn4nf2BkfJd6xGoG1+pS70jLsmoGM+sK6R6hdbHS7lVwHo0o70jVNrUh7Sv81mJrmi8F7LUB10rlHySZqtbnEBmtIPkuvKq0k/ojnUg=; 25:qx7Qe1dVLN2zSG4oiXGi5W2nqXImocypASa/X6M19YWdp10LstwL1sTZmlLzimb7fIjpel5xP1/JTYQ5C1N/3yxgP7GD0TM0RpRmPW8VV/w5Zm2pah89jHFEmO/6FnGZWTErd3nKy7i3IhIQxhVZb1wCpngfTJAfbwKoTqw7NweuXen3CD0445L998VV5pYaSefPklCpyz8nw2+Z55eCHRGl7GKLqT4xJycU3Qtxrv+AFYdl0+MA58pHpoA0743GNdBWpX1qBeBYq+KYfpO2gbUap/Yy0HA0ffRXOMheO9KtgpCAZCOS2thZa91AylSmwZw3g9TrlOQawWxm2uLuLg== X-MS-TrafficTypeDiagnostic: DM5PR02MB3387: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 31:dTRYW+aJkHjon/dqDQASmiZwRo8fPVnl3USDYtWD3OCX0ihKM1/prLM+R4IPjJlnWx4o++ShZRB8BKSv8kbszdz/qlvdtJ3Ftm5FENgCPxw3IDlwOFPHsYg/4tVhjK+x4C+X/A/b9aU7QZP1O91MGtNpjKAdWgU7gE8VzYHqwUKMOOqrU/cqzt3FHYpM/hCYHkcbUfZDDAiaFybiKte6cXH/9m3tTp6GK4cmoO5RwQQ=; 20:8YRucGjmorZJCDlaWcIYIoiqOuekrc56oOmxU0dz98uemKL7ps6uh3sCgfzJWGAjWBjBeVR7C8WPUyYTMgtW5MylV1t57CMepv0Y2os9VuPL0zGoOTibNZBudi+ApBdSfWFHS7odSXENvFAwAXUgxG3mb4eJlwUVbqSfr6BuR7bma++yAP6xGOH8Oq0JjLz77kI6NDhoryrsaYj1sxwiAUKt7Ipobw/1BGg3nmRBJ9gTxBLtTSCf9zTAdiwtxzwxTnqOZhuDnwLsCFyR5IuXh54BCVUztjcEPxO8YFzEi7cWOzieTouzwYrhuJExM76GMCe9yA0FUAOm+qFoKYj4uj1IHV4zAiSc/mKxgNFj311nTRNGWyLRH6PHyHVLIXcCAwGaZg0KHLlOQ0ui1Ka8gIk7GnsRiWW3I7Sw6SqgVH0TJnz8umK0VhHQJEsMq0cZ6xLB9/Rn9e+d8DeCJpcdtinV2hmWM2PojTx0DvR9igAeui3WsSEnOgdnR5fubR6K X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(3231021)(93006095)(93004095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123564025)(20161123558100)(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:HyJdh7Ahlcsush5IxAOkfa+Qp240AeWnRIgmJQduL1DDvNH/Hiqc671fjAU+kp7CWDjD67jA8BR+EMkDlUA/xqL28y11qKvV+1JEGNwfBhA94S3/VfQa5Q06IEfR6n3QJ6IZe1WWvDjVZSGZjeQX58RjM8jEePwsZk5JFACIhQTPqIr2sV0gmkYls1UpgmpApV2HHZmlXEPYc010TI1D2MWM+FhK6ABYmCwPOlLEc47xrzeSuxgOnBigIPfCCs8q8/SBc+vr+ZYnL51E++fQOuPKwEM1lNA6e761IAhghOceNgi2ZY96uKjhPtAaULncP+lGDTbBkYWKB9pefR14hA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3387; 23:FtEZmdI7/FRMjxTNSWy3DbgbB9cMNaqujVCH8rv9H?= wgtut2C0TeDENci8q9Cd31VIDFJB/ySHkEVwrq8WGy9xMKGOSod/cK3XhLiCFHf//Zr8YUKyqHfiAeDqFfUxHj5bumW8sAyHsKls7WSwUIFvow0O6cwDO+MIdpFOHfoibNE2MYiKPXoVcW85PIeKxN12yt8QLfAatCJ9KMw38UbvYUWTeJfglyJUgo60118sFHSIwEEENe3qvhzgLn/fZ6BN1d1sihB8IQ/HoCGFVdwIsDgCTZpfg115pRYD4mpC6xJUFBENeKZvtoTeHt8gTjUVVDL3z08FTR7ulhcVfUVhUIxvCznd9SKv64Oijn5FulUth8Fa7aBJiXi0LozcKjygjO9BOawVkuHeJlScClWxugzQvXmrQskiHM2GUYNlEIrxmHay+VaMYz2AWEWW+KNLkD7hxOPV3yoA5Cv7+9M4VDGGIaMgR5pIvLA1Uz0EjqyN38pYaO19eRHy29HYgqv3B/wTMUUuKzmD9lAFn4WK2I5a7dsqfzmhji7cdZ/05mH9HYhyBzRhGs1Ow7o7EGpgzNuPMqWXQWMhYdZjaNINkK71DuD4/zTwCraloCF9lEtossxaJPBjZHTO5DpwXh3SsHMDkKv2h/zwuyYkbH2sr2cKPWmF7TAe6mjr9//7fIMOXGQHQ1uXzsuGWE31IV4vJZqTdcN1bI32CeLciYYWhESHxWF3chbb7bBO626wcTMXZAeBmidntVI35jj8M8VngoHJIXWEWOMsP0brIMEBgPa/xKCYGLPpQJTFY5DzLUHMxOgeLvMZrAgqcdsth+lwzbgIvUcGPn2G+a4xTwgWcuZ5I7Sg1UlhYfO0xf0EmWa2aukhvlFUKACqDlIAsArqlBE3R56KrXUMesL3ZyVlfMJEmUJJStVR0MRXUtPU4PiykwnYAviB4U0irAN+9HQkBxbF9ZXNTHEB/PUvewqGG4O+scCLljicUSLIXmbVakl1uZNBfbEoh1SmSJnglRn5szCxyCH5X3+BdeavAa9GH4/0mqoWAYyzhivvVw7T4ljPVdUE0szwkbP5SYFhcn1yx+mKQmzEzQWA1A3oOistQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 6:aWzAmELSKMc+UTM5tC6AlxxBQB+V61blhS3iglqSUn+3JGGsx2diTDhWhaHymZ6+wpjkZ9XmCUtPUnCpx0m2ISVPPii4sAingc8D8S7a97ueqa6pfbkTZrOjwgE9asHzDU+3DojHrrueS/wc54S/Bdv3rRndUMNSGG+Ys3rqCWZgIkjr9Q7hw4X322O9SjSrw51Hmz9U8jFFBLZMYTc9qUPCQekILGiOTKJaqD9YS47e/5GrREgXX14AA9uCVBqN1SqMDF+QPnqVm/Y+9GPYv1VdNxtbnjCG/p25KhNbKHEHzsDTSrWngYEC3CNvG8DCns3z7oMFRkdnx1YIyME1jUApLJwZ2+6/WNIG57NZbJ0=; 5:li8tLR5NyGweqRAEFlEtlWOt8ekDiUlFvizOJY3uhgKoOxvY5Cg1F5XXRnULUIpBG9BNacYV9HR2xN4Ug3N9zCuuKBUWIaaqasfB2OqBd/BpgtyD3+l6xUEFAVBriVH38JCeLY2ZDuLHPg/Ad7S6EE1PJP62H11MN5iNh/grNOA=; 24:FOcjzXS8+Tyko1lv60JG+guWNVI3/umLlB3WUTOxdD5rDkWTzm93nosgWQ32eno/akoqK2H4ZTkUCnK7hoavdWwHTf8Z1kLJJC8a7hDt0CQ=; 7:dY03SZHuAWIhZ9HycvMlN8zjVOJJzoH7mp1f1fLJByFDyiAqW9qMRKseEQodOezWhhPyAkVC/j9V7OUTnWvwSsKnKsmRrXWb+95teoEdLcgqWOnME9/6gTfSozkdSFESQyqbhlk3fA7mOmweSY9ODJkQHTza/r8hjfUNYAOtMTOVHHWhbplqwoZjXITzGyR65xuCQe7i5p82jIlCqsoqjxEycQdxp2hogtVRSYTZdM7M6IOpX0vA50fF9G/n7+pH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:40.5982 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 917b1ab2-2ca7-4a7d-d56f-08d526fc88a7 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: DM5PR02MB3387 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.86 Subject: [Qemu-devel] [PATCH v4 01/45] 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 --- 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 Wed Nov 8 22:56:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836059 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="tKW62oSi"; 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 3yXMd551bTz9s3w for ; Thu, 9 Nov 2017 10:16:57 +1100 (AEDT) Received: from localhost ([::1]:34383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZaZ-0003Zh-K7 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:16:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLs-0008Iq-Pz for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLj-0003Ho-Kn for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:44 -0500 Received: from mail-cys01nam02on0068.outbound.protection.outlook.com ([104.47.37.68]:37600 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 1eCZL8-00032R-GS; Wed, 08 Nov 2017 18:00:58 -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=tKW62oSiwZWB+UX39xhhJI+qbAyCEwHiawnaOHOCVYOhn9nKto3xyO2Kwp/6f/C6Kl5RQKp8XmIsuFuBZcaEr4GDYded0VaQEjgJPrWKS0kPDHgdwTSPGTqFjFh9FwL8w49S8v+Dxzhfbx56cLgIfBKKaozU58K1nP+FUquiA7I= Received: from BLUPR0201CA0002.namprd02.prod.outlook.com (10.163.116.12) 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; Wed, 8 Nov 2017 23:00:50 +0000 Received: from BL2NAM02FT054.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::209) by BLUPR0201CA0002.outlook.office365.com (2a01:111:e400:52e7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:00:49 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.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 BL2NAM02FT054.mail.protection.outlook.com (10.152.77.107) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:00:49 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:60023 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKx-0003we-Om; Wed, 08 Nov 2017 15:00:47 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZKx-0002Gi-K7; Wed, 08 Nov 2017 15:00:47 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N0T6Q008186; Wed, 8 Nov 2017 15:00:29 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKf-00025l-6S; Wed, 08 Nov 2017 15:00:29 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:31 -0800 Message-ID: <286a30c5d779c9a99d384d6960cba8ac3a2e247c.1510181732.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-23450.000 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)(979002)(6009001)(346002)(39860400002)(376002)(2980300002)(438002)(199003)(189002)(53946003)(7416002)(50986999)(5003940100001)(8936002)(16586007)(118296001)(63266004)(551934003)(81156014)(81166006)(54906003)(50226002)(76176999)(4326008)(478600001)(16200700003)(5890100001)(316002)(6666003)(575784001)(8676002)(6916009)(8666007)(33646002)(47776003)(77096006)(106466001)(356003)(106002)(2950100002)(48376002)(9786002)(5660300001)(36756003)(305945005)(50466002)(39060400002)(36386004)(189998001)(2906002)(2351001)(107986001)(21314002)(5001870100001)(959014)(559001)(579004)(569006); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1336; 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; BL2NAM02FT054; 1:Ug1DmvmYWklZ7HM91LRDNJQ4qRVokndOSWiKRockkZeXVDwUv0HhliwSX9p8k7ZcotmFLKbQkIP3xlljdFWpuMUjTH6NlcZ9/HwSkmWFl1L+z4a0THPHB0zHLW4XtnPh MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f8c8c01-6b15-4c42-726a-08d526fc8dc0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1336; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 3:RSRvlP3myncpoqHejaXyWqbKsoD7IdRfIiduuF5XKrt7bkxVjK2rQz6OZELmX9KRP6B1Yf3YvI9s8czQiQQIDtUOt2/inSFeSD19aE9K88Oc+eFBKfk2BoGJpJlkvqiXw6TzQDDgg98yYrsiEBG3g1HN7IVE9hyIuQv8TLPw0kKz1dlY8KbMJLEH/RkJDTg1YVZFPFrnCfLo1a9POqoLY83dEOfGVxgbiU+WbhvJ8QNn3QdZHGYPXWJaZfjmlCW/ELPN6+IDnLa1wTIPrEk4hLRzpCVWpErh98rCmVbJGXqrWKF+GPUK0cW2V/9h2XmfU9z/CN8NBZCaPZYqNeCTgItpNc088OXHOaimWqHsOjs=; 25:BeHnm75ttN8Jtn7o7kcjkGQk9DHsaVX5i2Wm1RYHeAC+ZnlOmTHwNYOcN22Ss3Aj9ziJoGG1s/3wzLf2LVH0yCLlFw7BoUvBvdfmOGnUQD7O0otmDdsXKLVR6lXwTF68XUUyDBMJ6WWMcp4uYY8s+73lEDOkyGOtQ0sqgj0y70Sj7Tovfr0uMzR99pFj1xq0tPetcxsDQhAh/MJN4FWX9reuk1n+6ZRk18j5ipn68JtMrm0bFYywYAaGzB1Cyf90Z8LCBefI5U4e2QQJwRptlS6rCRaWloj08+mN9UyYDUy/9e26a5eKS8//9Ad7bmxHoqZoc8MfRpKGcUhXk6Kx1Q== X-MS-TrafficTypeDiagnostic: CY1PR02MB1336: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 31:Nv/QCtNzyelJjLBz6aZKHZUG93/H1/f7Z8D9hTlh9h9FTO6XXrbpoYs1+uf6opzdK3pIbb6sbNyigzekhY2VL8V0O3WJZNqpZIFCW6onCUk0FFgjC0y1nxYbd0X/o5U5w4lLvS/ZHiL2CZVJnGyMWT3Z1lrMsZfb504f80qnUVWeJQuIabPmg831JWiPfTTtUI+krPGo9T4M7QdZ2I7OSXvVoHarAHK3STTng8jaQiY=; 20:PipKRjjQCv7JoMiWn3qx2tCCy+0cLns/ZA1cj5xjyTum06o8vbZv0teJq1RpQ3nlwDmiNxsvvHiVRhMIge/jKt6IZSllC7J394eFxWQojIs5L+oblqBb+zaqjPrFcC5D1q5ePmbJTMoU+tWJ3vipf0+IHAGmohJLnMuCF2fKgV3DgKEkk+zvGeXavBW6JTJFJ2EB+dOP8w6VJaLCXLKDRGqNdjaVTBCn3U27M+H0v/6PrjdIKLJz/DYealgof+lOYrmUdFq14E7A1Na4nxjMmvo9eAh9qoE/EWXfKP1Z85DfVyhKMMSvUZGqCbdaOveLxDJL49lltJoNF4Q0FxjITLsZoJ8DnUKcUv9/A+VQ6gZavY40v50h+ZtKiPgyu1EFvERe15mQ+bgKgengp+CuF56z627emWvfGT6AyczVfekso/g/GtW91QNbYuoVhSY/bG/Yu+kfQwZuf78Yh7XjbnNNSmdTXEC/yBGpAqe8jWJQ5CyuYHb+DRo9uk5pVxpr X-Exchange-Antispam-Report-Test: UriScan:(131327999870524)(788757137089)(192813158149592)(70601490899591); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3231021)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(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:q6K2tZ4nmxDXBRwyWJ91dHgzPAizQ7U5GlZo81eTUfIMljOxV1Y4CRP47DpTXftSsR7deGxnLOf2Zm1gKzOQJiPmAQG8S+E6HH1A25rQxP8eRHcWn6RiF1bY4i0BuUpFa04SzsJ39elUQx9WcmfeNR8jh5K4HFn+C/UD+f2JkNszWBs8gFnkTY5KwbU/mlklpXI0y8QHoBeAsoI4/hQf84lhqqZ+hU+QLdBY8ga3gcX5sAd1Wdqwip1Z3OP2Nu9iSbKurIdMCJYMoF0hIDCuf72rvfO1Vt8lud21+PoKBbsw6OXKhwIprqs7okALKePojAMdYL67r3flvDTGPd4QpsqsEqaa6q7lOKpHEoMwDaus+pX0nGTT0UoPntgu59ek5vTt1SibTr8GjK+uQz793A== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1336; 23:hmF/TccQ+pzvSm+dJy3GyGUjWLyQ9mjHZl+GjIbiw?= DDhNCtfro9wDKTmY7n4OVB0MQsyMSmWoK0fZuTSWkTU9XccIHn9bIyvTQpkKhIqVRdP5WAodC4k4+QDXki7X58uzvqYXA3HM3tUM7GGFBNMGYfxehHuJu9mYSa+yLCgHCYFSM47MFlg11AYyAcs59dpPJmmwgqTxQOqJYCSWwcBDHU0LwNKfyHrx6A4zj5j9dmrxQ58EtJzt2t8qapvEhoG11ZD48BHUuSi8WR0F5SmuT83lNa8kQKmqD4rt4e/+9FxkyDcJQ0ire7mbXb8TXgbxj27Ss3pc49dPDkhYBNgHNQ/wYVsdMnHhBsix5uZb2vUyWErTZoqV5vUsyjGg7jrwaQCmr+OldxurlGNN34LneTzHxyzA4M1tMkofThzuzfOCknxGVRwNehGPYiWnRnFkViawmfwkv6c7dMyPoa/xm14ABKJqFQqoIpcuX2K+/nP9AWNKCI1Nhv5Rc+bkAL+1K5Pvu8Z+wyLl2tejcNEz+jvFRKmiW/uER2VEVxlxFvPYwM9br7V/wwFQUfp+qnoLTmq4Hpy1c7X26z5Lf+itlgLcj94t/QAd/YSQMayBeltEkcZl+y1dH0RI9XN279WdsXLj4/yo7QyFNTqn1PasjJl1w3QLmfn+9A9wcWX1Rp/JIofDoGhxSIs7TuxMi9hf5qjEobTx4MfGscwWe50qjt1vO/mcQ7E99jihyjLCNOCSltIIxkN2kkIUQCHJ4hrqMXvLGrwrY2gOia/E83E7+POS2o6OuvVYNxOsviDuK367x1Tyt/VLXozm6p3T2Bjv+TFm3C5qM2gDGQUjV6HP+cljnFCd24giY41xSfZZqKIAXeWuOG2w7q3oldxQWmsNHmuuso3YIqIaInWWh3BnleprVDpkpFTNsyta7NPhR+Jx5+nhMJSKJV8TYPTBmuViRkPZPC7+Sqp9bFqCZ0t5k1voAsWKjraaLrOAJ+THW0K+1dmGg0ymKXIOfY91hGVOfGv44Vo/F2mV9XWVpWsRJas/Vh2EEvyQzY0gtKRns1SE8Nt0AB9lrA4tXH4clviQdxYc+0VZ+0cVyIX0qAEQLFKslTeWRMDjyzS0Rs1kxFRAUSvnIN/MY7LBshABdGyRXMmk+6+CAJT3KcGRHxnXr9v7PjpFHqDY8zVUbAv887jklgwGxxlrrRoimPfo+nIxO2cAhnp1/TLVNfzQ0JkEtCjjtdY94XgBPrnEOeLF64VzzLvVpt9PpTAAAUhbZyHRWKAVqRtRe4kx3Cb0n3+k5zQEuSSWW6oRFly9tQrx8pKPI18gy8BHnEsR00mUvSM+pW4htFjSGDZ/o+kjjkTuA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 6:lKG3ER3X6SlEpL9sXzlZuoaRzCsCXgaFlSup+W8+8PdUME2/2wNDoA5G5CV4eDV297zRkTnK2p2LxS16wyt6nHvycrZ4+EJpAQ4U0eWn+4EYTOmdExxVgxC5bm6gahYt1UaQ2F8DTV12O/pmo+g1swdUCnBBrTav69L/nNoTPaFoQ1JevJzc0plOCymlSCrb2D/3r2zSxhcZOx9+yIFxQro4BbCz0S9UfkwRiS0u6ZFA4PnQtlptrEMGoJbGaQr2p5fR22M5N4Dub5ssYll+hH0DsnHu8oFzQyaHgzm3t6YnRSLQPEmuQDkHpJIKQZEutrIOxlw6vGVAVHVEoR9ztPIhHR0sStIbwe8nLOF+lX8=; 5:pjY0S/Qpfo48QOLTYNfso7UkGQH1F10cAwUqki7OaY81pvkrkenWRIgZDpGsEFCzH/ei8S/n8Xmijvc+OJ9OH+j7v8zVLQkb4By0xBXDDJXh7ZC9yOJvO3Ou3UITPnpJ2HvY+lnTU1Jq6k/X6apJqj/cfrRE4TnRM1ISUPzo6fs=; 24:QQ7mAkbvyGdFSDcKxUv9y+LeJL/qkLSLGbCiQKGeq7cpoJiOSWsdzpVx85uRr5LRTiRToXbIwFtzHVqqA5vZSWacj3OcX2OSD2cNJJoVwqg=; 7:Qcg+3oskFnmlyenBXGRYYlUC+oBEyzw7l3L7TI7e6A5H1iOYWbJgviviXaMsi8JV2dfzfKIZNTRgIrMaLlTXeacTmJIEcM1dbPJSfsFhRBQHaUjp084EB2VHFEQVw6HhBWdCS3QtjOK8Fu80RTAxIf1k6/Pd67JiCLaq7/GXshgnsnIV4UxC9yEvHXo90kBQnfXf7MdLNnNV3N8+y7vRr+hcrEMDM6LPgRgHmp//VFXzyZzPfUtrIFcb/2aVXF8p SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:49.1013 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f8c8c01-6b15-4c42-726a-08d526fc8dc0 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.37.68 Subject: [Qemu-devel] [PATCH v4 02/45] 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 --- 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 Wed Nov 8 22:56:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836034 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="Nleqj6vb"; 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 3yXMHP68Kdz9s7C for ; Thu, 9 Nov 2017 10:01:37 +1100 (AEDT) Received: from localhost ([::1]:34304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLj-0007TU-W7 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:01:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZKy-0007SZ-QM for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZKv-0002tC-KX for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:48 -0500 Received: from mail-sn1nam02on0086.outbound.protection.outlook.com ([104.47.36.86]:18220 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 1eCZKv-0002re-CJ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:45 -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=Nleqj6vbh7MHHzCMMli+UGt+46Z/9osJ3oxM5gtkkso5YDUGahOkDODOqhTyy9VWWSeV178Q/1cFJxWchIit0Eizs2ZGFwVgmZGmW27lWMUk0K9LW9vCsGJLuj9rU/bmUZf/+/oQMcE1ZBl+OPWFYNeE7VrcOolKivjru4Cd34A= Received: from SN4PR0201CA0016.namprd02.prod.outlook.com (10.161.238.154) by BN6PR02MB3266.namprd02.prod.outlook.com (10.161.152.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:00:41 +0000 Received: from SN1NAM02FT003.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::209) by SN4PR0201CA0016.outlook.office365.com (2603:10b6:803:2b::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; Wed, 8 Nov 2017 23:00:41 +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 SN1NAM02FT003.mail.protection.outlook.com (10.152.73.29) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:00:41 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:59794 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKq-0003wY-Hi; Wed, 08 Nov 2017 15:00:40 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZKq-0002E8-8d; Wed, 08 Nov 2017 15:00:40 -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 vA8N0WqA008272; Wed, 8 Nov 2017 15:00:32 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKi-0002Am-MA; Wed, 08 Nov 2017 15:00:32 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:34 -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-23450.000 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)(5660300001)(6916009)(33646002)(2906002)(76176999)(50986999)(8676002)(8936002)(478600001)(305945005)(16586007)(2351001)(77096006)(81156014)(36756003)(106466001)(356003)(47776003)(63266004)(54906003)(81166006)(316002)(50226002)(5003940100001)(189998001)(50466002)(4326008)(39060400002)(36386004)(2950100002)(48376002)(106002)(9786002)(118296001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3266; 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; SN1NAM02FT003; 1:jTuGzn5eeMh6sI2uPyqyNeUQxiH694Ajb2qOhDGVhKRe4bXcnxtPwE7BSQW2ZilZnL12zgBkun2T2IcMO6abVyMADqlVYkx1bskrm7DFzqvCCkqQGFn3BBuGkja988UG MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 955b8bc5-2e2d-4e62-6975-08d526fc88eb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3266; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3266; 3:h0AH7gBntBrjmuXN5sspoMflThpH6nV4eLhJxyRmevpHkSXh3QNAAhcOMArAWnyvNWSVx7d75Fs9GFOVXHKwe3u/jhmj4G2basC39lo2WUQUx8gHeqfhdBSSPPmuhCqLlvlWhzhrbvKvZBLiv7/hQoEUstj1/aOCBw/qB6bx+RUWUcxCuC14MHegmp3idSmRBnTqn3VVg2f7P+U2mYeOLhmz6D6RvUETpWCZxf0KJluEtvG3jZBXXFJuujTyzkbeZrcmHB8gGlWjtE0NhujMNA5MfoTxRPh9nrpLiAhWf7+7ayByDvYkVZDBEFOOrI2vroQGLBkMR9p73o9kaeJNsUHEhTHaRPgWiU4SfsdHrgY=; 25:gGwN5Krt0zQzuySR7fExInxpGs5AH/6rOpr4SUQGBikftUIlMYTn7mvCJIL5uIIURMT9XYnR8w9g94G19o/qEcDGpbw8EbtG4CAL0VNySWaQE8fNRKT/G3XGpirE56A2pobBeZiaMUCb/uwt4hnkFWDkJ9AygjVvGAzUR9+Bu6jZXQhTM04Wa+f00pVCY2Mfgi3Iv2BK3y6eAX/zpNOIMO6odvoBXNubtaBiqJHFA4UCIS95wT/j3EZRgbLQBlTaTznDqiW57/EZtydMLOMHpelZXl4nTSjH0U062HQPe1V17PEKuHKq497ec2tlgDRl/dm8dmqvcEBFN6izgJKWMg== X-MS-TrafficTypeDiagnostic: BN6PR02MB3266: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3266; 31:8fcl7c1Kq2o3RWCOI6/SBwXZsNKWHWWcRQgO1iwIGcNJgMjviGAdWemJ3+PmINfsN06LAoGmZkRk3La6vFYzzjfUDg0nBtrGiC6ExqrAzfXqGvXjCb4sDXbDhA+Uy2GY7IwDhdFFjKdG/Ppqk0zL525XoCECNVqAt5XmODzs3f8sL7sE3jt4Eq33iVJCwcxxJbV6JiMVobmfQVfIujrLVbasiebfb+3zp5q/RBV8NXs=; 20:WXipbDhLgYMVbpvmRt6ukHzFpVj/Wx20374G+6J+UO3QS3JvAxyRz7RfPjPRQdfHk2+GvAmk/4EeiBZ7mvZpKCm9K2o86Cbd44cMCcDelt9hJj+QY9cmsvrooHM8FRNMRrwHdToBGGaohsiw7cyCqTDBQk6BLaqM7WYPT/cPtCOCTGtk2QZUHLjaH61Mw36/Onu27o6Aks28McTa4i4lRfj6v42glhIeTi23R2L1jLsxlSZezONTBfMfznRxM7buNnLN7keVluscRw/zzDLK2iSDvByzNvi/KxhcsJBhR6MCYpPfnhAXIZ1/UkbgGQqc38N/BBrqeotKCOHhnuDRQmzDBqwkopB0c++uPhDl693/p0z0iE3m07llzndDx7yilBTPjd7SeAVP8ujnu0QVFUsVwHrbdXD21Ac5TeRQMkas/q6BAFFFC2AzcJyK2t/qbyxHShLcbiw/6yyGpuq4302YbkHkhXtIh6vuu39c+njMeIJ6lsjM+4EZX83CoXQ6 X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231021)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3266; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3266; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3266; 4:44n2pYOOJYqqM0bYBBYNPP7BILvSDq/RXyWTw20SRiOkUrXx9fZjt+ozCgxqVb2Va3fAYOYKv/8B7/oFjV++XPxmay+iPT6+Qqc3tqd/82NB1ueUUOGkUfqJDWFXUw3Q9lURli70UuhepzXfgAVYy754IokvfG4gJAu3qyziSqHkru4nzhBFbrJO9l7UXB0jKAHMWevVf2MJn7t4W2NNcIFzdZ1NCqR5Pj24LEEXzIEW6QG6puCbMmlxv7HjdK5qb9H/V16uG87WAnNaR42ypwtMm6YqrhgxiXC+eyoaNWXzEzhkqrsp1rU5dZCvCK/F X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3266; 23:tk/knuyvWLw/rgGsH0GLA6q6qyA6ZUrb9TIeKWa7L?= +ivKWcc5HLR0ZgNuA8mmmnO6lcwzuFQgE4hn4BjFDnyLjUETLnCFFl2WtWyYB87gi0T6IJ/+C2CstdwuOdAzjNwwTMYrwazsXfW0wwPi9Ws9uX3MaJtgbVvWAoL2P5X+SD76OKXCcHKEUKEjTeiKa44O/9W2o202zmnBdL8tIGv8hHb7g7AO+yRzkc/LZZwzUkF9Kwo7vxybYNyjCyD8gSo/TUQmww7Zb5Gxc7Sa0BUOTWN2wAMwoa9aivhE5/wUp2s5X7s6qHtwGc8O4c7p0gNLQToB8O4E1qyRid2NXrs+2xUuhm1OuUVWiN4lGwKj1O7fS7b9+zPDT/QziuZjDpX+rA+RYLL3ce1kv89pJ08t3MfqIo4MtDfZ9CTS8FMNm1z6qvfZyrL884FWSBhiiCrVMS/BvP+8CQuekWL2GZUJSIIoDp9XMLrkEb1rxdqZHeQKrNULzFGLkp21cwfK3oxaR1D1q5b9ECAiyRK4dLalbCYvjR9wVGmnNOEGk+HdVuA1GUKa6pH8lJMTAhJzLbgv3VRwDMRdA4XgLhCO2+iTyYZ+i/fou/k99p+QH/A5eiGwj19UJa9V9qjO2kz0Vjrh/lgq7c/H3VeJWyOxcnJBELsOPAB1hF4h3nHxGl7JMby/gjI3fpt9Zxui3ylJPLpvGNY/MV3+7b3tfCRv1MMkXq9RJrmxmtEkbDSETFfS47wvg0DFIkQW/CfRp/HWNNhKYIiC2RyxEfyHflahiSmzgMUE6NAePkGybd66P8ttLxMRgL009QF4apKpk3lVvNJDQYHSwDzwNgXuNjE1pShs2DezqpVzwVATRE+iQtBddT1mPHGXjcgi+hQsWZx/jmhZCanjmK0Vda/7PovTB6TwzkuRToKhgaSRC8a2cGlwsf86cBmE5ZznzLCkYIiVMzVN491oecL1XL6IiDPWSdg0UNZTtJl1DwPSBBVuX4HUEKtaZ8JcmPqbnqknhcM6tLlPkhuluWAl/D87rrrIDHtc7IFBu8+osqPqWA7v3eKNmo= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3266; 6:3OdtvI7g39+jGv8lrDcajLm0Kbo/I9SFbCeW5ruT+JdE41gUfIC9U4mQAKymAMhDzCIlkJE+8vQYrVO9EvSAU/NzO2V306EA0FhAzO8FX5X6qvHa/Q7LLMY6Abrge6MTKpAzlMVtbHuk/yWbJU36oqkezxHGNLkbMZfCEekMdEa2GGUQHwDBiA8UYUFMmzni7KLxCGi7QoXomNVOGMl3nPoOqeijG2yOehX2YytjGjMH4YBfacB4ynUnhQJ74u6JHkKIXf2cDNk3oe7/kcYrpD8EOHBaMVA4gx4RHkZMX5uSMwnzPJoH/3JgGQffqfSl+Vn1dPYapWmXFmmoTYXTFPirUNvkUry9TWScSMoAGtI=; 5:1ylrxD8BWhNKxPOunhYSpbNsdzAawBg2s/TEVqD8s1yWongN3ecLq9nfBqfqMcOwoIreH5TGXDfAQ9E/9lvCRgbYhxFbKaaEatDZwEGEi3OtsL2WdJTXJBTBCufkCpMcIc+dR6Mlzl3r26saaBlq0t73EZm5ZxYeZ7Mf+ZFTA9k=; 24:wQi+3D8oeZMo4oQeI0DcQwzNoYh6rokV0x1AT0XVwepEdkNA+jZd0DljnPXrlWBXLC88r9vqZ8XDGcyO9d9uDnD/lYRhsv7iPBPCFFEwiuA=; 7:AFC64jEdSiTVuMo1VQR70Wuuay5PSCj5s7V+/WxEMgSy64+pS/7Um7Pt0VoMSfDbPWPajHvqGYt9k970ZVe/1/g/NIFtN5mgUH7ew49UjAJAW5LnV9YyNFIqpA7tUnvigx2/P5l+hkmG8Jdb5d9az8fdkERo1Sweu6faTVtwz2zL44biLy5GMe5IhCaNnby7f0MQHdsEEmdS6buMUlLw5dD2bNChMDYHbPMoMAGlWMwjcYE5aMvwohdxAo/qOG4j SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:41.1661 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 955b8bc5-2e2d-4e62-6975-08d526fc88eb 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: BN6PR02MB3266 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.86 Subject: [Qemu-devel] [PATCH v4 03/45] 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 Wed Nov 8 22:56:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836037 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="VOG/s0eI"; 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 3yXMLZ5gSYz9s72 for ; Thu, 9 Nov 2017 10:04:22 +1100 (AEDT) Received: from localhost ([::1]:34313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZOO-0001Pq-Qf for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:04:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZL7-0007Xe-Fb for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZL4-0002y9-3b for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00:57 -0500 Received: from mail-sn1nam01on0074.outbound.protection.outlook.com ([104.47.32.74]:1834 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 1eCZKw-0002rW-JN; Wed, 08 Nov 2017 18:00: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=9wtCPf/J7PbtQK8poQBL6jLey92lNwr/YFNvh+ryvcc=; b=VOG/s0eIwEoFMNO/iPjZtKOxsKbpTFI/CAdqWTNvNIUYCa6x7TG0NPDq1ybwzE8JHplz7zZTlwmgBir2l+l8PjR+xy4Xg13R3gZPqbhSGZaFZ6PBfDjmS2utUSEVVWgFDQIoXue5p4copFWLg7GaPN/zmlKXuKnZPLSimXBafjs= Received: from BN6PR02CA0082.namprd02.prod.outlook.com (10.161.158.23) by MWHPR02MB3391.namprd02.prod.outlook.com (10.164.192.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:00:42 +0000 Received: from CY1NAM02FT021.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by BN6PR02CA0082.outlook.office365.com (2603:10b6:405:60::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:00:41 +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 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; Wed, 8 Nov 2017 23:00:40 +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 1eCZKq-0001KP-6G; Wed, 08 Nov 2017 15:00:40 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZKq-0002E8-31; Wed, 08 Nov 2017 15:00:40 -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 vA8N0ZbA008349; Wed, 8 Nov 2017 15:00:36 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKl-0002Cg-Ok; Wed, 08 Nov 2017 15:00:35 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:37 -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-23450.000 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)(118296001)(9786002)(76176999)(50986999)(4326008)(77096006)(36756003)(33646002)(356003)(8676002)(50226002)(2906002)(47776003)(478600001)(305945005)(36386004)(316002)(16586007)(54906003)(53946003)(575784001)(50466002)(48376002)(2950100002)(189998001)(6916009)(106466001)(39060400002)(2351001)(81166006)(81156014)(8936002)(5003940100001)(5660300001)(106002)(63266004)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3391; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT021; 1:LXYvKCU2F4YVisBrlBjQUfa5t21kxPKiLukDR8ry89C/3BirsD8TveDrnPTxs3/F2XobQXeZ4MutKBYW94oFjy+Ou/eibf9cNEN4RSotFu5x+Xmku+wds7+1QFt3XodN MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c8ff85f-5f1e-4d61-fb5d-08d526fc88f6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:MWHPR02MB3391; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 3:S2sPb2kjKPI0nr2ockkKQewsI20zjjstXaG3X/AyutXodUFJw4Bic8ul2SY9VdySiiGSm4ySq0s7QqWdlqrJvOZrYxVXhQXTkWx0OdRE44D/hr2mEg+LeFaGku6Cc5e4hq22ICr0yo9V1bqvhskCohU/lPB0HSsU1xWelws132mug38IWQ9EVxFj7zxkM75GAjgb5wRWsy3CHgXkNrEGNju1KSSAOCY+bCQr7Cqx0kKJnUbIu2gB6mXuWyjMHbewlKDQndB9pk6Fktr1xWcERAHamEDxtrfegz03YGugQXUVLGqRidutMqvxvtbm9bdggM4LyLqvPmBUXWGZNYVk6G8h5MLaBCQepocAS+k8AfY=; 25:VbcQaMqTjQcF2N7RVUU7hsO0F9NwgYRFNKAAGVeImKiVO2HxoIdeguxQ2rqDC52Sw7OjeJhJimUr0YLhTBH8md1H9S9gWPk5FGTUfBnStsoKm35wu54Y/Wvh6rEblz9UHRWq9ijq+t36R2nYKhhr5XgEh861zVY3y3iq+ayZeq/ojXlkzmD4vF+v8F8hgJriY8Qv2ZrrmoSk5bze5K4cEieZQ4WRs2K2OFeTMv0D8hvlxX2pKaKZTyX6o5ox3mGOPeabC23sNreXjhmZ3z39Z34WFZXFDhHuBzXoPfaplm0SjLZ+MxNlG280Qe6L/E7NjxGXvHNAcVVofAJF7cIE/g== X-MS-TrafficTypeDiagnostic: MWHPR02MB3391: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 31:J05Jqcqt9NZ1REnVHMmhjOLlOUEITl2TRlOBqSrUzPTo1GV9VoJ+AZj94mP0aHMxpt7Id7j0hbWeRDsWNhJhSt2e/sEdiMpJezlYghhfbtOeNlw1fUSv1qRg2rrVP5jxNWjTPRY/YAgGd/da/nAS0w02vLarmSvdwGP8Dzbl/K9w5XlgP4wUFrghWcZ5BTzLgjY+1+rj+0TvZrjNFHiZN2co1UGyGyINCeD/5E5ZRt8=; 20:OIKSuZppsvM0ttv+5LaVcTIzeZMzG2Se8hcV7U8SnYS1aj9TSXb83cwysGzyYSHCs+C9hVsycCz9HRef45/wsFvKHR4eWzEBF0zWPw7r8OiL4QCKR/blndQaHiBy1CLO3Pdj6Bf4Bo5QxcyocmEiJXzpNv32/P55O34inXqor2Gwqu97/CWjlJFbvYMh2JPZNzZ07OyzVxViYQTgBfMqXqHKV/qBdlq4+jH0qDGDVIvFmSq8xbn+VzFgHX/or4H4o+xDgGFfjsRHQrzP0WTVlXTfYnlW8109y2St4TWxL9gqt8h6eVImIUBIV+N+X6N+RCq4zPaJ2prx3b/nbEQxhn4UHQlwBZuW5nalpSny7Ol4f0lIOGszl8hV8dc9APR62ojdRjG6yg9X3EhZMnqh2JHXNnGE3TpdupWqsrcGSYOQpqwvlETIM1zU910t6JOfy5VcR8WEHTefPoUF2omQnS6BvVIYXrf4mET7utefr3my+Zu6yILt9JyXJIydYauA X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231021)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123555025)(20161123558100)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3391; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3391; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 4:yJrSf92u2ZwNt0L8ai4dfxHJNYAiDT3qdxVn35h2tNGCYU2Rsd3LR/MkzslB58NIAuN/v3N2QM8ZCwfQnDwUPHEyv8ToBm1SpByi7tCd6JDtyAenkC/oBMVRaI/gkSehgGWZq+BqJyYbbfQpBESEN523XC2PHiTs17E1GxCmgAnW+AI2l0VILhnw4uNmx4yMOUr0k9ycFw3lGbEYhmehNgQ2TOG0PrC5tIVD/x4KlFCPLAoq+QnQe7ru1dIvrdNvvR2z1oOzMez2yxR0jG0MjXbSFTHK1wx3pFOfhNOLNR6F3zDh6/cKX6IhAIyIysxGMratBerQyGx+7535gRNTAw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3391; 23:yxrVwqVBBCc1hk4ceBj9w7xuKlon+2Xg2bjgQM+QU?= E2FbZEp3ERkcoAjz7Jye5aHOoT4IFz09gKToIsK7z032yYyuUS+8Og6H6t/Ybjb5p56JfWd7lpwMPaA9hp3VHZluG3aNz+1O/ow7bWw5stXgsPap85naZsi87AwCytfg3KqdAndZsIyaJK2ze2A+LoERa2CRXk29PZ09UiNDcyU3umuU2Typqrfx2Kx4TpWQfpMkgyyC2clCzLvwYrDC6kkTrLac8pVchfdASaQfCp7t++kUfn0DMsZnF6IBCsMUTOUQhz7iADf47jMzEbCRkZovAUNqjHEa+we5bUv5EhvmYs4j3bfNhjh/CG0oEgCWlqKP082gG62paxODYZ8O+S5kTHmTCNFe/2DsRigWic/C2SIiatgkEbFoE0LbX8AHZYRh8l+3AdQg2zkdy+Wu6iN6zyIviTUIuAT1c1styWFb4yrAtip809J4fdb2mbt0y2pTn/cN8BzgCJp8LhpiB/hDOG/sMqCNoAdn3lvv/vBpuQ6zZYkjTabcUHrsBccwMaw+eu0gzpnifgNdpnFZJu3eOjMmEILe9h7G2sCyZE6Do7975cO5tnoQWN4Kego7WRaPD/m3d3Ifz0ztj5tktzFP9VsqdQHlTW0xvICm84w9jX6o7F59jv8J/k5+uP+vypaXeUMlKuq+oMlX8vvH0tmaDo4zUeoMqI0JnsVApLAa/pthvzHmv7WBYqssW94+7TLCOV0sOZJWmdSdx7kOpoewlPqRSPHKnnKSfbpZJG9CPQMXMN4qdoGIZATsiYTtQLCi+xdvWbgh4PhzwwTI73wUM5DL586E0P7ddwT+q0vWiD71NkRd2SCQu5JCPPz1v+LKKbwozYRKXUQUaUuPLdyfRkU79/Wuvwru7CUXfmfvG8JiRCL2wXGL0sTwdTnOg6T/OLgnC/2VEcmvEyBlniPz5IXd3lReg+8URI7LRhRvXOGOzmWX7qrkHUGz5iWbWfmJuig0qYbB1wc0KcxgfNLy86GhAFdHFutqdrY68p0xU45chCp/nhuJRq/f7NOIebZ9vv4SArDBLFUkZgv8MZR X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 6:sfgs93JXt00dYatHWW2DjPRt68kEEeUllMkzlOMssCHwM11BKcx0m1W3zFKm6TgR7QVIDXSglaSa/Lu8Vis1welMT4PnSB1kvWudN7BbZrDogOHjcV37XgGATxYYwzj2N09HMHuKhujfbbwVThCKRtAfo3I6N7BDyOak5s7egHA99ATT0NcZzjMx0k7d7JpBEMQ5DNj2s4rTcMEN+yQmg6VlRaVo3VoqW8EKdDv1gTGsXhlHvurvfO31oJ0+V8AeEt/W9hPSS9uWBRgEuDZ4VkkA3tLQ4rEZOH9iydGurTY9I+lR2mTKnTASZbw2DJpWamhXLrCMMAXSvhRhWkU89KlWkmR2855Up2xvVXtLTPU=; 5:qXcqGauM+PEurqEedlmjxW0HRiSXhmsRrKvaFIKc0ZtKsgxc2ZigbrUVjtuMS1zxco0qV6PIr0XxyD+aplxSkew53eACAC2TcYvkoDQtR4WsjmTV7CZVvHdxq0fz/YsEttsfYdqzNFzBM7DJRlzfKss0hN9sMDHSJMZj+ksCqMc=; 24:107shkrxlZ5bGAV1FpxDnnH/5sSbPo2lISqpQuIQnIEgj7IbbDpYEXTiAUpAMCrSoMPAvlN6NN6t7rVKyBB507ATa+y7ptk/o00ARxCa21c=; 7:eSqest7kGzJFUEevVm+hjamWrCaJwk6k8CCQFMnt9YtDsF1wesbahN7tAhxZw5oKveVnrcmV8wxIWmRwvRytfENxnO+8zEN64XB9U6GmSM8cqlj6lmOjtr8ELUXNyU5PdMeRLxtqnJR+QZzI44rJoWjTyoQQoMogymx8wMvGmEey5OGgNGan5bkv8NJ9PcFebcboH7/S4tH7O8K8rifaSePbOcytvw0XxbTEkPkW97VpV3CLe3v3SMLZYuH9/4KE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:40.8357 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c8ff85f-5f1e-4d61-fb5d-08d526fc88f6 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: MWHPR02MB3391 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.74 Subject: [Qemu-devel] [PATCH v4 04/45] tests: 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: qemu-block@nongnu.org, "Michael S. Tsirkin" , armbru@redhat.com, "Dr. David Alan Gilbert" , Gerd Hoffmann , Igor Mammedov , alistair23@gmail.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 of the error_report()'s were manually kept as fprintf(stderr, ) to maintain standalone test cases. Signed-off-by: Alistair Francis Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Cc: "Dr. David Alan Gilbert" Cc: Gerd Hoffmann Cc: qemu-block@nongnu.org --- V2: - Keep some of the fprintf() calls - Remove a file I accidently checked in tests/Makefile.include | 4 ++-- tests/ahci-test.c | 3 ++- tests/bios-tables-test.c | 5 +++-- tests/i440fx-test.c | 8 ++++---- tests/libqos/ahci.c | 10 +++++----- tests/libqos/libqos.c | 7 ++++--- tests/libqos/malloc.c | 13 ++++++------ tests/libqtest.c | 13 ++++++------ tests/migration-test.c | 8 ++++---- tests/migration/stress.c | 36 +++++++++++++++++----------------- tests/qemu-iotests/socket_scm_helper.c | 11 ++++++----- tests/rcutorture.c | 5 +++-- tests/tcg/linux-test.c | 2 +- tests/tcg/runcom.c | 6 +++--- tests/tcg/test-i386-fprem.c | 2 +- tests/tcg/test_path.c | 4 ++-- tests/test-hmp.c | 5 +++-- tests/test-rcu-list.c | 5 +++-- tests/usb-hcd-ehci-test.c | 2 +- tests/vhost-user-bridge.c | 28 +++++++++++++------------- 20 files changed, 93 insertions(+), 84 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 434a2ce868..5fcd63eda5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -621,7 +621,7 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ $(test-io-obj-y) tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-obj-y) tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o +tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o $(test-util-obj-y) tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) @@ -788,7 +788,7 @@ tests/migration-test$(EXESUF): tests/migration-test.o tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \ $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \ $(chardev-obj-y) -tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o +tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o $(test-util-obj-y) tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y) tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index cb84edc8fb..ac8a30ab8b 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include #include "libqtest.h" @@ -1859,7 +1860,7 @@ int main(int argc, char **argv) ahci_pedantic = 1; break; default: - fprintf(stderr, "Unrecognized ahci_test option.\n"); + error_report("Unrecognized ahci_test option."); g_assert_not_reached(); } } diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 564da45f65..0955c72a74 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include #include "qemu-common.h" #include "hw/smbios/smbios.h" @@ -396,7 +397,7 @@ try_again: aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, (gchar *)&signature, ext); if (getenv("V")) { - fprintf(stderr, "\nLooking for expected file '%s'\n", aml_file); + error_report("Looking for expected file '%s'", aml_file); } if (g_file_test(aml_file, G_FILE_TEST_EXISTS)) { exp_sdt.aml_file = aml_file; @@ -408,7 +409,7 @@ try_again: } g_assert(exp_sdt.aml_file); if (getenv("V")) { - fprintf(stderr, "\nUsing expected file '%s'\n", aml_file); + error_report("Using expected file '%s'", aml_file); } ret = g_file_get_contents(aml_file, &exp_sdt.aml, &exp_sdt.aml_len, &error); diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index e9d05c87d1..75fb9742ce 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" @@ -295,18 +295,18 @@ static char *create_blob_file(void) ret = -1; fd = g_file_open_tmp("blob_XXXXXX", &pathname, &error); if (fd == -1) { - fprintf(stderr, "unable to create blob file: %s\n", error->message); + error_report("unable to create blob file: %s", error->message); g_error_free(error); } else { if (ftruncate(fd, BLOB_SIZE) == -1) { - fprintf(stderr, "ftruncate(\"%s\", %zu): %s\n", pathname, + error_report("ftruncate(\"%s\", %zu): %s", pathname, BLOB_SIZE, strerror(errno)); } else { void *buf; buf = mmap(NULL, BLOB_SIZE, PROT_WRITE, MAP_SHARED, fd, 0); if (buf == MAP_FAILED) { - fprintf(stderr, "mmap(\"%s\", %zu): %s\n", pathname, BLOB_SIZE, + error_report("mmap(\"%s\", %zu): %s", pathname, BLOB_SIZE, strerror(errno)); } else { size_t i; diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 13c0749582..286f5c3e64 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "libqos/ahci.h" #include "libqos/pci-pc.h" @@ -985,9 +985,9 @@ static void ahci_atapi_command_set_offset(AHCICommand *cmd, uint64_t lba) default: /* SCSI doesn't have uniform packet formats, * so you have to add support for it manually. Sorry! */ - fprintf(stderr, "The Libqos AHCI driver does not support the " + error_report("The Libqos AHCI driver does not support the " "set_offset operation for ATAPI command 0x%02x, " - "please add support.\n", + "please add support.", cbd[0]); g_assert_not_reached(); } @@ -1060,8 +1060,8 @@ static void ahci_atapi_set_size(AHCICommand *cmd, uint64_t xbytes) default: /* SCSI doesn't have uniform packet formats, * so you have to add support for it manually. Sorry! */ - fprintf(stderr, "The Libqos AHCI driver does not support the set_size " - "operation for ATAPI command 0x%02x, please add support.\n", + error_report("The Libqos AHCI driver does not support the set_size " + "operation for ATAPI command 0x%02x, please add support.", cbd[0]); g_assert_not_reached(); } diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 991bc1aec2..c84ffb6925 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include #include "libqtest.h" @@ -155,7 +156,7 @@ void migrate(QOSState *from, QOSState *to, const char *uri) continue; } - fprintf(stderr, "Migration did not complete, status: %s\n", st); + error_report("Migration did not complete, status: %s", st); g_assert_not_reached(); } @@ -199,7 +200,7 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb) fmt, file, size_mb); ret = g_spawn_command_line_sync(cli, &out, &out2, &rc, &err); if (err) { - fprintf(stderr, "%s\n", err->message); + error_report("%s", err->message); g_error_free(err); } g_assert(ret && !err); @@ -210,7 +211,7 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb) * 0 is only possible if the program exited normally, so that should be * sufficient for our purposes on all platforms, here. */ if (rc) { - fprintf(stderr, "qemu-img returned status code %d\n", rc); + error_report("qemu-img returned status code %d", rc); } g_assert(!rc); diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c index ac05874b0a..a655a25f1f 100644 --- a/tests/libqos/malloc.c +++ b/tests/libqos/malloc.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqos/malloc.h" #include "qemu-common.h" #include "qemu/host-utils.h" @@ -193,7 +194,7 @@ static uint64_t mlist_alloc(QGuestAllocator *s, uint64_t size) node = mlist_find_space(s->free, size); if (!node) { - fprintf(stderr, "Out of guest memory.\n"); + error_report("Out of guest memory."); g_assert_not_reached(); } return mlist_fulfill(s, node, size); @@ -209,8 +210,8 @@ static void mlist_free(QGuestAllocator *s, uint64_t addr) node = mlist_find_key(s->used, addr); if (!node) { - fprintf(stderr, "Error: no record found for an allocation at " - "0x%016" PRIx64 ".\n", + error_report("Error: no record found for an allocation at " + "0x%016" PRIx64 ".", addr); g_assert_not_reached(); } @@ -234,8 +235,8 @@ void alloc_uninit(QGuestAllocator *allocator) /* Check for guest leaks, and destroy the list. */ QTAILQ_FOREACH_SAFE(node, allocator->used, MLIST_ENTNAME, tmp) { if (allocator->opts & (ALLOC_LEAK_WARN | ALLOC_LEAK_ASSERT)) { - fprintf(stderr, "guest malloc leak @ 0x%016" PRIx64 "; " - "size 0x%016" PRIx64 ".\n", + error_report("guest malloc leak @ 0x%016" PRIx64 "; " + "size 0x%016" PRIx64 ".", node->addr, node->size); } if (allocator->opts & (ALLOC_LEAK_ASSERT)) { @@ -251,7 +252,7 @@ void alloc_uninit(QGuestAllocator *allocator) if ((allocator->opts & mask) == mask) { if ((node->addr != allocator->start) || (node->size != allocator->end - allocator->start)) { - fprintf(stderr, "Free list is corrupted.\n"); + error_report("Free list is corrupted."); g_assert_not_reached(); } } diff --git a/tests/libqtest.c b/tests/libqtest.c index 0ec8af2923..b0fca61f79 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -15,6 +15,7 @@ * */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqtest.h" #include @@ -89,7 +90,7 @@ static int socket_accept(int sock) ret = accept(sock, (struct sockaddr *)&addr, &addrlen); } while (ret == -1 && errno == EINTR); if (ret == -1) { - fprintf(stderr, "%s failed: %s\n", __func__, strerror(errno)); + error_report("%s failed: %s", __func__, strerror(errno)); } close(sock); @@ -155,7 +156,7 @@ static const char *qtest_qemu_binary(void) qemu_bin = getenv("QTEST_QEMU_BINARY"); if (!qemu_bin) { - fprintf(stderr, "Environment variable QTEST_QEMU_BINARY required\n"); + error_report("Environment variable QTEST_QEMU_BINARY required"); exit(1); } @@ -334,7 +335,7 @@ static GString *qtest_recv_line(QTestState *s) } if (len == -1 || len == 0) { - fprintf(stderr, "Broken pipe\n"); + error_report("Broken pipe"); exit(1); } @@ -419,7 +420,7 @@ static void qmp_response(JSONMessageParser *parser, GQueue *tokens) obj = json_parser_parse(tokens, NULL); if (!obj) { - fprintf(stderr, "QMP JSON response parsing failed\n"); + error_report("QMP JSON response parsing failed"); exit(1); } @@ -445,7 +446,7 @@ QDict *qmp_fd_receive(int fd) } if (len == -1 || len == 0) { - fprintf(stderr, "Broken pipe\n"); + error_report("Broken pipe"); exit(1); } @@ -902,7 +903,7 @@ void qtest_bufread(QTestState *s, uint64_t addr, void *data, size_t size) g_base64_decode_inplace(args[1], &len); if (size != len) { - fprintf(stderr, "bufread: asked for %zu bytes but decoded %zu\n", + error_report("bufread: asked for %zu bytes but decoded %zu", size, len); len = MIN(len, size); } diff --git a/tests/migration-test.c b/tests/migration-test.c index be598d3257..2918a322fb 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "qemu/option.h" #include "qemu/range.h" @@ -214,7 +214,7 @@ static void wait_for_serial(const char *side) break; default: - fprintf(stderr, "Unexpected %d on %s serial\n", readvalue, side); + error_report("Unexpected %d on %s serial", readvalue, side); g_assert_not_reached(); } } while (true); @@ -334,9 +334,9 @@ static void check_guests_ram(QTestState *who) */ hit_edge = true; } else { - fprintf(stderr, "Memory content inconsistency at %x" + error_report("Memory content inconsistency at %x" " first_byte = %x last_byte = %x current = %x" - " hit_edge = %x\n", + " hit_edge = %x", address, first_byte, last_byte, b, hit_edge); bad = true; } diff --git a/tests/migration/stress.c b/tests/migration/stress.c index cf8ce8b16d..49e1ff4555 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -47,7 +47,7 @@ static __attribute__((noreturn)) void exit_failure(void) if (getpid() == 1) { sync(); reboot(RB_POWER_OFF); - fprintf(stderr, "%s (%05d): ERROR: cannot reboot: %s\n", + error_report("%s (%05d): cannot reboot: %s", argv0, gettid(), strerror(errno)); abort(); } else { @@ -60,7 +60,7 @@ static __attribute__((noreturn)) void exit_success(void) if (getpid() == 1) { sync(); reboot(RB_POWER_OFF); - fprintf(stderr, "%s (%05d): ERROR: cannot reboot: %s\n", + error_report("%s (%05d): cannot reboot: %s", argv0, gettid(), strerror(errno)); abort(); } else { @@ -76,13 +76,13 @@ static int get_command_arg_str(const char *name, char *start, *end; if (fp == NULL) { - fprintf(stderr, "%s (%05d): ERROR: cannot open /proc/cmdline: %s\n", + error_report("%s (%05d): cannot open /proc/cmdline: %s", argv0, gettid(), strerror(errno)); return -1; } if (!fgets(line, sizeof line, fp)) { - fprintf(stderr, "%s (%05d): ERROR: cannot read /proc/cmdline: %s\n", + error_report("%s (%05d): cannot read /proc/cmdline: %s", argv0, gettid(), strerror(errno)); fclose(fp); return -1; @@ -96,8 +96,8 @@ static int get_command_arg_str(const char *name, start += strlen(name); if (*start != '=') { - fprintf(stderr, "%s (%05d): ERROR: no value provided for '%s' in /proc/cmdline\n", - argv0, gettid(), name); + error_report("%s (%05d): no value provided for '%s' in /proc/cmdline", + argv0, gettid(), name); } start++; @@ -106,8 +106,8 @@ static int get_command_arg_str(const char *name, end = strstr(start, "\n"); if (end == start) { - fprintf(stderr, "%s (%05d): ERROR: no value provided for '%s' in /proc/cmdline\n", - argv0, gettid(), name); + error_report("%s (%05d): no value provided for '%s' in /proc/cmdline", + argv0, gettid(), name); return -1; } @@ -132,7 +132,7 @@ static int get_command_arg_ull(const char *name, errno = 0; *val = strtoll(valstr, &end, 10); if (errno || *end) { - fprintf(stderr, "%s (%05d): ERROR: cannot parse %s value %s\n", + error_report("%s (%05d): cannot parse %s value %s", argv0, gettid(), name, valstr); free(valstr); return -1; @@ -148,13 +148,13 @@ static int random_bytes(char *buf, size_t len) fd = open("/dev/urandom", O_RDONLY); if (fd < 0) { - fprintf(stderr, "%s (%05d): ERROR: cannot open /dev/urandom: %s\n", + error_report("%s (%05d): cannot open /dev/urandom: %s", argv0, gettid(), strerror(errno)); return -1; } if (read(fd, buf, len) != len) { - fprintf(stderr, "%s (%05d): ERROR: cannot read /dev/urandom: %s\n", + error_report("%s (%05d): cannot read /dev/urandom: %s", argv0, gettid(), strerror(errno)); close(fd); return -1; @@ -187,12 +187,12 @@ static int stressone(unsigned long long ramsizeMB) unsigned long long before, after; if (!ram) { - fprintf(stderr, "%s (%05d): ERROR: cannot allocate %llu MB of RAM: %s\n", + error_report("%s (%05d): cannot allocate %llu MB of RAM: %s", argv0, gettid(), ramsizeMB, strerror(errno)); return -1; } if (!data) { - fprintf(stderr, "%s (%d): ERROR: cannot allocate %d bytes of RAM: %s\n", + error_report("%s (%d): cannot allocate %d bytes of RAM: %s", argv0, gettid(), PAGE_SIZE, strerror(errno)); free(ram); return -1; @@ -271,13 +271,13 @@ static int stress(unsigned long long ramsizeGB, int ncpus) static int mount_misc(const char *fstype, const char *dir) { if (mkdir(dir, 0755) < 0 && errno != EEXIST) { - fprintf(stderr, "%s (%05d): ERROR: cannot create %s: %s\n", + error_report("%s (%05d): cannot create %s: %s", argv0, gettid(), dir, strerror(errno)); return -1; } if (mount("none", dir, fstype, 0, NULL) < 0) { - fprintf(stderr, "%s (%05d): ERROR: cannot mount %s: %s\n", + error_report("%s (%05d): cannot mount %s: %s", argv0, gettid(), dir, strerror(errno)); return -1; } @@ -322,7 +322,7 @@ int main(int argc, char **argv) errno = 0; ramsizeGB = strtoll(optarg, &end, 10); if (errno != 0 || *end) { - fprintf(stderr, "%s (%05d): ERROR: Cannot parse RAM size %s\n", + error_report("%s (%05d): Cannot parse RAM size %s", argv0, gettid(), optarg); exit_failure(); } @@ -332,7 +332,7 @@ int main(int argc, char **argv) errno = 0; ncpus = strtoll(optarg, &end, 10); if (errno != 0 || *end) { - fprintf(stderr, "%s (%05d): ERROR: Cannot parse CPU count %s\n", + error_report("%s (%05d): Cannot parse CPU count %s", argv0, gettid(), optarg); exit_failure(); } @@ -340,7 +340,7 @@ int main(int argc, char **argv) case '?': case 'h': - fprintf(stderr, "%s: [--help][--ramsize GB][--cpus N]\n", argv0); + error_report("%s: [--help][--ramsize GB][--cpus N]", argv0); exit_failure(); } } diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c index eb76d31aa9..7785da953a 100644 --- a/tests/qemu-iotests/socket_scm_helper.c +++ b/tests/qemu-iotests/socket_scm_helper.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include #include @@ -53,7 +54,7 @@ static int send_fd(int fd, int fd_to_send) } while (ret < 0 && errno == EINTR); if (ret < 0) { - fprintf(stderr, "Failed to send msg, reason: %s\n", strerror(errno)); + error_report("Failed to send msg, reason: %s", strerror(errno)); } return ret; @@ -69,14 +70,14 @@ static int get_fd_num(const char *fd_str, bool silent) sock = strtol(fd_str, &err, 10); if (errno) { if (!silent) { - fprintf(stderr, "Failed in strtol for socket fd, reason: %s\n", + error_report("Failed in strtol for socket fd, reason: %s", strerror(errno)); } return -1; } if (!*fd_str || *err || sock < 0) { if (!silent) { - fprintf(stderr, "bad numerical value for socket fd '%s'\n", fd_str); + error_report("bad numerical value for socket fd '%s'", fd_str); } return -1; } @@ -96,7 +97,7 @@ int main(int argc, char **argv, char **envp) #ifdef SOCKET_SCM_DEBUG int i; for (i = 0; i < argc; i++) { - fprintf(stderr, "Parameter %d: %s\n", i, argv[i]); + error_report("Parameter %d: %s", i, argv[i]); } #endif @@ -120,7 +121,7 @@ int main(int argc, char **argv, char **envp) is supposed to fork and exec this program. */ fd = open(argv[2], O_RDONLY); if (fd < 0) { - fprintf(stderr, "Failed to open file '%s'\n", argv[2]); + error_report("Failed to open file '%s'", argv[2]); return EXIT_FAILURE; } } diff --git a/tests/rcutorture.c b/tests/rcutorture.c index 4002ecf123..21d2c76d0b 100644 --- a/tests/rcutorture.c +++ b/tests/rcutorture.c @@ -61,6 +61,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h" @@ -86,7 +87,7 @@ static int n_threads; static void create_thread(void *(*func)(void *)) { if (n_threads >= NR_THREADS) { - fprintf(stderr, "Thread limit of %d exceeded!\n", NR_THREADS); + error_report("Thread limit of %d exceeded!", NR_THREADS); exit(-1); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads], @@ -417,7 +418,7 @@ static void gtest_stress_10_5(void) static void usage(int argc, char *argv[]) { - fprintf(stderr, "Usage: %s [nreaders [ perf | stress ] ]\n", argv[0]); + error_report("Usage: %s [nreaders [ perf | stress ] ]", argv[0]); exit(-1); } diff --git a/tests/tcg/linux-test.c b/tests/tcg/linux-test.c index 5070d31446..76c9059073 100644 --- a/tests/tcg/linux-test.c +++ b/tests/tcg/linux-test.c @@ -51,7 +51,7 @@ void error1(const char *filename, int line, const char *fmt, ...) va_start(ap, fmt); fprintf(stderr, "%s:%d: ", filename, line); vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); + error_report(""); va_end(ap); exit(1); } diff --git a/tests/tcg/runcom.c b/tests/tcg/runcom.c index d60342bfc6..7acf0239c8 100644 --- a/tests/tcg/runcom.c +++ b/tests/tcg/runcom.c @@ -61,7 +61,7 @@ void dump_regs(struct vm86_regs *r) #ifdef SIGTEST void alarm_handler(int sig) { - fprintf(stderr, "alarm signal=%d\n", sig); + error_report("alarm signal=%d", sig); alarm(1); } #endif @@ -172,7 +172,7 @@ int main(int argc, char **argv) break; default: unknown_int: - fprintf(stderr, "unsupported int 0x%02x\n", int_num); + error_report("unsupported int 0x%02x", int_num); dump_regs(&ctx.regs); // exit(1); } @@ -184,7 +184,7 @@ int main(int argc, char **argv) case VM86_STI: break; default: - fprintf(stderr, "unhandled vm86 return code (0x%x)\n", ret); + error_report("unhandled vm86 return code (0x%x)", ret); dump_regs(&ctx.regs); exit(1); } diff --git a/tests/tcg/test-i386-fprem.c b/tests/tcg/test-i386-fprem.c index 1a71623204..7c3d37d07a 100644 --- a/tests/tcg/test-i386-fprem.c +++ b/tests/tcg/test-i386-fprem.c @@ -340,7 +340,7 @@ static void test_fprem_pairs(void) } } - fprintf(stderr, "test-i386-fprem: tested %llu cases\n", count); + error_report("test-i386-fprem: tested %llu cases", count); } int main(int argc, char **argv) diff --git a/tests/tcg/test_path.c b/tests/tcg/test_path.c index 1c29bce263..d543bb76ef 100644 --- a/tests/tcg/test_path.c +++ b/tests/tcg/test_path.c @@ -150,8 +150,8 @@ int main(int argc, char *argv[]) ret = do_test(); cleanup(); if (ret) { - fprintf(stderr, "test_path: failed on line %i\n", ret); - return 1; + error_report("test_path: failed on line %i", ret); + return 1; } return 0; } diff --git a/tests/test-hmp.c b/tests/test-hmp.c index 5677fbf775..ff86220814 100644 --- a/tests/test-hmp.c +++ b/tests/test-hmp.c @@ -15,6 +15,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqtest.h" static int verbose; @@ -79,7 +80,7 @@ static void test_commands(void) for (i = 0; hmp_cmds[i] != NULL; i++) { if (verbose) { - fprintf(stderr, "\t%s\n", hmp_cmds[i]); + error_report("\t%s", hmp_cmds[i]); } response = hmp("%s", hmp_cmds[i]); g_free(response); @@ -102,7 +103,7 @@ static void test_info_commands(void) *endp = '\0'; /* Now run the info command */ if (verbose) { - fprintf(stderr, "\t%s\n", info); + error_report("\t%s", info); } resp = hmp("%s", info); g_free(resp); diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c index 1514d7ec97..00a03de370 100644 --- a/tests/test-rcu-list.c +++ b/tests/test-rcu-list.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h" @@ -64,7 +65,7 @@ static int select_random_el(int max) static void create_thread(void *(*func)(void *)) { if (n_threads >= NR_THREADS) { - fprintf(stderr, "Thread limit of %d exceeded!\n", NR_THREADS); + error_report("Thread limit of %d exceeded!", NR_THREADS); exit(-1); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads], @@ -255,7 +256,7 @@ static void rcu_qtest(const char *test, int duration, int nreaders) static void usage(int argc, char *argv[]) { - fprintf(stderr, "Usage: %s duration nreaders\n", argv[0]); + error_report("Usage: %s duration nreaders", argv[0]); exit(-1); } diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c index 944eb1c088..1e7ef842e5 100644 --- a/tests/usb-hcd-ehci-test.c +++ b/tests/usb-hcd-ehci-test.c @@ -42,7 +42,7 @@ static void ehci_port_test(struct qhc *hc, int port, uint32_t expect) uint16_t mask = ~(PORTSC_CSC | PORTSC_PEDC | PORTSC_OCC); #if 0 - fprintf(stderr, "%s: %d, have 0x%08x, want 0x%08x\n", + error_report("%s: %d, have 0x%08x, want 0x%08x", __func__, port, value & mask, expect & mask); #endif g_assert((value & mask) == (expect & mask)); diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index d820033a72..31a884e0da 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -181,7 +181,7 @@ vubr_handle_tx(VuDev *dev, int qidx) out_num = elem->out_num; out_sg = elem->out_sg; if (out_num < 1) { - fprintf(stderr, "virtio-net header not in first element\n"); + error_report("virtio-net header not in first element"); break; } if (VHOST_USER_BRIDGE_DEBUG) { @@ -294,7 +294,7 @@ vubr_backend_recv_cb(int sock, void *ctx) } if (elem->in_num < 1) { - fprintf(stderr, "virtio-net contains no in buffers\n"); + error_report("virtio-net contains no in buffers"); break; } @@ -364,7 +364,7 @@ vubr_receive_cb(int sock, void *ctx) VubrDev *vubr = (VubrDev *)ctx; if (!vu_dispatch(&vubr->vudev)) { - fprintf(stderr, "Error while dispatching\n"); + error_report("Error while dispatching"); } } @@ -461,7 +461,7 @@ vubr_panic(VuDev *dev, const char *msg) { VubrDev *vubr = container_of(dev, VubrDev, vudev); - fprintf(stderr, "PANIC: %s\n", msg); + error_report("PANIC: %s", msg); dispatcher_remove(&vubr->dispatcher, dev->sock); vubr->quit = 1; @@ -562,14 +562,14 @@ vubr_set_host(struct sockaddr_in *saddr, const char *host) { if (isdigit(host[0])) { if (!inet_aton(host, &saddr->sin_addr)) { - fprintf(stderr, "inet_aton() failed.\n"); + error_report("inet_aton() failed."); exit(1); } } else { struct hostent *he = gethostbyname(host); if (!he) { - fprintf(stderr, "gethostbyname() failed.\n"); + error_report("gethostbyname() failed."); exit(1); } saddr->sin_addr = *(struct in_addr *)he->h_addr; @@ -590,13 +590,13 @@ vubr_backend_udp_setup(VubrDev *dev, lport = strtol(local_port, (char **)&r, 0); if (r == local_port) { - fprintf(stderr, "lport parsing failed.\n"); + error_report("lport parsing failed."); exit(1); } rport = strtol(remote_port, (char **)&r, 0); if (r == remote_port) { - fprintf(stderr, "rport parsing failed.\n"); + error_report("rport parsing failed."); exit(1); } @@ -714,15 +714,15 @@ main(int argc, char *argv[]) return 0; out: - fprintf(stderr, "Usage: %s ", argv[0]); - fprintf(stderr, "[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n"); - fprintf(stderr, "\t-u path to unix doman socket. default: %s\n", + error_report("Usage: %s ", argv[0]); + error_report("[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]"); + error_report("\t-u path to unix doman socket. default: %s", DEFAULT_UD_SOCKET); - fprintf(stderr, "\t-l local host and port. default: %s:%s\n", + fprintf(stderr, "\t-l local host and port. default: %s:%s", DEFAULT_LHOST, DEFAULT_LPORT); - fprintf(stderr, "\t-r remote host and port. default: %s:%s\n", + error_report("\t-r remote host and port. default: %s:%s", DEFAULT_RHOST, DEFAULT_RPORT); - fprintf(stderr, "\t-c client mode\n"); + error_report("\t-c client mode"); return 1; } From patchwork Wed Nov 8 22:56:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836038 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="xiUiXQdW"; 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 3yXMLs2BrYz9s72 for ; Thu, 9 Nov 2017 10:04:37 +1100 (AEDT) Received: from localhost ([::1]:34316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZOd-0001cM-Dy for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:04:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLI-0007ge-2V for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLE-000345-QI for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:08 -0500 Received: from mail-by2nam03on0088.outbound.protection.outlook.com ([104.47.42.88]:1987 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 1eCZL7-00031k-JZ; Wed, 08 Nov 2017 18:00:58 -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=xiUiXQdWG+RNj1mtJn+XKCwaKQOSUOzgi5eH9D+I0XZkmhXW8WNGDqge6rO5+Q7bKgRoEAxvRpdye2PnhptvQHk7sd8id6WEXLKbHCi1LGH2MywhC765CF4P+l9t3vj36ZYg2zWyjRACx39de9WG0d4aTgsjW+A8YyuemX+z9ig= Received: from MWHPR02CA0008.namprd02.prod.outlook.com (10.168.209.146) by CY4PR02MB3382.namprd02.prod.outlook.com (10.165.89.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:00:54 +0000 Received: from SN1NAM02FT032.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by MWHPR02CA0008.outlook.office365.com (2603:10b6:300:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:00:54 +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 SN1NAM02FT032.mail.protection.outlook.com (10.152.72.126) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:00:53 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:60242 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZL3-0003wq-3B; Wed, 08 Nov 2017 15:00:53 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZL2-0002Id-Fh; Wed, 08 Nov 2017 15:00:52 -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 vA8N0diC008403; Wed, 8 Nov 2017 15:00:39 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKp-0002Dr-3d; Wed, 08 Nov 2017 15:00:39 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:40 -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-23450.000 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)(50986999)(50466002)(63266004)(2351001)(54906003)(76176999)(5820100001)(5890100001)(118296001)(47776003)(316002)(33646002)(106002)(36386004)(575784001)(23676003)(189998001)(5660300001)(6916009)(2906002)(9786002)(39060400002)(8676002)(2950100002)(4326008)(6666003)(2870700001)(305945005)(106466001)(356003)(81166006)(77096006)(36756003)(50226002)(8936002)(81156014)(478600001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3382; 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; SN1NAM02FT032; 1:4MGdrUZDFIWWI9zHqGJ4YWf7hkLIWueumUlnTFs8FSX5PURbuL4n6DjGne81TK/BMWvDI5Ti7BCy6FJ79C8kJqPt7wUx0ZRBGECadqMON7nxyo9IBjkc6Y6DcOzOBLG+ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6abff64-51cb-4e27-1d12-08d526fc9069 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY4PR02MB3382; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 3:RGXrLToLNQzjBhSyQoEF52ckrET5a/8mktxqxvUq7+9xDq/8DEASJGcTXQQ1WUj9Smyk5y1RqTCnOGjGmCAz8Pd49Xl4iOfmwaqG+baLeyiWsvTfdAvUB/3wcSIe76gjH562AZCQRkZAAo50WPqSY5kE2CKAXvSkAMMATEzVCJpafVLsbB8BHc6UCsflWKnJGF7ghrHtgCJwJugth4uoquXmHXyXm6Z8fUSNUTUYVVIRB9vFqUTTEo4uavFFBVBA4/SslYqPHgf2Ve1ey5eQlSMDENLuL3IZwu76uyQOTIwi4sxeDOY0UV4eoEPBLd8z7P7Nvv5imRjo492knfh+9h7aorbVNVl42861wFW3glw=; 25:iEs83edRmOMzgiKkl5+OR8HYzOyuMW7QzTlHaby4/yO3tRkF+RwjfFrYvuceSdP6W68Z3uTfLVroBSCgU0cdDdgItiuLWmZxKIeK1jpOhOpgKRDkzsUikZnCZElacdvOQxyG8hWvLJrFsiDPxmqNn/Gix4EwJ/x093vxPvAi6SqmHWbwKrnaeTZUYgBAiWM2XWZuPbZSqD6Gha4ALc2r5ZcC/vN5nvanCNo1WHrt+Q5ibVplAf/ArnYOwkpY/ge1K4fB1d0x5Gq4MX4bZW5wz/MhI7AjTQ6cpCWqElXhnntFe3j26+KICK7jAXAQyeHvPNekEuq+vSTA8rorLhsBIw== X-MS-TrafficTypeDiagnostic: CY4PR02MB3382: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 31:ll60Zlb8JrNk5dOHhWSzLz6BGYilxMPMhxErUbKqqJgoGVQuw0/f6inG3UFdBdQPa78Z3j7fIgJ6A3iEl7qAUH1lLn0msoabG/vcXT7B87EgxOp+eUGoqBEDI9am2k1e5KkfCsI3LBowBYkexzWITiCcJGZbnGMmzScE8InATHjHnaQIdLm2C/z9LOW+gqStDXj5U8jSnKfn+kpN2QINb/0nxq3zV6fKayLlFUUnnjE=; 20:1yGi5NmjsDc58AcNt+vrIKdY3pgXKoTFwPnROV7uGs6bYPjoQE2yAjvOgRfgssM2jiDN/koTTJF6WI7sGPtBNOSBmUjEEwZRHzFhiF0Tq2+PzAoJoYheYnuDMqCSC6Osn5+WcLnpfsBO1kQpH4ANXW3qi9B2Q6t2NT33Cgq6ZZbtjh8ra/8H7JKzeYeGl6ycRU0cLQNyrQC6r2QG7RHV9QwLOCg36WGmXWHDIWl3y13WxUQculMbIofRR4rkrfmo2lcrciXHPk3BNqamVvY8VNBVxm1sHuTT/ND24FdawD1IPh3Qw/HcCU1Xbf7ZTjzMW/gsVNc1kv1+EF4ANMwalKmwPJmoerUu/VvH7TjGiDXi4nDERIj2aHmVA347U4usZhe+J/Y9c86mC69YkNfSLuackq2HeFvXaJ4P1VbsA2PZTdMfwFo++K0yabZlBwv7xpV8Dq9zFECCE8nUrVDraudgnw3DU+sxKminQ1CbMotIMLInkFnSWT0HUMtT8pRa X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231021)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3382; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3382; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 4:mfO7se2jHM7MEsHP73nFMUDtN+e/bzodbD/2hsSndFrzj/8jsivZ4zG4ku0WnFmaaog3fUcEmSe8zqod0ycX7GGbGpEW5AwjkfZo3vOdjNh22QwpHA8dZ8A5uca4X0R/XtQPjwbbP9NlrwYw7B0yu+LUDyKHmIFiVU1DqpqcxJEPpR0/WSDZuQt/gq//OR8AVx58W5SavNKm/yrI6Hvppdvk/ateq4DuPX/HEzr6N/BH9bwuy2PQXevxg7nri50hWXOZ9LqxiFXcF6errplm9nxjooQYZk9IUkVKRCq+arsbh1ufB6JujMYCLw0nHr2QOQUOYmCZoOXb5Ee2xPVrcQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3382; 23:Nfh2rNVpwN2MnRyKXC0+Eu5M6INO7jP/dXi9sa4XL?= 8O/RVFL4hHRgP1JidpR5wgoPsU9FiL8KSwx7sRBlcNiNcoktzOlINjWBUCmIaQ8DUc1qaJ1SVrKhNBW3frNeIaNeVay1fbIPOGfgrLCy4SUw4T9/AfDcGpEqsTlPVc5/M0XOQimdRX1Bhq1chX6ZoYuQhOllUPub01tZxQT7pwfXn3AcL8hmOBqTXMSVNszKZWmcXuN7P6sk3iB3raRYH92wXMP7QxaEs8fbelumIuUjhAYcxkXsveqFpOEKoxOfxETR7+M1ct/j2oBA5RmpMLHqtLGIojy8IjxRtdGFwyTocPziXqif1aFO8PSrjCct2wmvIghcM6o7CxRMV9L4gySXZkW1Es/vpDAVjCttXb81ciPxzYDOxbETeQe8K1yT/oclQbc1RQexyx1tgmKQVT97pl/orQn8L5BQTiQWynTmXGtpEqmdF+YJrFfdCufF954wtlCbisoLydcXkCPNA4lEKe3LezDjbX8Zr2rMufjJQh2ENyDrnGrsGDNJkZqK6HnsLRtsqd1HYojWH5k0Q6ja+huQGPRj2gHh9iDHCX2NZj+0vCKgzFqmQGzGAxVe1C5/eGPokCCP1e+8oq3LfJ8X2oSCNAu4IXbRYFGZ39Kzw91SCKXoIlNJngbYxE+9kaVA6O/tpzRmUWxnPFxfHgFvv4BHs/R8ImHOIjDLE2vN9Dw8xny/gWi/hmzHRFZO6S0Ynv0pFkyYodMSvrLpqLbZxFow+a6hr3XUJtKXFRIb2Qqmn8i9eQkkqne8Ma5V4xb69Bonay+CXiSBSsaOrgGYVqVcarmxBSyJA1atAhGLkChXDrFN9Wn6BqUtL1GsiHT0KjQ3Pyp5W6Iw1V5XP+aA4Enx91YeIu2iP0rYU/ADfipHBjuyqDAQ+Ve4sUt7pBsR+r9mj3eFJ6z7jeiNlljkfW3d+5VqQV1S/nuOs4CiEh0NXVvplPDq5IsQ7eOO5zoLk0ceB2KH52ettQkCi926ktbHLexXUirRNCYpO9bCEqVncgL2FdNz2imvF4CPA6aFTbxCYZNoFSOw1pmSMj9PP06+ohdl9ANOE5k3DzRAhV9Jv7t6WddpfoC3qhkWTKGf+CsrZq19X6sXHYWVIVS X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 6:+jjjDzt/L2yxt9oXC5cdIpJuQ+/Vim6TthWSXIGhBN+FIhSQXwlDJGtWhAY/AdU1f8ffESILfC0hzWuYLFXlYDW8WGc4uzN6fE8A5a15a7tMs93AxRp9wLMR0oyxFWnjBZKAjWaurwLKQtI1VASLA7IXTikXMwSfefqr96+FOYl4GYcHDNwgaD1sWwE+qU5vZtVMDZnaCc/MSSgSqaufDOOvx222p3JJmuvfLBeec5wP8+Cj21KVf5xegsuPpmIeODnwI5EyrzQZc5meElUzFyoRXdoLfRZVjpBmeNVb4dbYpLPbJBKSLv+OKvfELBX0z0la8zwox94HxVJ/3ac87Y41qOahIzAGtoMSIYidm4c=; 5:OBbu9dOHIrOMUVrCE4IDevq58VHXjiRTk7YOTpuELG1qzRgZDhwSrE5qAslj5Nyf3RAX8QoSUH8j86qG3941ru2pH8C1wZl2k+B77rd5vXsTO2XoiKkjdIaZ3vfC+A+J2RyEBTOyYnJ895HTRZFtK9JMKdKKSmc2iXn20hf4T34=; 24:7ZgCc+sngNNWYBfX+biNuqLJfshgrU/3xHUnHwjZabcBdM2J6EbZ5FN7mwOGu7b101k/pIdcX86nbXQ601o9zGXdamttlbQQ4nLLn/ZW54Q=; 7:zmxJloQzsUHdcH6dG0o7meyZY0Rq/qz3af6CDFDCGdrCW4Dj7eCUYqcoN1zHxuvBxnZXkKLilDvE5ZawH9mDvmIt5sNnqLetYK2ZL20prwUzCKVw5kLavV+ikw+xTHbT5cd+EkzSRhLrnZv6/KtT6Q+5B7hBrCmJrVkjT9dxUXTVXUVMwSUo3m++oRCnw9neZ1kcn8WSp2IBMhWpUQUoG5ISlP3+5gkyYDyfsgffFfL5XizxgAdBfEDsjcSHUBSs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:53.5777 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6abff64-51cb-4e27-1d12-08d526fc9069 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: CY4PR02MB3382 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.88 Subject: [Qemu-devel] [PATCH v4 05/45] 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 Wed Nov 8 22:56:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836036 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="EQd8QHvy"; 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 3yXMJ40dCFz9s72 for ; Thu, 9 Nov 2017 10:02:12 +1100 (AEDT) Received: from localhost ([::1]:34308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMI-0007ud-4x for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:02:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLF-0007de-2h for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLC-00033i-O8 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:05 -0500 Received: from mail-by2nam01on0059.outbound.protection.outlook.com ([104.47.34.59]:5920 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 1eCZL6-000314-TK; Wed, 08 Nov 2017 18:00: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=94DlBs+q/9HzKyBn90kR06R8CHXGwepqgXfm30/GFzA=; b=EQd8QHvyWLt3YiKxBMwpi2np97DgeKWqipyf3kvF4zXN5COVvvR2ZNikZqoALMPxzGMQJBeHMsAtGgcg+7jpPofpL6nI5PnH2eHSjOclj82b7+mHusU60q+Etl3vZn0ymc0dMiTLqjx30Auy2QIIm8iOmajTMO/iq2lSqjFzFpY= Received: from CY4PR02CA0019.namprd02.prod.outlook.com (10.169.188.29) by DM5PR02MB3274.namprd02.prod.outlook.com (10.164.148.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:00:53 +0000 Received: from BL2NAM02FT017.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by CY4PR02CA0019.outlook.office365.com (2603:10b6:903:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:00: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 BL2NAM02FT017.mail.protection.outlook.com (10.152.77.174) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:00: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 1eCZL2-0001L0-AS; Wed, 08 Nov 2017 15:00:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZL1-0002Id-Gy; Wed, 08 Nov 2017 15:00:52 -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 vA8N0gxA008441; Wed, 8 Nov 2017 15:00:42 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKr-0002Ex-UY; Wed, 08 Nov 2017 15:00:42 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:44 -0800 Message-ID: <7d327222a677c66a4de74f563fa9af09b87b636a.1510181732.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-23450.000 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)(50226002)(5660300001)(48376002)(36756003)(316002)(54906003)(16586007)(50466002)(356003)(8676002)(6916009)(2906002)(36386004)(189998001)(77096006)(47776003)(4326008)(2950100002)(39060400002)(305945005)(2351001)(33646002)(106002)(478600001)(63266004)(106466001)(50986999)(575784001)(9786002)(8936002)(118296001)(5003940100001)(81156014)(76176999)(81166006)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3274; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT017; 1:IDibqfjMWuYvJ/6W9rYwyvtHNU7+ivtjXQwjAZQkmU1n9BHkVo3oCvRny1k9dO5YwNmTGzDcE5/CggDJGq5ifamusL4+fLHA+Ft98+TRQMqzGk1sSLXu0gI0JlcYcZ54 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04da983e-d18e-4454-836d-08d526fc9018 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3274; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3274; 3:9nhPvH1sZxk+wfcgBaIZFlW7Ye30oYrDV91hyus6UNjHg7nvfhZfan5IrDdnvQLkT60coebbkmnChxjOtfrch5vKSOzP/QwewviYELPQ33zEGcTMkuFeVL1hQfVfZkeat7/lhPE0q9wUur6pwt4kZd/tFYJT8OwGNKTEXexq9ePsRwiJ/yWUbGoT4N/f7f8FcfWPtljXeAMnRyG/2l190sp/7/Q9Dy+UefKrrbw3rFrIwPM8vog2fkC0U9ujOtQ6ifAL4NXrAFJSP+hLZu7EEbkp2j3CZqd1cylYKSgq8qZVgUqRgydUrzbC0b0HEhnMgbXdqfki/JWhqYbJMVrFDSpt37vPcCwgIJYwqjO3Bs0=; 25:A7P7kXJj9qIDV7/nrGuTGIoNZEa8yPXcMPSFgvCyeJbK+ezsF4sVjmYfq1JGEwbdasuCrhGfnVr8Nd2o0J+1ljwerRYye+EVoolO2tW8CdsjLUoL2AjiaQC1UZKLlucUYfEIVn9nc7mfV5uBlHsqZJusTzs+Fhl04oHOohyKvTsTWhJfY/4RXbzR4ueCTGf1WMqSNzsdWweNRS4VSxWYWUiSjx8ZRRC6OKMJ7xPa5++VtPwJdFZx5aR/dSjaLvRF0RxxJVNBQ+FJcv1wTxXrYYP8Se33BXkPdEsmaZ+TYdc83HOxZzRw4eeXxEnIk99ANJqUWZgiskJZWY5R/ykIcQ== X-MS-TrafficTypeDiagnostic: DM5PR02MB3274: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3274; 31:rVbegGlnggjpaqBMkYt31Nuvb/6WfGFvmMsReKEgERojG5tVmEG+Rbl990Z77UlJTAscYqAcX77l5dSuhbhyXUIF3zXPew+bLGNWraA+RbULy0/ORMYwNndIKzZmel72wttqnsskoG1TwyH4qOjEGUsrHzpD0529U56WxlNckFVCyZvi9o9Gi05/VrhpB2+4WUNZM0WVWAOK3o8ikcqg50VBcTpme/YlWVU7kPNkUdA=; 20:6L96F9cJA10solVKHMHeyWVTVlMCqFX1gaqK8eG0jy/uXyoj5Krcajql4FtgfijUNtSkSN3j8M76J1Ej4QDFw53jz9zyJHLpC1ar3xYIDNiVBgUWp2+M0DdoQTRnHQYrFedjzM+/K7YVFRKFQyBxFxQoB0zAlrydt7Fu40bmJse5wkgv6xfXUEsHkwpNtmRXBwx31yCvB38S2iJrSOr8JYixAMF8dm2GAVuwYFM8Zk68JYLqyN8FOzNsv5O9b2Q20GfGaM3FZne0W8j+LKeqTAZzSjL07aF/Ve5dsSXmzYNEH10PLICC1jXzwf5lZA2NIbriM1pcAv/ccGlQvZzfR8iMAqH2i/Cd9CrYoA4kipdOBqoMXJUyP5in/jitFAsiNWcOn33IGiURiqD87gO9chRKfhxsCVqaYYkAXn4D+n/J7DXtTg7l+9D/LeYwn1XL0SUxhsymE8obcgZu/wtxudP13uEoNVX7uAMNfmwpTjb06/HtlM/sjxeURzaQAp1G X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(20161123558100)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3274; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3274; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3274; 4:Xz3GSeJBcQKFn84hkmVg9lV9L8LdPQlC+HGXbJnrtnJ1+NWPNEeRPU8EBmmGD6dSOujTopUU21r4+0aca6Y0QNtr2+cfG45ZR/xqYyw1vSvbM+g+deeZftf3dmk/9AEu5l9xpPf68bMHkjmn6dhXRmwA4qD+rHqIrOOlvwnRHGpvW8r+x4S6sCWUkPe3MMKQp6XQcHDQNMsfiGzYgAYeCkoW/aPcuC1V4da1bAi8AQIu2Qdeas5Jwxt57yyt5gFsyhVFK2g+rR53L8pZkwxUEx7VtlDz8E0hIx9hZl1cL6Yeed/GzhFFZf/V9g+dIs60+R69B99Jlx3bM6XetLCvEw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3274; 23:5jGNZk7On+DFyTS3o978BRV5qE1HTWzUa3jEtDWTp?= 6P1NVL9CYf7eyJ7NPVpy4lD6SvZtY7jZqnbYybe8/y1SudLQoKP6bg3Py3Ib/QRiW4cFHgVs20iiay2UalJyEq69EE//UqQwWxAp8Ft26SH0YEiOwkOTh2nsEzaRzBJOcDLJ9gEgUYyJCtACcvNsB6T4Hs4NvgscF9TfOoRvygQOfmTo3TvEF3LcLwA/aIxwJzV+XLt3l17tzAknGN5KjNbXFooglpysuCDqxL/lPhcq2qeh9e8qvJDK7rj56Ru5Xj7QwjsaCoFw1JiIocD3HWHoGEgQtE2QNVmRNdTu/XlS458n6G77P8fuPaHlUVBPmU7WddYZyVIg5OBL2YorD1qkKJg+1xBpUK0fmPcnJWzuncHm2Fv1Rh7AeEEbZ/sfTEeZmkv73/QSoXi4h2Ra3vSxy60ksoeKAVf2qCjShFIu7xx3SbXwNPUZjoJLI8/YRSdhGXAjckP4amJjzFT2X4qiDK27hfQprNXu02HI4my6PQoe/u9sx0Kg0sE/0MzNbiMKvcsWdR7xsQ08z8MJrocH976x2UEx5ydCzwGXiTTgjdGufFJvAA44U99elLRIpFR57siM1f0J3mpO5dqBpz+s9XpCXI/a+Rgn+xafOjiuF7oHJ1vV6D/zMwVfIiaArlzkwMnRVeTQ+Xug4fmFa+NPPhAsBv/GCo4fJpT6QAo2fFlvKT99RHYBdDeLJc0ocgHvClR1dpsEj7cjxs7BRDuXzXMaj+b4rjf9tj2Y3trih/ceI+Ccuerp2T5b1sLtaCSkVoLuAWmghUbuG/BioqPX6GXJd8gdPKiq9SQPJNnxGOhtEqV4xt5+2CvEoffM1EmmE8mV2ILT0WHls8WuYiEri2JCWo9ORrmtvxaBUxobGbo38oy6kIyKgvlfaZhBEoZnmQlpeENK84AVIzsky3IV6mnlfOhIePBDX55dG/gL4i4ZKnfE4N9lgPJutcOBM6r6FLsYMbe9E51CjLkKslvrPKTLrRduIPrRGvK720T0N2/KU+UHd8D+GOt+mBVw7s= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3274; 6:C+iS7EA+rRDwJbcs6ixwMvIlcnQrrAfvFdEzWM9R5ylaPshIRrUh5f7oZLOww9dFiQh/J0LYSWS7YK0GHSCTQSP1CR0f/RuAzOEGALW9Y6kPnnctfFSXS8RwOiF5LeBTn7rlPUd7DjvSD5c5vlIh7NM5EvIFvmUqu3IYU6s6g3U3re0upXOw2VnI51YyjiiUQiAxAr2iLsFR+H/aAFqygOADj2QrEOHH1U/7Vg4BqjofP/wFg5fj6ALaq4cXdiqq4bTN15n+hfY5m8XVI07/CGYWiXTMKK3DknU44ILPy49ixLrHjSvrgY60TG5MAQFdkR3mlkxPLOYm93hFsJ9ti+cYj7Ek2pr7Y5yjtKe2sfc=; 5:kv7ljk1sZn1JNGUEjy3CShdLJYtVbs2LypFWnw80UDSkgzp581jGJLjv4LMkbVQQ/viubZLRcVUzPGyejD2FNLgZlCyl/FfIuj1QEhXVTiSP9t+3QB+h+zHw6ThiZsTjh0V35DRhRRCxhMD271aYAimaSv9ZnCi0levRhhVEvBE=; 24:hopUhDe9ZKivzE/L+018uUaNxZn6/1yx4qFgAu7De8xtEiBZnVhpl/zUwAwxcwUaJDID9GmahYVzgk2wftDSggftl9u7zXr1AVTS5Rf8z1s=; 7:EpZb4xoC0eHpBDr2m0Zn/x0haT/75DeJQee1JutPvmjs4K55K1RymiZnjRI/l0IGHtzGolJHtZx1BE6uuB5jDZXv1tTuulrcQ9JQTJECMvTYyM3G7CKi0HxKq4YyeZ7NX75lE7aZBedM42ar62WQTw3zw4dU9r/uhYAoeiLK+e9hHQAWyr7ekqrzB8u1L3RMazXYezqHZexLLePScD6Cyt0Ueb+kbUyb8HaU73oHgyzYkYhxN35BDFnO+IiH0XGR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:53.0964 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04da983e-d18e-4454-836d-08d526fc9018 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: DM5PR02MB3274 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.59 Subject: [Qemu-devel] [PATCH v4 06/45] hw/block: 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 --- V2: - Split hw patch into individual directories hw/block/dataplane/virtio-blk.c | 6 +++--- hw/block/onenand.c | 8 ++++---- hw/block/tc58128.c | 44 +++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 5556f0e64e..69dfd49191 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -178,8 +178,8 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) /* Set up guest notifier (irq) */ r = k->set_guest_notifiers(qbus->parent, nvqs, true); if (r != 0) { - fprintf(stderr, "virtio-blk failed to set guest notifier (%d), " - "ensure -enable-kvm is set\n", r); + error_report("virtio-blk failed to set guest notifier (%d), " + "ensure -enable-kvm is set", r); goto fail_guest_notifiers; } @@ -187,7 +187,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) for (i = 0; i < nvqs; i++) { r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, true); if (r != 0) { - fprintf(stderr, "virtio-blk failed to set host notifier (%d)\n", r); + error_report("virtio-blk failed to set host notifier (%d)", r); while (i--) { virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false); } diff --git a/hw/block/onenand.c b/hw/block/onenand.c index ed77f859e9..9591e9e82c 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -596,7 +596,7 @@ static void onenand_command(OneNANDState *s) default: s->status |= ONEN_ERR_CMD; s->intstatus |= ONEN_INT; - fprintf(stderr, "%s: unknown OneNAND command %x\n", + error_report("%s: unknown OneNAND command %x", __func__, s->command); } @@ -663,7 +663,7 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, return 0x0000; } - fprintf(stderr, "%s: unknown OneNAND register %x\n", + error_report("%s: unknown OneNAND register %x", __func__, offset); return 0; } @@ -708,7 +708,7 @@ static void onenand_write(void *opaque, hwaddr addr, break; default: - fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n", + error_report("%s: unknown OneNAND boot command %"PRIx64"", __func__, value); } break; @@ -759,7 +759,7 @@ static void onenand_write(void *opaque, hwaddr addr, break; default: - fprintf(stderr, "%s: unknown OneNAND register %x\n", + error_report("%s: unknown OneNAND register %x", __func__, offset); } } diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 1d9f7ee000..d274c9aafe 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -50,8 +50,8 @@ static void init_dev(tc58128_dev * dev, const char *filename) dev->flash_contents[1] = (blocks >> 8) & 0xff; dev->flash_contents[2] = (blocks >> 16) & 0xff; dev->flash_contents[3] = (blocks >> 24) & 0xff; - fprintf(stderr, "loaded %d bytes for %s into flash\n", ret, - filename); + error_report("loaded %d bytes for %s into flash", ret, + filename); } } } @@ -60,26 +60,26 @@ static void handle_command(tc58128_dev * dev, uint8_t command) { switch (command) { case 0xff: - fprintf(stderr, "reset flash device\n"); - dev->state = WAIT; - break; + error_report("reset flash device"); + dev->state = WAIT; + break; case 0x00: - fprintf(stderr, "read mode 1\n"); - dev->state = READ1; - dev->address_cycle = 0; - break; + error_report("read mode 1"); + dev->state = READ1; + dev->address_cycle = 0; + break; case 0x01: - fprintf(stderr, "read mode 2\n"); - dev->state = READ2; - dev->address_cycle = 0; - break; + error_report("read mode 2"); + dev->state = READ2; + dev->address_cycle = 0; + break; case 0x50: - fprintf(stderr, "read mode 3\n"); - dev->state = READ3; - dev->address_cycle = 0; - break; + error_report("read mode 3"); + dev->state = READ3; + dev->address_cycle = 0; + break; default: - fprintf(stderr, "unknown flash command 0x%02x\n", command); + error_report("unknown flash command 0x%02x", command); abort(); } } @@ -103,8 +103,8 @@ static void handle_address(tc58128_dev * dev, uint8_t data) break; case 2: dev->address += data * 528; - fprintf(stderr, "address pointer in flash: 0x%08x\n", - dev->address); + error_report("address pointer in flash: 0x%08x", + dev->address); break; default: /* Invalid data */ @@ -119,10 +119,6 @@ static void handle_address(tc58128_dev * dev, uint8_t data) static uint8_t handle_read(tc58128_dev * dev) { -#if 0 - if (dev->address % 0x100000 == 0) - fprintf(stderr, "reading flash at address 0x%08x\n", dev->address); -#endif return dev->flash_contents[dev->address++]; } From patchwork Wed Nov 8 22:56:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836040 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="mfcCyge2"; 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 3yXMMY2hKnz9s72 for ; Thu, 9 Nov 2017 10:05:13 +1100 (AEDT) Received: from localhost ([::1]:34322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZPD-00026E-Do for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:05:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLB-0007Zv-1r for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZL7-00032O-Re for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:01 -0500 Received: from mail-sn1nam01on0042.outbound.protection.outlook.com ([104.47.32.42]:45518 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 1eCZL7-00031u-HK for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:00: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=8wMs+DfEvqgrI3GKRc0/e1nuwQojSyMI5/sMmtYuwsc=; b=mfcCyge2ACuj6/0h77Bb8Y2GLpIHOzl6+wvs9LTUwwc7pOJ07bAuyGNSG0CxNjgicQSeDAcTjqzd93olbZbx7O5ntHWf6R/WT6s2sdVjMzIVGYt4pS8tBTIJeM+uvXVCTCSELRNRoNjml2z9iVn4TGu7suxxhm/wyO0xUtlbmNA= Received: from BY2PR02CA0008.namprd02.prod.outlook.com (10.163.44.146) by CY1PR02MB1335.namprd02.prod.outlook.com (10.161.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:00:54 +0000 Received: from CY1NAM02FT057.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by BY2PR02CA0008.outlook.office365.com (2a01:111:e400:5261::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:00: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 CY1NAM02FT057.mail.protection.outlook.com (10.152.75.110) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:00:52 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:60166 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZL2-0003wk-BH; Wed, 08 Nov 2017 15:00:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZL2-0002Id-70; Wed, 08 Nov 2017 15:00:52 -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 vA8N0jun008475; Wed, 8 Nov 2017 15:00:45 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKv-0002G3-10; Wed, 08 Nov 2017 15:00:45 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:46 -0800 Message-ID: <389cacd55d717f1b540c94c0c95eddffd8316fc6.1510181732.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-23450.000 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)(81166006)(33646002)(9786002)(36386004)(356003)(478600001)(189998001)(5660300001)(106466001)(2351001)(106002)(551934003)(2906002)(305945005)(39060400002)(63266004)(2950100002)(4326008)(6916009)(77096006)(8936002)(16586007)(81156014)(48376002)(50466002)(47776003)(54906003)(36756003)(575784001)(118296001)(76176999)(316002)(5003940100001)(8676002)(50986999)(50226002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1335; 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; CY1NAM02FT057; 1:DowC3XC5RgDN9VQlDIT233ISq0HDBAqC109oHpzSqNBwB0ZavvFrHkL7AJNpnbXS8gg3gGjhPY1jXDY3KEsBSqrsFY/1Jiu5ccmqdDh3ZZJM7A3TBRGSWNJdnRKzAFvi MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10cbac14-b12a-4e9b-301a-08d526fc8fdc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 3:gZ9npry5I0m48tVB0Aco5MM75B4pT+HsvAOkO5UQc04jAx6eB8ho0sZwKjoVuDpbLHH6lS8MdGPNBRQg9KL9s2O8DqnE/p7G2MchQIO2DE5xxcMzgEEvh9XpKgfhNZsCoyXOnEN2D88E02Xn956/NAU//E9sIdW5WVu6NOFDjKeexqzJrxhnv3augqb/EDkpIBVp1hLZ4s6G25cuByL0wVLsl8XVyDOYjn2eO0oWYNzxL8QmO4rffZPcluAfQT5goi7Sjq2v4prhxAT+OFUUh4DT/kJN/viCdMc70PqQFGN233IlTO7cgkDrw+jfl1CV0HOFYSAEuYKcqi9W8h+XvuroRUTzYhXkgBnYAz3xKlM=; 25:Ci0nw7YH3pPIdFau4Ec9UjwxvEkBO/vYqCe5XeO4Bq3kJCNh6J9ItcbcSVj+abjGwmPzmKdN5i24Vm/YaZl9lAOxzthsdDsWG/1Gha6s0OQQhVsfHDn97ozVPnuBTvGnGHI2zmpcB9vcqOVIiGGaYTItIPXwBOgochM2atBpMOk1l8wd14QRrRHHOn5elWwJGrxb0dezgxqw2fRKiIgBIiCMAo8/siJsGS060srCwwlV0I29a6tIJ/yUuxwb9RxT8IqCZqeNo2UTu9SA1gCWd27OFaxwHjos19/s5tDHJMWMYhSf/h8MugktTKjghwNzDoK3QxkD2XzJzqaHuYoVJw== X-MS-TrafficTypeDiagnostic: CY1PR02MB1335: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 31:t4daxXgdDNnbs6QDn3viQmkK8sBqVg/Ikmnio4UditMMJxxBKKMw/j+TCqGqV6zwIJxEXSN2NM1vaONr5mdsn377HF9HBdOvH3kIENdyx4xE87SDsPcmaFOwFISUyP+2/F0DPwe5ouNQpQAckg8AGdiyKQ22YUVIW5nASG3bkv0JTxd2PKg/n30Xms0gfXkyN76anBJUTgQGIZDhHVhP1K9kj3uzypPDa0tUxYEIHlQ=; 20:spig4ElommpMH2eHfOzInyNUAGgCiV9xoZYXhylDcX9JuDxxyuuVNSWPoxVlBV3MjPF9Ecwf3NCriK2B/O/aZXuHLT/vM2kARiIPCyJqAGn8GQF9E6XO56qkyWEiKTJOR8TwkEYhSssGPCvKY0spRd7mhJWaF4bquxJwesdr30sB4YV+kNpjtfUoO3vSxdG86KwAMFVYmzdhX//wCGF0YLBsP/XGLQfAjvDjFMHFv8bDGjp/AMUABiTVPYAdzq9qYWkh1YybwmybAGO+3dcrewmij64qwDjylY3Q4KiR+ID46Vy681z6YFPD7vSt5erbBMD42zBXZ7JaxQ0xcB8Cuh/iDo3VIiAu6aj+6pT8H1G6RHqYvVOtiQdZeYF3r9WB3Xchd2z5ADMz71CbvQPR7pfQTGMcQKyUFyA7W5w1U0BJs6bL4Lj0+hGiYXsE/dxJNx5Rl9YvhyJy8VUCdZ0r/Kw8OiZcnaXIJnUSsFpSrRJDhtffEehUT9nLco1p6ng5 X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1335; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 4:vHSqpk0bGDOTr213eQgr4hCwH2DvHJFfDvRvxx//1Ml4MqZCWxnpdSUIBG/FnNa3WDP1wInggX/8hiqSauNhaa4Beaok7RpKXoqj4iMS8XaxDyFLVk5farN8XSwaHAHicPJ8+mCJ6Ja/+n4n9/qy3tfqaj50Wqef+S95IeQ27TmOA2E3/gKT/mOqJnkA3jA5WIcLqxcZowPYQcLFpqMwCHidMxEXMbNvwRRHmEGepkc6Z4gr/WpQV/EfjRtj4GlCM4vtNnGU59KcHvC3QyXqHzivvW+kSs1G+aM3Od+PB3iu/CaD/mMyrkGBA2jYI6cGxVmKQoof0DnnHf5nQTvtsg== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1335; 23:g0rVGrVKqKrLHg2aQ8oxgTmP8f9fmeYC9mT48KTZE?= pyyHsNzeq4Uj0Gqrzd91eJyraUfdrr/C7Ya0pl6nW6wOK+fB0FFgb4oa0XMYvkXo8shhE40UDaSYNq4Mhb1TY4itkjYtKHxOl4AHZLgTXR3yPtKrBq7pJS6Ao+BOBtlPo2Ahya5mD7bz5I16fgzZVh1Bc5mLCBaviWEDqupqDibqcO8zP3LoG52eiy2oSrtZo1OplrNMqEYnadAlZtPXipLVLxeLp5966kNWN1K5HXpS9sDhk7AA0TRhn+W/Mz2hPoi4vmISEwVj/NRLDe6nOYN2UHfuAZ9Gs865pZdJJXR0iigmFnZVBWPrRo93Y6/Gafbg/8Zk/M1/zFoODkIUvq52bb9qboc35lb9I7rTATJK0Jm8CfZo+1lqlHC79t+G5sTS13yk6uqa4TNzFBhm2Fdq6FOO0YXIeA7nON5Tq+7dmMIMiN9bngxtT3U09OhpIQIB8s0p2emtWPdXsfzdL8KBgZSdsxM1gEyYbSGGnBC4Od7yhOgUSxqLj+j3R/bpTJH5z0RzHKTUvrX0+c/EhqiTcwa4Zf4T53QnkTLjKnsH859wCv56zASsjJZxbp1ZhzqTRGni/j9okKqpdXA4PxKkVwU9OBVrvMMHn+KalGrcMv17EHtBqnJ4UMg8KoWYpTgnfiK20SYMbjFPSj1t9JloIlTdYCi/QGXHz5kD/IeNKPnjmDEC25/pBJSAh2BXrZsxOfUcgJzd8Ke8WkAyQmfz8Q9c4M0ckSrzGaQvLVlP7NwUQgfy5X0eBkclqDqHETIXSrtTqVVPYU1S1YGammegYn8vgAQCW3zJATtxLI7qc0kxneVYPEx6eSiq2ecA86Gi+vC3+BUPiNs2qxnLtmbqsJaGmcMwsrcEvW5my4u1Wi9OztbsZGExEygEIY3/NxkxlJXvXPoXHytppDDdHuDAvlSe3wiROPhQFAYrKnW2Bj7Ro7cVncE+A3ppBhuUVQuUnpJnlhiyP9u4gBvqf4LW416vuOT/Z+g+1JhvltGofo2BhuQORr/ONhcGUx2FvL3tLAAo0uK4V1wWYAOw0WxIEsiJvrG0S0H1K72uiXGQQifoC4EaQN8JJfLgdX6k0c= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 6:H+DCJ4YBsWTQuZPM0xyxzLZ3BwymFWBBgXtCzwY5L9GkbYxffpFg7fn4rebZTU8CDledO1XQPJlZNCYnmSV5gGwBjGeAEO7m69LxN5E+3oMF5X77itIlhr0+hJW0v5ZTkACTRvF3h4ayr9o3SPmrbQwDvRgIt12dA22w39uaPMVjDbcoOsEaj1KgJDMSmIxK/CgYXgjt4ZaMVpRnq7/OfUtMhgnX7SaX+C6Cm9x9GElQpFKpvJMJ04d2zEb5cmZaaE9bZ4JS7rGFMtXlPkTVTVCLz7D4ki2p3QnXQldWVqWE5LO2eK0t5TUETEnmyrR4VdrZzHYOHnyqwiNsHEq3mKN+u6tVu//YMpG8Bu9B7XU=; 5:pPuYXHq0XwiEOHSrhY2dPbrlaESszxuWpcLZRfbdE35q1JUAGFm+bFTI5MFMLct1r/l8PqhVfAnD17jZC5GB8Pz86AkWKNg3oWPgQSt7N7OF61CMZkGbKimqynupJe3RdkssiHinp0B+LaiaxqghAIPXFzqEHXAWfHMuT+hbs0s=; 24:KQmHSXZimsaDKE3/8opxI242fOrCDhh7UfQ2D24GSo8qpPwTDozFCrgaJRuTlrYfsmNJmV1qZ0jGxkPoDb010coq0BknJ8XOxxoNcOqcTe8=; 7:0oqG/Uf/F0cjld9wdoR5YDuxYPUID7pyLaTiUD1LV2IMHGvPqsEVWVL29xzFALMGJPlHi3BXrGOfhSeawL3H4bRvn2p8ELrsLxNeyzKhoSA++uraCDOH/dNi3UoFuXh6J5HS2rZ+pIA0QOj/T69Km/gZZed1mbitIr5Mz7QrAua//Nr1RZCcJEjT3kIM0vXxfpKv1NJA16VyKZp3KryDlqRb/6ChR+kQgRP+Kqd3yY4G/PygUhAGFJetp60FWYsv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:00:52.6229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 10cbac14-b12a-4e9b-301a-08d526fc8fdc 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: CY1PR02MB1335 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.42 Subject: [Qemu-devel] [PATCH v4 07/45] hw/bt: 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 --- V2: - Split hw patch into individual directories hw/bt/core.c | 15 +++++++-------- hw/bt/hci-csr.c | 21 +++++++++++---------- hw/bt/hci.c | 40 ++++++++++++++++++---------------------- hw/bt/hid.c | 2 +- hw/bt/l2cap.c | 47 ++++++++++++++++++++++++----------------------- hw/bt/sdp.c | 7 ++++--- 6 files changed, 65 insertions(+), 67 deletions(-) diff --git a/hw/bt/core.c b/hw/bt/core.c index c1806b71a3..e588eae6d2 100644 --- a/hw/bt/core.c +++ b/hw/bt/core.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "sysemu/bt.h" #include "hw/bt.h" @@ -31,24 +32,22 @@ static void bt_dummy_lmp_mode_change(struct bt_link_s *link) 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", - __func__); + error_report("%s: stray LMP_not_accepted received, fixme", __func__); else - fprintf(stderr, "%s: stray LMP_accepted received, fixme\n", - __func__); + error_report("%s: stray LMP_accepted received, fixme", __func__); exit(-1); } static void bt_dummy_lmp_disconnect_master(struct bt_link_s *link) { - fprintf(stderr, "%s: stray LMP_detach received, fixme\n", __func__); + fprintf(stderr, "%s: stray LMP_detach received, fixme", __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", __func__); + error_report("%s: stray ACL response PDU, fixme", __func__); exit(-1); } @@ -113,8 +112,8 @@ 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", __func__, - dev->lmp_name ?: "(null)"); + error_report("%s: bad bt device \"%s\"", __func__, + dev->lmp_name ?: "(null)"); exit(-1); } diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c index ac067b81f6..0341ded50c 100644 --- a/hw/bt/hci-csr.c +++ b/hw/bt/hci-csr.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "chardev/char-serial.h" #include "qemu/timer.h" @@ -111,14 +112,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", __func__, len); + error_report("%s: can't alloc %i bytes", __func__, len); exit(-1); } return s->outfifo + off; } if (s->out_len > s->out_size) { - fprintf(stderr, "%s: can't alloc %i bytes\n", __func__, len); + error_report("%s: can't alloc %i bytes", __func__, len); exit(-1); } @@ -168,10 +169,10 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf, s->bd_addr.b[5] = data[offset + 2]; 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", __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]); + error_report("%s: bd_address loaded from firmware: " + "%02x:%02x:%02x:%02x:%02x:%02x", __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]); } rpkt = csrhci_out_packet_event(s, EVT_VENDOR, 11); @@ -181,7 +182,7 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf, break; default: - fprintf(stderr, "%s: got a bad CMD packet\n", __func__); + error_report("%s: got a bad CMD packet", __func__); return; } @@ -226,7 +227,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", __func__); + error_report("%s: got a bad NEG packet", __func__); return; } pkt += 2; @@ -241,7 +242,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", __func__); + error_report("%s: got a bad ALIVE packet", __func__); return; } @@ -254,7 +255,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", __func__); + error_report("%s: got a bad packet", __func__); break; } diff --git a/hw/bt/hci.c b/hw/bt/hci.c index df05f07887..c6b2cc1d48 100644 --- a/hw/bt/hci.c +++ b/hw/bt/hci.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/timer.h" @@ -457,8 +458,7 @@ static inline uint8_t *bt_hci_event_start(struct bt_hci_s *hci, int mask_byte; if (len > 255) { - fprintf(stderr, "%s: HCI event params too long (%ib)\n", - __func__, len); + error_report("%s: HCI event params too long (%ib)", __func__, len); exit(-1); } @@ -589,8 +589,8 @@ 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", __func__, - hci->lm.inquiry_mode); + error_report("%s: bad inquiry mode %02x", __func__, + hci->lm.inquiry_mode); exit(-1); } } @@ -1971,8 +1971,7 @@ static void bt_submit_hci(struct HCIInfo *info, break; short_hci: - fprintf(stderr, "%s: HCI packet too short (%iB)\n", - __func__, length); + error_report("%s: HCI packet too short (%iB)", __func__, length); bt_hci_event_status(hci, HCI_INVALID_PARAMETERS); break; } @@ -1991,8 +1990,8 @@ static inline void bt_hci_lmp_acl_data(struct bt_hci_s *hci, uint16_t handle, /* TODO: avoid memcpy'ing */ if (len + HCI_ACL_HDR_SIZE > sizeof(hci->acl_buf)) { - fprintf(stderr, "%s: can't take ACL packets %i bytes long\n", - __func__, len); + error_report("%s: can't take ACL packets %i bytes long", + __func__, len); return; } memcpy(hci->acl_buf + HCI_ACL_HDR_SIZE, data, len); @@ -2029,8 +2028,7 @@ static void bt_submit_acl(struct HCIInfo *info, struct bt_link_s *link; if (length < HCI_ACL_HDR_SIZE) { - fprintf(stderr, "%s: ACL packet too short (%iB)\n", - __func__, length); + error_report("%s: ACL packet too short (%iB)", __func__, length); return; } @@ -2041,16 +2039,15 @@ static void bt_submit_acl(struct HCIInfo *info, length -= HCI_ACL_HDR_SIZE; if (bt_hci_handle_bad(hci, handle)) { - fprintf(stderr, "%s: invalid ACL handle %03x\n", - __func__, handle); + error_report("%s: invalid ACL handle %03x", __func__, handle); /* TODO: signal an error */ return; } handle &= ~HCI_HANDLE_OFFSET; if (datalen > length) { - fprintf(stderr, "%s: ACL packet too short (%iB < %iB)\n", - __func__, length, datalen); + error_report("%s: ACL packet too short (%iB < %iB)", + __func__, length, datalen); return; } @@ -2060,8 +2057,8 @@ static void bt_submit_acl(struct HCIInfo *info, if (!hci->asb_handle) hci->asb_handle = handle; else if (handle != hci->asb_handle) { - fprintf(stderr, "%s: Bad handle %03x in Active Slave Broadcast\n", - __func__, handle); + error_report("%s: Bad handle %03x in Active Slave Broadcast", + __func__, handle); /* TODO: signal an error */ return; } @@ -2073,7 +2070,7 @@ static void bt_submit_acl(struct HCIInfo *info, if (!hci->psb_handle) hci->psb_handle = handle; else if (handle != hci->psb_handle) { - fprintf(stderr, "%s: Bad handle %03x in Parked Slave Broadcast\n", + error_report("%s: Bad handle %03x in Parked Slave Broadcast", __func__, handle); /* TODO: signal an error */ return; @@ -2105,14 +2102,13 @@ static void bt_submit_sco(struct HCIInfo *info, length -= 3; if (bt_hci_handle_bad(hci, handle)) { - fprintf(stderr, "%s: invalid SCO handle %03x\n", - __func__, handle); + error_report("%s: invalid SCO handle %03x", __func__, handle); return; } if (datalen > length) { - fprintf(stderr, "%s: SCO packet too short (%iB < %iB)\n", - __func__, length, datalen); + error_report("%s: SCO packet too short (%iB < %iB)", + __func__, length, datalen); return; } @@ -2223,7 +2219,7 @@ struct HCIInfo *hci_init(const char *str) return bt_new_hci(vlan); } - fprintf(stderr, "qemu: Unknown bluetooth HCI `%s'.\n", str); + error_report("Unknown bluetooth HCI `%s'.", str); return 0; } diff --git a/hw/bt/hid.c b/hw/bt/hid.c index 09d17322e4..056291f9b5 100644 --- a/hw/bt/hid.c +++ b/hw/bt/hid.c @@ -419,7 +419,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", + error_report("%s: bad transaction on Interrupt channel.", __func__); } diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c index 3e53dd082d..9cf27f0df6 100644 --- a/hw/bt/l2cap.c +++ b/hw/bt/l2cap.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/bswap.h" @@ -467,8 +468,8 @@ 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", __func__, source_cid); + error_report("%s: Ignoring a Disconnection Request with the " + "invalid SCID %04x.", __func__, source_cid); return; } @@ -790,7 +791,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, #if 0 /* 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", + error_report("%s: out of sequence command packet ignored.", __func__); return; } @@ -813,9 +814,9 @@ 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", __func__, id, - le16_to_cpu(((l2cap_cmd_rej *) params)->reason)); + error_report("%s: stray Command Reject (%02x, %04x) " + "packet, ignoring.", __func__, id, + le16_to_cpu(((l2cap_cmd_rej *) params)->reason)); break; case L2CAP_CONN_REQ: @@ -836,8 +837,8 @@ 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", __func__, id); + error_report("%s: unexpected Connection Response (%02x) " + "packet, ignoring.", __func__, id); break; case L2CAP_CONF_REQ: @@ -865,8 +866,8 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, le16_to_cpu(((l2cap_conf_rsp *) params)->scid), ((l2cap_conf_rsp *) params)->data, len - L2CAP_CONF_RSP_SIZE(0))) - fprintf(stderr, "%s: unexpected Configure Response (%02x) " - "packet, ignoring.\n", __func__, id); + error_report("%s: unexpected Configure Response (%02x) " + "packet, ignoring.", __func__, id); break; case L2CAP_DISCONN_REQ: @@ -887,8 +888,8 @@ 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", __func__, id); + error_report("%s: unexpected Disconnection Response (%02x) " + "packet, ignoring.", __func__, id); break; case L2CAP_ECHO_REQ: @@ -897,8 +898,8 @@ 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", __func__, id); + error_report("%s: unexpected Echo Response (%02x) " + "packet, ignoring.", __func__, id); break; case L2CAP_INFO_REQ: @@ -917,8 +918,8 @@ 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", __func__, id); + error_report("%s: unexpected Information Response (%02x) " + "packet, ignoring.", __func__, id); break; default: @@ -1066,8 +1067,8 @@ static void l2cap_frame_in(struct l2cap_instance_s *l2cap, uint16_t len = le16_to_cpu(frame->len); if (unlikely(cid >= L2CAP_CID_MAX || !l2cap->cid[cid])) { - fprintf(stderr, "%s: frame addressed to a non-existent L2CAP " - "channel %04x received.\n", __func__, cid); + error_report("%s: frame addressed to a non-existent L2CAP " + "channel %04x received.", __func__, cid); return; } @@ -1128,9 +1129,9 @@ static uint8_t *l2cap_bframe_out(struct bt_l2cap_conn_params_s *parm, int len) struct l2cap_chan_s *chan = (struct l2cap_chan_s *) parm; if (len > chan->params.remote_mtu) { - fprintf(stderr, "%s: B-Frame for CID %04x longer than %i octets.\n", - __func__, - chan->remote_cid, chan->params.remote_mtu); + error_report("%s: B-Frame for CID %04x longer than %i octets.", + __func__, + chan->remote_cid, chan->params.remote_mtu); exit(-1); } @@ -1353,8 +1354,8 @@ void bt_l2cap_psm_register(struct bt_l2cap_device_s *dev, int psm, int min_mtu, struct bt_l2cap_psm_s *new_psm = l2cap_psm(dev, psm); if (new_psm) { - fprintf(stderr, "%s: PSM %04x already registered for device `%s'.\n", - __func__, psm, dev->device.lmp_name); + error_report("%s: PSM %04x already registered for device `%s'.", + __func__, psm, dev->device.lmp_name); exit(-1); } diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c index 7c0d38b504..f4aba9d74f 100644 --- a/hw/bt/sdp.c +++ b/hw/bt/sdp.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/host-utils.h" #include "hw/bt.h" @@ -506,7 +507,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", __func__, len); + error_report("%s: short SDP PDU (%iB).", __func__, len); return; } @@ -517,7 +518,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len) len -= 5; if (len != plen) { - fprintf(stderr, "%s: wrong SDP PDU length (%iB != %iB).\n", + error_report("%s: wrong SDP PDU length (%iB != %iB).", __func__, plen, len); err = SDP_INVALID_PDU_SIZE; goto respond; @@ -544,7 +545,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len) case SDP_SVC_SEARCH_RSP: case SDP_SVC_SEARCH_ATTR_RSP: default: - fprintf(stderr, "%s: unexpected SDP PDU ID %02x.\n", + error_report("%s: unexpected SDP PDU ID %02x.", __func__, pdu_id); err = SDP_INVALID_SYNTAX; break; From patchwork Wed Nov 8 22:56:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836041 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="BTGcID32"; 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 3yXMQH3JjGz9rvt for ; Thu, 9 Nov 2017 10:07:34 +1100 (AEDT) Received: from localhost ([::1]:34334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZRU-0003zl-3h for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:07:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLL-0007l5-HE for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLI-000360-CI for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:11 -0500 Received: from mail-sn1nam01on0052.outbound.protection.outlook.com ([104.47.32.52]:53831 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 1eCZLI-00035a-4j for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01: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=rTAdIGhAHmNQOQRfXBJIwW0plsgqrqDc845XMUTqVWs=; b=BTGcID32c6KCZovQTdB70AvR40wxYB2yXYLv/GNxY2W09MMmAjdhhe/dAM/ulXfO0zNm1TBn36TLeNFm44fpSwM44TRHSMr6U3rlDdH6/RHdTZmekD+OmadyY3AVzRvHaLpmA9DlkiIhloMzNin4jqNx0lITEUSezBGPfpd1/KM= Received: from BY2PR02CA0003.namprd02.prod.outlook.com (10.163.44.141) by BY2PR02MB1331.namprd02.prod.outlook.com (10.162.79.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:01:04 +0000 Received: from SN1NAM02FT009.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::205) by BY2PR02CA0003.outlook.office365.com (2a01:111:e400:5261::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +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 SN1NAM02FT009.mail.protection.outlook.com (10.152.73.32) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:33284 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLD-0003xC-CP; Wed, 08 Nov 2017 15:01:03 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-91; Wed, 08 Nov 2017 15:01:03 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N0mYr008497; Wed, 8 Nov 2017 15:00:48 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZKy-0002Gr-1g; Wed, 08 Nov 2017 15:00:48 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:49 -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-23450.000 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)(376002)(39860400002)(2980300002)(438002)(189002)(199003)(6916009)(81156014)(81166006)(8936002)(50226002)(54906003)(8676002)(63266004)(106002)(478600001)(9786002)(106466001)(33646002)(2351001)(47776003)(118296001)(77096006)(5003940100001)(16586007)(316002)(2906002)(189998001)(76176999)(39060400002)(36386004)(356003)(4326008)(50986999)(305945005)(2950100002)(36756003)(48376002)(50466002)(5660300001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1331; 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; SN1NAM02FT009; 1:WNpDPDOdVwtNmbE7sA3uvDbi6ZSJ+53YQObna67Eabmq8q7kWYjp0cDWo0iZr+5YRDRWHovQ7LvalMa/8KVB21R4RfvJiK3IAuvUtLYrxBEaSP/A4n2JHYcsO2rnOUTO MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06a57de5-44f7-4909-fdb1-08d526fc969f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BY2PR02MB1331; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 3:ZvADi5IzeWvp4gwELTdxd2WgFFX/irGdO5wIuqzFns2iy8+bnEml8IbF3KyEoQTGlw+MheNAsFYYh5sf0MGvaPxxDGIIY5+nyOgMrEHW7bVp7VGyYM+ZbU/TvKFxhiac53cVh5pHBH7K2SgyM8sMGoEEQc5hwrDInRvl8A5pYRfOBq/d88XvX9Rj9JIujTmSg+PCEtUn1Gbn6gpvTrDr3ZdeirvAK1NkVF7RT4ITBNCXu6bY/6FIVTY3Dg9ljAJ0+K+xObAR3HFt0YwVo20Y41MPQJbe+mQY32nRoTJcpBPkree1AqnlowtaWqbPWw6BRXsKc2c0b7hvzEerToh3/TsXcb7id29qaNNnM2DHQX4=; 25:yNztAtnOgW9hQZopDxGGVjogxgHUqkGQb0qCrtTXcyDbm3kXMhwWpfPQfz/E7ryuUOCQxNIetmWGlEh2BgBIdY03VyKo1ixhGg6Sg2A31+YCj9f3fYM0Fzk/DYoQG6WBGGXc/Bnh4Rm7Ee7H/r0tux7jmPL0Qmgl1yDlSkSdOB3cwhgzq2gQkehsIoRqrTYxQhaZNKaFQj6DnZ/4PY1o12Wm75Fr9qK8gIyLEoGLd8am8kp8HSwtS3XCfbM0o29refk1Mak4k9DT46FDhcn2TVb6UYSr+M5dMV5IHgjsZxoYq1XYm2bYjwE7yePGw2mbXNweAWvAVMSOX6FS8K+CSQ== X-MS-TrafficTypeDiagnostic: BY2PR02MB1331: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 31:WknhLGrWk3TSSJviQkLdzm05A/1fHawYQsghkdTI8pOQWJBp8JMkc8mmp24gbWjGnXQCsKiTk5z+PpXxuCgcgrZt2AUgKQ8A88pgEdj3qCiy+X+GaRdpYwOzlEQWbr+u6aZRdFZvNjN24ombabU/lcH7E+WNmSdvaywBdZDv69N5KNhbaVhSexpRY9EqhPBzEnH/06F+ZcqisZKtqnaz3Kw2+YiQdCmwXF7+1515L8A=; 20:GBcki6YQGkzg99DxQ5DOrOdi++MrAdv5lEguv30FdMblACj4gfYqScc/yA/q2LrsvxGd23M7TFfu++fx2NlGeFuLlUBjkrfB8lwI+I9c1f2xqzxlASnU5sXE//9K/s1zKDPiL5Gf6O0nfs2BCigiF7pBjeVK/ISDVyr0AgYDN0lsUd3/ryD+B1W66JJ4QPD5MBhrGidCP2gme2jDd+0YGz2YEgPXCKrRI8YJdxufCASV3NbCdzykju3nBNB31f4ffEYo1Zj+1dLa18qB5C+POMXQmmPWkcnBEKvvlbf8Y5z02yk1DPQq7oag+G5y7N/0FH1vHf812++mQA/EsZv0Grfw3fG73TnP8IQH6Z9UVFxFkLwgzAyojEcedoTkfAn7RjiZ0RkExvBkAKMTit4eGhRo0kf2WrH3rFT1KbcctDMdyld7Cy8+UmpFWuHWuOhtAseF9kB6FigR6TqT+HJ5zcAzfiU13E6kD1OrOHxK4tZqFrPIehtyRiluwK1Iue4Y X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3231021)(6055026)(6041248)(20161123560025)(20161123562025)(20161123558100)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR02MB1331; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR02MB1331; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 4:mvx9N1b/F9VbXvHuv4UXBemJlcqyVW8t7UcQQrq0pc4qHaZ6+FwtU+lSlQOuFzWwXIdVZKKDuOpC/n7ESBpYMMpGgZbJOfqUZ+kVpbUDkUJA8bkn+FtvwKIbH421aY/uPLNw0Gv5pK+t9brVdmN6NVu5CbCkMMGjPkYuXJGsG7yL+ZcTSdu3Emmw/0qUAlg31Bg2MNku8jDhqQegj/Mp//D9G7XLkxsziiHsPJoVNMvuvi9eVPggfxbcIN7I0XOKS61fXChgstAg8PqhMym4qQTKmJx1gPz1r6djOitTIvdGCFm3wvI06mumpixZD0XqStda+zFikTYYsV/yGS1Gtw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1331; 23:BDCS0pVFfkLm195AolojAqnWr1fLikY6zSi+2x5C8?= jYdxA3vLfYtd+1TY9VtTPsO2pRZHhSlRMsTNeD4wu5xRHw73aZbUW+W2oNiyYsOaSHL0yCj5XzEQ7Dwc87gIYkCUnTuxkBJQJsOHkcJ66EPOfiE+/kBpstN82b/V/ZZ4UpiLWT3/uVlv/WD9GSkGywDEgGBjwv8Tl7nj5C5lMpMoHx59t4FlYyFYejH9zyInpzQEB2R+ecCDoip2/E6A95rDN6bP9JbiqhozKOI3Xw9sqUIHzs3kTizO5+fHrE9tCSNP7dkp9jDw6AXLjDMW6ONMydVbqhIGDMWNWRxrrlLmFNKzg/EMSoju3v7kI8mWUpqUa9furIZ7Yvp5fSBFK3cCqOCYmMV3kGVlPiV1lW0PgIuPh604uq9gZ6+DZ+OBumqhgLcvN0TGVXbHCyAavWy5miyMJ5psiMbEV83iRpZqVRUHhZPj0RUPCipk8zc5nxmZ9Tg15/8Jbo7UC0z9ds4QPbOJEAhJ0PN7F13sqFuNrwOnreWYFIUXDGtWLrCShi1VsWzmiikG8lVPJ107noK++O00McCEAIbjsV2wUPfJXvKSft0KznMonJOanx9ao/+BYkGRGrIZZltSxn9MD5R6nkBaYt4Cbo/3+EbOFRIzghTItLXchqYVp+PZWHuaNB91hS2mtUFEGXla8dtgJD4dLa37KZyXhNVww/oepQrK5BGrYyAe4JQ+0P7Koc5bYjvCZpkT7Ay7Db+6sLo7pzreUVoAE99uIUo/dV9RaV2mcjzwsLfDW2U7pS/0Id1Hape6oEuOy3CEnC2piHmgll3WdXDITAuqoRKWgt5cVH3A34xmTkge1V8GyhA48XSqY0cddG+BbuDJi+UQPODoVn654HnxqQ0CYZmbwHyjfFePGqYbgYW72Oxkyu2n9ByxaH2lp37RWK4TXqCZCNJcm9OVc91dtLn6CcRMy05QI6gdBwKudGZvo1JWE70jLRfJXTu62PfPiC1/QCDIm3tUcjq/4VTvWOpg+FcYVaSi661YgjK/0/GmBTObSqufhYliA0= X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 6:63WXQAi1tQczAYhTOfpc5JcQzUKKxi7eFG2fTJjG0kECkZgh+Mz2F0ISaLb6lUFfA1xCWWMaVApdziUj1sbcqrA8Fm4VCF6pW/b5mosYTCD0yJGjm1qAaugOiHNpmPm8buE+jfhQKylZXLKe7dR7xLDi3wMp1wtKhgH4cawIIZgkvWz5Sr5Pm8S29e/vt35DOB9ydSY1JrEnGzn/Ep3EvA8a16tbEy1ywH2Qde6B9HO0u52UxPzNmwmdw8X0EJU7r2BtRSRWi1camLN07fJhzKIgnKhCr7OvGVVezKCVWA+wIks3E6bcQLdi4bucxOUi9NsQrQssTxWUmJLJLQNoqP/zvlk7pCrHsx23kMf7mzI=; 5:DPS5RifCJZS1eMrIZrzvTKc2lMGFysT/k/vgjZMUt05ax0EUM3Ohd8+OapNVUfnEpWFSX92e5dfGpjCszxlUkGZ3kDQKzj8CqAjWyBK+sKIaEioRDuo3l7QQKHFxEnun5rlIKkoOtYmFm63W90V3A9JgvqA+iD7oURJMvitrsM0=; 24:HkOnVQ6zOnpD3OKEHPhwucZ5GxBZqDH6IdAZLSs3AtcUjB3nesRnKfuoOz3UCN9s+YaxQ5ZmW7NyZO28+iQJkL+jxtY/0h8Iwn4k/3eEZiY=; 7:tvq8XC5jihQ1nhbQlAz0CYLoThS3BfCsJ6H40jdK6fYGh7eEKoCTK6TekfM3k/7Q1hSFjKIqGejAsL0oyUaM+DSlaaLmEZp/2VN+JClY2jyPk0i+J1j9rE0r9qaRyHvCqcc6Voqst1yDvkzOOIx5v8NUC2hdtXpv1kahOQpBs6LpvW2vhGMh6bf94al8Znd9mr3f3hPdC55m2RXAw7XZuh4iKRf7kgRm/jVE6nxQdL0sy+VqAZuY3hdnMvvf6wpd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:04.0974 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06a57de5-44f7-4909-fdb1-08d526fc969f 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: BY2PR02MB1331 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.52 Subject: [Qemu-devel] [PATCH v4 08/45] hw/char: 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, Paolo Bonzini , 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 were then manually tweaked to pass checkpatch. Some lines were manually converted to qemu_log_mask(LOG_UNIMP, and two abort()'s were removed Signed-off-by: Alistair Francis Cc: Paolo Bonzini Acked-by: Philippe Mathieu-Daudé --- V4: - Remove abort()s from guest accessible code - Use qemu_log_mask(LOG_UNIMP, V2: - Split hw patch into individual directories hw/char/mcf_uart.c | 5 +++-- hw/char/sh_serial.c | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 56fa402b58..1861c9733e 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -6,6 +6,7 @@ * This code is licensed under the GPL */ #include "qemu/osdep.h" +#include "include/qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h" @@ -174,7 +175,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd) mcf_uart_do_tx(s); break; case 3: /* Reserved. */ - fprintf(stderr, "mcf_uart: Bad TX command\n"); + qemu_log_mask(LOG_GUEST_ERROR, "mcf_uart: Bad TX command"); break; } @@ -189,7 +190,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd) s->rx_enabled = 0; break; case 3: /* Reserved. */ - fprintf(stderr, "mcf_uart: Bad RX command\n"); + qemu_log_mask(LOG_GUEST_ERROR, "mcf_uart: Bad RX command"); break; } } diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 835b5378a0..fae2d31b4e 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -25,6 +25,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "include/qemu/log.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" @@ -190,9 +191,8 @@ static void sh_serial_write(void *opaque, hwaddr offs, } } - fprintf(stderr, "sh_serial: unsupported write to 0x%02" - HWADDR_PRIx "\n", offs); - abort(); + qemu_log_mask(LOG_UNIMP, "sh_serial: unsupported write to 0x%02" + HWADDR_PRIx "", offs); } static uint64_t sh_serial_read(void *opaque, hwaddr offs, @@ -290,9 +290,8 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs, #endif if (ret & ~((1 << 16) - 1)) { - fprintf(stderr, "sh_serial: unsupported read from 0x%02" - HWADDR_PRIx "\n", offs); - abort(); + qemu_log_mask(LOG_UNIMP, "sh_serial: unsupported read from 0x%02" + HWADDR_PRIx "", offs); } return ret; From patchwork Wed Nov 8 22:56:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836043 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="CWhHsx2p"; 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 3yXMR33bvnz9ryT for ; Thu, 9 Nov 2017 10:08:15 +1100 (AEDT) Received: from localhost ([::1]:34338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZS9-0004eQ-5B for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:08:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLR-0007rX-Se for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLO-0003Bw-Kh for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:17 -0500 Received: from mail-sn1nam01on0082.outbound.protection.outlook.com ([104.47.32.82]:44213 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 1eCZLO-0003BK-BU for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01: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=O4MeHOHa8Oe2xEHWplJsAJhtb98LdeC5wO7yOohwb9g=; b=CWhHsx2pEBFqHIDiArYTFG7SVvBw0dy1mpXB57pM1tpV0N7ybG7S8rh0lEhP8jyDldWatuMX+PngKvI1E9fxeWoGtkGgkXbdN55kNtjJPMxdJMo8xt8zK06QTkCK4W33kP4lOeHW/cDu/FVKQyC56IIq+9dW3781RD02CFUGF74= Received: from BN6PR02CA0039.namprd02.prod.outlook.com (10.173.146.153) by BN6PR02MB3268.namprd02.prod.outlook.com (10.161.152.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:12 +0000 Received: from BL2NAM02FT009.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by BN6PR02CA0039.outlook.office365.com (2603:10b6:404:5f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:12 +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 BL2NAM02FT009.mail.protection.outlook.com (10.152.77.68) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01: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 1eCZLJ-0001LY-1I; Wed, 08 Nov 2017 15:01:09 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-Rr; Wed, 08 Nov 2017 15:01:03 -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 vA8N0pxt008532; Wed, 8 Nov 2017 15:00:51 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZL0-0002IK-Sf; Wed, 08 Nov 2017 15:00:50 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:52 -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-23450.000 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)(36386004)(118296001)(9786002)(76176999)(2870700001)(50986999)(4326008)(77096006)(8676002)(33646002)(50226002)(36756003)(2906002)(47776003)(305945005)(478600001)(356003)(316002)(54906003)(23676003)(6916009)(2950100002)(5820100001)(189998001)(106466001)(50466002)(39060400002)(2351001)(81166006)(81156014)(8936002)(5660300001)(106002)(63266004)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3268; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT009; 1:+Up3RjgGJfdgaZR1cVohepnd2tWhE1xoZGeniThHQlJSL886BegXjlP3PGu2BxBde42d281UYV7SGYBVow02I7WYx5D9smlsVNrqHF8cVWLopNmpnQ7Rvqq8hg48y0Ob X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49cd0628-a781-4fc1-fbff-08d526fc9ada X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3268; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 3:+io0P1b66J35nl+LG3CrTz6KdFYkNnzy9K2VyPtaDnX6ZA25mfqPKJrrlnfsU/FAjwUaEhxNcNYva8bMqsB7S3AgCLqbS8+N2wxz9AVKT4oXr1wepfqrGIHTMv3iDKbBPHrp52CwMcs7ZAOueJzWcqbwXTpLNv6MnEyOY9DtdTiQse6vcm9Nu3Xw4E/gn6yAnhMLgIDA1bjFf90Phd/4wh1wnPBHX0bzaWZU9rQPy6PCqVg1AiVpqXFF1RLZ9q9ULbPDNNr1LEwkIOJwyV5lz4H5JPD7HE/GNZR87otfseipYzWFbJ9/qrs2+0ycHl9p0W+pPB2Z1xtqVoEkrJD61hmH6x2Fq2ybxvOLOb/xHG8=; 25:c6EjqbNU9WBSIIgd6JGEjSSAfwg4iIAx6Z8/TqIEQHP8awrjk75L9XlNBHehbx4+WgpjKDIYt4Khilr6KtfQNr2bL+5igrVtPEl6PRZY3GmuK/wgISczVI5hiVp8ywTr2v+PTP565DMwr07fsZXWzh7HIXpO0e2ODhIG2R4NMOHhv1fvEAaZywKO2C9aTe0jzbjwNbNyGPHOp0fwiuoWZVEu2wlzdX9PjUlgqz1jm4cj4cZzkjXmTtSuvmDluIQ67ZclggPMmTCvPGOVbDtpTExsee8Lfmx5NKN+dIkWbU9Cy4opa3f27BqgxTx33M8lu0YBGPaJKf8LAk3F07PbbA== X-MS-TrafficTypeDiagnostic: BN6PR02MB3268: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 31:69ShyppCwIb7B/qCINp/3y8eU1YmPWZP8VYzYnKiBF0ROSYYnyzUcBAAOecFhdCAI4alRMYmM5lnX/M2jzuoERLkewfceTv3xQB59iZkaxghUgXA2ZC7PBXYUj+iDnKT5QwSEWX0I2eA9c258cgsZfO0eUibeCR26oA8dXaPtY7MbJav7g0p5p3FbDp4beMyjWbYcG4VezJAyfibYwiCQfQLOq76+wPyptA5sC+EFvI=; 20:yOINKB3dqCVdlsiJlHb6d1MP5SAxfdnjAp4jNm1Djugv2aAtwpt8eUfgixN3uQ6xvaJCabypOcpUd/IlYtGnqaX+fUVD2pztRftdwnLTzjhPSJtD9NGAjhgnsmiGqgCsfh0/sMhf/G/5YAz7V3eTl8+jjvBPI4xI/yOQ8eZuUAZngE3188sT4RUyfOxy7ux0PdDBStzkew/ocnV+cXCgSeBVHFhqlO0wJw9slbCwJ+w2kdr+E8YBose6vJBcUqXXLNIRdQDqzor9gWkjW53CMeqkt1cOy9o2g1vljpyEK4DFv6xYvEim052YoAq++6wAYGbQsgHXC+yPFpdXdmyjTA2dooUVYlhhvhYPu3ap9hMAstM10fcFR4tgqhKYQ7yIyKwaAhOQ3PfK//sS2i8PC9SxWSED0AGoaTdo6hfn77MemskBWHvVfIIzVzjtJDINk1Sir7PdgYm1tRgUZIykEUm0FhsCMGJO8mBkP+hY/z6hHIWyXSYqwNECuTBtMFip X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3231021)(3002001)(6055026)(6041248)(20161123564025)(20161123558100)(20161123562025)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3268; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3268; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 4:zv9Fu89eJ0xFf6/hfhyJtZWAPwWlktxnBNQFoWBi0UyTlfl2B1YRZYq5RJcq25fKnnV84Jwl85xaanQm5iAJJcQFvx45rGwkeMuEJbf24kouzGRZXLFYm5ubiMS/Iw81w1zDAsipe8LpA6gw2JuGT74WKFAwSNc1VyUHBnEbDI/TIAoXXT4G7p1+IAUdMfysqX2vmhNAEJcelwlgSUpncOqTqHiFV4R2/XcvwmYqo76miVTBSbu5s8F7Wq61WFfQXFTphE/c8BBqh0hxr3kgWYiHpqIg3QbmOaKxcPPe7jpeKcALSVnWzcEGOiUpoWEXMu5vEdVyhtFB/rmiZb49HA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3268; 23:2gCdI1Eogb3wOS8hbf77OLCSdI1UGAfu8Pl8Ws03g?= e7RefUIkXMNJK5fsPsex6VM2OJ1RSf338XCPjfdWgEqe6SPBf+PhIU7mzSNHCm40UTLqe2kKBac3rZbv4opLj6P4Y1T74DwNF+0/evxMxNETjoZDJ0BNHLS3fqEnY3I7AOgXrsios11/YGzfi8FGERTo4UURzgfRWqpY0euGfUKmGW6Uu3iDokclxXCds/MbppstDoCq4PwvwsR6XcauPLkuBvPbOPsFFpndznzto+F9SZi3LySqfRX2ya9ZSDKgvFc16ydpstuEFVIxVLFXE+MhtpzU23KE9kUi+b5qolDIn4P1Mb4CTNXPiAUhfwQoeXf4g0CJjHNUaCHVCV3OCMDAADcwt13SzyvQC5XE+6MijGddUOsV1wD8SkOq8Iw9ZjQQSjWLpVlfdg15FZy2Z6V7pQ5zVci1SRMW0ep21RkJXp7Ae1ykMKwSVRkE+5LXC/EU7gvNlVFkRfa4TdT+WCWROa9QkHdVyedssMdJLX2VkNZVhVNkuo2a+ySdiCOrKdwLNxe0iRAIltiTzIm6hVYKgM0oKB4t6T7pKIo6lAg6yn4tegxqdCHmLIXZSAaQFW6rL+5FC49TfxREvyVILMxerH+tNoGm7hE1MFj/9N/dFgQ09RQHSNBfa86v/X7CMzzx7i817Lp9bxykqUJNebizVfXOHQXIuwmbvnL78BfK/t7YEoGH17V0iSLDhDCTHVtX2eUvfPqn8yzLn3qobTqk/aHekxRRsMSphRaQOPIX73IudsCIFtBNdf/0RtDztj6c1MLfSd47M2wN2B5//rZL7q5IS60QzkiWdpqPC97H2FAzILWnBxiDEqe6cny6A1IQp+aMsQrb9BAlYth2GfBypQLy72fZHqqatZIAH2MJu+BQxppwrhLnFF3MrqpFe8Dq9jlYb1xdYDYxFh1BPy5WXnzAmZYgZ30bmL+58LNdo9aQ9pN84rR8/gJWxXsyKhDAeGc5BdPCGiVNa4WcX5ug0seH54TVSg+9JmeCPhwDQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 6:UhY4otRbKWHuWCVDwar7iN5SJ5xqXYJY2CDIBfZ95hO0/0DU0hT4XMTw6zU6SD1FtouaqTF6Wm9lvwrcMZfNR4TN8YORb5lHbkvsnd3c5mI5K6TEBhkziPVhBLQX+wwRiA3rC2hfR6UbUuTfMPnIm2TC7g+D6l/bipAmvs8Z7KV6VVcrpllka6qAErrRyubV0k+yCJm7Alrvc7V/L8YEwUZE+u3EmYCoUNG4NtNB2dDw63Gvvjme0xRsKPSfAUvrtZ3TY5xoQsY3Q2nGQy2hT8KxzDNH17vnSVY2/VapM2eH1e2p7wi2v2l+JW0zHK0teCpmhrrZGdci6KzqyBOCAqlI5Nnv7yzFR6i9+TkWzq0=; 5:1AKw16SHKsz/C6FUK7vuIHcPAdhC/eveO89pR/WSB2+pqVgq2qYO5urwwwjCctzG4KW8W72kZY5QZLnjta7n4aYAFUPjANcunhb0O0EyqVCsxFJ7P+AS7bgl3KrNQJ3xaY0x5H/z7K6ycSQ/UwdpBFXfnXfkehAcn5a1TQDzFIw=; 24:2H3r78+gyGOuOlexouOxDTFI3+3ikvB9MXXVgKMLlMa+lCNfMzRuhg2p5ZsbYgN0pCnfjjqrnxaG/aRmgbD8QEPhIbcmUtu8fsVUvayd5qM=; 7:ytSfC/HGZGZMCzGnYLq0yCNRRFVsZZxY9fw7pvxwwPEnnyNLZjG3OLx5+OQXW+QUgNMYGaUK687nZlZ8BeH594fks4F/nyE2UAz7enJ1vDqEJ+VYEi1b1TFifzwQZB7j5n+jrdAJn01XkrPAEdrYHS7KZNygsFhK3Yr3k1NhH4fkiJhMHkDInJpBX9O6dLTMfN9Qx4YSx8QPImbXS89iJSfh58yPbS5qD+8e6s1ciRTkNdeaoquYfhU4a2LjyDf3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:11.1168 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 49cd0628-a781-4fc1-fbff-08d526fc9ada 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: BN6PR02MB3268 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.82 Subject: [Qemu-devel] [PATCH v4 09/45] hw/core: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, "Michael S. Tsirkin" , armbru@redhat.com, Paolo Bonzini , alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + Some lines where then manually tweaked to pass checkpatch. Signed-off-by: Alistair Francis Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- V3: - Fix white space error V2: - Split hw patch into individual directories hw/core/loader.c | 43 ++++++++++++++++++++++--------------------- hw/core/ptimer.c | 7 ++++--- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 91669d65aa..75f3d4301c 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -43,6 +43,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "disas/disas.h" @@ -82,8 +83,8 @@ int load_image(const char *filename, uint8_t *addr) return -1; size = lseek(fd, 0, SEEK_END); if (size == -1) { - fprintf(stderr, "file %-20s: get size error: %s\n", - filename, strerror(errno)); + error_report("file %-20s: get size error: %s", + filename, strerror(errno)); close(fd); return -1; } @@ -623,8 +624,8 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out; if (hdr->ih_type != image_type) { - fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, - image_type); + error_report("Wrong image type %d, expected %d", hdr->ih_type, + image_type); goto out; } @@ -670,14 +671,14 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, address = *loadaddr; break; default: - fprintf(stderr, "Unsupported u-boot image type %d\n", hdr->ih_type); + error_report("Unsupported u-boot image type %d", hdr->ih_type); goto out; } data = g_malloc(hdr->ih_size); if (read(fd, data, hdr->ih_size) != hdr->ih_size) { - fprintf(stderr, "Error reading file\n"); + error_report("Error reading file"); goto out; } @@ -693,7 +694,7 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, bytes = gunzip(data, max_bytes, compressed_data, hdr->ih_size); g_free(compressed_data); if (bytes < 0) { - fprintf(stderr, "Unable to decompress gzipped image!\n"); + error_report("Unable to decompress gzipped image!"); goto out; } hdr->ih_size = bytes; @@ -763,8 +764,8 @@ int load_image_gzipped_buffer(const char *filename, uint64_t max_sz, data = g_malloc(max_sz); bytes = gunzip(data, max_sz, compressed_data, len); if (bytes < 0) { - fprintf(stderr, "%s: unable to decompress gzipped kernel file\n", - filename); + error_report("%s: unable to decompress gzipped kernel file", + filename); goto out; } @@ -893,8 +894,8 @@ int rom_add_file(const char *file, const char *fw_dir, char devpath[100]; if (as && mr) { - fprintf(stderr, "Specifying an Address Space and Memory Region is " \ - "not valid when loading a rom\n"); + error_report("Specifying an Address Space and Memory Region is " \ + "not valid when loading a rom"); /* We haven't allocated anything so we don't need any cleanup */ return -1; } @@ -909,8 +910,8 @@ int rom_add_file(const char *file, const char *fw_dir, fd = open(rom->path, O_RDONLY | O_BINARY); if (fd == -1) { - fprintf(stderr, "Could not open option rom '%s': %s\n", - rom->path, strerror(errno)); + error_report("Could not open option rom '%s': %s", + rom->path, strerror(errno)); goto err; } @@ -921,8 +922,8 @@ int rom_add_file(const char *file, const char *fw_dir, rom->addr = addr; rom->romsize = lseek(fd, 0, SEEK_END); if (rom->romsize == -1) { - fprintf(stderr, "rom: file %-20s: get size error: %s\n", - rom->name, strerror(errno)); + error_report("rom: file %-20s: get size error: %s", + rom->name, strerror(errno)); goto err; } @@ -931,8 +932,8 @@ int rom_add_file(const char *file, const char *fw_dir, lseek(fd, 0, SEEK_SET); rc = read(fd, rom->data, rom->datasize); if (rc != rom->datasize) { - fprintf(stderr, "rom: file %-20s: read error: rc=%d (expected %zd)\n", - rom->name, rc, rom->datasize); + error_report("rom: file %-20s: read error: rc=%d (expected %zd)", + rom->name, rc, rom->datasize); goto err; } close(fd); @@ -1105,10 +1106,10 @@ int rom_check_and_register_reset(void) continue; } if ((addr > rom->addr) && (as == rom->as)) { - fprintf(stderr, "rom: requested regions overlap " - "(rom %s. free=0x" TARGET_FMT_plx - ", addr=0x" TARGET_FMT_plx ")\n", - rom->name, addr, rom->addr); + error_report("rom: requested regions overlap " + "(rom %s. free=0x" TARGET_FMT_plx + ", addr=0x" TARGET_FMT_plx ")", + rom->name, addr, rom->addr); return -1; } addr = rom->addr; diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 7221c68a98..514e177de2 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -6,6 +6,7 @@ * This code is licensed under the GNU LGPL. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" @@ -56,7 +57,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust) if (s->period == 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with period zero, disabling\n"); + error_report("Timer with period zero, disabling"); } timer_del(s->timer); s->enabled = 0; @@ -89,7 +90,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust) if (delta == 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with delta zero, disabling\n"); + error_report("Timer with delta zero, disabling"); } timer_del(s->timer); s->enabled = 0; @@ -263,7 +264,7 @@ void ptimer_run(ptimer_state *s, int oneshot) if (was_disabled && s->period == 0) { if (!qtest_enabled()) { - fprintf(stderr, "Timer with period zero, disabling\n"); + error_report("Timer with period zero, disabling"); } return; } From patchwork Wed Nov 8 22:56:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836044 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="Id/eTYhQ"; 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 3yXMRG2TbKz9rvt for ; Thu, 9 Nov 2017 10:08:26 +1100 (AEDT) Received: from localhost ([::1]:34339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZSK-0004lj-A7 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:08:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLL-0007km-CA for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLI-00035n-6c for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:11 -0500 Received: from mail-dm3nam03on0069.outbound.protection.outlook.com ([104.47.41.69]:15784 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 1eCZLH-00035X-UT for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01: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=3yhRBSYmsH7kaOjQ0f/YoETi0LQlmHAnnPGrad+In0g=; b=Id/eTYhQAj+e+ekPKpYUqQNvmU/8Dbzw0iu9/QLbi852AUGbV/RB08k9ySBEWhIRPqNKA7uJmP74xe21qoWDZewWTZI2vWmb2aXHavwPgbKitcwTkttuuIxhJm3UjTpdcdSxP9thjWMuV3bXnrDMCCTOEhJvntoOoVpQ2IrBl5c= Received: from CY4PR02CA0019.namprd02.prod.outlook.com (10.169.188.29) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:05 +0000 Received: from BL2NAM02FT017.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by CY4PR02CA0019.outlook.office365.com (2603:10b6:903:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:01:05 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.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 BL2NAM02FT017.mail.protection.outlook.com (10.152.77.174) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:33351 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLE-0003xO-1z; Wed, 08 Nov 2017 15:01:04 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-OW; Wed, 08 Nov 2017 15:01:03 -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 vA8N0tBg008730; Wed, 8 Nov 2017 15:00:55 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZL4-0002NC-TU; Wed, 08 Nov 2017 15:00:54 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:55 -0800 Message-ID: <52a2e1755b0e8d163c2d59a77adfad48976fbbdc.1510181732.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-23450.000 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)(376002)(2980300002)(438002)(199003)(189002)(76176999)(9786002)(118296001)(4326008)(5003940100001)(106002)(5660300001)(63266004)(16586007)(6916009)(2950100002)(54906003)(575784001)(47776003)(39060400002)(189998001)(8936002)(2351001)(81156014)(81166006)(8676002)(50466002)(106466001)(77096006)(50226002)(2906002)(36756003)(48376002)(316002)(478600001)(50986999)(36386004)(356003)(33646002)(305945005)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3380; 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; BL2NAM02FT017; 1:V/5jSkkw+BsfzxPv/cqlfCWcGBJ+eryCPvMYVmtzp1sob531EG3c/qydgQmqmmNpyqKwPjrHqgnl5qhBgGKUhfNH1sFgpSG2mPQP5XX2T8ankfmd9flGzOGYx1DT2nJf MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 049a17b7-6a56-4bda-c6e3-08d526fc9708 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3380; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 3:Q5Ceoh/MiEvKiThmFI93PUGLNYuVlNcc9yTMIwz2GyCCQIn0V6l1HQGemyIlZTiNqy3/IH8+NhGbvv8xNpOQw56auKiLeHzSsS6m/GsiqDOwFxEVRgUeMRFBXViZa8nEgE8u8GiSo7VIm2u9xCm1eGni4Ws67nou0h88UlOLQV1r6W69c9l+2RQDZArwmxK6obIw1l5lGxEjpiDkQpw6EQWk5HCdOLQCm1U2uAPLRm9aNLoBOkUXDMU+Gz+qvsY9kF+x5GTSxYb0tIQ7v1BoEguSC0YXjrOqHhRqhAhdEkjwNk6x+RMCQnfn3giNWdvOXhNPrTFLdlhaOrkeX7yfubQtvV89JRC1JwEl4rHu6QQ=; 25:niN1ldJykZh7j7VTGPi0SAR4PLPv4K39INsjgoh63dfOpRR6zWCXBPNKg9wy0YIfixC3McQTsavSSCzLGQsQxmkqj2cXxCh1BxqsUo5XWKXpJc9gvV1SNeEu74nClsb8miO8ON0xF8DLX4Ntqh1y1KeibqN23QXqyiOrURBaGQ7Ch0W7yBP2AKsCxEh8fbX6kFQ8VusdQy7Bc2kECLy0M4F4isDiqkQpP+bkQH65bXdv5QimmT7JaQR6XCxdt/Zg2V4YNpPE9Yb8dU5yvlaX7hoR+qV72aMw7r6W5HCm0KFVkBHqLQFhSJks8Fxsv0uscu2h1vnB95yrI/uZCyWcXQ== X-MS-TrafficTypeDiagnostic: BN6PR02MB3380: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 31:XEaxFsNziqpaJv6eKmlR7VpTT4H7Vw/pxpvAZsH9iLKKjWn56VPO5oN7X+cXSBvKdNP8rkj4Iv4N5P+8AsiSZ7eo8Xi4wkGDT77I6HhA/v9xp9yaSVnHNxm/l690wzrGbTKO07iVjaJjmXubrZ73+2BT26zGrejLjMIS/i2F6Nxj3N7GApX3alYbMOQ1JVqCKir9I4rph4sju6oKyfPi+pl65Wt6WEforMWhRKHnDxg=; 20:OalUphnp8C6equWc1R72WBZeSXthEZ4Sh9SrqUjXVxsgLT3LW9DzeqpV3BsmhY6opUiUpLdtwKEcMmx2zVIepdDXRKrkl+tfzZpccf7FkMKLvhj7lCXxSSotQ0NYnsrYBT6ipHsGNF47FcAKm2HYIjhvhqDPqrmCpL9mnI98sKrvijSgKoe5aQ5o29Uv03PP6Bz9P6unC/WWwkEiIFYJ46qm+np8SkltRux/ItpoDBrVQaao2CTnQj2gKP5EMmklBmcH3hhuk+23cICXGnRS2ODPI0lkoqhsowxASes5xZVS+oF62MXZbXsiUVRcZgIC0MpMNEy4XRorfkb6HwYmOKvF48A980MRXN7TpqUCrUtDdirA510D5JSCp1CsvYINmi9UT6j4wckRDKacF+wT2p7FAmapX2cgTO5lSN/oa4brraYCSjdYd7aUPY21Z3E8Cj0TeUz8nNazlKUkOo0kxfIx5onEFSlhWCX3dnE0B5thtA/a2k0GmCV2RhFybVej X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3231021)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(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:ZjgNhWOwjgDP1ONla1myFur1awB/oO422/Z+cWg1LV+HjZwl3VRTXRtk8TpTJDe/oSUp7661bSWtT0p1wLEGkwmAsqY7zja56ArbCegipUwYOP7okzO52JH9R4X6SIAZzEvTMUxQkyiiiygpSUZRCnRPzzj5hOi/7CgmPyQSZW8dv1XOMA6ACu7NleTdJ5EtTETxHRDbgL7GsWX5Mky/3OFwzbu5yU9rIEaojGT7J+IVbRAF3N09MJjLaA5xc1PxqIHmfClNTdz85QDO4gg5R/VC+yNL5r/TpgetsFwIJXxnhMSqi7oYHq1snIRJ4CuDemLzdyKskjg1mdP3tHFNJA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3380; 23:lmTW1hnjrOKHRIClUMfb4IEHG14MO/tdDbv52QvgF?= 4TZymaSbkGL3tz846lxAuLUBizAo5dWWSrkbdjbQKp0CdvjMcVpdA/cKJ6O3IapBuuKvspJ3HnrbZSzRzP9uBriAy9dH8HGljln6zbpsTGOaAU/IdxsMWoXh/OKuiHz5t3tc6D3BcvZy+CXfFuy6ju15URd1cUKqZLV5qf65/xlZIo7JSdTgRKa8rQkOvQ1hFhTdkXhghCOjZltrvJhaJtwtQUAv13o00QxI/XcGsJ7m69iRmTmPQUsYQI7JqfDej9YRNiZhXllLPENlTkOFGqjoKc7mJbVu9G1pjnB3XI4jyTwhu2ndqmLIl1mvAk9gW9CYaiwntJ38WigFoobvawNK9MP2SrtyNP9gAHDMdW67qCJVygSsD1+VtzJUacat7hryMrTHGt7wXlSS5Xwo6GnU+aNJXUXM00a2qoifdtk5WoKdQVTJw25c71/9YKINIwJzdanx8jd7ZYm8gCGssdLUx1tKY8Xo0suPki3VmDaN3bL8Ckf7dfBJEsxLgZAAGQ2kBCcbP/huHd1jIfsGf9UcuBo7//0CayibxbKjJypyEuVChOB4IeiqlwxozNedU+CMNxb9TOFm7hcxHYDhUDbaF6wJK31ATXDWL1NglAshIJWO26WP3UTKb8FTdZsf90eLHXqtJ7xu3Shi+6IobZLEYpkbbQcjkjX5vInbNJTp2Q+lJ3PaMtOT/7PLqAxjEmRJpO2er+V0iRitVvhr7TMPKmF0m7dXYAjTbNR/fe1RdyG5YPuaAuI1mcPKgp7XBafoUHqH2+G+ok6qRz02DvDtbis2nseSh0WJEhkN1ibcokSb9KkNY2kNie5gGdjn2gtobO7FahF1HCk3eF5zlTT+QONvBjPjfmw6l0hFKoD/S0TIThSFd/wATt4vNyP11itlCVxMZqpVKCvh3/9vF38Z4eUQ2D/V5EE7QYYMsGdII1Tzy0OHnN89DU6pYfoI5zJahX7zTuXGcwoY/9bFApuCgcHXuOtReP6H4C+yWemhRacp+4mY7CZzo0/Vt3hwYE= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 6:n5E1Klbcx0KzNxelFQ5/P7efr88YoFyoBuFM1tZiv+G4F4d55IPwqkT5LPNbnrei8CzjxZCk/YACJJr9Cy7FZTY/MCyse45lv8NPV46fQI1wHRBKaN7U1xI3ue2qLOuvfPWeMbkDDEyTL415i1c5xDWLwNNJhIMlYAQnkC3KyTk7QxgKUJTXmv+0zneTW2AeacG5mW3+XK4CQUZmTVQg0RYnpT0PSSg76DAEo1o9/3pFL9OVIfWE+2VhFsjUFIwa94La1rWI6CAmeLQygIQRzaLBNXtmpIl/J8rSFad3TULpyYa4cus/S2lF2/hK0kl+QWOyyqwr7f1VBEEszo//Vu/cXpvnlAifWP9iooFHQQE=; 5:0T1Ha1cRfLqocj/suH4mGrYhBsK3uUxleCCbsIzQu7BlcTd/X44O+gSfFd4zxQAkkAMRh38QteMZtO76TBfNeVNFpSPowloPkHo8miKiyEq0O8ZSDbetjIRMbX5TGDn5VIC6AdfaoN/jM+4ZvFRSRs8P08U+ta/8j0sz00TJd+E=; 24:Ah9zEvuYUUzwZvqaaISouanukpA5qNZoHNmMiGzmGFsSM1VGEdqwbLqq9saZYePFv+Gc17WS2SaD5PVtFDZ359TpWWKWSI/i8qczpv8kehQ=; 7:0kJ3o8lp7Z0gsfiD6F6nnyhinEIJSAmkXiBcgENju+x/Dtx95J3X43mWT16akhxjsD9inbMv4CBa+VbXkPufshsHMxGCOoUVkJiYJ3Di3ZObdSXak48Z5Q5dMrCSrU4jeO1ph1p3D7ES5CdEMnc69gevfZ2o0QK8CqY71zmlzYd5bE38WuGpkCHcdJpbMTcIVJbJnXbsKUKShWurxZuAjT3xCPh5ZI5aVL/GTf1Qo4e3PCd7EGiaXdy61UfvtIKe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:04.7685 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 049a17b7-6a56-4bda-c6e3-08d526fc9708 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: BN6PR02MB3380 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.69 Subject: [Qemu-devel] [PATCH v4 10/45] hw/cris: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, "Edgar E. Iglesias" , 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: "Edgar E. Iglesias" Reviewed-by: Philippe Mathieu-Daud --- V2: - Split hw patch into individual directories hw/cris/axis_dev88.c | 3 ++- hw/cris/boot.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index 9ccc4350a5..df124d5128 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -345,7 +346,7 @@ void axisdev88_init(MachineState *machine) li.cmdline = kernel_cmdline; cris_load_image(cpu, &li); } else if (!qtest_enabled()) { - fprintf(stderr, "Kernel image must be specified\n"); + error_report("Kernel image must be specified"); exit(1); } } diff --git a/hw/cris/boot.c b/hw/cris/boot.c index f896ed7f86..fda0a039b8 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -86,14 +87,13 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) } if (image_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - li->image_filename); + error_report("could not load kernel '%s'", li->image_filename); exit(1); } if (li->cmdline && (kcmdline_len = strlen(li->cmdline))) { if (kcmdline_len > 256) { - fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n"); + error_report("Too long CRIS kernel cmdline (max 256)"); exit(1); } pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline); From patchwork Wed Nov 8 22:56:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836039 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="DWef4vAM"; 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 3yXMMS4bHcz9s72 for ; Thu, 9 Nov 2017 10:05:08 +1100 (AEDT) Received: from localhost ([::1]:34319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZP8-00020h-7K for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:05:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLP-0007p6-Dw for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLM-000385-49 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:15 -0500 Received: from mail-by2nam01on0080.outbound.protection.outlook.com ([104.47.34.80]:28357 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 1eCZLL-00036p-MO for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:12 -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=WolAlXq0CQh5btnkqpCVCYbSoTZTzFX/pzWI91sSaes=; b=DWef4vAMsIR1usK6twNtfm4+nU8iFvmUJ+C9DAWgM3gjFsLihuDyIk+dKAEXIY+2Db4o8V8/D6fX4Ejb3SCjMjXuxKODiOCehBrgLtjr4B0XVMs1RUgV7FXlPGu7VrsUIN4JxEX6qkD5rR9oHjz28tKy+TrjmB8Dw0wYrgyucrw= Received: from MWHPR02CA0028.namprd02.prod.outlook.com (10.164.133.17) 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.197.13; Wed, 8 Nov 2017 23:01:05 +0000 Received: from BL2NAM02FT038.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by MWHPR02CA0028.outlook.office365.com (2603:10b6:301:60::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +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 BL2NAM02FT038.mail.protection.outlook.com (10.152.77.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:33295 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLD-0003xH-GK; Wed, 08 Nov 2017 15:01:03 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-CU; Wed, 08 Nov 2017 15:01:03 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZL7-0002R7-UD; Wed, 08 Nov 2017 15:00:57 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:59 -0800 Message-ID: <530b263ffcce137748560534ca5a802533ee1347.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23450.000 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)(50986999)(118296001)(76176999)(36386004)(77096006)(356003)(16586007)(54906003)(33646002)(106466001)(316002)(2351001)(8676002)(81156014)(39060400002)(106002)(81166006)(8936002)(2906002)(189998001)(36756003)(305945005)(5660300001)(4326008)(47776003)(478600001)(50226002)(5003940100001)(63266004)(6916009)(575784001)(9786002)(48376002)(50466002)(2950100002)(107986001)(21314002)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3378; 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; BL2NAM02FT038; 1:5QQwx8oRZiM5KoR0sX47+3Ys51zDV6LXvvZ+jECmp0ZUoCIoGCagmbIRovpCgRgRVqMk+gH5wvzr5M8m6VCKh4NcWSzasZl+svEAu+ouZIzI7iEkphojm2WWC8XG5x5B MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d583797-8af3-4fba-2b65-08d526fc96af X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3378; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 3:PDo0L6EgiAwLp0yb983qrLfeOl6eS6DVGe0PHVc1RxOtpQ10wddTz8rxDQs0LP2yWZPUcyPDZjS++imukn2QYJD/2tNffdiRusBiGDdGvAlPFEipTC4Kbbm+J/E8oRDzA0ZPqge7QaYi0HhfkbWqntGcF0PIgMfl5LS/4zWcNMGGtPI/bEI5c3N2jVGxBf6nl93qMjIxRdnWKDIXPysDJn9QZco3H4G6iQizF2b7HAEHDLeEYBET9P8O0DR6Wjaw8GqJEv/L0ZGfRau2SXspekynAu9movbLO5GJKVZLQI8pNGDcgnB5tt1aQgUtwJApjujDUGNsry03qaUbVWZcbfjHVHp2e8UwIDCbTguqwRE=; 25:5BR00m5P+7CHq4gnVOBCkpvJ3LV6EqGb9sGfoIcAhi+mtR/QWGgf0u6UJ1fDnG1RveRnUF6SG6amCX6vSuSAGRB0jGg6Qug7TAggjgFuc1PWlGgthNfryhzyUjsJ+R2mkiK8et2XQZZnsKRDKrbDqKXJbUxrvHWJ36AZ2/WkRtFq6cjmUhTP8XiNJcvKF0FQHVBVA1OR0w/QMaKpBKQ/TmdWTrn/OAT+7bBpCgiOzkv91p86AeQlBU5w6VonEwHpS8yTLGubKVvvX1oFhOmj7DN8Jm8x2M7wv234ZH7vzYT2QbKAL4lJWKXocsUIUYo2fPEQhk/NuuiFCvdubtJ5xQ== X-MS-TrafficTypeDiagnostic: BN6PR02MB3378: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 31:8w+NRxY6a2LQsD00bLKDBAZVMVlnVMB91/xD9CvPDYqFvO/X9jz4xPUQE72f8XuG2iCLXqzhLCZRLetgTEuDLdh1zY9EfY9uo4q2b9MeKkA6wptMEyTG5CCCk4YVaRKEh/zSaE1YzxZhYyLcEff4wSR9nAqh8po+lxtmYKyb/Zz6cCOaX89Zho2kHF19eIjwDVcjqZfqRh6qS5RYJLOPYO0Xu9zZ3X5ywhk5G6QGaJU=; 20:zDYvQWfZWxU44QpdphOPdMvBQsSVsqKS5Jkt0HERg+1LFKE1vp2W2Gf/Ls3iR4VvgIvRQHuGCnSxnq/g3wZeJ2/5pq6c7mMM8hCn5+iMCKge4vHALOo2LUmDNhsrPC9HEEhWEPTLrGHo2T+1udBs5HA7otg0jLa7Dac0ji6lFZx8QFYM6eDBfKqmZwleAq67rlAqKuwKnRmYL72l7/MswG+1yiyRQBQvG+1oTYqi1g+v3e9Jaj+0+dmXJMmepfdC+hCr9Yl/4el2l8zvtw6FVvrjGDNM7ncLplGrGWDF6g0C0G0KNvH3Zu/IILmZUwGdH1GBTj6UvArN1BHQ4LBtMiYS9uemm9xX2ivJEW9TQ74zN7baFP8dfZ2wRhtp4SsJE/3QVoW1PukFyqufF+PGtkZywbLMxu2sG2tDFp/FCASCs9gfXvG4VAWnhOG7U/VIq2WwOtbK7l0sM1gmKII1e6ev5BkdCJz0pxtQAPH5cj91D70aQI3aSrEpyOfCLrLS X-Exchange-Antispam-Report-Test: UriScan:(158342451672863)(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123562025)(20161123555025)(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:bu5oYTruVGTBSSvIsMgQ0Bjg60YZkce8+2tCcOwLYFOWOPPJuUVJA0k+mLUT1sgx6zgzzRFGMsArYXh9m7eF05IHs4ToN+ylJGWhZGfgIz+6AwJJHrG3dNQBkJWyxrt8H8DYhOs3H2e4+3uNQBD1s5oL8wFdb1LDOR7Lhh7Uy0s3Kjq8Y5JbfZn0PR0/suly5dXG2Y3F2V3liN0Fg+xB5cKxpEuf2QLSq6NMeiCwo7ZjLVgTV1xHcc2z7zfvW3m3a0iyGrTB9N5XUT5oHpNdkAsXhzvW4ctSP6i9LIrhBB1sVN9eh0wr7bGCCerWW6wJ97pbM3sdOSZeSJ72l+NX1M3tpQQ6Yp6bjSUIzfB+2l4RxX11Br+eM9zyqDDC2OCl X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3378; 23:RLAhSfAv3mkL3lZVeHxV8A2GhBAQLuU9DeZTcUYv7?= e/wVmaunNKm1qquoSH/A0NNNV9xJR7hJ9MeyEtAShDoORFFAMje2U6lrB1MEwzIhe5Dn7W+tXfT5I9qcOErquP+gaCmsiq4D0v1X9KQvdwtaoYt3hzi4ceGmpa9JLGjbVZiK7rJizYGSQZzSV2V5tVYhG9GzoXR79n5oAYtIwJh29SSy2bLcfXvOGA5naISIGPcDX+ZDHc7uyh36ILKZFlPHPg2K7tI6Xn2pzu1EDYIET4QBkhK57dXRnULIlTK6vXWCzao3Cc1oeD0Vqs2UQqvXlG3uP/1nzFYIjWl8IVboAdq1WspewUg2yet8ewhPV0B7V4DI9ENy3Z3AynAU6DKnemyC9R+pXWdvZ1Ha2j34Wd6gFpEGyVOwcQpnT+c/y1iKmKAT2wpJ7gOnPuFH9rd858VVl7iMu/SGLqrbCIFPp4xFJ+ENjbqCxsVYLXNNBdMFQ7vG5/vKyg2dXydSf57Ey8QFl3DputaYLDe+t0nq5s50g9yGoVqc6uBY1e0dc7f5uUsM41ULucA8Ug2FSJCpFu0IjqPS57hXucz/8uz2Jr7meR0q/C/zfQ4akIoTEeGRXZs13LnWCSk5/g/1ZrYed7FXdA/Nv8WuByAAK088SupOT0BbwOc8wL/1IEdKbgnIT+5CrgUPx5XUAhYRgQhs5OjqVFd4hVnCqfYLxyCAnJWcQqmEmNeqKpJajO5GnKTYxs8TbiHLM+CBOdEioYOyviIEPba02qJOolQvUBPz/e56aYztOKzkQqbfC2Ifns9fs96TsWgaZM4GGPDgnmUFCzKhNdlVdBn2HIjkByN+QZhYVcbBCwu5DwOQ2ijo5zKeoYZYgm20whSz9kr33OqIw9DiwqOwDFaKjdGQLoEQUILf/+UuKNfWI+VteiKJqyZ4WW9c9RCUChxDHWKS4A64Zy3qbQLKkGFno/juX+wO+oLmbwylaA+LmNs+8etkJt+ZJJJxY1ShTlXAUR76b1Red3GOuaRlBPwDDoAkTAQj091HH6C9p6/Y/QRKvvn69BFfwjBb8A78Yv4Sd5mB9zKPMfnWaW91wl1qo+LujcIrf+BfDtlOATq9eAovFVJCAg= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3378; 6:TE+17DV6cfbU2Ad2cztc/KeApTn0z2si5t2T0Aa0AFvX7LQDMQENQ4t4CzTmgf1JBbh1XuiROt1vfwhgyn7nRIHlqaVCv6QL2Ab8QvUcJ2MwzyDJLmJ/ZhHa8O3QAQGdRd60B0rZ6KgTsBaVGp8Q6MdUgxA3TAbjgW3rWrRuUuNfonf5bvEijUAGqb9S4Y7G8YcTmv98V12pgqF+QD+DgPVxUQKmYnR+QwfT757rj4mf8uWBakv4L5DHvLf/6T9Vk3ADfyq5zSOM3KnV8bZDqbTgvEF1g8NyrGHEj7EbKIRwarlZYqoeZZLRyhFFIaVXe78E9RyQyREzemFnr95u5alfsQ+COomo3cMEGNwZWy4=; 5:u2V6ihEVmVg1YPtaECU622qxVxLjZRWV9I7j/Af3vA8vPh4eP9ZDSDMU+99owD93OzDfeVvOmwuJZxJ0Rdd4Bu7KKw62TNR7dfgsIvrPLmpuDgaXrrEGmv7f83n9ldVKBjidGOcS/ejwI174XCUgwyvurDOwtqapf64wWlQs/lY=; 24:NZIDrpSNiSbdaWiCOy6bxjVGby/4oEWgMImDVJrkynQ61TVT4eC4e+eiKwc1wubFpkotifey3fKckXLSk3pDoNEdCQwAJVu5T+qFZzYdB1c=; 7:fNhslkNRjYESbaUCUMPqAOnx+K7up0Pv0rNY2Ip0ftv7lek52gF4DQUpUWQYS0rU51DMdrEJoqvvsfNDygXgD56xRNN4e4PRrDUZ9hhCwrNzOtf3iVESVh9il5aOX8NSM1ze1X5JvhAe+AYI0rtMsjNlR6tK5GSgAFje91jIzmXNd6WBZ/puuUjB7xFMr/xPRaddWUQnsAPcE/N8QzdJz4CqUrVTaA4cFmvLA5EjX1pRpRv+/D9BUm+ir6l8rqq1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:04.0875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d583797-8af3-4fba-2b65-08d526fc96af 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: BN6PR02MB3378 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.80 Subject: [Qemu-devel] [PATCH v4 11/45] hw/display: 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 --- V2: - Split hw patch into individual directories hw/display/blizzard.c | 20 ++++++++++---------- hw/display/omap_dss.c | 14 +++++++------- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl-render.c | 7 +++---- hw/display/qxl.c | 10 +++++----- hw/display/tc6393xb.c | 36 ++++++++++++++++++++---------------- hw/display/virtio-gpu-3d.c | 4 ++-- hw/display/vmware_vga.c | 22 +++++++++++----------- 9 files changed, 60 insertions(+), 57 deletions(-) diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 291abe6fca..0d12e078c4 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", __func__, reg); + error_report("%s: unknown register %02x", __func__, reg); return 0; } } @@ -501,7 +501,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) case 0x0c: /* PLL Mode Control 0 */ s->pll_mode = value & 0x77; if ((value & 3) == 0 || (value & 3) == 3) - fprintf(stderr, "%s: wrong PLL Control bits (%i)\n", + error_report("%s: wrong PLL Control bits (%i)", __func__, value & 3); break; @@ -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", __func__); + error_report("%s: data swap not supported!", __func__); break; case 0x2a: /* LCD Horizontal Display Width */ @@ -585,7 +585,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) case 0x40: /* High-speed Serial Interface Tx Configuration Port 1 */ s->hssi_config[1] = value; if (((value >> 4) & 3) == 3) - fprintf(stderr, "%s: Illegal active-data-links value\n", + error_report("%s: Illegal active-data-links value", __func__); break; case 0x42: /* High-speed Serial Interface Tx Mode */ @@ -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", __func__); + error_report("%s: Macrovision enable attempt!", __func__); break; case 0x6a: /* Special Effects */ @@ -717,7 +717,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->iformat = value & 0xf; s->bpp = blizzard_iformat_bpp[s->iformat]; if (!s->bpp) - fprintf(stderr, "%s: Illegal or unsupported input format %x\n", + error_report("%s: Illegal or unsupported input format %x", __func__, s->iformat); break; case 0x8e: /* Data Source Select */ @@ -729,7 +729,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->iy[1] != s->oy[1])) || !((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", + error_report("%s: Illegal input/output window positions", __func__); blizzard_transfer_setup(s); @@ -783,8 +783,8 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) case 0xe6: /* Power-save */ s->pm = value & 0x83; if (value & s->mode & 1) - fprintf(stderr, "%s: The display must be disabled before entering " - "Standby Mode\n", __func__); + error_report("%s: The display must be disabled before entering " + "Standby Mode", __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", __func__, reg); + error_report("%s: unknown register %02x", __func__, reg); break; } } diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 601f178fdd..52d6e753d3 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -406,10 +406,10 @@ static void omap_disc_write(void *opaque, hwaddr addr, s->lcd.enable = (value >> 0) & 1; if (value & (1 << 12)) /* OVERLAY_OPTIMIZATION */ if (!((s->dispc.l[1].attr | s->dispc.l[2].attr) & 1)) { - fprintf(stderr, "%s: Overlay Optimization when no overlay " - "region effectively exists leads to " - "unpredictable behaviour!\n", __func__); - } + error_report("%s: Overlay Optimization when no overlay " + "region effectively exists leads to " + "unpredictable behaviour!", __func__); + } if (value & (1 << 6)) { /* GODIGITAL */ /* XXX: Shadowed fields are: * s->dispc.config @@ -525,8 +525,8 @@ static void omap_disc_write(void *opaque, hwaddr addr, case 0x0a0: /* DISPC_GFX_ATTRIBUTES */ s->dispc.l[0].attr = value & 0x7ff; if (value & (3 << 9)) - fprintf(stderr, "%s: Big-endian pixel format not supported\n", - __func__); + error_report("%s: Big-endian pixel format not supported", + __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", __func__); + error_report("%s: Bypass mode unimplemented", __func__); return; } diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 8c7dcc6f0a..b8b7903d36 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -174,7 +174,7 @@ static void pl110_update_display(void *opaque) dest_width = 4; break; default: - fprintf(stderr, "pl110: Bad color depth\n"); + error_report("pl110: Bad color depth"); exit(1); } if (s->cr & PL110_CR_BGR) diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c index b83f80753a..ae3a365849 100644 --- a/hw/display/pxa2xx_lcd.c +++ b/hw/display/pxa2xx_lcd.c @@ -1050,7 +1050,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, s->dest_width = 4; break; default: - fprintf(stderr, "%s: Bad color depth\n", __func__); + error_report("%s: Bad color depth", __func__); exit(1); } diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index e7ac4f8789..0cd07028a4 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", __func__, + error_report("%s: unhandled format: %x", __func__, qxl->guest_primary.surface.format); qxl->guest_primary.bytes_pp = 4; qxl->guest_primary.bits_pp = 32; @@ -247,7 +247,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor, } break; default: - fprintf(stderr, "%s: not implemented: type %d\n", + error_report("%s: not implemented: type %d", __func__, cursor->header.type); goto fail; } @@ -275,9 +275,8 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) } if (qxl->debug > 1 && cmd->type != QXL_CURSOR_MOVE) { - fprintf(stderr, "%s", __func__); + error_report("%s", __func__); qxl_log_cmd_cursor(qxl, cmd, ext->group_id); - fprintf(stderr, "\n"); } switch (cmd->type) { case QXL_CURSOR_SET: diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 99365c3e8f..2e3ae5b90c 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -875,7 +875,7 @@ static void interface_notify_update(QXLInstance *sin, uint32_t update_id) * Probably was at some earlier version that is prior to git start (2009), * and is still guest trigerrable. */ - fprintf(stderr, "%s: deprecated\n", __func__); + error_report("%s: deprecated", __func__); } /* called from spice server thread context only */ @@ -905,7 +905,7 @@ static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie) trace_qxl_interface_async_complete_io(qxl->id, current_async, cookie); if (!cookie) { - fprintf(stderr, "qxl: %s: error, cookie is NULL\n", __func__); + error_report("qxl: %s: error, cookie is NULL", __func__); return; } if (cookie && current_async != cookie->io) { @@ -930,7 +930,7 @@ static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie) qxl_spice_destroy_surface_wait_complete(qxl, cookie->u.surface_id); break; default: - fprintf(stderr, "qxl: %s: unexpected current_async %d\n", __func__, + error_report("qxl: %s: unexpected current_async %d", __func__, current_async); } qxl_send_events(qxl, QXL_INTERRUPT_IO_CMD); @@ -998,7 +998,7 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token) case QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG: break; default: - fprintf(stderr, "qxl: %s: unexpected cookie type %d\n", + error_report("qxl: %s: unexpected cookie type %d", __func__, cookie->type); g_free(cookie); } @@ -1875,7 +1875,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events) trace_qxl_send_events(d->id, events); if (!qemu_spice_display_is_running(&d->ssd)) { /* spice-server tracks guest running state and should not do this */ - fprintf(stderr, "%s: spice-server bug: guest stopped, ignoring\n", + error_report("%s: spice-server bug: guest stopped, ignoring", __func__); trace_qxl_send_events_vm_stopped(d->id, events); return; diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 79f161740a..8b708a858b 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -159,7 +159,7 @@ void tc6393xb_gpio_out_set(TC6393xbState *s, int line, qemu_irq handler) { if (line >= TC6393XB_GPIOS) { - fprintf(stderr, "TC6393xb: no GPIO pin %d\n", line); + error_report("TC6393xb: no GPIO pin %d", line); return; } @@ -190,7 +190,7 @@ static void tc6393xb_l3v(void *opaque, int line, int level) { TC6393xbState *s = opaque; s->blank = !level; - fprintf(stderr, "L3V: %d\n", level); + error_report("L3V: %d", level); } static void tc6393xb_sub_irq(void *opaque, int line, int level) { @@ -257,7 +257,7 @@ static uint32_t tc6393xb_scr_readb(TC6393xbState *s, hwaddr addr) SCR_REG_B(CONFIG); SCR_REG_B(DEBUG); } - fprintf(stderr, "tc6393xb_scr: unhandled read at %08x\n", (uint32_t) addr); + error_report("tc6393xb_scr: unhandled read at %08x", (uint32_t) addr); return 0; } #undef SCR_REG_B @@ -318,8 +318,8 @@ static void tc6393xb_scr_writeb(TC6393xbState *s, hwaddr addr, uint32_t value) SCR_REG_B(CONFIG); SCR_REG_B(DEBUG); } - fprintf(stderr, "tc6393xb_scr: unhandled write at %08x: %02x\n", - (uint32_t) addr, value & 0xff); + error_report("tc6393xb_scr: unhandled write at %08x: %02x", + (uint32_t) addr, value & 0xff); } #undef SCR_REG_B #undef SCR_REG_W @@ -341,7 +341,7 @@ static uint32_t tc6393xb_nand_cfg_readb(TC6393xbState *s, hwaddr addr) { case NAND_CFG_BASE + 3: return s->nand_phys >> (addr - NAND_CFG_BASE); } - fprintf(stderr, "tc6393xb_nand_cfg: unhandled read at %08x\n", (uint32_t) addr); + error_report("tc6393xb_nand_cfg: unhandled read at %08x", (uint32_t) addr); return 0; } static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, hwaddr addr, uint32_t value) { @@ -357,7 +357,7 @@ static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, hwaddr addr, uint32_t val s->nand_phys |= (value & 0xff) << ((addr - NAND_CFG_BASE) * 8); return; } - fprintf(stderr, "tc6393xb_nand_cfg: unhandled write at %08x: %02x\n", + error_report("tc6393xb_nand_cfg: unhandled write at %08x: %02x", (uint32_t) addr, value & 0xff); } @@ -377,12 +377,14 @@ static uint32_t tc6393xb_nand_readb(TC6393xbState *s, hwaddr addr) { case NAND_IMR: return s->nand.imr; } - fprintf(stderr, "tc6393xb_nand: unhandled read at %08x\n", (uint32_t) addr); + error_report("tc6393xb_nand: unhandled read at %08x", (uint32_t) addr); return 0; } -static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value) { -// fprintf(stderr, "tc6393xb_nand: write at %08x: %02x\n", -// (uint32_t) addr, value & 0xff); +static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value) +{ + /* error_report("tc6393xb_nand: write at %08x: %02x", + * (uint32_t) addr, value & 0xff); + */ switch (addr) { case NAND_DATA + 0: case NAND_DATA + 1: @@ -420,7 +422,7 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value) tc6393xb_nand_irq(s); return; } - fprintf(stderr, "tc6393xb_nand: unhandled write at %08x: %02x\n", + error_report("tc6393xb_nand: unhandled write at %08x: %02x", (uint32_t) addr, value & 0xff); } @@ -522,13 +524,15 @@ static uint64_t tc6393xb_readb(void *opaque, hwaddr addr, }; if ((addr &~0xff) == s->nand_phys && s->nand_enable) { -// return tc6393xb_nand_readb(s, addr & 0xff); + /* return tc6393xb_nand_readb(s, addr & 0xff); */ uint8_t d = tc6393xb_nand_readb(s, addr & 0xff); -// fprintf(stderr, "tc6393xb_nand: read at %08x: %02hhx\n", (uint32_t) addr, d); + /* error_report("tc6393xb_nand: read at %08x: %02hhx", + * (uint32_t) addr, d); + */ return d; } -// fprintf(stderr, "tc6393xb: unhandled read at %08x\n", (uint32_t) addr); + /* error_report("tc6393xb: unhandled read at %08x", (uint32_t) addr); */ return 0; } @@ -548,7 +552,7 @@ static void tc6393xb_writeb(void *opaque, hwaddr addr, if ((addr &~0xff) == s->nand_phys && s->nand_enable) tc6393xb_nand_writeb(s, addr & 0xff, value); else - fprintf(stderr, "tc6393xb: unhandled write at %08x: %02x\n", + error_report("tc6393xb: unhandled write at %08x: %02x", (uint32_t) addr, (int)value & 0xff); } diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 8c106a662d..88bc1c84a6 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -473,7 +473,7 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, return; } if (cmd->error) { - fprintf(stderr, "%s: ctrl 0x%x, error 0x%x\n", __func__, + error_report("%s: ctrl 0x%x, error 0x%x", __func__, cmd->cmd_hdr.type, cmd->error); virtio_gpu_ctrl_response_nodata(g, cmd, cmd->error); return; @@ -556,7 +556,7 @@ static void virtio_gpu_print_stats(void *opaque) VirtIOGPU *g = opaque; if (g->stats.requests) { - fprintf(stderr, "stats: vq req %4d, %3d -- 3D %4d (%5d)\n", + error_report("stats: vq req %4d, %3d -- 3D %4d (%5d)", g->stats.requests, g->stats.max_inflight, g->stats.req_3d, diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index cdc3fed6ca..a8a2b470bc 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -293,45 +293,45 @@ static inline bool vmsvga_verify_rect(DisplaySurface *surface, int x, int y, int w, int h) { if (x < 0) { - fprintf(stderr, "%s: x was < 0 (%d)\n", name, x); + error_report("%s: x was < 0 (%d)", name, x); return false; } if (x > SVGA_MAX_WIDTH) { - fprintf(stderr, "%s: x was > %d (%d)\n", name, SVGA_MAX_WIDTH, x); + error_report("%s: x was > %d (%d)", name, SVGA_MAX_WIDTH, x); return false; } if (w < 0) { - fprintf(stderr, "%s: w was < 0 (%d)\n", name, w); + error_report("%s: w was < 0 (%d)", name, w); return false; } if (w > SVGA_MAX_WIDTH) { - fprintf(stderr, "%s: w was > %d (%d)\n", name, SVGA_MAX_WIDTH, w); + error_report("%s: w was > %d (%d)", name, SVGA_MAX_WIDTH, w); return false; } if (x + w > surface_width(surface)) { - fprintf(stderr, "%s: width was > %d (x: %d, w: %d)\n", + error_report("%s: width was > %d (x: %d, w: %d)", name, surface_width(surface), x, w); return false; } if (y < 0) { - fprintf(stderr, "%s: y was < 0 (%d)\n", name, y); + error_report("%s: y was < 0 (%d)", name, y); return false; } if (y > SVGA_MAX_HEIGHT) { - fprintf(stderr, "%s: y was > %d (%d)\n", name, SVGA_MAX_HEIGHT, y); + error_report("%s: y was > %d (%d)", name, SVGA_MAX_HEIGHT, y); return false; } if (h < 0) { - fprintf(stderr, "%s: h was < 0 (%d)\n", name, h); + error_report("%s: h was < 0 (%d)", name, h); return false; } if (h > SVGA_MAX_HEIGHT) { - fprintf(stderr, "%s: h was > %d (%d)\n", name, SVGA_MAX_HEIGHT, h); + error_report("%s: h was > %d (%d)", name, SVGA_MAX_HEIGHT, h); return false; } if (y + h > surface_height(surface)) { - fprintf(stderr, "%s: update height > %d (y: %d, h: %d)\n", + error_report("%s: update height > %d (y: %d, h: %d)", name, surface_height(surface), y, h); return false; } @@ -529,7 +529,7 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s, #endif break; default: - fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n", + error_report("%s: unhandled bpp %d, using fallback cursor", __func__, c->bpp); cursor_put(qc); qc = cursor_builtin_left_ptr(); From patchwork Wed Nov 8 22:57:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836045 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="0rCd6Dlo"; 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 3yXMTd40mYz9rvt for ; Thu, 9 Nov 2017 10:10:29 +1100 (AEDT) Received: from localhost ([::1]:34344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZUJ-0006MB-4U for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:10:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLM-0007lu-EX for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLJ-00036F-7h for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:12 -0500 Received: from mail-dm3nam03on0087.outbound.protection.outlook.com ([104.47.41.87]:56096 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 1eCZLI-00035s-Ua for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:09 -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=jO1Bph08tpoGIeQ6JiStAJzPAPw/goalNNAiSEL+Y8o=; b=0rCd6Dlo2ve8iS5LFmdpf8sOFuIYDzRJ2l/HH9egizougoCPLaMynjkY5fJSxCLWKOaGTckdiXXhKGvKLu+wcvD2/nFAuJVbcFZFk2jk2yVXxdjRyvF8YrQV6JmO2NXGO4QW7Df2xCwDA3IMSFTytC9nzqUQKAcLuoaBX80I0Lg= Received: from MWHPR02CA0052.namprd02.prod.outlook.com (10.164.133.41) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:06 +0000 Received: from SN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by MWHPR02CA0052.outlook.office365.com (2603:10b6:301:60::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:05 +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 SN1NAM02FT006.mail.protection.outlook.com (10.152.72.68) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +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 1eCZLD-0001LG-VY; Wed, 08 Nov 2017 15:01:03 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-Q8; Wed, 08 Nov 2017 15:01:03 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N11vc008944; Wed, 8 Nov 2017 15:01:01 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLA-0002Uc-US; Wed, 08 Nov 2017 15:01:00 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:02 -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-23450.000 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)(16586007)(36756003)(118296001)(63266004)(9786002)(50466002)(2351001)(48376002)(33646002)(2950100002)(50986999)(6916009)(47776003)(106466001)(77096006)(5660300001)(6306002)(76176999)(478600001)(54906003)(189998001)(8936002)(305945005)(36386004)(81166006)(2906002)(106002)(316002)(8676002)(81156014)(39060400002)(356003)(5003940100001)(50226002)(4326008)(107986001)(21314002); 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; SN1NAM02FT006; 1:u8Wiy4rHSivnp0a1dwxu+SRY3EkiGQoMx0jT67PghIZyeEKwXy35NvAAn5YsljzJIkkMH+WbznXdQwZsKXXbUYXbvvl2/96uT9qy6FhkWj9oJ0Ch1ozo5lFY4wposNcl MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5ce28a2-09fb-4086-abb7-08d526fc96d1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:c/hHN2zHJEacSYh+KbdN+vqKQiLgOPIsVj/7USBRFYiNv6kZi4W5JanVm6JJK6Rw3gRLA7cD6B8LyS4qQliaxx+b9GMDWzK4oKZrhNNKIeneeJ7RGVt+kU1gt09rWkmBQhzAK2grfRA/4REOKazOJ2tzMHDlWqDCKooDYSLm5zm7mfPga0jvQqehIaMu3LeAWeA70bcezn93yXbkpDQ44l9ibTsZbIsoWzSQ1BQ2ya7tcqxUM0gi6GnaeKtFmwtBi8DWDhk0K9eEfVBdYTUKOSboQSYmH5Qosh2ryyf3DyjgXnKDfN3bovs5QOYpvCflwktbU4yW5/bsjfql6s40r/qiOjVs6PVz1caaEC585Js=; 25:8b5lIePOEyO5k7KVlszeb9YRxXqIGUkpbwYEC6d9CpDoK80Icoi0MPej80fybo2D2+BcozdmdRwvh4XxPMqZYfl5mh242QaoWHmPrm4e5vvk35WimQ43oTBIpsvJuhQL3RE+7US3qbK4y2dvdz/watbGtNYdKofGHQpe/H0M1xdBTS09P7aD/hDWzxJpwBQF0iGkB0TzuQSkhoRiZ+bc6nzpglYBL5+CA3+v5My68FH9xVll2uXsD1i2jtV45EwgOROVJl0Ns0YkhGwAqSXN1A7/kRhsqrXSRxJeamHu22NAGHgyk57PIBRK4tKSi5ThbWD7hbWS0XAzQIRJo2pNIgIN1w+xmakLIoLk0irKWcE= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:+AIhfBTLS07eW5kE+I7S8rB0lZyoywW1qhHMcg6HYGG8ZF7ZSxMeWZ3ONVe3VHXfZUwNhpdnRkZTfvsjenSnwWgW+IhZuejt0sZZNARwTwF/8jKqiHcl6v0GJVaSqH8kGkLoF4ZEoK8GJ4LLiSTm1gdUi3zek6kn0ZJfPAhYhEwAGPpNZMqu6ypZdAJwegLGLYxcTZ9vE3EmT9EzNeraQe4rUKm7PCWLvTwK62P3uDw=; 20:g10Cd/tzK8ToRMMTqvuH7LJUS9FWk0ZX6e6MH0NSsz7sL3JK2MePcmHt/fI/Vy10uajhLR222IvWfZKaeAdd7yl0CQle5BKAowjfNRwH1wHdMrF7AtFN0XDEr9gcKGsLwqYZhTLO8omFBegq3eOswwbFsrI44eSloQobBZ0iQrCU0YFD49kOV2NUduTCVmAVIkPU56GcJoxBsZZcHyyfXuyqTmS2Vkr+n41lKUOoi6mmt5dQF5f9OR4V+Ec9kU4a1/OczphBJMeeO1noVumS4RiypXe/FD12GgV54/qilMEtCMp2ZsM6kuFxTrOtS/uB7wYBXykB3W9MjSzMRS6fx0r/c6dPTvosEVUaclIFOEP53hqiYb1xQnuouRIu49paVYYo3MiBP7pFLWiEuTArYvrubVYJ1biQquHGs1ralRHoj6ySaW6QTY1h5CuwEuE8vnnmqRwObA+LP+WGUIr8QAu39UgRioe7XB9LGiiWwLwdSa4Pv5dzgTB903Iu004d X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(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:j83r329lWGQROw5m32pK5TgZlZK7JyUiSTkWhxwwhqR70Uacpr2JwkVb6B7RvRV7royMFlIDSOarwXx0ZkdOIXQJK/ltpD4POU7LEyYWMiuSWTis4JuCu56PdPhL/HdnYiJKd1WvDtfCRLjrYBXTVnN0oPu37ET7KrWOwuKjiBnLpX0LWU7gQ79EJbrYw3Q0OiW7tPqF2e/0EhZBtD179Xo08uLK8jPqDjJaTZ6L3YwmZyOq/KPpeKK7ITPOL8P5g9hOy6dlFzM4p+OGD/OUbrXGyZEK1GdmvDLGjLTRqnA6IOA59oesq3SectWukF0P7Sgjhn4gfzgLQzaP/0iX3aR4kyjIxpEs64vkH6y7qcllCPamCjEPKL/fm24LLoszCYmRfa3J8AsJKnkQFz90snZK+wMm/WWPuFIno05zQWw= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:Uj65r+4aZPXuhSBSBdLr1T+6DmXK2v5BSLBMGbEHt?= Rrbhqo6n9Oo4OGEP9OymHSqNEb8Ay9SMmcXjlgjlcQkTpYzGEq7rLMKRuY0SJuEXXTxjJXgQqoncPrke2LSvGCsWOTsN3Huk8lBTDr8sKK2lTHazLRcj8JaZG+ES8OFW/zz4fwcXu7jfSnGcw3aFYQjDcFQDV3Sxra2wB2cWlJFL+egdIjyYMdaaGTm2RyswFaHmaj/9AjSvGpJ2aXol12TCg2bjm0ffJXNUdCpbAhtPmXdKWkYapj7BDbI8/2iXtCgP6b3AsN8vveO+MdUXTvfKwUTDfiYSTYRFJkPy1LDLWsCWuMggTKMu4j9U/nIn0W9AdrKYkWTNVSsUtVWpl84Fy4B2seDBqiAukOzqgUPQVynqCJGXavl6FHtufBlovOsmYEe/GDq00IvfNQmP/3gg+VDpHAt6+KXehq16nP8jBy/N+vJNVPGWLQSCZkn2OOLY3fEfiP8wN37J5XlbSK3Cajehz291PSHG8IZrUiHn2Gy84LCX1fe7uj0NUYQjyarUFhILQbcwhiSTK8icBpvLYDTeeut17gt4APYL2KlC8U5uh1tp6tmF9aRsYF53O726yWqMf2Eg4QIJhz3wT7stuPzAvai/UuV04SXieNG4pq8tskusbLpKIoEg2g/5ieqEkPuNCEw5Iteb6spjpgZjQ9LBe/S5k4NoZKKQrzHUwjp7ccL+LAkoBiJ2moE3FrGFg9N//mwNq+ZsTZmLi8h/FueiGzdBRazIhgC3gydOCt/0WYaaWLefhRNbxp2KvguoNE0eFFJ3pxtFEqZbqQ84bKtrKkRBysjJCh/m668WTf2RyvlH5Y1ZhGhbCte8lRzrwf4AN0363fTpBHSnIpJZ3EcZfvtfOzslW0o0FJkSTsmqWA0RyKC0HsWnMIurpFr1OUqe7ca+S8aMQvMGiP+eLdvRIIvZUZ67mJb5WHyNVsxEygiZe/h1pX9MKsUwKl1EV/qWXBXGKKp/n5POZt4z1AcT3Rl2duyQP58j7521Zu3DcvLTDMA/Y9Zr/JIcRriS2XaQe6nUcIEknxRmjgN X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:IlfxKX5nLyzTCulNKiLjWsbkfAnsOwg/oUCN702Zgm6bx59OZqOP4JyEdP6Lr08r7xeGUSBsWo2DO1+T+JM+pyUddQH5eEhmfM8jt2WeuAfjPyOkH3H3LU/gwpGcAMR/s7KU+1RUCOr4r4C33+iJnT5i7vNl7bvT2tBYw3mHn70vRF0n3GvaDb+rDPAjHR4xEFZrYfOwlYxlXfH5U8a/6PDoH1+EbfooLeljFlkmtkRMHIGw/T7Ci8O5jKzuO+Koly/IalSIPMlGh+HQ9PO9YcewUrYyEM26ZOQzlh45dtKIMIW2cONOtosjfLy7u6VC7Z2jC4l53NfnJIyac4Aj2YN8RkebNpIHhSwgSZK07sg=; 5:UpAvqrkkTuxcQjpkjZ7zxJd4VeTM35vXXGgCJB122O5/kZ8+q+EbSl5Bc6E1nIxmiFlOMXgup9a9Nsr5xvmKYye8BI/NKzI1nZXJ4H4ioLirgSGKhPHhzExmBi8foh2welS4fMwb+IWmJ97RRfIGGWIvMx1iCSI5ph61kaeVvIA=; 24:fl+/k4LwA5/nc2Qg4cOPSG8ZZC7b9jLejpVG1feLoi9aXa712NEaC/5B9I3HwwM8+j7j6DNxgezuVIHMBtCXm4M7s9RCFK/WDa7/BASHpv8=; 7:0+ciY9zoRz68kLGod236QEhx3iYu+mzHNlcRxwFCdE9CSbFQs4NWasCmmW/tFLg2oeBLQ4Ec6AaF0Sv4nb1C1nZ6kdOx16vwaYvlOk3ff34vOOBuCjh28+wOVkX7LrVaVt6YGXZvQ7bm+t5DlmmxsLcsHRtd+o5XcEYN13P1ntMpwSaX6Up6IUn/dzxS7yG6q6kSf91HfIIh+0MN2L+l/jlhwGW2KEo0HYTxvNtBI6EMOdN42w9Uwg8sFL41G0Z/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:04.4386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5ce28a2-09fb-4086-abb7-08d526fc96d1 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.41.87 Subject: [Qemu-devel] [PATCH v4 12/45] 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 Wed Nov 8 22:57:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836046 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="pWr6ycEy"; 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 3yXMVM2xhMz9rvt for ; Thu, 9 Nov 2017 10:11:07 +1100 (AEDT) Received: from localhost ([::1]:34352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZUv-0006yY-DG for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:11:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLZ-0007yL-Pq for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLV-0003EE-P2 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:25 -0500 Received: from mail-by2nam01on0056.outbound.protection.outlook.com ([104.47.34.56]:53861 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 1eCZLV-0003Dd-Fe for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01: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=3Ft4rmLvvQl9wY6Q1p1GjKenDcHGz/Fl2UFj2woSgig=; b=pWr6ycEyDym4of+OBcDfsucOxhB7BD0ajj6bWqFQD61fvGdImfI+joMlDbk0hK6/68V9MSLp4ttJA+gYGL7Q7gkXGYz9DdqT0gupd1oKnl4+qFJSmYi/pBfM9a3qD3QgmGmXswcPP+DA/o2ezMuq/ZspG/efOt2gAsbp2428x8o= Received: from CY4PR02CA0014.namprd02.prod.outlook.com (10.169.188.24) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:18 +0000 Received: from CY1NAM02FT016.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::202) by CY4PR02CA0014.outlook.office365.com (2603:10b6:903:18::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.178.6 via Frontend Transport; Wed, 8 Nov 2017 23:01:15 +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 CY1NAM02FT016.mail.protection.outlook.com (10.152.75.164) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:15 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:34187 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLO-0003xb-DG; Wed, 08 Nov 2017 15:01:14 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLO-0002ho-9p; Wed, 08 Nov 2017 15:01:14 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N15a0009176; Wed, 8 Nov 2017 15:01:05 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLE-0002aO-Ok; Wed, 08 Nov 2017 15:01:04 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:05 -0800 Message-ID: <1a4b0d078ceeaa56e3a8450e4015a0c6457b62dd.1510181732.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-23450.000 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)(16586007)(36756003)(118296001)(63266004)(9786002)(50466002)(2351001)(48376002)(33646002)(2950100002)(50986999)(6916009)(47776003)(106466001)(77096006)(5660300001)(76176999)(478600001)(54906003)(189998001)(8936002)(305945005)(36386004)(81166006)(2906002)(106002)(316002)(8676002)(81156014)(39060400002)(356003)(5003940100001)(50226002)(4326008)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1341; 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; CY1NAM02FT016; 1:YRV8Zxn9UkoNdosOXA2gc3V4PcbkeZhsu4MH90AfbdioSEeZ/Ft6EKIZWDJedBYvkCyUC33cGydVRKzFaMmx9Pq3iT7UEcfxrLYl8KXYObxiSm2qjM9dIjg+tKuP2ZRc MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38c86360-2f5f-4eda-317f-08d526fc9d55 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:KYEkhDcHFKglRyoZikT1JTI9mRxMTB7Alzx85Z3RrE98W8RSfjVSr2JF4cYoDpVQq0a177+hgcBKQ+56pHBqkrS7dU4/FW/8/vhnoDjKtaNCLcCMNNIi1w7QFwtlCQOjDv548hJY2vSTl4vigsG1mf1tbTujRsYVQ6lft53WtSUoHgt7oNKavQIEknY+WafF33/q+rZyfzPpnfQUx5s0Wb4OCkzbzxA5+gKQJ4ABUxgA5ZmytjIPBHRo/FKBzSQIEPZFAniuENNzHJl2HxQ0mJrMJBBSjB6oxB/JBD7Otz6u1ZXRQMnuCI65PXjzmWpQsb+MQlVQXdtQVuv4CIR4qT2A6KWOFPx022l3itKzBug=; 25:IxsdY+tLjFE75VV0yMklPsDRDg2uLL8kTnYYrUyZAHaBtsdEv6tt0GpLqxUNDkNSRjeZ9zzTmkRH337lFSGXj7XbNCbg35qZTZEeDnZ70XKKiry0sEvtLhH9nrJ4IGlUARvbsB0QhmYGQg4SZKBvdlOJU9IVtZtBUbsBq3wWYgUOMyHvIQLlumh7/tyANHfj7u6U7N8GPg1rjtqW9YBexZ7+47ngjHQDtnx5fdgRZ4W3DAGpbVs6Z1iUZaTHJfZPQXQhei0OmdQTJ+jEMe7trNwB9toC6lLIhPc9zCQYdSrDe9up7PrmzWhTKNBZWbCvRelC9bm2P2lZVD7pxMmT8j+DSWVR86sMnfDTpY6qXeI= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:EYmwo1cF+zBR9FRAy4wUcKFDDqgJBOfYCbIJfxoW82vhJmGSOMPlqWIlros+a5FOBODe95OGhZ/CzvybqANOPD4ywfdn2BWydNa0sYJx9vdB/qX6JpytH/vKd8V9zh5HF+XLWAtjlbnCNjs3eNWpvKo0J8X3+i0+0tsm0feYo1wEUIYw65IL+XOY6I9Sx3ZFECrHX+y/+igDHW4qfCHeo0bXOq/oxq/a7G138XlRlho=; 20:yQz2b//dGwDrnnnAw4ADfMGTmNLVzKtF5IPI0lsSLOoROgJCEDhy0f5/fSr/pXdMSr7MOCcHXNxXyhg4+IO/vB1uLSYG/yq70PqGAuC0I+COij5wwszJK4aUNbs5NrX7JnpFiuCWEo6AblhDQReq2dsrP62KiLlN7SoANh4EljIc+HuC58FtCdS/Y5I69U7DiwDObwoQD/BxIy3/V/K+wZ7L29j3vJLUkkVwP99otu3IA/0a+ghYhmdxEFkuyTCNzHC/iUPcVkAi3IXsibcUQGv4PmLTO2NtZrsv8R7M/N1lMby37IrTFyxyTDSrNa6R0gse24gIx2LUFneNJrRFBDCpTp/MG7xG3qhCMncf2O2z0ZvM7XEINq4PoZlQBn4z0bvEN7YTWU7EP0UrUGd+sE8hYgtTb9zjtL8w5qPhoubfM+G6KX9EDAXxbXs/bVNd8p8YCAMHrlcfBSKMLkvsSrbmfp/pFoG4W65Rcs5FWV+g3P2PSBgXrqf3RMMp0TJP X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(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:LSCL4U9+oBPkhw4OYkCRFegKx2C3ASz3h95YqatnUF16RTb/vY2/m5Z6axnxPENx2mNtpEc9pB4+Td20EOZ5UDMedo/quxDqo+6ouyGVXbOR+YBNd90o0xizD7C46Ou5DzgcVlOv5lML6VW2Bdr0275Cqt1Rola407lRGXeMHRuK6zLDTb16oSjIOmBnAGbda/o3SWuOPZITfTOxeWkRp7pA/sKEVqi5FchetL2eyWcTfvWSf696z5uhSmxN+untTEN5F/7cmXxnYeDbzvr1D+iQwkDh8N06KxRfkyynyBMEaTh4Wy3/Cqj9fXuOLFLtVugAthWLUEiuRWJNyd6cmA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:q5q9QPLrd6/7MljXPs5wQFBbW0r3RpqfXe8dHxWqe?= Uke9/oC+lP/t6IA+vQxO8WJfT7kBgQDucRN60uipxWmH9oykVh0gaO2JT8/GJiMMLzwoNMDV7k9Up6zNBMLZ5/YsiB/bPfLhyYj0rDJ8rHoAO1sEvWF2ZyAFPkkc1cnyfX1q7ZnvewI3JM2UE3HcS0SdH+Swf1WCbyUj/ZYuXvCkq43Edk3k/M0CQBA+MoU/kG0JWIKPu5BjeLIMD3oryn3aiYz3uffDyGkVLbdk24PrPvup4BPSaMddZWrqqgkXDgkZLL27mwcV2ynf6AVSU8rUbXY3g8xJadcgsLjQBriAVvpkrreyl2J7USeaCvBHUYRsG/Wokl098nTeR35T8CwmdWVG8xhWSX2fVd+szbRCehw8pNBO7z1ocFJYfC2SCGcBaTaixZ6FMaORT/L6HgAnpP4oVqyHgxRAK9CIL58lduIfTXRTvNfUZ9mgdR/wlMd+YHOKguuABx2VZSsc1WEK2KFsK3hfcrVMAZ/6FQcr1wt8bBjc/uY4G8MJD7pdLK+6CTAm/kLwXsWIAZ9mcnKYv7lcBOECJVuQPMgEtRzDVO3ufSmx0hQw5d8Fmq3ne00WrdTRLRGLc4AMxocOVlbpqshvaMXVkMJwinTD/JSY7+Za1u5MilbgWLftjNB3OTFsU+zXuqeYPM7nPb+bqn62+z36gV3ZkLyYfkEMBASllmZz/yPLDDCM/k20GgG0tYxIfktowJnwVVc9BDx6epBcNk3jbX3SIpQch2uX6fZjNS3jVBzpoQp89ytyxoj9KnyyaogzdsoRsi+bbxnZdrQWVRo0JIJgSBY1GXujh35oI+JcxcOUlPldWTBmkqdbybIojCDPKaHuX0j3pN8YSA9VWcJbOkhfkO4dh6GeFdO2azKyhOMKqD3rfP+VZkiTXxGkaVlCNQPV/NdfRBSIY4a3OqG4eLaf1c98+kRzFlXePbGUBzx7WWwiseca1+zg/a/AGoD4Xw2wQ52ix8qzJgW+5JwMzMZO2D0/dtvRP/TZpmsjCFcSbNoPpKk0QZa1fc= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:pB127NabZTFHfubw03/Fv5JAYLs4Z2nKOsrRYDGspt0zJ29j9k+rjGFbyVMhElAhTiqi8KyvKdmDgRzG8lwn3I1epri32rJVTzyo7twJTPsu6OWbgRVyLOpC7Y5UYv4zRmUXjh2Uyp0lviusCVB1d66GKIZwq32k5ujjEnWSOigl8bnbAnoC4gaYQ6T9g8sFoNuI40QUda/9PAtpfMGzGOsZjZUIXYhVMN8tj0fCHLlVCD+ScIaMYwmulB6tBLezZScKihs7HhzjodCaezBLGo1bJ9qtBONgsYQPpf1spXF+r9p3uQu5PCVvWhS0PoqgPSCTcl36X58u+Wkep0z39g6CPS0xe1BMmFU2ImrDjaA=; 5:8p2lzO9193Xw3LfnzNackOSSQ2z0uQCdFNKCu45UHjSpq77MK67lK7Z73FtD+vYG67N7V/Za6et4YnLmNn0j6e9Dkj06ldllF6DlbGIJhLQeqMiD5KZathJm0ZrK6CZM1yl2HpvmYjpR097RiVXQmQf2ndLADwgqyWWCuoAz0BA=; 24:TEqewLRvBgPw2FivkaqnTKOnSqS1R8rh6kA1rO5m3DUQfo79NsvzDrFDWaHilQuT9CKrZZz18gVlMmqet9ZFKydjJvplt4Nyq4UZ7QB9sQ0=; 7:8SQ47B90FI9WwVnP+veWZbR2VhBxi/ZYokUvm9n5KHItkpNKK0O7MnOTn8SsvQpURVbhDC2CtYcx9HWuy4FLpsTPpMzKk66BbCLA4f0glBYxN26AEYLW+vS7ioVGdF8kLExvnl8bqY0yrEq+QR22eM6D9OUCSWXkYpYVC4tNmdpJLsJig93o6x2OixWN6bk8VQ2HovAL5oVQJjlzjVY4MR4mFsB0XP/RVSkMN2S50aRPKgJXOap2YZaeXLowAG80 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:15.3513 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38c86360-2f5f-4eda-317f-08d526fc9d55 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: SN1PR02MB1341 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.56 Subject: [Qemu-devel] [PATCH v4 13/45] 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 Wed Nov 8 22:57: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: 836054 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="dRhXk9wg"; 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 3yXMYt3WWLz9rvt for ; Thu, 9 Nov 2017 10:14:10 +1100 (AEDT) Received: from localhost ([::1]:34367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZXs-0001F0-DE for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:14:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLW-0007vf-L2 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLS-0003DI-P5 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:22 -0500 Received: from mail-sn1nam02on0068.outbound.protection.outlook.com ([104.47.36.68]:59191 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 1eCZLS-0003Cp-Gq for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:18 -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=dRhXk9wgtFxJUE8l97yU/BCYPY7202VOPc3NHYLqnSh8WjTqErHwofV1BSG9reVLBtjEP5xqKRmpVVXThsE1UofALr/g2HF3kKDDsfIzqHt28Kxnwr4h/TURpsJF2yBlAvIN2lSsaBXJFYAt44wNuVsez29xt/Z8HPEYssSp8+s= Received: from BN6PR02CA0048.namprd02.prod.outlook.com (10.173.146.162) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:15 +0000 Received: from CY1NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by BN6PR02CA0048.outlook.office365.com (2603:10b6:404:5f::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; Wed, 8 Nov 2017 23:01:15 +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 CY1NAM02FT060.mail.protection.outlook.com (10.152.74.252) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:15 +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 1eCZLO-0001Le-B5; Wed, 08 Nov 2017 15:01:14 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLO-0002ho-8C; Wed, 08 Nov 2017 15:01: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 vA8N180P009275; Wed, 8 Nov 2017 15:01:08 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLI-0002dX-HH; Wed, 08 Nov 2017 15:01:08 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:10 -0800 Message-ID: <720acbeb99526cf48d07f29594c1964e97c6387a.1510181732.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-23450.000 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)(2980300002)(438002)(199003)(189002)(76176999)(9786002)(118296001)(4326008)(23676003)(106002)(6666003)(5660300001)(63266004)(6916009)(2950100002)(54906003)(5820100001)(47776003)(39060400002)(189998001)(8936002)(2870700001)(2351001)(81156014)(81166006)(8676002)(50466002)(106466001)(77096006)(50226002)(2906002)(36756003)(316002)(478600001)(50986999)(36386004)(356003)(33646002)(305945005)(107986001); 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; CY1NAM02FT060; 1:V+/uL5a0oYxtKVzeWz38F8VECmPsOJDMYriej/gt2DB3sXEx272VcqgsOKWSkuAxQ0NQbzwAVnHL+wiDZbGgLrO6d3l3+zrKlmQTHSPw3MV5tRNU6bh9XN6ZOXpnGrZx X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 424f2021-5671-4ccd-869a-08d526fc9d30 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3380; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 3:GTmDqDmVslNRZ3R1Rl9aWF/hlZ8pXAqCCetv31gnn0P4UFUVkQNTPuG2Vduwp4ProIdmyzQTRtobzCuM4nFhlzn1BW1qYosKGZWIrLOMz2a/lEDcP2Dhq3E69tbfMEwjnC3IhV93uSWw50ohrHBQWoAnOyzdbJqwtokooZeQ6aUq88MRCHhLX68TU1gVbT2V0ih2O1TyNlZDDbQEv8NxW4K0RGTH8rUhmRNSejYTQxFcD0c5p8M5i9BD+rCHouB4bwD7vlvTV2GVyqkgiq1lQ9VsTInvDeGvnvI9kNnxCJ9FTuzQ9P/Tz4fmw+vIZWgCi7MB5vjPE4oFLVsHBhmEVQ45r+QZVex0yTdYgkqfUDg=; 25:sVwTuZFk3Hq+hBCojVnO3f6wrKlRb3I++g9I1n79JN7JTmLq0Lj0X+IEfiXqD+IvobrCY3MMf7X+AnqeMIJUEjPDqM5dYCBId6mDyacPhHnQvKrqMhIbu5XTzn0al08r+O476yxhEX1UTnerphFK/i2FFBRZLBWFJsK5oLMKlpAjyS4UgGyB3R1To0w0IrE44P/KI25Z4kYqg8tYHyPaG10I8or8TIRt4HKXYBmnRd2KUY9Z5MLkvmypkgTq1desC/28iZ5R+sjqf09MlhX9/Bxjry7Ud/rAMmIE8mT/UPVNnnwzCXDEbHNk3HMAoKnK50+d54Ntq38AiuAfEUNnbw== X-MS-TrafficTypeDiagnostic: BN6PR02MB3380: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 31:1rLp3X6/PgPOm93UsGkkgr+ECQlEuyBErfwtZVerNRnrsvpxuRw05f0GEDRcbYtqRduOL90eZAqAiBlI/gE3f2VL6rAiV9uPxd/vKjTRpsfgOnA24H+8Zav64QN14roY9GrdHCKThPzhr+Pt0e7Nocej5/61PmdYIZqlcCEb93Q2CmH5O+Z+bmG0pYVZXRJr3r7WgfplLa2XMJqXbeQpjkk9cAYGjsVTaCG6jr7r9YA=; 20:g/Ort+U58oat3wZDhWVRDSHfKj8+3UwmqNkdSz94/2UxdbHuayMQmzrmF2gxjxtTc6FjrSW9ZcHsor53NF+UnkFFHLr4OqZTmVAhfz/BmiTO+N5TnWz1MUANbwMKqFqn7fxMUH+81slwFOYqgFqqGnr0wzZyYepOq/hsxONJ6/MAy/niMs7lUgUsKiYXKoLC3WX9NrHx1KKDmWypWfiVvoXKjLr7j5q7KlgZWmH5Mowrl5RCU02rV7rO8YzuwQnAzoTmPhqc241G66HNjJVagUkWe4bPLQBHhPbfiD+SPs+ELTfio9FBKtz61gYCVjzEnlq8dnLpReS1IKW8SaUQeNPyf4P5NkiU0ZnVS9tKoI7qdve4PQ0AR7ID1ZHAUVtEWG9Zgof9zqdBxEapkNmTfqprynVfjgccoKWaXbaC+ZzzDiA6WGyD0y644PqshWBIYRnkD7aCmUFJnrq9GQsPBuK+ZDc0buM4wCX3pB1Cg/rxu7rWReBGf6ixqwHWdbIw X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3231021)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(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:3B2EoYLfMmXpOFhqlUetDVWb0RhVve7Ve6OZMS9tAD3ifJdt90EfsCOOZ4fqEkq/9VBcHS9KjF21Ji8ypEeW5lBScFaSJrGQt/is9TKQNbNhQjXHrmR83LxEZtZ0X13R/OjhbbLz3oUK+LBdHIfR13AyiEGXGgIgp4BR8hsiknwX1SzK3ZkQYv7ohvBGo05y93KLDUfRfPVMLgCnxpvA96hr65/Qaex1APbkOPxj9/bn0FuKyFwnU1dYcV7BvcAfJf/TEq92Sr4EYbRGVtASYwJwqDfaO3gFQ/txH99PA4Pn6K87bPF+gPF9ghP4gZf+iod9nGC6shu2JNNytI7rpQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3380; 23:Rus0aYGPJ24nXcrKE1/VhuO7YAyJCpaHy/W6GIGF2?= 8dE/gQaE3gS/UImTrXs/oNATZBVXz//BYX7c70gB80fniyKoTFN0sEFiTepCIc+3AOLfZG+TrQc+ODGJAeR26tXirimlON8sKebSZCTzVfkhX6nK9Ya/4xvipl/TsZQL1ma7PtkHkwXKK/fLxTIxW51NM0ZQJJ8MZ2jdOpSZ8EqsL0CEPgVx1lDX1WLAnQOXInYbOoGzwOd89wcDy+JQKTnMv22ZgqRi2HasODHz2oT6CrMMAy6NlaQ/HEAoNZJmZtkNxzxA6f4ldjHdSXN3jYwh6z03N95wX3rdJ4g/AuoGaWDCW/HPrOqxEQ/gRb/17RuNuqamgZBn0/vJpVd4MJQE+OWwGs6QdCSeGcepgn1323NG2q2UiMtpd1HaaYPxdpI7/lXc/Tk/pjlnet8Y1lxL1ZKqDLc9ogzJeznkNN2jUeWhmwerQIKeKtkaRl48yY1nXUvsr2oEYBapu3h3DWLsBmelACXEm53RPDil0g5rQROArIlJUguM2S7laBaZG+erctDUugY9Vgq/wIjvIhmhKi26A7ozV5dzK1YuwYwf+NvV1TsVLMqUg0pt7b0rR3Y48YF3XAJYDVGaN6Bh1avYJy5zjTGVI0kEYQTYnYmki5IKiUFZ99axBXAAx5Mr+2i4dWkZC8onmTCE0+3d19PnyLUY5G0tP8XSrM97XA3/IyQ4NWqWjVfZM3MCcvYNsT+yvaBx3raOMsDxE52o1xQC3b5XTE4LdNAIK55SihJ4qDPSoEGDb/iJBsh9JVnAz/ZOmJhWiQrvXquvnk3Xj3cxwbi7eXNiLpVp0YIVF0e5kxZ1vZ1vOjO24dUBVevbiloWG5d8g6vhKULLmZuEFYGNhibt977zs30mAyLLwBC57I9Ls9SJGUzE6IQxuFRM3Sj/UyMomJ3Lu5JseBud8oTvuLXlGTO9CFILAtTS6VLAZvIm+ZqoaZWqq72dP38OM16g/E4rJ9/yqjMYrYBkpLta1dceqpQpaYZ5C+aqg/lzg== X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 6:oWpXMCCDo9xshnvT+DFwAsSy1JSouN6PyrW1SkPXzOt03ygZzNA4Ieh7/Gh4mqU5LYmmqi8gPmH18jMSQXARdARtmjhPmgD7FInLdkCtZ8ykLZRzN5YBi9XFiEyAU9W2mYRrJ8EeXc+w8+2Cybnt+/5G2ugtXjOn5vpSKzJbIo6tawkW5LGcik9/B17qszaHDFBd3k+wmzOh/W4sN61i2RDk06duNTjHvji66YrFQIHOFQfz2X2JwcdLtwdCGwetN2kf2AeMdpgad2tplfjPCjJV0/GiodoOQ6HN/0z5k8/ByWR7o8rrxSbTyVBjgtbXXBaFfspZPnCRcL4vUfKNWhmfOf0cBnB+HFhiVlAReKw=; 5:R1Umw0ozg1Cb3V4FG6uOZaOKHnQB6b7weBfpvHYaI00X0XdyjBOQKZ4oBFRXy/xcVeJ0kf9q/7A4lIJ7GlODy1avTEC/YoyK64XzRsRz5/DgslS+ZXpm+sBBEVXJT+EjozFU6T9p31JrhoCoQVjPyIshClBTjg3lmxWrIjfBBVQ=; 24:VsBrvXrsO5G+1lqwngHxFodrZyXwe0NDEuLJUD/R/k9lUjF0Pn97slilSEkhm23kzBCfd+Pf+AaN/XV3/NUP2h7sZJufTFRKX0L7MNsotXc=; 7:7kgUKl/eAmrmuMHDJhAYUd289YapRp3iGZKzaCjVtjoiQ8ovOYgJnsKEfiTWj/5lxpwbMaSTHQJT6/CFoDNKi6HCJ/8/i/lFu/D9KLN6TPxrz+2Rq8/eLMVcyew/4gLI79IJZz8rhBrU5+3mgLz1H95HQtUGLFGnBHxk4sP8qbLBNAlCDqLNKEl4AhZQap2NLVs0vkKEYohl5FaQ2O0H8k4c+q9BcpOWZqhWPzSiw6aYBDaJq6xJQSnFqI55X83B SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:15.0641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 424f2021-5671-4ccd-869a-08d526fc9d30 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.36.68 Subject: [Qemu-devel] [PATCH v4 14/45] 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 Wed Nov 8 22:57:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836047 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="lyGlWpRI"; 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 3yXMVq6FpCz9rvt for ; Thu, 9 Nov 2017 10:11:31 +1100 (AEDT) Received: from localhost ([::1]:34355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZVJ-0007K5-TK for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:11:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLj-00086v-Ou for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLi-0003HD-M2 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:35 -0500 Received: from mail-bl2nam02on0085.outbound.protection.outlook.com ([104.47.38.85]:11008 helo=NAM02-BL2-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 1eCZLd-0003G7-Vh; Wed, 08 Nov 2017 18:01:30 -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=lyGlWpRIie5Q0yTclBgOmnLQOYdxCZqZIJUc1SKCSSA5MiakTz8p4/FVwo0WLcj7aJYLOZPJaZOicT56HitHuGX4G15UiVc9uNXKawDTuNbg3/e9vEG5EkGF7k50kEcf+3J3j7ta0EAoilA0ROzfFG//qQWXuthna8nGYePPUmA= Received: from SN4PR0201CA0048.namprd02.prod.outlook.com (10.162.76.34) by SN1PR02MB1342.namprd02.prod.outlook.com (10.162.0.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:27 +0000 Received: from SN1NAM02FT055.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) 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; Wed, 8 Nov 2017 23:01:27 +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 SN1NAM02FT055.mail.protection.outlook.com (10.152.72.174) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:26 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:34458 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLZ-0003xi-7J; Wed, 08 Nov 2017 15:01:25 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLZ-0002lU-3X; Wed, 08 Nov 2017 15:01:25 -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 vA8N1Fem009455; Wed, 8 Nov 2017 15:01:15 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLP-0002ia-Cn; Wed, 08 Nov 2017 15:01:15 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:16 -0800 Message-ID: <2076fce7bbee31c5d7ae4db1dcb10f79c879975d.1510181732.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-23450.000 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)(2950100002)(316002)(6916009)(50466002)(106002)(48376002)(36386004)(4326008)(50226002)(50986999)(5660300001)(575784001)(76176999)(36756003)(39060400002)(118296001)(47776003)(54906003)(106466001)(33646002)(9786002)(63266004)(16586007)(77096006)(5003940100001)(356003)(189998001)(305945005)(8676002)(2906002)(8936002)(478600001)(81156014)(81166006)(2351001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1342; 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; SN1NAM02FT055; 1:ThEQVMYZqG4yvVMXt5fGJm3vHKYg1BJ6ldl+WsA42iDD5x39MIBeuyn26/DVbOdfpHnRXlpLk3sJ77SqLsFKk85NY0vJ98fi/XBQUf5/blR5Fh8WtZDIFbV5lt7w3V0E MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b94cc669-aea2-4822-af25-08d526fca3ee X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1342; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 3:35S9mldaHHyH8OWzrXwvtJDQLTIZ+omz37r37nPtdQAxJTffTiI45I2zlo3+RTz9VbsIjdkTnGl/q4wNKbsJuccHzvRYJaCk/J71ocC2Aa1wzvTkxp2Juc9p8VmK/Ay7ry4a8ffOmsmt2Bmoxd7TCWzJEi5+FKay4BzWn7uJYpg83GIIQQfTbgGvQEpHPNae9gWK43YA8KQvArmuWeOH2yMVeX7lKwqarRXMwu701veiYVBM6niQLJt+K+LiARpQ+H+LuQ1/lO365o02+QyPRkzf+RlH1gyVhcIEcB3dKNa14tfBTQwekMcXozPNR3qikZbH9NhW8MZA0iqzgvsFEyOEoH9KUncqD1zijszVRo4=; 25:pmKLvUSqq5ZZd2dB+NQhI3FiCPUzOcUKMkPli26c6ngCMx06l8OouTXdDIpnJdyX1vE4v/xpz+JKexAVh9BoEe6QbpMHhT9H0oU/fZ5+B1ZVrPcuupW/I3rRVVYGvckHpNXpRT4cC6qPc32p5EObguhp44sP3K4mk+qiJJwxEGkKDgUMYzrr0a1i2WonxqffgflqrRHRQ0QxfvYJWT41T3CtWejUAERatsTcGIRxazjopeIkPNe6nGmhHd7TXWofGehydcD/3ML2Ciaiz8U5uNNMlDwdpFCmeNafg23Xn1P3i/xfefey9qdronZ2Oux1EY5kUHqOCvNaXWXVT8Wu6EGrnP31gh+K61AX9cRD4Q4= X-MS-TrafficTypeDiagnostic: SN1PR02MB1342: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 31:mnyODe/LJ5nRaGD0h891Uh/4MUbtgWrfv9Qgw+YvWNiVhIi22pF+4Xi714JT3aCuYOKqpkLmkR80wRPE+HWl4joEQhpcOJeBgZ3yI4FkdhFNpt0GVav8wJA6SXwh2+P5JILQIxiP/mJYhYz670XCMosLxzrQ8sTqewjt596gQrL2cmF/mQow0T0dGO1Zn4XEAtM/2uzboiTIreN4lzfu4BH7N1P6c35AsmWmYgBT8Ec=; 20:+yCw8ZbDeNldAtqLlUW49aqPKAj0bDdGB+VCO0N5bG4Y6SxQsABdqX7w64OM9hhSXu1LjU991159yh5E4VLkymlSztTNpeRiYlD9V4ii3G012p3NEBMuHFEkorNiZakyVKC/mFqHoPYbL+yeB8nyZpaktAUTOYd8v+ktevO0EyZA67fY+N0+wLi0CtD4Qi+noZpUg3S+gX+/y5HgsfNKDRfULqOp2C4JZ/0FS6xa8nig8cVADVHfg/whQEaqkjlOWLIZ7xzKUZi16h9ekHSjZNEdtKysBPZohA8z4My+ehnCNSbaEKsCYLfr1wwoBoIwH/48h/Nm302jROpJnwJdNMHcxmQi0UXqmmafxjiqgxkVP5/JK7UJVuLD/Fi/ZLnL2ESjvCjQENfE0+Unvh5IVWQLZvjayD/CPTNqXrHco8Vi4S2KdQiHUIxMQuCZH5bRf+wN+FZh6GZcyKG5UfQS+xnpftIjlECNa7TsyTkdRKQmpMDk7tyBHH9AI9pJaplH X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(100000703101)(100105400095)(3231021)(3002001)(10201501046)(6055026)(6041248)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1342; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1342; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 4:7+ucxqYZrPwXQwLKj6lkfvPLmssfQFgQ8aUKUVLxwbVTy0UKxd8LiYdrEafe4WKuGMhxAaXG3tW6ZP5dL/rlXRMnDDGomXMAHXzzN8fkYlO+vJANVfJb6BQSqyR82Wypq61rvLhD7Gbe5yTg2i0TYJPNO3rEXEWCUC6IYCcVlAiXJ5lImSGfgViS8f4AMdoX9JYz7K9UtHzKx1wzJdqcGtLbFEaRTdcjNsJWJhkrQs6grm5vs4iqSm3kRkU//0l1kqCcVtRwMoO81xCpG9BcwAWVXTd+43Zfpy8tTbSU0egRXZld45ixXhTY76c5WLeBYG22ySjwfsR2RMiw/A1j0g== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1342; 23:ZeagmnbjGAtc0WtEXfOGHrUuxcjF/dNU2C0kq9dkx?= lcUqjGlV1Acp+mKZH5Y3Zh07jVbgb+CZLFZS1+ze/BbS/zP+zqG2RaTdIku9msBMi0ioxEhbiG2TocCmcBesAPxSAckGoi9tsxItq2VsJhUXaSf9x5i4++ouMOnuPArTLbLsV97vBBxoJG7YK9lcYSIyCl6aXd569QS/aH56mr97Cp0zc4rrWh1VNqPvZgpuFp3mpOrvCZZhvLhmQBB0G/yyLyojS8cN0LoQHL4hlhtxEyS+rAsN3c5kukq9wlID2DGtnm5ZKFb9mmpER/fQa4sX+hyWmGkwRS8ytjyzQ/uGUmkzSgwRZVGoZMNdChtbRf3mCng823qi2n/6v33uxn9fl23ca77pMk1z3YUb++bmBYI0Qvt1TEeysuWUXXnGJVbQkzuivvlVyc0Mh/JSckOqQ69dhP+805sQ6Ni4dkPOSStl9LrnqHZyWIEZ7vYznWS+9IOHYnIxyTwjuf8Qj4hVxsN5kWq7KBG1pG7sQ8yNRJ2WAn+e3xVUwO2iRVksxseMq6/kDcFaNtuXhAjZWCw+Bq93eVlvkBOwrLEr4P4HvmckMbR9yWTaZXmBpO7vMOL4xI6MC9CxQku0x/JKhn1KXNpApeUesvs2lyI8++mNoEqA9Mf9mE33VjD9IcPOzVf2gNI4g9p0sdSH8eH67WChKgtih2cMqnWg+hZ6Y9OUMdUFkMoT9EU4MiKPUCol+11q355ax/6P+qEyx8wYW3cET/zi5SXg1VkhJnSyTqBVOj1bkahf1UnISkoVfwGVfa5oL+4hynTfzlSap+KkfB6FEjlYA67YikJkN+OIHcn6qqAlqSTB+2T8FZBGIb5afNo1mWrOKCLbOq9jw9fwiGQOJ2+0F/V0esM8I7eBRx/3w/oHt2NwrE8Qe3E5+3ClfBTcbHkaJKw2DTx9xzfAyoiPjHgckfHBKmTpfrJnZQbr4hXGDhmvZyX9jaBLrVDv4ZfeePM1uODGtIQKp574at9qAwfcs5fHnBIdQIgW3jy75Iqv/NPQRslqs6rTOOzA8VYRmUZEEarCC1EWf/kvGg5XuZQKaeDFfFQt/ytTiT4LQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 6:euXwc+eIUyHxHJc6qGFlIq1p9s735VaGH5BF+aL8QUTnj2qNkRWEQT5O9CSnuamOYCMn/jmjCI/DoXDKwmaD1MM1NQQTGS+183lITo1QJT8mSPVka0I0Y6b5miY5cjF21Zo4Nad/Yd5q/aQsoXKsj+2x+rfTJaYHXc8YPHEYEorHbCX28ADvnApAnUBMORAHk3D+g3V96rcEzz0KMpulNtMeIAAXb40Nfc2V+xpetp35P+OmDcs/Dvkaj7IFZ5qgaRZxooDMwrQd4Rh/WLi3Q/NcGCDibArUo3QxOXzx+mc3Rt/xyZA4VDhJC1S2K2DtiJMdGKfY9cJlDQbsI5MAmHu6nspfCut7bVHDHSciqj4=; 5:jYQQWhWFn5OnkUVzQhz67Hfopz6bWjxShwbXlCnowU4i1UoNOLRa/VJYds3+B6pzoGa+SgyxB1M6m3pgXr7ankvs8c2ZmCAod/xHNwjxXl4c2JPhYoVnt9F+nWQNlKU0aBk3qDz8AzcrbQge162Z/ZKR5UGCo5QGA3B4Rg69agI=; 24:hvhUhpeGV/gAGX+izHvPLRIvqLy8nu66bbfacrz5T+1iFf9arF8IKZKppE9oYUbXyXdjSU1dWjMq0KkncbcQg36UhHfHY9kjuMQ7fA0Uo3Q=; 7:ErhzN8jJ4beK+2blBJc8cyqGZH3nvaMrtuVmdet90MT8ZxMiVSLEPjzsBAZssQrKUyXORuJcks2gO32//XUzwtthG6juMLjPCQvR9rEP0tqDYERNS8UnKggCtkGuAboODFlYI1BJzFLSQNIvIK0+TXgeMR7pujtdCpWArsCeEbKD5g45zPMR2Ta9TH8PGB+dmR897nMpt4DGs8kASvwyaOuqPWF8ft016O42YD4pjjCcOUnNkEuBfYYGnlp003DE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:26.4079 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b94cc669-aea2-4822-af25-08d526fca3ee 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: SN1PR02MB1342 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.85 Subject: [Qemu-devel] [PATCH v4 16/45] 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 Wed Nov 8 22:57:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836058 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="FLTBbKJ7"; 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 3yXMcz1SZ7z9s3w for ; Thu, 9 Nov 2017 10:16:51 +1100 (AEDT) Received: from localhost ([::1]:34382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZaS-0003X4-Cv for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:16:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLm-00089h-Me for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLj-0003Hd-HO for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:38 -0500 Received: from mail-sn1nam02on0061.outbound.protection.outlook.com ([104.47.36.61]:61327 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 1eCZLj-0003H9-7B for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01: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=AKG68PZssRB8hQxzxwk2sZFvK+P5C2nw7J5cSvfycbM=; b=FLTBbKJ7fOqlOoayQbbYAQGn4hLE05oMJDrDR+30wU5SWBs0edyFMCooHqfBSSRJHs5bVBFGGILkwu33/qxIQUhBrw3gYmX26vU6dO6p7L9QiOpCSjZcqMXfRU8VVj4UKNhEjNW4V74bej3PuOy4/SkvhC5cJku/bywKHHxhHU8= Received: from BLUPR0201CA0024.namprd02.prod.outlook.com (10.163.116.34) by DM5PR02MB3386.namprd02.prod.outlook.com (10.164.152.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:27 +0000 Received: from CY1NAM02FT052.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by BLUPR0201CA0024.outlook.office365.com (2a01:111:e400:52e7::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; Wed, 8 Nov 2017 23:01:26 +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 CY1NAM02FT052.mail.protection.outlook.com (10.152.74.123) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:25 +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 1eCZLZ-0001Lk-5i; Wed, 08 Nov 2017 15:01:25 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLZ-0002lU-1s; Wed, 08 Nov 2017 15:01:25 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N1Ioa009497; Wed, 8 Nov 2017 15:01:18 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLS-0002jT-KE; Wed, 08 Nov 2017 15:01:18 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:20 -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-23450.000 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)(199003)(189002)(106466001)(16586007)(77096006)(47776003)(478600001)(54906003)(6916009)(2950100002)(575784001)(39060400002)(4326008)(2351001)(33646002)(50466002)(356003)(48376002)(106002)(36756003)(6666003)(316002)(5003940100001)(50226002)(76176999)(63266004)(50986999)(8936002)(305945005)(9786002)(8676002)(2906002)(36386004)(81166006)(81156014)(5660300001)(118296001)(189998001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3386; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT052; 1:OcQkmoujyzDYwIwPSQGd1aFEUbTGnasVZ4zqsoRSo8X6v3zBnsTmE+RVwAELhOY9GNkTs9JDAymzr/vcINuFu1drKWoIXRXf5E96VKAqdqXT31o5+c4okvyHDv42W7p9 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89b0d87a-5b6a-4cdb-c12f-08d526fca3af X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 3:3EzRoQzOtNCHvoLyvwt26huw5jN0Vi0/klt/iJHcCkXW4UqygWP+fbv/NRW87VUhcRS1EtzXBbjGkjaJnShhK942rtPopjyQnF4oyFlm/LJhqxQKhhm/N+biYZcFsob0T4L+LPuFqp6doPnHYj+7nqR4n5Hpb6N+5Hj2xCHeDBgZpk9/lC63R686oQqJAINUoYivjACJ/UN70LKrevYKwn5B/c559fa8DYJhw7Sv78V7zmWdfGz/UEha9zNkaA90iNEPYFa7VyBraA08UuRpykVqiT7GA7e2ST979kLXOTB+uFPea+iJq6O/LuZGq4rkhPq4pNM5VvagTMQJ07cxQAVcwSHNP17FZfGJ72dERmI=; 25:BbSIg/bV9gDKFYKhKni1J5dJibWkTPge0lPEinyH67hhRlUJJsE4fGlFtl4y6u4CtAKORUfDPPMa5LAQ/ltH7t2ApArLiCt1NqZ/ieTM5PeYWUqDAJvIFnrdWW1LpWlTctfg9cmPHjsxRWvKZoxHeg8nfLY4jj0hU+0CN3BjRuH1ZLmO10jqAMnWAKr3UhH5yoMgMCDeXWHyyMYmimw8+djbECs06PXlXGUSgEMcDjk1VzWcIBSIlKaG+Dvf47mlGSxS/vuYRG6nHuOTZnwZcGRVR5pl9EEb5dgINWUtP/8WyWvIaRCpJ7W5WjnMqTvCNgEQaH8mwnHo4kZFQ9Ibdw== X-MS-TrafficTypeDiagnostic: DM5PR02MB3386: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 31:4zUJuojhbh6v/i3av8UkrR1vnVG2OQ81wb2z6/Vv2zc15aZequf6cqyshMTzXT4t2B0iB2b837i8C9Al/SNX9J+JbsuqsXRP/STZ2nYxJ3mXFhxhi0A9eMkxddTypRk+egPA8ObF3KlpR6Cta93UM6osnOPybGmirA+nqUoIv4LD609p3zyhkKGxm4ca0fapBGOaN86zLdD6dKjh3sGQY+NiS0nHMANlDqPSDhe2gPM=; 20:WyhQVpnGLcsk3c2hZZXMenfOGvhyLZ19bMJZ5+Z0zWGvw1zBGqSyBE8KzACnUn63qEbZEnG65i4g4727if2xJo7iL8QPppTckX3tVDU7Zmiftc9h99tmCTgqnIUdf/LNG2X0d2yAcr8GXedR26r7ES3yPhVGUQtDWw/xZlvk6rzudfuG+cwQzRTdoZh4brWxRESR4csols0Vvow0RKf2kKAGq9Xi/O9ueAKNbiGyFlvZeOZjIW9avUxZxQm7A5VbxLTR8n/m7z0KBtih1nobsoj8sHx0hHurK6GBPu73/JwDIxsR4o63IVzt0NtyfWugxefk+gLDJWRwsCbgZ+S7Y12NB9wKLDFZOHNhauLTmJ1W0ac5a35xOQNruteopuFdx5EGu6x5QtXQn65Resc76UMGFsS4IHUyf3M8WLLUP/lJtb783lHv7uFJ0+ZN5fTk9hR1IRPCIslYylMrk6CnMycar7EqydNNcj5P21gTxf0P/usnwNSTQOksqPNpFqXG X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93004095)(10201501046)(3231021)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3386; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 4:CvkjAzku2n88jZ3S3aclQTcCv0geYUqVvoJQUc8qKSR6u0oRoa/rGvVztNxFP44b7gSbkz3HS2m5NRxC4buB9Opaod2/C3uq3abvPBbuN8BeQuHWdtzf9wsKceuevT3gF7uG/8ArYl3lhgP6Cji8Xt9lKPDLlpBaEwrx2OLm/MVr8UVbxR2j6YNRsEcdRbDGbF+Ie16ChEdRBdk+KjAmk9M4Fp6kJ9tEO3hEsbmNFr+g3M9b9foZrUzBYRxEU0tpJgKu1GbdfOWh/qcrcKvsBr7KT1Zjgt7PxumZTi919uD3kZfiJjU6HMrhWYzZulfi8e9yTl4E1kGpadL/f9wBwQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3386; 23:vm2x4LwsHEmsvGqpvK8BZ8NVkZNdsPNE+6mm3tVvK?= r0FsykhiIWT/pPWilqSvpbd0tnPJyw7XW7YWuTxS3ZqDAia2RzaSLJPnJhGbwO3FQLvitn6C5KWLFWgeVzqlEVm+zzE492mbrtAilhnyRst2izap19kA+BXJipqwqPFpoYiPaqhTgKjUW10mUWOFXpuS4ZSfxVM5H3IuWOkJe2wGDCg3ppa568Y90CLtZKlcT5ATY/A+TVyNDuYZwnY0TRogFR+2hCBnfg7jfF/04VKYbKVkLecegpQUXVDxU/IgTesGaRXWQEGhrtxdP8sB6Aawu2NfgsvpV6ITL57GphCO3EYJQGaIpH0l8hxcu2zAkd7ti+QHPTzqt6ids5F8Fxena3N6kkyPyUUr+bpRt/FYVvuj+0uoAqQPEidYNiz35CMFoL1OWD3Qo4xDeh2hT3Pn7anVAbpd190SA7j7/rcC2baX6MQZ8Epi5Xf2EzAuyb4spUH3yPIhVpUCXkcMEDbJP0eq24RSPXrSbKfM+mIE0SlpAiGvYyEYIW3mzHCwBWzdhdsNHcq/3nj3sMg/wCTZ+ZrCWgi0xOMowMlon8jKj/IMT5JiojLuswbj68Km5ixYL0Dq+m8uJzYdx2r+I1YMV5ygnYILXSFpFfC+IZWS1jmIZVbpNza6KbnmHyPYmTRb9qL5cXaFupELwVBiE33E5fFjcoIQ0W6fI+odTNLHIPTVBdBuo9HwsHo70K3dvxVzCyltIJlLEZ5bQeOnXckYtUGOm3EzZf4JDK7zIvmzdc3Ck16fVCz75sc5VkIRlGT5su/Fr2Q85jlecYnZPFOJmjlzkRjJQs4MeZrYrQPM2TSpzoWDunOvLkVQ9mC0HkNog/9vlqj7pxjTyTSH0aWeyjJJvq2cIa3dNIVmSiZ84bKdfinGmuiN8Z69qXSbUimFhFLUDwPP4TGTGoNjtgbu+7s+0t5LpjQdTRCSZ9D6+L3LP9GkRjOZsI7Mixj/XBV5HqLKBJGkLldDTQ/k9MCke4Bd2CPG9YlN2j0be+Z5xmKA90qgRJzR3Os3KWCNW8j3IxfUclJx62vTvaba6N0 X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 6:RjdW8e2hFvza5/U95RmqH+FIo/jQElCAFKbFDDh2qmVT0aFsoS14tBWq0VAB2p397D/X0plJVZfZ8vM/kaadNjiL8YajKB4uZOZQcqUfVAVhR+mVX/SJWypZP5I43qzG6IPZTjv0gCt56w6pg0pB1GDtFIZE1YbgeVFFRRUpd73fPzUe1v/gF88qGQehsCrV6guiVzqmm2FMr8Ggjbnqf//JubIOygufvfbTrkpgCkfG4BusuMS4G/YumEJyINPtJAvwr5h90BUGPvP2FZFwE7V0VhHsiFGqL7T6FSmFq5qWcuJF1lpV63Z91zH6ElXDq31mvy/g7LbGFTNYRTPFt0B2qgFB/3v98bGAq68rCho=; 5:nIIvp9/NwQb4ZMp3Ihd2iDI1uTj1FpaW9hmtRZt0TSIFYyzRby9E9BKGUFuGhk9tNLk/Jr9hWMZTT2img76ijqEJ3oshy0YhuhwWkxdN0vaFuUq8857j0VKaR+SZDx3KdZdR9iywxsvRwpuBH/h5jkJiRPrY2hevxCiGINIosoA=; 24:Qsx5mn35kupZZC3Aknz2+/m8GlIHFoosQZ1ykij0x+77GNI2yW9F2bknip1iJfO7y2iBGv8RiOsiBWZRv9KyHN2u/+88WLYGuhfcJMmUBCU=; 7:jY7gFBrYAQ83E1VEi+SmEN7scJ9DUfCCxreuH3vQzerpTM6MTn3Zb8lwmHzaJIXH2CHLKIP3xH6oCEII7WP+vlFQ8roa/LK2QP+L000VVlE1Hxo0o3Olwn/rpRTp9IGoA7zWDQ9ZHPXBd7jfTfg6EXCUeLmFa+is2DBIEgAcfheH7CVhwy7Xu9HSTZ1GjnWDw0cJ6mFPm3uEYE6BTxQ70ygqxQA/kfOWcHqZcrjyKwYuyynTIjeA9TWrzRaibMmD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:25.7924 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89b0d87a-5b6a-4cdb-c12f-08d526fca3af 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: DM5PR02MB3386 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.61 Subject: [Qemu-devel] [PATCH v4 17/45] hw/input: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, "Michael S. Tsirkin" , Gerd Hoffmann , 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 S. Tsirkin" Cc: Gerd Hoffmann --- V2: - Split hw patch into individual directories hw/input/lm832x.c | 6 ++-- hw/input/pckbd.c | 3 +- hw/input/pxa2xx_keypad.c | 2 +- hw/input/tsc2005.c | 17 +++++------ hw/input/tsc210x.c | 72 ++++++++++++++++++++++----------------------- hw/input/virtio-input-hid.c | 14 ++++----- hw/input/virtio-input.c | 5 ++-- 7 files changed, 60 insertions(+), 59 deletions(-) diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index d39953126b..caeeda47f2 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", __func__, reg); + error_report("%s: unknown command %02x", __func__, reg); return 0x00; } @@ -330,7 +330,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value) s->reg = LM832x_GENERAL_ERROR; if ((value & 3) && (value & 3) != 3) { lm_kbd_error(s, ERR_BADPAR); - fprintf(stderr, "%s: invalid clock setting in RCPWM\n", + error_report("%s: invalid clock setting in RCPWM", __func__); } /* TODO: Validate that the command is only issued once */ @@ -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", __func__, reg); + error_report("%s: unknown command %02x", __func__, reg); break; } } diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index c479f827b6..6fb5c4dbaa 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/i386/pc.h" @@ -307,7 +308,7 @@ static void kbd_write_command(void *opaque, hwaddr addr, /* ignore that */ break; default: - fprintf(stderr, "qemu: unsupported keyboard cmd=0x%02x\n", (int)val); + error_report("unsupported keyboard cmd=0x%02x", (int)val); break; } } diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c index 93db9ed25b..0a594c30fc 100644 --- a/hw/input/pxa2xx_keypad.c +++ b/hw/input/pxa2xx_keypad.c @@ -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", __func__); + error_report("%s - No PXA keypad map defined", __func__); exit(-1); } diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index 7990954b6c..f5057e8eeb 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -200,17 +200,17 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) s->host_mode = (data >> 15) != 0; if (s->enabled != !(data & 0x4000)) { s->enabled = !(data & 0x4000); - fprintf(stderr, "%s: touchscreen sense %sabled\n", - __func__, s->enabled ? "en" : "dis"); + error_report("%s: touchscreen sense %sabled", + __func__, s->enabled ? "en" : "dis"); if (s->busy && !s->enabled) timer_del(s->timer); s->busy = s->busy && s->enabled; } s->nextprecision = (data >> 13) & 1; s->timing[0] = data & 0x1fff; - if ((s->timing[0] >> 11) == 3) - fprintf(stderr, "%s: illegal conversion clock setting\n", - __func__); + if ((s->timing[0] >> 11) == 3) { + error_report("%s: illegal conversion clock setting", __func__); + } break; case 0xd: /* CFR1 */ s->timing[1] = data & 0xf07; @@ -221,8 +221,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) break; default: - fprintf(stderr, "%s: write into read-only register %x\n", - __func__, reg); + error_report("%s: write into read-only register %x", __func__, reg); } } @@ -337,8 +336,8 @@ static uint8_t tsc2005_txrx_word(void *opaque, uint8_t value) s->nextprecision = (value >> 2) & 1; if (s->enabled != !(value & 1)) { s->enabled = !(value & 1); - fprintf(stderr, "%s: touchscreen sense %sabled\n", - __func__, s->enabled ? "en" : "dis"); + error_report("%s: touchscreen sense %sabled", + __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 1cad57f644..65c7569723 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -396,8 +396,8 @@ static uint16_t tsc2102_data_register_read(TSC210xState *s, int reg) default: #ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_data_register_read: " - "no such register: 0x%02x\n", reg); + error_report("tsc2102_data_register_read: " + "no such register: 0x%02x", reg); #endif return 0xffff; } @@ -447,8 +447,8 @@ static uint16_t tsc2102_control_register_read( default: bad_reg: #ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_control_register_read: " - "no such register: 0x%02x\n", reg); + error_report("tsc2102_control_register_read: " + "no such register: 0x%02x", reg); #endif return 0xffff; } @@ -528,8 +528,8 @@ static uint16_t tsc2102_audio_register_read(TSC210xState *s, int reg) default: #ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_audio_register_read: " - "no such register: 0x%02x\n", reg); + error_report("tsc2102_audio_register_read: " + "no such register: 0x%02x", reg); #endif return 0xffff; } @@ -553,8 +553,8 @@ static void tsc2102_data_register_write( default: #ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_data_register_write: " - "no such register: 0x%02x\n", reg); + error_report("tsc2102_data_register_write: " + "no such register: 0x%02x", reg); #endif } } @@ -606,8 +606,8 @@ static void tsc2102_control_register_write( tsc210x_reset(s); #ifdef TSC_VERBOSE } else { - fprintf(stderr, "tsc2102_control_register_write: " - "wrong value written into RESET\n"); + error_report("tsc2102_control_register_write: " + "wrong value written into RESET"); #endif } return; @@ -616,8 +616,8 @@ static void tsc2102_control_register_write( s->timing = value & 0x3f; #ifdef TSC_VERBOSE if (value & ~0x3f) - fprintf(stderr, "tsc2102_control_register_write: " - "wrong value written into CONFIG\n"); + error_report("tsc2102_control_register_write: " + "wrong value written into CONFIG"); #endif return; @@ -637,8 +637,8 @@ static void tsc2102_control_register_write( default: bad_reg: #ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_control_register_write: " - "no such register: 0x%02x\n", reg); + error_report("tsc2102_control_register_write: " + "no such register: 0x%02x", reg); #endif } } @@ -651,8 +651,8 @@ static void tsc2102_audio_register_write( s->audio_ctrl1 = value & 0x0f3f; #ifdef TSC_VERBOSE if ((value & ~0x0f3f) || ((value & 7) != ((value >> 3) & 7))) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into Audio 1\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into Audio 1"); #endif tsc2102_audio_rate_update(s); tsc2102_audio_output_update(s); @@ -661,8 +661,8 @@ static void tsc2102_audio_register_write( case 0x01: #ifdef TSC_VERBOSE if (value != 0xff00) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into reg 0x01\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into reg 0x01"); #endif return; @@ -674,8 +674,8 @@ static void tsc2102_audio_register_write( case 0x03: #ifdef TSC_VERBOSE if (value != 0x8b00) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into reg 0x03\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into reg 0x03"); #endif return; @@ -683,8 +683,8 @@ static void tsc2102_audio_register_write( s->audio_ctrl2 = value & 0xf7f2; #ifdef TSC_VERBOSE if (value & ~0xf7fd) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into Audio 2\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into Audio 2"); #endif return; @@ -695,8 +695,8 @@ static void tsc2102_audio_register_write( s->dac_power = value & 0x9543; #ifdef TSC_VERBOSE if ((value & ~0x9543) != 0x2aa0) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into Power\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into Power"); #endif tsc2102_audio_rate_update(s); tsc2102_audio_output_update(s); @@ -707,8 +707,8 @@ static void tsc2102_audio_register_write( s->audio_ctrl3 |= value & 0xf800; #ifdef TSC_VERBOSE if (value & ~0xf8c7) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into Audio 3\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into Audio 3"); #endif tsc2102_audio_output_update(s); return; @@ -740,8 +740,8 @@ static void tsc2102_audio_register_write( s->pll[0] = value & 0xfffc; #ifdef TSC_VERBOSE if (value & ~0xfffc) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into PLL 1\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into PLL 1"); #endif return; @@ -749,8 +749,8 @@ static void tsc2102_audio_register_write( s->pll[1] = value & 0xfffc; #ifdef TSC_VERBOSE if (value & ~0xfffc) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into PLL 2\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into PLL 2"); #endif return; @@ -758,15 +758,15 @@ static void tsc2102_audio_register_write( s->softstep = !(value & 0x4000); #ifdef TSC_VERBOSE if (value & ~0x4000) - fprintf(stderr, "tsc2102_audio_register_write: " - "wrong value written into Audio 4\n"); + error_report("tsc2102_audio_register_write: " + "wrong value written into Audio 4"); #endif return; default: #ifdef TSC_VERBOSE - fprintf(stderr, "tsc2102_audio_register_write: " - "no such register: 0x%02x\n", reg); + error_report("tsc2102_audio_register_write: " + "no such register: 0x%02x", reg); #endif } } @@ -847,7 +847,7 @@ static uint16_t tsc210x_read(TSC210xState *s) uint16_t ret = 0x0000; if (!s->command) - fprintf(stderr, "tsc210x_read: SPI underrun!\n"); + error_report("tsc210x_read: SPI underrun!"); switch (s->page) { case TSC_DATA_REGISTERS_PAGE: @@ -886,7 +886,7 @@ static void tsc210x_write(TSC210xState *s, uint16_t value) s->state = true; } else { if (s->command) - fprintf(stderr, "tsc210x_write: SPI overrun!\n"); + error_report("tsc210x_write: SPI overrun!"); else switch (s->page) { case TSC_DATA_REGISTERS_PAGE: diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index e78faec0b1..172ec2972b 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -209,8 +209,8 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src, virtio_input_send(vinput, &event); } else { if (key->down) { - fprintf(stderr, "%s: unmapped key: %d [%s]\n", __func__, - qcode, QKeyCode_str(qcode)); + error_report("%s: unmapped key: %d [%s]", __func__, + qcode, QKeyCode_str(qcode)); } } break; @@ -230,9 +230,9 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src, virtio_input_send(vinput, &event); } else { if (btn->down) { - fprintf(stderr, "%s: unmapped button: %d [%s]\n", __func__, - btn->button, - InputButton_str(btn->button)); + error_report("%s: unmapped button: %d [%s]", __func__, + btn->button, + InputButton_str(btn->button)); } } break; @@ -318,8 +318,8 @@ static void virtio_input_hid_handle_status(VirtIOInput *vinput, kbd_put_ledstate(vhid->ledstate); break; default: - fprintf(stderr, "%s: unknown type %d\n", __func__, - le16_to_cpu(event->type)); + error_report("%s: unknown type %d", __func__, + le16_to_cpu(event->type)); break; } } diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index 0e42f0d02c..fb5fa0a280 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -5,6 +5,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/iov.h" #include "trace.h" @@ -121,8 +122,8 @@ void virtio_input_add_config(VirtIOInput *vinput, if (virtio_input_find_config(vinput, config->select, config->subsel)) { /* should not happen */ - fprintf(stderr, "%s: duplicate config: %d/%d\n", - __func__, config->select, config->subsel); + error_report("%s: duplicate config: %d/%d", + __func__, config->select, config->subsel); abort(); } From patchwork Wed Nov 8 22:57:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836055 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="hS+g5Rlg"; 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 3yXMYw0c5Nz9rvt for ; Thu, 9 Nov 2017 10:14:12 +1100 (AEDT) Received: from localhost ([::1]:34369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZXu-0001GE-0l for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:14:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLt-0008J1-10 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLp-0003KN-SH for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:45 -0500 Received: from mail-sn1nam02on0089.outbound.protection.outlook.com ([104.47.36.89]:53134 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 1eCZLp-0003K3-Jv for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:41 -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=AlTbxhbOQwjP4KUALWny0YEBnx2kIFdgJgnL77AsRGY=; b=hS+g5RlgAvaDyaXOEBiFrda5I8f806al2CPkystbxkSWqlkYnmhxkrfMt3RVql2xucbf4Bmsyv1btsA042HAGObnlcqsq0UoJcy2EBGMvfAzmiCXY2FkUYhWUIDZbP86F7hCVHZl/Q7N7bJ0nWDV3TOr1gMCTLImOs5PbIWrhx4= Received: from CY4PR02CA0001.namprd02.prod.outlook.com (10.169.188.11) by DM5PR02MB3385.namprd02.prod.outlook.com (10.164.152.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:38 +0000 Received: from BL2NAM02FT042.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by CY4PR02CA0001.outlook.office365.com (2603:10b6:903:18::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:01:37 +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 BL2NAM02FT042.mail.protection.outlook.com (10.152.76.193) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:36 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:34895 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLk-0003xu-45; Wed, 08 Nov 2017 15:01:36 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLj-0002py-Qe; Wed, 08 Nov 2017 15:01:35 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N1NCr009531; Wed, 8 Nov 2017 15:01:23 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLV-0002k7-LX; Wed, 08 Nov 2017 15:01:23 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:23 -0800 Message-ID: <301f422d963bc19b9ee5f6ebbe6bc3450b18664b.1510181732.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-23450.000 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)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(6916009)(4326008)(478600001)(16586007)(63266004)(54906003)(106002)(47776003)(316002)(50466002)(48376002)(5003940100001)(2906002)(8676002)(2351001)(106466001)(189998001)(118296001)(9786002)(36386004)(50226002)(33646002)(2950100002)(5660300001)(36756003)(81166006)(8936002)(76176999)(81156014)(305945005)(50986999)(77096006)(39060400002)(356003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3385; 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; BL2NAM02FT042; 1:LqNVG4unjZFUY28vdjSqMr1vgVmOXPFg0GuHITOrTq1sypTKYaOQgQZYNd/+7mBoOLv35p5bvp1f4tj+/h3A6Cg8XSxEpoP03ggvQaVy5KVxi7JcX0OTxxPqLONQ2Yjd MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e261884a-1378-4231-81a9-08d526fcaa28 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 3:KndTDnP0fBNJ0uQX2Xb/B6kFlszPHNPxMhxAj/8nCa4UjFOKnpdt5jzWbVMsKS8sKB4KukDsRq8WoiX2GmyoubLA1mBIcmpH4hZx1G/5n+G95gwquZm/bfidx1iHfyZVEbH252voNXJKT4zi/xoqVGbjbprCY7Ka2BJQHSp3LtP+X7qEjsvCc8wl0nEAfk+ukvDFIRaMs3QpyFWDNHuE6FxX12T36kHgjjRFloKz/wb/1OmBVAOZFz2yDJJN9UswBhgDNfoM41gMs6diHEu+edoySO90D70ocFohga3Zl1d70Afcve75cECP6pU539XAIFlIPnN4REIGyxjtWfWUoznFBwW0zEbbWuCkuQk1Qmo=; 25:IwPBcXqTS2JonGz4NlanXIHCTQBgh7Dcsq8CLbVnFXPO+OAcQv/5KyMlrmvJvk89AZXbKzIca2py7XnTO6J9fA7NrWit/FmrqGVTM2y09cxQyo35kcg07LadngiDe/nLSrB7lfW498vnUZDqiRwra3SffcaLtyroiDeAbVJP7xZ5DfEMiOkRLH+N519PSdZRpjP00KSIiUBq29an07jiPZT3yV2bezfpNTAE5sMDLt/+jDt4zMK5aCYC7YuO0aeuIsgoW0Ubxyeygl/kKH3b0CVP6ZM33K5TtzNDuVsaHGTXBzinCFpv7PIkScgQkMLOUrbY/BvsTeaC2p2zbkWLIw== X-MS-TrafficTypeDiagnostic: DM5PR02MB3385: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 31:vH3pgE/zLgs/uQlIIeuJcp8TILhITvrIQN+x0TfNdANc6BU715/9QVrX/1ksMIGR5jpQM0obwUZp2sSuJswYG3Qp+ImnCag8QMAJkBE9hjgd1HXwOBsMNYY3K5b+VHI0cpgfvXgaodfXVdV4ppo9p0YV+QbuEObSEm8HkgMUKO8YaL/y+DoBJJtj0CAxYFL3HTyhsoZrFghmnb/qHmpnOupk+aZgz/yy1EaMiXBAjiA=; 20:U1D0f0V3iwsIFIclHlvL5xM8hkNQX95ADxIG52dez1MlLBkQYgiE9ffba2dTSWEduWsxXYTzuCocJ44PpDYq8nh8Uc9wraZIMZXHshU29CUC/uPXodfZMBnKOsErjIBdpX5E+0E4pLftBTkJaGzjusliPmkR0ZHNJmLOzfVQgHKZEd4gj5Ssl/nJjj17Tz4w8rQ7auU7wIMgdSjpsVaoZpOWwR9hHV7SuGZunYQom30muX5t8WlNKLOKNfzcLwL6/Q1fFzUU/JEjkJ+BRDt6+1ijX3qGUT2LpGCaAi/mxUdaYKmfM5ljopA5A3NgDAIuslGiNoVKAy2BpOyc4Mrr1wxAPkA4TxsaRx19OaeYtIqixTTIKeGcmP7yuxsPcg6dxMuJrkCjaMppnJvkduGrunETle0CE+99G3u6d4GepWTw0ECcxiLXFPy8JvYR0/K/eu7h04Gu3Jvh9g5a6w0uPZf61ILCApkeuXVhi4Dbnm8b9M7FBct+b5gw1L5rS9ie X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(190383065149520)(192813158149592)(104084551191319); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93004095)(100000703101)(100105400095)(3231021)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3385; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 4:tQXUnUFNIKmRBtz1u97CwHV63Lb/MMD2st5FM1NG6CHkPT69TnkkuWbd3Vgj27+tLI9DA9rSeup+SGhSKFlFsprRCGfod7MFCGvhrUzdU+W2FtLAi7gprPv4z8BvnlImt3Z3CFgh0WGDK8uz17/f5EI91t2ST7RgN3sgFE8Dm5ZFixjs9ygFYs7g8Ll6wB352H59Lki4o/ef8QEsBuq8qQ8S/24UKADEusb8GUEPuHj9OFhVdux4CbVQAr8mzBf3SnVpMYrHMOjlXUYR4Ed7ii5ue+G2r959wq11mHi6YjyXJwtm26HLTh8OGm0DK7FN+rQTApCXUjmOEZkeBpWzCUeq0meJnLHFNzsVNkc8eRUN6FUUfkqI/fn7njT2Bcb9lunPk/i0IMpJqqohyc61v1w8nAIhNvhoAbM6M3LzK/Y= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3385; 23:cK1gqtsFXh2BWtl1ZsLMuqyxm5ve4hf7xvuQ9Thjg?= 60Heb+LwyBNXcvzbdPVNbBS8nIBKT7i71kIlvI5CbG7v/3OESGYiUy1q6UsUa4Qq57+GlBniMMv0/yYJJsKcYiGdlbprYEItnN/1JKgIraJFD9fOy8vvcclwi/FVc7kIx2f9NJXWhCy/+waN73dJUjsLgjmmlXsFcN9k3shlkv1TZJK4krclG3iohWCeEXqMGqVP7AjurX7oOzN9TRp79bNbkUR+nWn4oLukIHdbxZp6MWSnw/POe8k+PG8BFfuGTEtrzhMbqQipLLh2SKmM7FmNHglkICUDLRQa1ZQo5jIDsPvpKSDK7WHWPDuIIxywtBZDbmi4CvffZ252OLqYAzaBetPBfdqnQBt5qhuvTZSQEA4zijPsJnn4JxN46Ra79vjhYOCYpjS6P911ueavbcFuqyxZpfy/bNckqE+Sj3Wfko8I1ne4f1iLQd4KR5IbKJ7aiQC1pCNeob7QII0GnnS2m5jnJsslTYvfXF9Vr/lkvU+XAZUlix2yWIyDJl8Gl9WQc1v8Sj+Qo6RT7bw20+3a8w9gVxmcpoAVyAj9XexigUb7nhO0DhMk9cZan1vLI9oC/8wVRauML2DIvdjfAJZUD4SZbCFztHb7YamK2f8eucsEgistVILv5czjoOJGAn15XxpSTF6V1VNyuBAsHdx5/HMIQFakkrHiZOw18QQ1s3p4WJ99rEMPplKjEuU2Avc8tA//Fr7CIF62atvH/7mdLcrRy8F7DjWvQvzeUUh/TNaGiMz0c3Kf9G9t2bl1cZT+VR3hsc2u6CJDqDYVCoyqWSMAQd88gdOsVJccYcI20KGRRGlGKE4i4SeLCeOPG7JfCFy0Rv0mxyb5hbzmbWWPfZymYV8IHg33+QK5VLPkhGqu8ZjnSe1wxeDiGAuveYUal4OZNA2wiBhZoXlOM8BuQM9f36YDXyuC0ovCj46+RwHDJPMUXyph+K/pZ+2WZrvw6EW2B/vRDi1uW1ae3bodW4uNmhyEz07yaGIOar0v/qTT1G9pTg0NR9uOjma4pg= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 6:vLfwShE3ap3qwTL3xrGPw2PKmVIQYtoC/zo5aAyzdiAz4Bai++I87/aUq+FjZpqI/8vxeIdflMEEJjc1Fc5XjtvZNrorNhOZVuA8xx3En9U3rNaqJEE2GVwpSdsaYF+nt/1OlcseLK4O8t0rO2a2fbSayjqYdYzOtPbTv4Xk7+u2l5QicwmwJnLck6gJjzmgmZbJdllwnZ+blqSnAskJn8UYuOWUQHaNhBekyFVir/gjOjHYC2q5SPesRgw+AvLZWX9NF6lfnV0Wr1rQK7GLYtc6P3Li2IK2meh6FSykOBdes2ZwCioIgk35V35PxMJKGzUpXdsWnXh/wqWzCYuNU/kPJ1ckvnwxrxT6d7MfAPA=; 5:kYcx8hkFpOMA71BG3GiYAzxS9xqLzMTFrdQhTbsoiJz3DvXb995bHlS0kM4oB3zqQtDgzSf/Od2S5y2JmiukwXWs53Y64KDNUmBQsqsgbC69UybMHq0FFh2JIvAatL/4EDSuFIawSTnCiA+0F6qrSseD3WICqfq31qpzZme17W8=; 24:TQsAe5TaTH+egfay5J6l2LhlesTfyEdFvbqdMRujYIScm6KPIvbs4AHNcDjIxLObG+NmGKL2dyI12uFmgJ22b+sugUPgenfIpZZRnAZDN2U=; 7:QKdz2fnCu+mu5AW8tmE/12EOszz19cEdGIsnf0sdsRNwEqSPDwlujmygVqMuEEKkNPh7m7cKwdIs7QctuHgYnmrUpi6jcaTkfYUmXSTCqfC8sSccdI+MSMVM8Qs9qnDLru/1AnSBXCIEWedmTPtpaf4zql9DeIYq8J8sQrkLZ2/MKw17/8WdMr8oy25cq/oaook8Xm0BqLeH3+k6IFyKHxBJJL2K0y/kULWKjIIYuD27eHUTzKY/Q4MoCT/neQjU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:36.8532 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e261884a-1378-4231-81a9-08d526fcaa28 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: DM5PR02MB3385 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.89 Subject: [Qemu-devel] [PATCH v4 18/45] 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 Wed Nov 8 22:57:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836061 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="cKso4x7l"; 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 3yXMgy1bxVz9s3w for ; Thu, 9 Nov 2017 10:19:26 +1100 (AEDT) Received: from localhost ([::1]:34392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZcy-0005jW-44 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:19:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLq-0008GX-Rk for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLn-0003JU-OS for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:42 -0500 Received: from mail-sn1nam01on0059.outbound.protection.outlook.com ([104.47.32.59]:33357 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 1eCZLn-0003Iz-GK for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:39 -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=cKso4x7l3donQimaEHUnCkN5AwHGzZAjQmmG9MnejDAO1zQ4cmNE/9RvZ2XOxKHT4F+XhXhNUImslvalvqWpKT3HeAW2mGbw5erZpv2nntvhkCGbAPp6A+x8ipWGWWiQJx0D3tXXNFeqaCNvx5qHIhfRutak0/nsHdVj/zMPlxk= Received: from MWHPR0201CA0074.namprd02.prod.outlook.com (10.167.161.15) by CY1PR02MB1335.namprd02.prod.outlook.com (10.161.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:36 +0000 Received: from SN1NAM02FT049.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::205) by MWHPR0201CA0074.outlook.office365.com (2603:10b6:301:75::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:36 +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 SN1NAM02FT049.mail.protection.outlook.com (10.152.72.166) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:36 +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 1eCZLj-0001Lx-LO; Wed, 08 Nov 2017 15:01:35 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLj-0002py-D0; Wed, 08 Nov 2017 15:01:35 -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 vA8N1Prq009559; Wed, 8 Nov 2017 15:01:25 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLZ-0002lw-Eu; Wed, 08 Nov 2017 15:01:25 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:27 -0800 Message-ID: <5c147b85d57e57a1b8fcda6974630a82666f1bf1.1510181732.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-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(81166006)(33646002)(9786002)(36386004)(356003)(478600001)(189998001)(5660300001)(106466001)(2351001)(106002)(2906002)(305945005)(2870700001)(39060400002)(63266004)(2950100002)(4326008)(6916009)(77096006)(8936002)(81156014)(50466002)(47776003)(54906003)(36756003)(118296001)(23676003)(76176999)(5820100001)(316002)(8676002)(50986999)(50226002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1335; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT049; 1:l00dbILS2smVsraEblWrpqm+4jC/UeOGXJRZeHMNDspG4wW8W/TrhRiKI2I7bLaybV5a7XGUTa4ftluSOUkYl7/uqIkETDbbrIsojZyNLS2ABfoi7j8iQW3Je0ooPYcc X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d4fd54f-faee-4d56-3cd6-08d526fca9a8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 3:nQK4gexbjVW4wqH9knwN6SDwOWsXWSmYZJLA9kBI/p/tVOSbM1SGW2eitSX21S8BOBY25Evu/y2lGZy/G/qchEVSgsboyutpHWN5yoo6S9C5plhBEku9m4Vk8+jZU6gU04z+J/iwjCQjUh7W5FNy93msiZMZLi5rZh+kRsCtj9VB9XnYwmmr8ENcJaUU45z6L+R7m5odPon2nzLdSC2S/+7jN+ed71k5qKfq5jh0D7EAmBS8YQCRnjMNUMALnxzF1KY6XbMyA1A14g0feuARVrncRA70sCqFoZrMXw2hozvk7n4sUs3k5spxoKviPMmFINd3F4zrGQcEH0bVexhb+gXwVwx3WGefJJia5PrBnhU=; 25:PC21VAAklV/pM2g7yIhx4CZYvKgiWZrhptFFr1a9aLRH5VPmeyriuBBLw5yJvkaYOGi7inD8rgIc3HpePMF8yS9P95ifWNvZcWbXGLSZgGZP9JzvdOGXhai5tamHpO3ciGwf46PVkWMIVdHpH5QCBPdE4N1MhI/EsVo4RSDJNyxA8fWrDICS8sI9I6yZ0TdLofqHPN1VTh+IUwELDV7WlTKTBV3XHCHnAGtjSY+w8pl/MK6AiyHn+Sr/n+9ePKQp8I6LQMgO3r+nxAdyy9BhsvIlQujwBWkN2PGWg4L+eMu2/rYDwd9GF/muYI1PONG7O8E5UdIKpz1eA1Jadxq8RA== X-MS-TrafficTypeDiagnostic: CY1PR02MB1335: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 31:cVc7few3IVTK96x7FSPCGm+hZiwsEw38KO0viD27s9b2eYYvphBKKuSVkVN91mS2l284HAruIPbeXBeCqSV278URNzTNZ0Xlg1IgNJSodI+ec+oLWd0Rq0+Eph56qybMkrctje12QmnaPq/M+s8tUJzywRmaxS3TuN9VCy8aek1OHS3l96Q/JzAO9SyezEr6mZVK1cMjws1E1rrdOuhFpJww2WOlzH77EUbf9/Elqo4=; 20:Pqm9/ODBDUzvah2wOMZpXFNDIXSISpTupLeY1IQPI4/whgWaxzNpdbNGZ4KhW3pS42RrFVXFxHWozfEIb1hifYocgsiOPYJ+uySi3jCLd4bmGmkjcRysoIYJM+JHoIBqGdO7iu0EOs0PIAhvC+pwP8U0Rmrxd/rbIoTHjWzpd2qyL+rrGHPk1KKmNAt9TANnEeen7JKTE2Dpay6nz1q6WEKEuu1kiANhy+DF7/jjoLJ08I49ErwfF9KKtgZWXucfTSUxZqNwm0OCjVO9VQBNWV7KLvAiNClKYCNmGBRbfAzJulNGNURu0lMDfu5I3t/Ydy+2OK/Uqt/5Qrj1y1LUfD8FyzYfGeTATEmqGlKnQhUGLh+/5KAGmZvs6nl/zyoRx9NlSN/69oQs3U8TnPe4FFIHD+iHpQCqOndJJuhaakT8FYRYu3qREgTlErH92oWQVHUppvGwmd48wsuTLW1QFXjDkTrD8G7y3NOBVZh9sTY+f2on05RSzE9a0aIE0Jw5 X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1335; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 4:13fpnMwdiHKdGfsKrV2NVASmtrmYi//I0vrJ2xXCT+vtrWhQUDCSuKQGZUvAGTHgcWOe8H3NrOa7r+ch+DU24+1adXDczwARzBcrygo3GGYUOWmSE1llXWdTkf4chhRN+v/P1afNYmn01JIPAjmaokTuGVrDKHBPRtUVDu1bl8sJLUwpGcArTXbTlk47kNJUXzp88rVjdzH71flOHdxq6fS6wEJF61+z42usp/vXz3Yn+qEUqMhyX04oZgSADtPeFQDKbr+lrUQL81RBpRCMFEZKvF8HwbJAe8fCcsqTmyjtstM+83dP8o6Tn3Cr6cXgCq+BMCU7XPh4/xrpW5bsqQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1335; 23:LSItZp0NiDTtLPEsbkv2egYBKtW/06ymZLtS8A8Wa?= Dqp96VR7dQSUAE/T5x8MWIsztdNSdl0m48WxUGt0sHlt/VmfBlCZQgVD0lCa3bRxhwLroQ9M++EwCyXQS4j2NI0ykud2xi2Kwohj1Eq0mMzC/CnSnXdQxU4xygsr7BCL9V1Z2kJhDtJ6O1m2Nl0jdvm/JyXPqNJC7xGSj+zeUCzeSsoGVh6b4m3vSsOggnXstKaL4muSS/PDSXmwU00JeaFKEtaJ+S586UkNjzxI+ueYFfwf1XKEBoN1cfc65ZbTAitkCluCGw5++hBjh1ufwlv0fWZ7XXcQ9BCsdtO79HhAQNBp33ujlbJGuMr5wpsIGthwguTeFS+AF2Iy2tM92st3cLFZ8+/qk+fz5zL1XTEpFeItbgLKP+zaZxPO2etdTejzo5qmRL/zUcjNjP1LMV08YvaZrFQttfmUym/BHfwVQbRe7E8JWb0Kyfr7gU7tSI9EbVej3quwsicNOt7uVlO073ph48IUC0XDYtxYLfES6c7jBLHRcJHE1jKFvyXSAHT8OJcMPdnD2JK3etoiYVdXCTeYdpd9TAQB+PH5qAVEwPRZ20LqA0dYLlwaXKkHAoUoeKz9bx/4IkSzZqxLkcLb987lcUmP1qtupp5mFosvo50xGq/rOaqBbHaFRaFTHyPjwIHC34yKA4zlsKYMps9JSY810PDRO0TIRkLJUecqbd/pO70z0MZnv7+46E3PA5roSXYss4JhPE2aKKlj/ctbWAbX+tSYvPLp+kjXM5DN0FjTaDu2/kvl7i1SoH4baZk1FdPxEhQInOuhLfe3LFyRiC9gBOVRzWJ1d2bsgDpbvfeFFRU4gf8VZlf/H6i1VFwXHkuh0W02G3uc8XNDQg2dkpyqCPGJPI3btYqkc5bUvjRdc4TzI3P5TIPlTaU1wmW9TyLUjbN1d2hotiTM5Q25IO6TVMXXyLuhv8kKjFhUjjH6RU2TPZ6JvCzufykunTLCfnwcleeX+9vtonrLRDoDnDHc1fLnSlqfEMtWuj5JQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 6:QK81+SxuZ5bA7m0azkQ1sQEoGuzVNxSwDwdxRfjGpxVoEb38aTKYD3NBgq3UKKWeuI3iSo3jnEwj7/Id1omr2Hvfd18lk+lAratUB1IkdLD0Db++sOXrklhEMnOJvh+jc4dzhselORKcbZxt+5k6fsio1j+mlsUoCli/X3g8lts8tk51S0out/BjrI5sQJ1pPKZFCutsag2eLlh/k2GGSLwZhL/zI64d2517spomd8Gqn41SQj6uSHMyIrgaFMV79DC25dtjgBEu8bkhjM0iSt2/zizfVOJA3Fhug69DGW+JjG6oHY6P6xuB49LLOXEBnd4OYyNCh6XxV5ZS/35nuHNPsmC0tPF/lq5QRQbsKNI=; 5:0O+9Y+Yu2rM9C7qtsv8gZhEm6cKj+S7/QN5O8hFaBgDL1Eqic3b54bEPv+kCK/uRRGB7LRn8nHdaS61EXOUdMKSJIUrVXYxwtd0ryh1Jey2YmIWX6/m/nieHxcqXDZLQWbkxrJuUhuGETjmcOLgENspnjZ1vSISk85phDw5O8oE=; 24:ExBD2Qvc+uPepbcEHOQEUhN3dVfjbGoTgJG+83jnMxhML/z+2/LcRoowm+rhp0fwN9u5zM/Ty9sz0iL9EJnX6RFs+UcnCY1Zr2ZCUhBU99s=; 7:U+MIfRAlzotaJk/NUKa7hlIfpkSu4VVZurw+eu/KW/O7QgSKLBis7N/rawZX41pvOSdE7fYlbmgZZKJcstbI5nX++cK51iSthKQwUBVYaMn5TNBXQJh+h90aK21j2JaMaS0NPX5mxfcXbHMEXQaNFFjO4kfdAyvk/ORs3ZCjjomUB9fusDGmiSyMkhjN1pyKrIyvTqjussTGPjrukAjr2BQ9RXT0ChnyhCvzTijrzZ4IoYZqou2pwyJPh+8UkkZH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:36.0751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0d4fd54f-faee-4d56-3cd6-08d526fca9a8 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: CY1PR02MB1335 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.59 Subject: [Qemu-devel] [PATCH v4 19/45] 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 Wed Nov 8 22:57:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836064 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="N/VhqRFp"; 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 3yXMkZ0VW3z9s3w for ; Thu, 9 Nov 2017 10:21:42 +1100 (AEDT) Received: from localhost ([::1]:34406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZfA-0007UF-2H for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:21:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLq-0008Gd-VM for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLn-0003Jb-Qz for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:43 -0500 Received: from mail-sn1nam01on0087.outbound.protection.outlook.com ([104.47.32.87]:49411 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 1eCZLn-0003JA-I3 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:39 -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=N/VhqRFpvm72cBqexAzOMzbzZfIovbRfsLCy6iL48vT4aWCFd83cUudIoOlJApBYBzBKrMJbUkY1tLk6jP3/S8kA20D62u3YasB9nTQTeAdXdpE7pWpsqZ2U9Iw/A2AB/xGddh4XjyLnMlRUcoxUVXTVdiGmFhIZoiSP2Mmf558= Received: from BLUPR0201CA0024.namprd02.prod.outlook.com (2a01:111:e400:52e7::34) 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; Wed, 8 Nov 2017 23:01:37 +0000 Received: from BL2NAM02FT052.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by BLUPR0201CA0024.outlook.office365.com (2a01:111:e400:52e7::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; Wed, 8 Nov 2017 23:01:36 +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 BL2NAM02FT052.mail.protection.outlook.com (10.152.77.0) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:36 +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 1eCZLj-0001Lr-Gx; Wed, 08 Nov 2017 15:01:35 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLj-0002py-9S; Wed, 08 Nov 2017 15:01:35 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N1SsP009607; Wed, 8 Nov 2017 15:01:28 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLb-0002mi-SI; Wed, 08 Nov 2017 15:01:28 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:30 -0800 Message-ID: <5ef24a383f26a1506bd57b576e6028ce506db65c.1510181732.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-23450.000 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)(81156014)(81166006)(2351001)(54906003)(5820100001)(76176999)(50986999)(106002)(8676002)(316002)(6306002)(356003)(36756003)(9786002)(305945005)(50466002)(4326008)(189998001)(77096006)(8936002)(39060400002)(47776003)(2870700001)(33646002)(575784001)(2906002)(50226002)(63266004)(23676003)(6666003)(478600001)(106466001)(2950100002)(5660300001)(36386004)(6916009)(118296001)(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; BL2NAM02FT052; 1:BuV+F2ds+zj8BS/Y9LbU/hFRvvDG/X5tQlqWvpVWo/dv49KIRjoxx2I0QDeH/ogYoVxdcpJ7PFbuw1c3vsG0tPl0umdBUH7k5az5+k3LkUWsM4hNr/sW2+R6crQe0S47 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 665fe080-d0a5-4cc4-0121-08d526fca9c4 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:8hZOVta4ngRnUiAzL2QfrdJ2Ye/bMyEsG2jbWWtzr0hzmSi7KFJPq97/yFFRcPYPOotzD2/fbpyrym/NcBy4eIkvJtmlhx+OMJSGhSZF5FkNwj7+5i+/FtjYxqjCEyiYcdngErebErLRmCk4rMjlrpHfzDC+PEaI+YZiWzqkgpTSL46BbzG7pkQlmX2trdm08zvJWTR/gz08kPndesq881aLfXKkI2GdMhoxyjYtmFHcNrTtXT0v+GNjKbOCiIwV8f2sJpvXry0Ji0gqhFnVwq3p/zybQlqTV2qHYaVcXXX/8a3hvFomRqe4xv3fWeT0oBHxycZTdhwWlZrz2986e7MppcS3ZRLXz35fqDspv9A=; 25:4bD8KPWjMkmY64Tank3hVIYN2ImhS1OtgHVKCsfOxchtF1p9PiZ3AdP6U56lIKYNXjB7MOrPjgJKDLLBLF8JkucB6rv//3UitWg7P6Nqixxml9wzuwmR+SD4oiIWMMr0SzM1l1fBqr0afy9QpKy9g2fZLAAD7AgbIq0ywlcSVuxAekh8Y/IDOgmuMRbXJAJmnZ4p9i+3GD2Ty89kYNvg/62gI1ajCYrGzj0O10onz52kHfBdLFBMj/8ym+1Zt9Gv/sVVewbUNBGoQtdDUdQoobw3FNyvYMajYvBVsx2aysjYdSjbpkupQJxBDY7ENgIGxB6JUvf5gYIX9Kjlz1wunZHfPhjqjS8zJDj6/2bacJU= X-MS-TrafficTypeDiagnostic: DM2PR02MB1340: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 31:9TIJUQlyioaj8K7D6VlrodPS5rCZsnZchFCJwWP3z7SyBOaZOOL/p8MaB2uh7+8m+40HiAKBGt1KxHx3RWPLT3NtihaQDGB/cFZF1k6O4cmkiFiRqp7+95J0Ymyx8q1m6hWWy51eFSLAmQidVnhykqpwFx2yV0jFvLRV4RDRtHcARt95XvaMeQtgKtXS3Sj3eO4A7tsFQcB9f3BgH3RsosIR+hfhel5uC7AJRP4Wmyc=; 20:SpPTYejc11S/mFGwLa5v9LH7Z8YzepY8iz44rLK+vmg3CV6ADL0/3xKsXhUps84lOJUndOxCA9Q61I+P9mapjXchihJ1zzRffKQcMzTwJxxnNj5xOmSC+up2xMt1hT4QKZQwzf8zOELVQpSoxfnUTTJidzWnBJdokrusUzRRFMi6lfug6bndjbWc7n4ZQ6Eaz/ykO3XEGuhAH8Et5nnBLU//lLFtNokNpz0SNFhsPremkJgTZJHhvFSY+eSPXF/jgsVC02e2KyWhFkLs7lNA21ZvDoj8qCY+A8odXfspZ2FAuEt50XVAf/ov9CXn2qxyEgbPpyPmFAY1lCr+QSziTF8VA9jR0ltxrj64PmIfg44VZzQJl4Npo+8lh0Ixe18+qJXn1mVI9uFqG1YQJYyI+wzDyZ5fNFpPT8WdjH7d2l14rc94vrEn60W7WHmsHQJnwBAK8TgWLch2cCwL+yFJon7P2JTiB1Iycc9a1EKDGLiMseed9kGFhcig2ufjrhxV X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(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:AqmY2foK964QKCJgzFP0vciQTZZSSzl8qRcag0kc9/hDRpT4X7ah01nkTz3DyiVEZ3Nnp9fmSHGtg1sc1zogGn9/OrXlCyFMyO+z5y3oVzTPSAIxl6PZ9tAotepkBnQvq9dzbiDBQWrvelL+I/8TwZTG/H066y2M4IwO+grxpjLKdkMJLfEJhEVW/6ye+K8ou9aEf8JTmviBw0e06lrqaZCGOESauUAc7gTqhnT+GpBenDBOOWlua126NSeL8iqtEooRn7wr8Y5cjdxuWhKx+0ntyvyDDtOEZMbuPASA/U+bSC406WApF7XC/pkk6e3KKGNyL+AeWUWfGZ+jFM5qOyorS+t0cwmnVGwdUDaPq5swZCRsvrec1jS+0vAgNqgBwSCBBzBp+YHUgygRZisey5IcuuLlqTuf1LdYt96p6gs= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1340; 23:AD8wGrfMgdAIj6SqKZfAJCcV12hz5VTgPImbnnsur?= inWW5cL6GV/4a1LfeEm5hMH3DdXlUkwSE5ivOgw1S5WIEt9tvThaP7oYcd9ELpDq+Ub/rgK35mrTwHd+JXW70cWC/guByl4fNnwhId4gBn6eVsSQFCenJcpWfPzKqvqhENsw80KmAoy3nSqgf5wJ5qcPkKsB9+lzCE+BxnH9t2JYx3ML1UYiFVwLtmhtHSRIJAhmY9nzVFDSyGl/kjIFyMuZ7pL8Z4ZS0xe4OkhVfA21CCP4rZrms7zfU7wRhpNoPRhzh2e5M0yKBP7Yoeyz+c8+Dn+D72+Nyo8ZsWve5LK3YJ8o9t1IE+ZrO14OnBtUw5Bnsh91mf9smdfNqSoIwpZukyjcQdGpZoLB21X25LT+/KEsDIrWMqI0EwyGRYzV9LZEp2U7KhvfAB7PvCmIKXOjQwvyVy8THFf2o+Twb0IdtThc+FUkoDIwH91JhhU1w4U3TUtwNQflpuPATZnm9aOhgu/971XVrAhaWxe/j8LoHduSyiqoY+vIlxs9hzudZzLawZAl+AwZA4+gWlooolHnWsosExHZ8vzqahuaYHZ5UAUC5jKwJGJNPJoHsQwVBS6b+8nxSS+7DD4LSTJCzAcVpZGd4NTWRy56eQQaVI4ezyNoz4aa/B4jugT+plPU1k1PCova1WeUbcefQhecpyqk1R0m1wDkiDluMCcVNec4eHAnSrTStriKPtY6FZc76AknPiG1yMZEtVBYE9AwCTQ8mZuRq75A6ODPUpfNiVqljl/stoJm9IXrtcYpg++tLRv1UzBmDdWwCfuw26h4DxUUKdnXfDWBB4vwrvo3KdK5XFwBEZCaRIUYkDlt5wIA3yNJU7wNqXbZUmcT2+vJYKwASGYGdpABYtVRHk5aFOruatx8IBJOuaLxy+7iyCYokI7lg2Dd9Q4qQhtvYQmN/Vi2lpo0SPRWMSdJS389i6dkFMubJA00HfH4z85JTdBMIzvSuC1pIIs/yKjv1oKBM+b8UISrg9QgHng9EOSZB6MPZDa4h50VOxl+tXNwRBqW2bEXEIzrQC4bkO02FQhLcy1/LL2lB47QeYI36LjiRlKTw== X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 6:k7NyCtnW8nJIzmgpSCzz+gsIlE3FVrR5Q6CExpnHQmUM2wMdE5NT57x7MsagUioZkOvWXZtNRyNdc42sO9Nprmfrg6MtEe7iAaPBit5JE8gOUdO9WDiSQA6yVZk/KllaOKc+6wT3dwidOLwJ2NkNP9LtG3Wq82CY8Bk03nNKiuH6R/KkPtihv0LQnlzfDaSn9liu88bx1yI9YBpWqB0oabUxaecOwi/5a2xexsXbivjTxtwwW+MeVs90e2IwpsnhVcFH2f6Nyp+27BEKe9Hh3X7eMGEdDDR1sslbJmkl0VWvRZHizEPb5eGd52oYBHC6mlnM19CREubKaYzLpaaj7rlr2SHRyVMk8cnJjzQAziM=; 5:d+rTVzQrTAwonfp6jMDSkJBjK7+bT4hAg05bsRJsWXAfzI6DRWqUuXyskqtjg849r0R9lMoyF7OfAStkqJFSqTTPAIGU94q/Y/bxgHIH6XTvZxxVzP3hg5YB87ocBFiFEhaKKxY6o+ga2Ih7oarZ/keuJj1vFE+26r0IA1cQXEk=; 24:2/QuDHr77ujTyjP8PlnDNIP0cVf2myepd6AZOV1iHjljlGkG9zcm0vKDABUwNXsc7jNa1CdcP3U70jEBmQ0PKpuuATilJIJywWvfBVZm7VQ=; 7:yRQABudvJGQls8DfQWt6nkdTVGl3IiQ/tHXUQS4qockOdpGY6g0oLdFPvk7/z6NcG0g9Div8RPJrsdI9g+n63ZFoNkILJQxTrQ8uVTVbM+lSw2ZGR9ykiuz7Aejlzt2YT2ZSfWa22dTzfki4GAcApQBvmpBegwKanjMD2V5+abLAvd21LXwEHbzUwjuWB0CErDe49MvzFgtGPxJ9tR6N78vWjWGA2lLvEt1eBGxsGXophsZJiOYL2NABMJO3rxJE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:36.2102 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 665fe080-d0a5-4cc4-0121-08d526fca9c4 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.32.87 Subject: [Qemu-devel] [PATCH v4 20/45] 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 Wed Nov 8 22:57:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836070 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="5ZjzayUR"; 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 3yXMr54WZYz9s4q for ; Thu, 9 Nov 2017 10:26:29 +1100 (AEDT) Received: from localhost ([::1]:34435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZjm-0002ur-FX for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:26:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZM2-00006H-OZ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLz-0003Pn-Kc for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:54 -0500 Received: from mail-sn1nam02on0063.outbound.protection.outlook.com ([104.47.36.63]:33385 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 1eCZLz-0003PZ-CY for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:51 -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=5ZjzayURyl3q/7HFrlMODg03JMuAc34xjSV4q4VdtGtesuPNi61TMG8Qismr2+mCp+PnwUTSTIoXedUB5bWGzA9akzbmn/6DLS6sZYOxQsOnp8gpGp04jOoO+CftfCPDHsIQBNhUeV/yKiZsU2U1wjA3zZleesw1+D7J6cRHQLI= Received: from SN4PR0201CA0013.namprd02.prod.outlook.com (10.161.238.151) by DM5PR02MB3385.namprd02.prod.outlook.com (10.164.152.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:48 +0000 Received: from SN1NAM02FT033.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::208) by SN4PR0201CA0013.outlook.office365.com (2603:10b6:803:2b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:47 +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 SN1NAM02FT033.mail.protection.outlook.com (10.152.72.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:46 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35091 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLu-0003y0-2Q; Wed, 08 Nov 2017 15:01:46 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLt-0002si-UQ; Wed, 08 Nov 2017 15:01:45 -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 vA8N1WGm009701; Wed, 8 Nov 2017 15:01:32 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLg-0002ox-IB; Wed, 08 Nov 2017 15:01:32 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:33 -0800 Message-ID: <395ee77fc574e6e75ed7e4eef8758a25370a208c.1510181732.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-23450.000 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)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(2870700001)(6916009)(23676003)(4326008)(478600001)(63266004)(54906003)(106002)(47776003)(316002)(50466002)(2906002)(8676002)(2351001)(106466001)(189998001)(118296001)(9786002)(36386004)(50226002)(33646002)(5820100001)(2950100002)(5660300001)(36756003)(81166006)(8936002)(76176999)(81156014)(305945005)(50986999)(77096006)(39060400002)(356003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3385; 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; SN1NAM02FT033; 1:dS9cVY3JDWGl/auVahvVmzEjJO1DrOa6657oOCd1RJ+3uSABoEiBrOeay3UZ/Atm4brZmspdxkE0lAGDmVRGAoNwmWq2LIfuVGqSmUz9oMhxhwvNKOiwPn7E2X5ILpCb X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8f8ac893-d36a-4d56-f051-08d526fcb026 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 3:/viz0sjlJ7Xl1CIkzZUt0Tz3oXfDGRWlpxTosu3KcSQNUOMDSXWNu+VYnTeVOUaJwxZNco6d6q0if9hncjmBkod3/eA2jWJMhgNmItvomA6P0kT+4C2/ZnDW3e153+qxEvZsX34Ifm6crlgwcL/CZhm73VrGhXkjqg5nZ8ncjCmzSXcVJlA13H1fCvw53XWpmA18kAsyfHPwKpAyBZpQ91FTZ2CHnvKqvjLu5Je3I8C7cqFgtRFxIWjLTjKFnYnEfPlaA2MHj/pz4sd/y11oKmxc6iHqIDLzdjEsQ2AEGqe0slWat9T1YMl61fcESFEWZ5WPy0Q2AJYcLU0xUw2BFM1Di4bIFyFCL0L9yX+8peg=; 25:rRSFdTki/B/gpFb1I1k9cMnXLz8QxzDknm8cbknXq855XBcXNv8sNsMvrpMV2ZYyW3WkjOsbo0YrLkI8BzzhGjdK72HG4X3unEkK9FiqH0pkcR3h94AgDUp1o7XF/0ih3PI+gmqvwyoa4W56vxS4PKqsaLykWd0rgbXEzdUefHuboNR09L5sl63HkYRyoz3SgOcjRnGchwlbxzFqL/3iKiQbWViseDgs0RGvWpDDTAS5b8UwK2vcA7KCxRnDkY9XCtViY3zbKwkPcQzGsyx/wZsW5HuHwLbxhK+aUZCIbneFW7da4r0ufBeLVj39zmf0jWv5T1KX5fXXOki3EW9DUA== X-MS-TrafficTypeDiagnostic: DM5PR02MB3385: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 31:/QJT1q/oT8vrY9tUorwCDE0m3irtovHk4zZfQPUSSJq5sC3hOYRop06aNbuuNSTNKxUDeta2JVg5m6CXa1/2LPWo/N/v/t3j9h7glGdsDCCTDsa6bafP6C0hYTdjl7X6hoX+xcLdsUNv32Cdi1yuWF95J5a/TXIEC8Xydutk7BtOpfwQ+/MqSitzhAetnOnf76qcyWEyUVIpGVcGx5wUUfd3BOGMbQ/eqzZTrG1A0aE=; 20:OdU06/76W5QG8xozOy20Hy33GAXEYWYdTjoxqXmygvHXcN5lfm57KQrS9yVep3Qr4H+W9+xrpHi3pnXEpHAcbbs/DSo+PpWNVzk1iqVq2zWALY1WAh+0ZzeEGmSET7yhPhPlszOIgUzOtZhducV9B+gDBt/AsS+MipxfrBv5bvPo5aCF25qc8B2OCricjBUR6rQezImChd89B9bomNOVHDwjQPsgKNLA+5KIUPIJuchOeJNZDTtUj3GaIb07Iv/21uJ/49Jqb7v44OrIvRtH4ArpaQ7ZE31SptlkL32/Sn3KEDaowRqtXSOmma++QFgvry3Q7HeBZyKB7FCRIYgECQadJL2E8KXK/JcfaE0ui4CJX1MvUlVcDrhaa5XSNlIwJ1xpXnIQ4Gf+qY7q2Uls5NM8zXfD8CgJwVh5/WpfKuGHCKhmW7fQua4kexwAzOSgKjc/fWU7V6OmMo2ktoSfd/gUFY2H5jH31mXVq4nwCOxmLpeakwqyQY013yX+gCR9 X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93004095)(100000703101)(100105400095)(3231021)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3385; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 4:Y6npY6LqiiL+lqssdwQm/jT6izfaE6/J0ZMLZhvhFTc3zuXA37S7sOqRaa/kPSw6cF/q43V5f0ZVQXFMVkKpMjFuhV2xEvbvqzjDPWpT9T9ZT0SGwLBC90AU/hGNilJBlvbyaXTpZ5nYJ6xDUng03a6YaSRMlq6db16V2dWf0GABR0cDd10VAIxrVSGc8y57xuEy9ZPbyDZcPY9LUWcflSc2aU/Clkt5wAmKYkdVYrzOMSH/cXZxBrqlwRSMkQWIKzLAn6P3PwehwjjhLqa9sEcuWnTbsitJBjcSgodCcEknEHmpBqEusv94VZtMvTS8AI4fTB8UB5RLlkuxqWJH+w== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3385; 23:4LU2jvd9bOZsJXvdjm2370Dgo7YQWuQhItET2sv3P?= sBgMZZUsQ1SWVNKFRsOpvysGyJy1E27hOupDgUl3OYuB3PXZ18MO1lDh4/kieDtO2yBm45UH+Sygfau4WcW/+bb6oE58kadNYwi+rt65zbvxWsSKpf6eOYRdQyZDf5XRp0eNy4QAU2Q8/9mbAG/LRi+Vcw6Cc63WhubUjdBEoe2MIa8IDTLMLf0iUNmwcteQKjuSIOajAwCEFSfoyMy/Id4g0AGB6Qd8KLqYE7M/pDAqFptUKMyM7fBeE+RlpjLDKGdsHbXvZiG8cgHaG1zBQiezOviDFCU3Fiz6fHxzeEYj/ccd2E+yKXTXiPs2EyfGatNMuaU5t1ZiTtI7iRt00VcDJol1iALDmpbe96367l0dvTynxtMulFrjcgCpsKrzKg4V8DOIDvK5QDSv5wqYWv6q1FibAnPxS2G9afckE06ZNykfu7CiJ9xJT7iAqHvgMtodnYp8l2MaBEDkCErdY76gJ7mRZvGlC0051+QQUKq1dTCEW0Hoj24Qc/GLvmZp3sUxWsEFmqAt/pFYWp9Zr5QcETmB+tIyWez+2kmF6F0IxYitYVP12mwQwj4Cpis/QxvO70S2elNpEF3klpmo4Zm3OwwNVy32Vqm2Ao3lXvREfKcC25s0ZlnctybvsBUnV78Y8qqsFoIVVlSL14EPXd2o8KizEd/YDO4Qs9JLS4ouMPaNjV3XYoDu0vFLeDvf1j2iaYIv4FyofrKkYyg/T5TLvX+folRzgI7U2bfq/+bNKflc+YozQrILkzXs/yP/lxgZzn6XqoeGRP05p1xLxhArHje6n8Wa6ai/jO+8mHjJeDcAeRBPBhmtibBjMhHJGx3Bn8pWIFJBPU6vP3bv0U1FnvLPNyYawWLw0gghgZdPYIsUx7Rs8LdNlF1HzywxCtkEumPS+f/MWSQYGsj3lIiHFSxgvio/fYpCYUjiUUfabjFI7G96WAXKbxKvFgsC/kQwV7QHCZR/RN74PfwFgzAIh75Kfdmh7u6MR+OWKEebEtbOzCLrc3MHXGqOsqG6s4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 6:2OAmAkZ4t6pfRXra4gB1CA923cTFP8NqEYzQT3x7aNbO9VuT1CMUJ1bZ2Hxbmw0CtyBIan3btzwzLEpDuvCi+QQbJZtJWiMxsZsTzFUf6auxz6/p65+pom1BwtzVgHOQqDh++JlkBPl4fOEp0kJJbtT+ykWHo1iySTcgjTu9pa4fqJpN4sIpZ//6eKJHL8gB/w0pntPSyYdLCEB32txgMlTiu/dtHoxB2WFWb48qan0YnAdxnn2p/tdNTGWHCGqxO0URR3x7dsPahH2kyRadjXrw0MUufvCflYTMVa8/3dtjo+dAN7Vb9pNZ2H2MvnjpAXaP3hWIoYJryxPwfuFLRLfzcYzKfG7xC6/WMLoic4o=; 5:aYQ7GII5/leHv9WbllnW+8L9Rlw1xOndh4HTu/CkNj7zZO+Zqd9rRBQ9vOixKApyYHr8C38BBYQt8MaZa9kjV7GWPznLzVSDvZtgmB85V6puFkGjVVvw9emwBdPHeWdktK7/mrq9tRl1xdY/EfmgtLQkoWDchYDz+kTpzb3CNdg=; 24:0U3PrZHvZYQdC10dHSG38JA/Z5rG+agaH3ISziJvl1NjWwu+3wrPA/LenPHP+5sosvx9qBywfczQYBjrGbiYW6WzHw9NBTxk42uoyYGnxyo=; 7:H9egwOSBPUxApbgXofWQ34ecJGAFA2jRFRGFPzd40e0BLKYTYj2tTFtK87IGDiGjWYHFkwD+qA5bJFurzjJOTP8jr+lqcaB9CMaqAREFa0r9PTj8uNweiV7VOc14sgHZc+NLBWK8pnlQ9Uy/wNvb27413XCkPs7b7GR+9NGjFlOd74PUgjb91bW9cZ2fFMLffK4unMHCRF2TOz7mpqZOKXfrAVkV4n44M5QN/phirIAEQlo2yxp0ksU+1dRjF2+Z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:46.9092 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f8ac893-d36a-4d56-f051-08d526fcb026 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: DM5PR02MB3385 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.63 Subject: [Qemu-devel] [PATCH v4 21/45] 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é --- 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 Wed Nov 8 22:57: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: 836056 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="gYHVV2bB"; 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 3yXMb40n0lz9rvt for ; Thu, 9 Nov 2017 10:15:12 +1100 (AEDT) Received: from localhost ([::1]:34372 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZYs-00025c-2o for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:15:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZM1-00005j-E5 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLy-0003PC-Ba for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:53 -0500 Received: from mail-dm3nam03on0082.outbound.protection.outlook.com ([104.47.41.82]:43904 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 1eCZLy-0003Oh-3p for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:50 -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=oWQPIj3mc9iHWanK0u4uTR5PQYxuPwmuy5hbhvojIBE=; b=gYHVV2bBwDVBwRzhJv842b+vvJWof4AIYz3a8OTT/VltmFX/6rSrFj4fEviG+3lxvwZ3itDjEh15ia7cLiGEyXOsipyrGu/Qsp0wPWNOK065jeNIXO5nM8+Yes0yEj5Z+2nTNDsSV6guQEGJR66lsdk91htycQj0wt7hEk8omyc= Received: from CY4PR02CA0048.namprd02.prod.outlook.com (10.175.57.162) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:47 +0000 Received: from BL2NAM02FT005.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by CY4PR02CA0048.outlook.office365.com (2603:10b6:903:117::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; Wed, 8 Nov 2017 23:01:47 +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 BL2NAM02FT005.mail.protection.outlook.com (10.152.76.252) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:47 +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 1eCZLu-0001MX-8w; Wed, 08 Nov 2017 15:01:46 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLu-0002si-4j; Wed, 08 Nov 2017 15:01:46 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N1cwl009792; Wed, 8 Nov 2017 15:01:38 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLl-0002qv-2R; Wed, 08 Nov 2017 15:01:38 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57: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-23450.000 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)(36756003)(118296001)(63266004)(9786002)(50466002)(2351001)(33646002)(2950100002)(50986999)(6916009)(47776003)(106466001)(77096006)(5660300001)(76176999)(478600001)(54906003)(189998001)(8936002)(305945005)(36386004)(81166006)(2870700001)(2906002)(106002)(316002)(23676003)(8676002)(81156014)(39060400002)(5820100001)(356003)(50226002)(4326008)(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; BL2NAM02FT005; 1:4uKmRtEUdOC/4/GIDOoPgSzJXnFzTxQQLXOReK/N1o0Bl6SwRj5eOzMl0mD0aYySts6d1PLwcPV4RWqXPqoNCv3v8DFhWPuq9ImtfrP8G/OWPKY297A3Y0UADGCgd//s X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22a0c686-2a98-4cb7-3203-08d526fcb038 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:rztopBf6P8wZ4TQZ3c+ZRSYyiy68sgwB4ANOjxILh0qj6njHTz9yuTmsel+NbDU2YhQZ7qmIrabvvfdpZbkU1ozjLWZB6bOlrkZEy+xKHaXbWGKAlPheUrJdszOa7Megh5b8L4aWBU241Fj8DKkvkyTP/uXnYr8becPzOuABfXQXORGRnHoao5jfLBHLqlkqchRiX64R4qnqz2P5yu3xFp7il3Mr/DQ/LsF5FmfVoAQpsphdjjXy4L9f+3VE2l8O0ER8LXsWtHTf2iZVwUkAXRTiBeoKqeNb5XdcNqMobAd373kGKETedAmLwgbzO53e78u2lhys17RqK20YP5wPp52SNay0Bx2q18A03SGdeyE=; 25:TujEHhK2RunSJGVoo7BReYLoVZj734w0Ic2NdclMiiuP3iKfcya0b/zeZVoy/Zi5EgFhJdwQ8wZGnSb722wIZFX99CjfrpW4+nsOc7JpbNiftvDx3IiDXxEmSDgpn8C+6OJ+8x/gXqi6KzgS5pUk+HT6p/LRHqsxxGIQHcZvsIib2wapqoAQuCPeXMZtnRNbbYVy61EXZLcudGRTuWvXWQ+aWAyZEE6Tz4BlrGX1wQhUG/g0fAIVsJS5r/kYAxL575MDZjbdwCUBzCCU0GTnYF11jjNTLK0H2JzTUh6FJn5/ubM8IlOHt+Bo88qFc3sSET8iQe1wwqH9CpleAPgLYGsfceRUK6nAY8qz/04rbMU= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:0AGK0ky+O/8CHDHC2BcjnuS2JTkkwJghxLpWspVUIMVnhtqMUG1bhs5QS+d9BLemc4yXPzqpLsB11C8OMO+L9QHII5ZUh05GZrkk1G2JHbGG5yJG8YYsKBYQX/29MxGOAGOlPw4PWVC1T7JKO5EoQO6UvGPJwaKU/j24fd/cYWcO9SSm4cfBi/8oG0TbHz5qJFYuMMsVP0WjQDgHFyzYIeAumSjkpCkUfm6legB7jLk=; 20:lNVqpn3Hr3/NlNai03O7koTN9y/hj5w5d0AlLsaFAdEmvFlX7/vo8DRerFNIfWEtMfcuMpk5KFDleRJ5KB1XjSLCOATaiBEjoHUwpH6T6TmbHrfUty8+oXmSRhuuwGg7/aRJqFc7bRP3OOxL4/BXHP1jGnMavEJkGFP48s8lDVuI2jnnza+TVBpUpJ+jiREmr2/YNw3oZBdChL/QLAGcr6mvGaw29lkqE7wYgfHRne7l7PBjqWS285apYccpt8P7uurZUuNouXumKJaCUTgXpHhxZz2pgzeGI8OE7OgHjl0ewcppGRwLVuDyHSM01Z7LedmADZf6hglUNKStVi+tuJDz5I/7JrMuPQyPvJWfvPV/WGAaAhtTYJmX3BSpN6E4v14gWQSS1Y5mNNhS3oy7/hiBS7Gfg5H5Oug2YMps6YAkAwioqUp9xGWoRu81LoxDBCZnKLbuZPAj+UacIrQ6snHBhQHiduM2knN8EzVAUb3oWqawbFTtsQ6NCsWk9JJA X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(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:+XizFzKrmxyNN4r08g9StTMicAaE62dR1DplhoZJN1796Gvv8BnfhX4xnUTYl0/hdFlIN8OYn1yA+D5Yub2iGYlN7ufzKqPsgU32d2ShpTyKZo+Cpu1+M+keXSgExRrM6ovQ+N0C6fvFkSMI4chp/bTJtO2xJG25uB+ANEICvr0BnZU/ng8iyjbGrgy6VgrHUemaPWoHLCbJ73QXSYp+5o4K7GnwCRlSH77gANEV/Sk1PvmNiZ0FdnHXM/qEpAA65k1hXEASZCIpdLFi4Ogho0xkh+A3c0VSxx9YLLTWAMYYy6n3tOqdHURgRoBmMVbLzPLh+xeiG3qid+lzzOx14w== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:Lq0UQLMup6n3JV0LLlvywFR7vXrgrL/jtCxoqvxPt?= 161cf1VHomHIROW5EBAnnCtC35j7TlLekdpR1l1PaMP27UuvxuwOojN2+26UZPWXgIWQ+zm4aJJgT3VsD51tUikWODnR/Dyjfj2vZpFxOMvK+Wr8qzzubBtB4kpFHZWtEvsO4R5dPR6X2UozqQ3/DH0WkAiAX3qpXWhHqt1CAXlkKSvj+DmECFQJ3ZXkfRkG/2TtN4A33lHeZ1Jg+v5Ia2dTXSMnHnAqaO82WVmjUtYytNvlQl3MB+FPS1+NECEL4uv1OAxFf0yfDwLVANfo0LiZnYtMInEdsdJzoSYdLzAb52hwmwdsdSbHl3edhLfB+09ifvSeIf3Ggu2nrKaU/4bWSdIzLQBgtzipa/its/DdqQYSlnkBfSuGe0GqYYSbVEU1lzlClb0rdyEqYSgMBGqquJkJztJV8a9tzVCyWRmXWQ/lAifyG/jtfBUl5NHjJew0knZ9vdaQ+h9dMQWnbn0aiea9R3TdGGPm+QJms1Q+OIZT2SwXUb9akLqqBRf0qGyTP+0fWLI2U4YYJsu3gDLP6+yqjwVsOFIohzlyuc+k+Of9v0IQePxpVctefsiRTywaAkW7MUHntgso6iv4KrQOwqDj3gdNS78AzveH40DA3hjlpg6IKYkcrfq6bJ9rXqIvLL7b1MirKTH9QdM+xzetrtHgqAJCrPNfT3qJu1BdrszWWxqwE8x6fVwcKlS+EqLE6PitR587bK0ceA5ZtXajrTabbF33tjaunbEPKzvuYPFSlU4mB2YgyhDwK66zci9VSQAzycgLXaPblYtcSV+EwmsGuzD9kRNfixKc/8ZxY6hCtwH2W/H1WPRoSQEkPpyXOnM1zpFAW+Q9g6c041PDuwawDY9TjIvbE/dhcrRJkONQ8LFEUnLOvQZDJZyOJclZhXlPywZyYnHTRLuosjgKVk02XQuuDtPC8vthIXQVA83uvjqyiYMVnCG2EXF+tJitaM+FHYUdWVzf/FqJ9cT+KjLnWPRCkdJ+MrQHGn0Cg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:vKvx1OUOUyEYNuQYPIjiMHhOUC0N38jy5dKjbfRJP8DssoryCE74NdSN7XUK3QlMHy6b7xgpThb89eU6lZdE8XGy4GuINL/rJ+f/cBxBH6ha2s+YIDtPgSFCThYA0ytAv/P5MRn4vMndMxyIMjqdOBuzHrz5blLEAYVTFrEPIqvxodzOvf+Lnk52jhQswDQkxL4UqeveW7yrZaQDREifLFhwPHk3QTxNKFziXdtfqxH/12uGjVfn0KrSdf1Rg/6hms5Dtllp9JFGmefA2Qev9utKmlNiMXG+lLWXi9FC0ss65hlfBAJPiFPoOdNUhBgxj7CxmL6lT4Sbv6ZcasM6T0QqUdB7eWSFDKVNamrQZZU=; 5:HKpZfWrWG9zGPN9hUdS48ZquZ6BERZmb/tW9Pd1o563LaaUpDlpIF9T8dDWqEIAahfh0u3ksz0PQKca+vsFgEA/4HiG326b2v4gruQyArtWwawffNo/EOZyu2+pnHGBpYVs3CdpsXPgZ/dPyM24HuLooRTmfGhcOljmJtC/vSXc=; 24:SkWUYa0mJ61R+mK+e8IdjezWcOVPMoJVgdRCqYUr2473CB80Gg324yXMPhISxHUdd6zVdrogHVopKfV6rGkJP0gH8to6spBBhR1Yz8YIddo=; 7:yoCUU3O6OJopj+UWj4vDSy4LFVSY3HerEn12avkoZMPLTO2E51ctU5Gj4aEemtxI+pst+6CGls1vQ+OogVkpKRqfPajXefj8xyvVx/JQ7leDdT2R4XgDAt9v3ICDwtYwA2n/ZwNv6nG5GDJNnnJfrncxGxU1aKZvMFP3RkbhTARF7Xa1gjWGkSmv6MKm4WOeWiiWnezw6wGXWST3zlV0TOrLpcEEbuj10r2YmJyqCiA2Wtz+ZLMb42OKhSCgdh5M SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:47.1005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22a0c686-2a98-4cb7-3203-08d526fcb038 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.41.82 Subject: [Qemu-devel] [PATCH v4 22/45] hw/microblaze: 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, "Edgar E. Iglesias" , 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: "Edgar E. Iglesias" Reviewed-by: Philippe Mathieu-Daudé --- V2: - Split hw patch into individual directories hw/microblaze/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 457a08a2fe..31466050de 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -86,7 +86,7 @@ static int microblaze_load_dtb(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"); } } From patchwork Wed Nov 8 22:57:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836068 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="5tPxvh1F"; 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 3yXMp53XBvz9s3w for ; Thu, 9 Nov 2017 10:24:45 +1100 (AEDT) Received: from localhost ([::1]:34420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZi7-0001ZA-F1 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:24:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZM4-00006N-0M for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZM0-0003Q9-Rf for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:56 -0500 Received: from mail-bl2nam02on0050.outbound.protection.outlook.com ([104.47.38.50]:19184 helo=NAM02-BL2-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 1eCZM0-0003Pu-Ik for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:52 -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=8wOOr00/IAJh/wy1ySpCHYw6lRMoQqnzQi9FaYIvGYE=; b=5tPxvh1FZLDPy/Cm74l5XqIoh27xv7wgL3t1judFrfeHSYgZ5egSAWQuApQ3LJ2nuY9Q1faWQrh+SPg3ty9HsXR8ZoU5PzzNbnjnZANja5mtCXAMFPfkQIAXoNdzXguW0auLCUg/34KaJxt0TSKOMu4Ey6dfVgDMcQo1GYkiWhw= Received: from MWHPR02CA0052.namprd02.prod.outlook.com (10.164.133.41) 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; Wed, 8 Nov 2017 23:01:48 +0000 Received: from CY1NAM02FT063.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by MWHPR02CA0052.outlook.office365.com (2603:10b6:301:60::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:48 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; reactos.org; dkim=none (message not signed) header.d=none;reactos.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 CY1NAM02FT063.mail.protection.outlook.com (10.152.75.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:46 +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 1eCZLu-0001MR-6b; Wed, 08 Nov 2017 15:01:46 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLu-0002si-30; Wed, 08 Nov 2017 15:01:46 -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 vA8N1iPa009834; Wed, 8 Nov 2017 15:01:44 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLs-0002s9-EF; Wed, 08 Nov 2017 15:01:44 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:43 -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-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(2950100002)(8936002)(305945005)(6916009)(47776003)(118296001)(478600001)(316002)(575784001)(5820100001)(23676003)(54906003)(81156014)(81166006)(106002)(50466002)(5660300001)(356003)(36386004)(36756003)(4326008)(8676002)(77096006)(2351001)(33646002)(50986999)(76176999)(50226002)(39060400002)(106466001)(9786002)(63266004)(2870700001)(189998001)(2906002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3383; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT063; 1:ivj2w5vlotPVrqpWkgg3GBnwW6/mYKtEYxCsIyzQg3wcgbB7IlvkVpuuPLvIkI3XamjWOS7x0YoA49Bj4FUNIqnJtBCBUGCTjuU7e4Gzs7W2PMVBB8z3K30iJzjEI+I2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4fd5a426-92b2-45bc-fe70-08d526fcb07b 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:lOjlVCQEgl/GdXTS8pmLNXgac3GXiGo3bq8e7GZ4/074uuErsUH9cDMFwfyCHQ1w/8/oKtp72wkC4052TyNKYtTAIL4hf6ACr24k+WQw3fBczgiMLuJGykyBxIcwbxvRue5uIVHvvyArFTMgFnB09Fnf9/iRz9Xz8Uv9q3MvGg4jGiXz8iBFQ7FjOlEJBM728xyTPM7AXPsI1Joz7ISyjro3afB1B2bJe80zG6O0IaJqmTvXQ3KBoxKYnrRGGHrgmTynv67EVeOASqTaF3TUV3tNAS3+YKekNnmHwfhpR7Gq4eidQeAUAoPLRk3SQZRSpK3AdEr994iPxOVHr4rBSY1wexKK5pi9thK5j1xrfig=; 25:3nU0aSc0DJKKNVZWzruwBvIQkC6wauFyivjTJqEF+AilZvw3NyojL9XywvEuVlktut0okutsuXooCW1h9LhqOPqUsVtzskbdhWtrblzDhkgE9iBb2eP7fXxdYcr1KENBF6r6cLe/bUMJT3q1TcovT2V1sXgKLnsoO78tFZFN/Otv1u77xrDXgycxTRFdjvCTL5NR2Xg8NSyUO/o9tnFY4CZTFZc2rRoBkxRKlpzvRtUvAp5LAaX1TKX4xN7Agp7f2E5x/mkRN5ZGtMFL6ozldjFn9IOGSy5peS5hJZ68eSa+uqESDNW+TmESdELO+M4a0zjeT0ZymuZoV1OqJAiKEQ== X-MS-TrafficTypeDiagnostic: CY4PR02MB3383: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 31:X+z2OPT/vhRhrZGsjq37rhOYgGSE4j3OVKxNBW6UzPMMN3v5uf5vhuMIi25mjhavoSOvnfIAGoUyjrjWIPzHKH11AM+VKg4UCpxibXf8CcFUxmexhEaWOEJTcI2+EXvxZ9vzOBC+0Me2ggeVSGWvycPEk/dGZV5Le0rO+Cc/u9D+Y0k1b/P7Zk0DXx/aSggXzzBnikAWSDQDqTaZJSqsecIgljx9+FAyMFqHsxUPTy8=; 20:5zOHk7jgKDW+nlfcCmiOOl5kRhBcBEkyZXYjCJ8He6PeCCgzP5G6rF9o5p+SdYtWm7qQ+tOAIWbizt73/k8cSVN5fAd0FcTDTTG5TzfOPWkyREzUvLl020czJ+FdRwvdCb6LYjAzB5hDN8Zn3eL0ms2c5bJelskmy4dgpSUKOlpeCacsb9D9S+LCq5se2m2DZzUD8UOjid7Kx+XVKF10/cwAE2t3B4ctKpP/N/AT11sgFpM4y+UbDPra3Rps/JVe46JjCB3NG7vq23REDXRAinxn52XhUXkn+CyIyz8FCtSHZO0TvA6EcIrdS3O0/XXnmbEmNXRwsebGYKoqJbkYl0FHKpkvFQmvS6SLxGBrma/bvaFouhXlSzd2Ob3uXPJE2cm97n+CXSBqC3+Nje05+dyjzEEJ9YcWXJfafxkhu824TWUNQI0jAqzZoekIeRLj01O68N+3R7SzFwcWeT2qMyK6mKZDoh4S/lmi0hYU/5Pamnu/GutddB6I2Q0eTtbs X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3231021)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(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:J759Pep7d8NftCTbjRnIuWOv30bxre8cz6mIXNSLkL+WNfxYBMP2LH3tO+ODWarl5l4mDGlrdakxofcemHRKtUX7JVMV6TLIBQ85+HhebidAkUThDSW8eq3fRDZXRJRWuoqFUXcePXyUVsahRXf/YT3Q6ftXaFv7VzS3IdXH4whu5xTYBr0GlfMxqe7nAk6x+FTEDoTikR5/HVvNSnFzKuw4oHJ9s+D4OvuAagPYJIGhoZEKj0XUbfJ2Upxj0t+qD+tAO+TzldVYB5kd6vr6pMF07Y8BHifRdUHFvhtc6SdKGvOxbt3FQGRS2aDPUjS4ZYj+PjkQqvDNoQ/98ZEwyQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3383; 23:i/F/tGd230wy7cIv3ThL/PlLxm7ynI+GrAFF2doJR?= I4wBk0WL4aY119zrBRXQDAk3S8ndEvYQn1VbAao+Cl6ulwwbfRlsrgeEQO34OAF6Ugn++Jk1tYArh8z7Sb1UDrstl/PiFypLB4K8jejUrZ2uQJjg7F0jkELWiMoVLc+X0uuho/CR2iKC8MHcM2NoKj+3WJiGsh2VXCYgAxRnnvyu5/01SfcP0ksQTDDqGfvUFKXexEzxg/w+7Y1vcvXt6I9r1VMJWCtHmWxRXPKCjngQOkrKi2pqFdoFMovPDSljZFG6oAdeR3NEWSiYNJGzXz4hvV8bfnyUAirDSOur+ksIULHphj5fiW7tTrxr2Ke/5UeN+2ofwtiTXIFekrvYVFf/uFTTcT/AthTSkQlZWXnlaVUwWc5E2NMEr+0nfbYyFwJVfN4BOoDlOPIYejfbhz1eUT92JwH8jyv1QyO139TfwCeWZTai8ILf2xUrAWK0K0jA5oaB52R1NODDB/SbN9dmaJOL97eJtXVfVByoZUuMEEFRa7EA0YN9lm8iTc5zMgSq/KX5tqIoET6fHSMl+csPqEFlD7lo/E0gqValkzxwQCqgn2eG3w9mD1kJ+YEXO7yUo91yHm5BWTgV9c4XLjlSeDNKeR5QdmbDwuaQ2QjzdCNsHkfXfvTpOg+rmmQa4wlXsI2Jv6Na83myHM92qD4R5K+wkTxoWxSwIAhheo4tA9PMvndinAxLdKtI/ORGJ9PaGeMG9dysqHgO/Q6oizxOCEmDPcxU+5Dc+Rs9du+x6BVKgXCrCMoZSFAZxW7HP4f8n9t0BGT4bZVmEW3OqXoRInKUXxTZe1CqE3EIWLjmENySQ8T0SbKF6v7iTKQiCgHR+/ty59C552yt6VTAmE0aKRuGxx/DpGwT2hNZSKXaQzGpPyid4ND5WGpWKICTZ+WdeQ+T7dljJUcQamFllmPVyz8tM6D8nxXMICRN9QuYogPmrsY+5HEhmURJzAkO4aXLyXV7pXA0c5PFRmGtYyP9Juu3wW7X/9Ie0myuK53QDAQO/GRlsmFsAsMl806iZg= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 6:svEhtjNLZz/Swd6JrBHng3P8a1kRy8/bJdsZZPUO9OLM3wpz40s/HMVhw/p9WteKxlySnR7Y0pgrA+2Tb4PxCIjghzgxU+9evqT0kXfDIYLYr7eEnbWXRlixYiYpcEnyik5e8qn2bYDm+oOcNtwFRcma/l8Htm8B/EZOOMGcCS/8N28FJ1o1h3BfBgqEY7YRlDNTDhf+zk74+GnPCHpCSdJdLZjGpMdsj7cZYK8J3Fwjg9hwLOVow2wwBjRW62xmgky/0QaEV5YI2mcJg1+LsccRibmhsj1ln2/easqJYk9FfCp5SJ195nV2H2QsqTqL+sWAL6OmAtek5js2DovRvLz7udocI5yT/KhJwtS9WdA=; 5:aBZ4ouCOw6ph3klH+xW+gSSNLACO7LYG/c7SjGt5z8K0DM8FElKVoZsvZPwMRmyWFdqgiWrjzArk879wBh25UY9v/qdnyBWV/V/56UGiYJwyhHKf6f1xZMnawnitDvM601O2FBGrx2SfvzFS2ZeUgua4/moR2h9FQcUUWzILw+w=; 24:eeIsNDwAB6L78/ZZeHAMhfbNEWvPDQfs3y1QNnpl+rkjeS7OGxwnFiR4V+5XyoYxZ3kF2B0wC2Jsq9aL7tGSR4Wa8PcOzxv/7vMe/CRwm5Y=; 7:h18R7u+zZ4JrKjZ58E7qdfEO4fGJBC0Y/NjZ7muthFyy42ip4Ef7eCgmL8gfWHKb55Ksj0J/RsWx9cII1qZkQ9BzwvoGk2P1mttXkY1+XKVKT2HalGE+VVpfZ3XBjqYv+k+eEeAhHA0gFUc1zLnXya7IcfMhvDjleVd5AjyR0xWVBiCtdEGs3ePZMpFL5MOVvSEBg/YL61WJ09ZZInyjs3jQeNp6s6ehgUhCGuxGOF0+9m4elZzAoUaiW8QBk3hp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:46.9198 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fd5a426-92b2-45bc-fe70-08d526fcb07b 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.38.50 Subject: [Qemu-devel] [PATCH v4 23/45] 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 Wed Nov 8 22:57:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836066 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="OzpIj004"; 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 3yXMlY1kFWz9s4q for ; Thu, 9 Nov 2017 10:22:32 +1100 (AEDT) Received: from localhost ([::1]:34408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZfy-00089C-Kb for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:22:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMX-0000VW-TH for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMU-0003aQ-Q0 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:25 -0500 Received: from mail-dm3nam03on0077.outbound.protection.outlook.com ([104.47.41.77]:2240 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 1eCZMU-0003ZZ-Cr for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:22 -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=1TqQRkBlxexCmBE30Wkgs6JDGmYMy45l0N8QDWA/AUc=; b=OzpIj004f1Sz7MlouJ4QGEQRRqk3zdMghrd2NTbMCVQ/vtMmdB1HYRg2cQgvO6JBbOd9F0+zNP8UiIWR0iwKrk5yrI46ozot8Hh8prZKK1W2EHiDN+48toDPi4Xhc3HSi97DwO4lYjjFUM5eNytV6TnEJSdx7ENm23O9lqRq0kM= Received: from MWHPR02CA0004.namprd02.prod.outlook.com (10.168.209.142) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:58 +0000 Received: from CY1NAM02FT041.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::205) by MWHPR02CA0004.outlook.office365.com (2603:10b6:300:4b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:58 +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 CY1NAM02FT041.mail.protection.outlook.com (10.152.74.156) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:57 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35306 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZM4-0003yC-Pv; Wed, 08 Nov 2017 15:01:56 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZM4-0002v4-GB; Wed, 08 Nov 2017 15:01:56 -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 vA8N1oxp009912; Wed, 8 Nov 2017 15:01:50 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLy-0002tv-8I; Wed, 08 Nov 2017 15:01:50 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:49 -0800 Message-ID: <8f170b3eb5b998f6e27d5f2ff0099bd2df7cebd7.1510181732.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-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39860400002)(2980300002)(438002)(189002)(199003)(23676003)(106466001)(63266004)(2906002)(316002)(50466002)(47776003)(478600001)(76176999)(5660300001)(356003)(50986999)(305945005)(2870700001)(81156014)(81166006)(8676002)(8936002)(6916009)(2950100002)(2351001)(77096006)(36386004)(50226002)(33646002)(36756003)(189998001)(39060400002)(4326008)(106002)(6306002)(5890100001)(118296001)(5820100001)(54906003)(9786002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3377; 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; CY1NAM02FT041; 1:PsVzwd6kMrUSgk0jpoancNgmT0zHQri+vRcbRhnei3PCB21yrnMpHvyazXsJTfDSNhF/quYQ5E0mntSz7bj1QKkV5z6wAUHiuOEN6URgRu/0OaR0hAO2hWJW2Bv3kXJG X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94d96d57-aa36-4748-a275-08d526fcb695 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:GcJ2phy6UluJTzbYlCmTmOA9I1dZtKmdcxo/CNo8X7FjRqTo6hGejPJiQzBj0u/5gsmtaS5hNYLpzjCovSRBXl7lD/FDcs2M1s3eUPfEMu/7cmFWtL5EN64eYcYKkEGmOSG0bm8pJLkOXYWN2g1PyYf4QPRZWBlCFxUnkKdMwzvuMx02qB9mAOZn92k+Pq+Zy/Ha8nDwzaOy/pcc14HgGKic5dAW5QvW+JSeZq32aKbc1vNqnlFaN92SVWABFDzkpASMhjHh58Y3vz5suNAt654sAnqS5AeB0B7P/wFrJl6JgIQfEbOkp/VA3rdVr8dzkJN2cMObRGAw7ss5NW9ngfyFFxzPJTiCu9tDPzmGhao=; 25:Uv9UrEuPzvgWf9xeHqQCVzCv7iG9POvWzIAOd2tImMyPk8U2VL//Cg8QChmLJoeXuZwhDVJ7rtOVtVzOZ/EC2lfmZRpPvo8eTD8WVBnD27+E5k1eLsdROa6dM6P1tdUMYcqq1pjgyssg0RuPHv/uq36gXyYIW2eCPpPf9xiNDx3663kStXdBMJYwf2LXeqQgbhwV76Dnqh6TiVKSukVdCNDrH40soC4I0x1Bgs02nF2AfVeV8LWPKZZNZiIBJvrFRaeKwmbvS8dgXJFCTZL9zl+pjI7RtaS7Cb5ghdhcbGQh7j5UzI6HR5/EdIlVqCubM+YOS/SNWp5Lj0QcPXkdNg== X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:B0hWdHnjlnvMyD/9wCPxJhdUqswD5yBV6Jn4q/VhGFk5sFE9NBCoY8Vw7JJmXXSoexNYVvQFimcjXzHdSSxgQH4KNjCD7YHMwFX8LMKiBuS+RxSjL4zj3UfDuSSAFn99GCqqaBEiFxG0khlu3vGF3YfOpw9rb/N+cTsOhS7UacCwP7kxjY531YA/c0dNhGsh+5URLPtoguRZG6Iqham2UDpsunad0H868Dlg8gzrG88=; 20:IlT3zwBkhBfg+dKvD4qutGewdrHwIMgVqf2LkxQxlj9xLeI8+UUdgzFFms11RcbvgZZ+kVjBv4BfxE5Pp0BcFgPqOtZjtmluR1VwWL5FkvlxQyXuUIiaxJHzf4ojIznIdwxMXF6KNJigOiQ+6JfWngpQgW7BD6pUWSVEuldEgMjxRX27xAnMr7X79bdmc0FldgZWGbVVKN34EGMEFSqtDvNC7XP/15FDuOzuxpcDbZ+h1kA2fvXYTmIaxfVjASctR24j/jZbkWj82qFwJnjoN0gFfbEYCfZ/9YPr032K57JAZ6dXwKEilYguNmK/y5txlETt+weaKql9ef8G/LsFNdjSwOJGhKmr/X4+2da3qTtY3ll2koja2nwTi2TNC9Uph/jZfzX61QCpUflNRkh6ef4/+yJI3eVNqF12b+Z63JSWYGz1qRuQk60Xq8op2PUR5O24BiUtG8f+EseiBXVG41bgCITecep0rDHWbXBYGYLhzV/1f9nBTFSVaEbNPBk+ X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93004095)(100000703101)(100105400095)(3231021)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(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:cZsa8kF/swgKSlcIpym9K6Mk9MSDkZxMYCOT0XEokarn79Zy8SgqM9w3OuWHAKJfjviNSb6aouqLSHxEjvzHNv20wqnNUMq9sdhLdcINFnof7Ym3DIE9tG/WN+etjyu0p4xEPT4VS/ME0BsW8QimZlHvLZq3jF/V/zePmXzUJUornf1ulXLH0fO3lLNerdv2N0wp/y5PwolLr5AmLfzscHN2DX8GhB5+s1JlRp9zj82YeC/y+hOtIeVdxKZvRJDKEDSkEXqjvSd5kx2OiZkLZ/nLCu9Uxlvkt0lfcA54YYnHDmwzQjzO+5zoKoIjlx6uCU8BoXmJmHZ4cJImixGZdBy/kD9JADNIc6Icryt0HiRi4QAHBSzIT6pkEWKwz7Vdqk5X1oX1regF0ALWOXfYDOWh6tjcMBEqjMSQIgZ5zes= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:8UDKK3o4fg6vCp6WoZbPJtCb4CQYpyXJaGQQHjcoq?= i+OX8e3NMe0hzFO58e7s08TMGtT4k2eytPaT2Yx9krjvAwdKniOfN5tBj3MH7MAFVXhkt/TNbo81CiMudNjyp5aBUUN8VHRAFSjCBKn0z+cp2F5xPA0AVefWnJ0DjFwmH86U2H3B/W/nK458horyhEgnf1iqPFvP8mbJJxL7P8LpOHDXnqnlxFG9V7M53RZJomGMWm1/cM+/K6sY3yIoJqGG2p+P6BUE6kzujmNBzqO9kYvseafHt7MVkfTLCn0sPnNMXjtUKHkPOaRIVrXF6D2u57Fy5W+y3YExW8VVrv/Q9jCuT7vykmaRO1iDkVncPXd2JUHMwMdzb4kgV1Fsj+QjCBXUFP6vAyk48bTo83afS5bf4cEwEiWp6qq035BRdKHxUV95S+qe1eyaTCOdWEYXlUOQr3CYUE1fL4VHFGs1bZvPLXukkkItoWP7dSLmPLSMzK+ubMbOSs9eifUnE9vAddzyP9oD17XAnPvZK4Z1WtD9h1N+jYpJLybJ/0DQHg3GvsokDFtd5VwA5SmsS52/+SHluFcqvT5knDVdK/mC7rDRXnbiFjy4nI5PIl1/t6IpX+jKva567mVXON9nMrXyFA6Rv5WibBp83gbvZ3IqfE7Ap/SB4xjS6z8c15vstUocVmS3YUxeCEnrpM+1s2uJtd1XntCPwSDzK5fAi4F2fdJ5HoIK2L32zvI7nTFXN9ujH5ME/u18faNy0Edq/MvBQvU/vZkFEJDmC391/xMjSkfLedugOl7HcXGkayk79kkdIWUa3/axE3vg9Hk+AZ/KLC5USeRAYixL3RvqU6odrsm68aAtd57eq/uuOMJQ2ThdfccoNatjGYVEYshWfa/opiP+HUQ6vU9gxWSA1M9H6G4mnxSxIsGQuaViDQ5GRQ+qZtuPfIiPo9n74teN5UZCjKakqIrYaNK+N14b3LNcEUN3mOa3rVoEx9JknnhUfxsBte01kzwyCxG7LDurDxW4T+Q563RIU/nhBi3A/qq/pkXStbX39GwxOvJ7oTnjMy+hKiqREPehuWSOBxgt2uJtsvIEUR+Pg2ZIsYYZXs31VKyzq+oVbAPvnxD3qqED5I= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:n8e/oGsqKBKY9oUZ/+8dSGUoekx/P3MQLalBslEoGyg4rygCkAHyXAeuiQy2k4wrigjEFSadcTRYVkazfTZqGymt5JOEUkt49G2mjTzxFF2K4HvxUAM/yrKh8OA5eKBXapZ5971KmJ0mIhcrE/fLd3sp9cqGytCvfWqPdEeWN1hjA6wNge7ceK4uf9kpn5O8DTYLwyuDCijJAYvyT83OpC10M8mvUCjUQGOPDDi4yNxyyz0Rq0rsRnvqV4wDdtXxmnRvJoz/62Pl9v7jtJz7Npo/QEY6ldUe+hSeVaMm+fBD3xQ9CRySIxIMPuftIFxd8uoSh+x+xbQXS7WuwN5amUrP910ifQGeQQrdswZOMmw=; 5:LuM7M2ZOhg/wXBwnsvwowbdafJaOdb3y5BwPd8w3JYRLNAzMGZCEluFMkTCyQr0uR25BVqXD8aI+rulyJz1TOhpVgygJvP+4rxx1NZgoiNP/SuGWu6Ms6IWwB5hLAk+lwSt4B671v4/2128FE6cw1Q5JBNZHuOUiFbIKBlzy4n4=; 24:612v9rJm5J/MNmJEeyzeXNpoRFUrPVZsTbUaGRqOmuvdCYgBdagSaUjG1IFvgNnlW778ysZALVFQIx3SSUQdhIcP8pDNaC9W+5kOMxhNkcE=; 7:PFRLeTco4vP8fdYsriuqaz7eEHviUpRdYCIThCGSG1swGgB6Ot2Qjx2Op9yGMyIHpoC9JVTinGF80ekdr3gIFR5sRbXXPAPDFd4vyeHbsk7YDBnBVviSfFoSY/hVy8q3IQubTyAsOng/hKOk6e0mW7afsT1bbAEhtEKpvpqGMXzU/PFetxrOHccXjzE2n5pxcFSyjW+yhrxfkZF8goYJoZITErSXb7tT5UoILX/Mz2+Bf2h1n4O6PIHHaYUSoaHD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:57.6229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94d96d57-aa36-4748-a275-08d526fcb695 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.41.77 Subject: [Qemu-devel] [PATCH v4 24/45] hw/misc: 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/misc/a9scu.c | 3 ++- hw/misc/omap_gpmc.c | 11 ++++++----- hw/misc/omap_l4.c | 5 +++-- hw/misc/omap_sdrc.c | 3 ++- hw/misc/vmport.c | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index 3e8ad8cd73..21b8e49b6c 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/misc/a9scu.h" static uint64_t a9_scu_read(void *opaque, hwaddr offset, @@ -59,7 +60,7 @@ static void a9_scu_write(void *opaque, hwaddr offset, mask = 0xffffffff; break; default: - fprintf(stderr, "Invalid size %u in write to a9 scu register %x\n", + error_report("Invalid size %u in write to a9 scu register %x", size, (unsigned)offset); return; } diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 84f9e4c612..e3b30e90ea 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -19,6 +19,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/block/flash.h" #include "hw/arm/omap.h" @@ -408,7 +409,7 @@ static void omap_gpmc_cs_map(struct omap_gpmc_s *s, int cs) /* TODO: check for overlapping regions and report access errors */ if (mask != 0x8 && mask != 0xc && mask != 0xe && mask != 0xf && !(s->accept_256 && !mask)) { - fprintf(stderr, "%s: invalid chip-select mask address (0x%x)\n", + error_report("%s: invalid chip-select mask address (0x%x)", __func__, mask); } @@ -642,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", + error_report("%s: bad SDRAM idle mode %"PRIi64"", __func__, value >> 3); if (value & 2) omap_gpmc_reset(s); @@ -806,7 +807,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", __func__); + error_report("%s: test mode enable attempt", __func__); break; default: @@ -864,7 +865,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", __func__, cs); + error_report("%s: bad chip-select %i", __func__, cs); exit(-1); } f = &s->cs_file[cs]; @@ -881,7 +882,7 @@ void omap_gpmc_attach_nand(struct omap_gpmc_s *s, int cs, DeviceState *nand) assert(nand); if (cs < 0 || cs >= 8) { - fprintf(stderr, "%s: bad chip-select %i\n", __func__, cs); + error_report("%s: bad chip-select %i", __func__, cs); exit(-1); } f = &s->cs_file[cs]; diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c index 96fc057b4e..47d9c10aeb 100644 --- a/hw/misc/omap_l4.c +++ b/hw/misc/omap_l4.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 "hw/arm/omap.h" @@ -126,7 +127,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", __func__, cs); + error_report("%s: bad target agent (%i)", __func__, cs); exit(-1); } @@ -151,7 +152,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", __func__, region); + error_report("%s: bad io region (%i)", __func__, region); exit(-1); } diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index 7b38c5568c..3dcabc1e00 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.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 "hw/arm/omap.h" @@ -108,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", + error_report("%s: bad SDRAM idle mode %i", __func__, (unsigned)value >> 3); if (value & 2) omap_sdrc_reset(s); diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c index 165500223f..55369bd180 100644 --- a/hw/misc/vmport.c +++ b/hw/misc/vmport.c @@ -80,7 +80,7 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr addr, if (!s->func[command]) { #ifdef VMPORT_DEBUG - fprintf(stderr, "vmport: unknown command %x\n", command); + error_report("vmport: unknown command %x", command); #endif return eax; } From patchwork Wed Nov 8 22:57:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836060 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="BZ6hHC63"; 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 3yXMfG5g7Pz9s3w for ; Thu, 9 Nov 2017 10:17:57 +1100 (AEDT) Received: from localhost ([::1]:34385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZbX-0004Pe-K5 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:17:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMO-0000Nw-MM for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZML-0003Xh-Jp for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:16 -0500 Received: from mail-bn3nam01on0089.outbound.protection.outlook.com ([104.47.33.89]:26752 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 1eCZML-0003XH-Dc for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:13 -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=BZ6hHC63GQFXsq0l/NEw0XBaL2xwlEsNwbuSFhnFrbFOl8+P32phnUYyv22W9FiFVMRi34D41b8lIxkadAIxFT+e3smU48nIJ8JDscRknlO0SGPmmDyZlHrO8G+gggoM0jTClV3UrpAtARwFgy3qAdf9JuAUYopMEGzULrmuD+k= Received: from MWHPR0201CA0086.namprd02.prod.outlook.com (10.167.161.27) by CY1PR02MB1334.namprd02.prod.outlook.com (10.161.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:08 +0000 Received: from SN1NAM02FT014.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by MWHPR0201CA0086.outlook.office365.com (2603:10b6:301:75::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; Wed, 8 Nov 2017 23:02:08 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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.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 SN1NAM02FT014.mail.protection.outlook.com (10.152.72.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:07 +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 1eCZME-0001Mq-TT; Wed, 08 Nov 2017 15:02:06 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZME-0002zW-Px; Wed, 08 Nov 2017 15:02:06 -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 vA8N22lF010100; Wed, 8 Nov 2017 15:02:03 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMA-0002xH-2z; Wed, 08 Nov 2017 15:02:02 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:55 -0800 Message-ID: <0a23f6b00e104e03738363146849f1b5b10a1945.1510181732.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-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(4326008)(47776003)(8936002)(5820100001)(36386004)(2950100002)(8676002)(23676003)(81156014)(6916009)(106002)(33646002)(6666003)(81166006)(189998001)(50466002)(118296001)(2351001)(77096006)(9786002)(54906003)(305945005)(36756003)(356003)(2870700001)(39060400002)(50986999)(50226002)(76176999)(478600001)(63266004)(2906002)(316002)(5660300001)(106466001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1334; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT014; 1:7KJVvhEByBE4uhrPQVGTgJ4hyaRR/XXYRMbZbLNgc0EDbNRn/3fDrBHNTuYXn2S1F9Z+HyDwnVwIoX6E3hqTSXnFJQI3cvewNqoui7qe2G2b+20YZkPhUIFx5pwKV0g2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1db990e-79b5-4315-7cd6-08d526fcbc75 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 3:1+rcHfGdhkiYV21GKTr0nXKC5VRZBCVJc0F6xulJU6hPh9AM72oqzx3/yViw6iH+NA1IHQHtUnXA525RECg5WwIOE6L40smKHow6oXa3/Ku3Dp+CzU1EvwCdKwLapHDy1C0AJ86cpO4A6V84Y4Eu55xjZkuxTpsGa5ycksWxv5Hf/dvN9fAglhGKDhh4TW/wQ+edHiG1aH/6W7tweEyzTf51fLIKzS+wVsLIEQjmLGWhvWm84/Fbnv1KEaAqxYaYcgUR+hg9F8xt3u5vOnjdbLgBkfUlWgWyc0dS26srIEwi6rfjc6H7GUuhirj0mThogCWPnQspIq/Y1Nq6De8fkv7vzL+RvyltyNGg8dYpOq4=; 25:jTdPzmvBtZv6o+tXEdMSKbWb40VoymvfhSC1Z6ZVCUZAst/4bGIYJVhsgho5dn7q3MzeFjAvZJPq4647Wq4DZbcOi8rFlEArGKxYcNuGfipHTZl/ju5ukbRtFgNVVH1G4bUjJUBvKSV3uEszzi1/A0qwPhHLeV3Ld9z0zRNuHfq1NJGmQKHfzw0fDhEzU8sbYFZLSSC/c40n19g6Tsf4PvQzKtcNLQTT8WVr/xDB8VtPYW/KlLhzUpXkkAXvZUP/c7kF8CKMb3tHheEiSJxDv3TsrXszzD4ZLryxsSXpoDZnGtwjjxjgvUI7nMuy9yPoo4H3i3UzwZyaIdEvJJC7SJ3ZLjl+zV84dYdK+mZlj7g= X-MS-TrafficTypeDiagnostic: CY1PR02MB1334: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 31:OwJQHTJVPgKQChl8YGkbcQU1gq2DLzv4CR2ISRCNRV4n1QNQnJlyflFR4WXl8IuYBacokOfhq0MKNYKhUUuL0agtMCWiJA2OIC6lXxgGeZigteT6H49cDsLlsXT7nhCWMmCjqL9eoguGl99DlqAaC5YvO6joQ6MpJEaVDnOblQdHfT4sG7QpdoBHpDU67bul57IM5mF8NjixzthUo2DtPSgpErFKx0vHyYxPUiB6/rA=; 20:pibcg8TCof4uDOiX6B+L1AKXzCi5lwHjp+ZHRHAwpyfD1Jj7xzi+oAiLCPHXRxdd1De0WjK9ZMPFxnY80tcSFt9ATk7AQNOY4q8/NB4K7QpHdInhEKWXC3xMRFp8iVEFjy7HyPtyn0xsDa3LGn0qKCS3+wNayx9ZpYtppG7YwTIkuRnY4pQybc5OyJ9KeDPTX2BqmtzDFNxFyOz0Mjl+A3qdyhVW5u/FvSkmpxeJUcZ1ZTnLTcC9O6mu2nZUTaiUVKZHApCAX1otSgk4ZrMRRvll9PimBtMmgPPZVf6j2JJ2mX4l0JTpIOiN5+DivB1wbCRywFteJzJ/Tu6Q+TkvHO3A4CwgObGty6q1Do332FhxO7HKCRJ/eFdu9nGE+1bnB1uXeEGUJtmRbuO++3ndCJn4mGByUaYrAkEmWr/FmUhNpoYr0BxtGy8k5PQ9itp6m4wXTkrlTVDKt/b6jaoDj2uSsVYfMg3GwGNqtASZ3dxaxJq1Ace12GRyGTTyvW3H X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(3231021)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1334; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 4:qDccYCpaUhnSWyrhmzVhkSUGOj1EQtLQhrOe9wDuG5JuxyFeEEs4OpgbP2pMOQ5JH21uiSLXGH+w5IYYgolWuovmwoGzpFVg26nGRGHQuIRz90i+2n7l3PTzD/ksT/JAIbr0AHWLGmTVVGlGL3OV7MbQvO1C6B3qJ1009oX87vJGkgDz0n8wGGLCtz2kZODRQIUwGtcvVLWG5I9exX8n8r2ceyL/7H+pYnawlBGWuuBaJlcxzh9P13SWgzEfNU14P92MQhxe2bh13/VS3J2Ehmb6SZdpHDCzjQg1S0x2OOX1gGzFrBoLvd9ejfvnH/FrIzAOmArvqHtsXa6lwkRCVA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1334; 23:sK+xV1oNKxN76eX6VjgO0/nBpo5U50nj7nbLDKKmC?= t8QmWWAIy7UZcqiEF/aqVBX0oB3nBuAnhXTpARkOGcAAL9OrnXwVP6bEZkXXQWmLk4eLJTmPZEsL+f2MHsI8YCIhqitJaIAJVeU4eamvSVC9m/lAMJegWArCe5p4G++H3W+WwxsXj89ZbaJXvpiZXgyKpjo70sJiMLhWfRyFM9dYgJ4r1xbBhUINPjd7wMVQT4qdAAHebcBOtJRsyaDcxqLzUMvjkoFmL3+Xn2CajvZg9NdZXwW8XSNd22CXYn0uAElt/T1DX0R7u8PNMw4GWXG0EHpGxIRV4fv4azztVNQx0vcypLSRzBjNvdnb+f+78yXKoioY6dCCF6XMHd5Sige2JPcIKQ1ag5UnVpPdWQtNlQ6NTDSjpPLdNGMsPIID8MNGCyeQOOjdlUDRjykOBkvOWv6xw+tD4ohGHgY6taKLaRFsxxMlc/do/c2jK3ZIaiefb2C518uJJ+dui3O+jgwuKMXnFnSdEHnJwXQvJyufdoMHYwv08IQh67LcIF4WR2rnP8YSnlXtT5BzGPxkKs+DYZ7sarmcJvGAPcyi03j3pYLtt5eJWV/VVZSpj+2qoaYXMMUgyweZwp+LK068kE7hkY7aRCxpXL/76dJLXQTWGCo3PuHuQtZAsfwwxykZeZoiIWeO/YVQt33pViQ/0Ka6RoDWYjRvrruJHbP0oJQpjvHLR7ftxdCRlLPTylBUSqq6i2Trc2I0prQvTwmjYPML8QdRhGhQln7JcwGnbAOFsZI9kDo6jhsujHqSvVeGS49zHP544ROgcggY30W9h13RO+/RWjXFPa8HlyDzBzI10HoRkcTimXGMDYDAT4jpUFWUbKlEKyln/+xULmjAsipBtb2qiq3pVVOKy1z4bUl1XjllYwbqmVJEd9FnzO1oCgSbmC8ZSyFaagn+CxOSJGyT/cxFrmy0hhApRAtRpq1bNG3iC3DHZrIVwReaDb6RWhZBNZuDyU/OSk5ixFPnVXa1ILBlqBZiA+/fswNVZl48Zalwyrttu95as+bukaggF4= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 6:TMgr6VXUqOF15eDBUJ1kB8fJSYIQITnsltzLkmA4575v8DTlvdRrnLEHU/v2yZxeB9uZyNPGO1Yc5Jmf/vMho4NbdlQLFQbKC7YC0aI77l6fPZ6Tv8MPQETyzg6uOpbzM+VSx7DjHWsPeUGOQhUfSDarI0AlBjEuy8UXl3zoJMtr3/P6Qc0Zi3Nhcq3xBBpIUcyycpVum2L6WE1kNfvddxGz/svWrvfB5hZoGZKpL0j/V52kwG5Udor0HgSQioeCo3oUYHZ3grnaMZUfiS8wg2pIcLQfdqVPzSronM7CZZAQNBubfJ7vTdNSh19d5GFm/SvkvnJS5ThlA8w7uTh14bEsDPLwkr8IICArs9Q83rQ=; 5:CGkdckGE2uVzoe0mNDxNFW8c17IMCQC87qgQyAGlCHpJb83oksqRi+H9Ow1w6jb2dUVvj1jTmUFTIPcPBMSHvsPhNA7D3wjRFWtel4HBIsRqRNnxgBxZKU0u/yFSD8514eZNMcJYT/ok8IKzCCUi/0sjCz7YILPvdrKCW/YjbFo=; 24:qgclQyFw7Cq5B2QyIiR4lFh2ZBMdNq4DGMOwPantJE93j0/BM7jWT2uHmnlJQ/cToWXH4sV+SKg1/mqPE7Tr20ntyL0BBMuDega7fnucNAI=; 7:hqs3U54XJNBeQLELocBrR2B8xQYK3I/bc2BLVc124PxaPZ0D11ETmWBUTDnrTUsBrH2Tmy01nhhhJra2WiGyOEdFpF+XVqiRMVcsrWBfW9O3dbFyWsYF9mCdLNXVRaN8Ubnk9xTDJAVQxuM9AuphMlJI4FsYOyg8v2kpDHfcew7b9sr1ASLeqC6vWI4nB80U/2INi0l5uaUG9GJXkjZpM+AWiphu6v5ic3jVkWtRLv3ZryhKY52xAqjIaY8sPD4O SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:07.5723 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1db990e-79b5-4315-7cd6-08d526fcbc75 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: CY1PR02MB1334 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.89 Subject: [Qemu-devel] [PATCH v4 25/45] 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é --- 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 Wed Nov 8 22:58: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: 836063 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="eW5utycX"; 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 3yXMj01pYPz9s4q for ; Thu, 9 Nov 2017 10:20:20 +1100 (AEDT) Received: from localhost ([::1]:34395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZdq-0006Km-7Q for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:20:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMX-0000VP-Qt for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMU-0003aI-NA for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:25 -0500 Received: from mail-dm3nam03on0053.outbound.protection.outlook.com ([104.47.41.53]:34400 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 1eCZMU-0003ZY-8w for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:22 -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=oM/VCJVSmjaKDn1MKfFSEuHeAeX+3o1Z3kcf/JY8JBo=; b=eW5utycXaN8ntLMjOI3QmX/cUUxjmKWBMbk3hZnsvWTh79eQLthCsQLFcoipMWNjHJTd3XtsBYHgdyfNwdHWAYFkHk3G/i5bgaULxGHRxk/2UgcJJPYS/DaY3n+R7fYI2jZYbKlORcDaCyrYRSMMZZwDdGivqofsauwoGeLvFMw= Received: from CY4PR02CA0014.namprd02.prod.outlook.com (10.169.188.24) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:18 +0000 Received: from CY1NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::205) by CY4PR02CA0014.outlook.office365.com (2603:10b6:903:18::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.178.6 via Frontend Transport; Wed, 8 Nov 2017 23:02:18 +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 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; Wed, 8 Nov 2017 23:02:17 +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 1eCZMP-0001Mw-9Z; Wed, 08 Nov 2017 15:02:17 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMP-00032X-4I; Wed, 08 Nov 2017 15:02:17 -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 vA8N27tO010139; Wed, 8 Nov 2017 15:02:07 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMD-0002yi-8N; Wed, 08 Nov 2017 15:02:05 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:07 -0800 Message-ID: <35c73e90f5667cfee146a2f69fffea10862c4f7c.1510181732.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-23450.000 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)(36756003)(118296001)(63266004)(9786002)(50466002)(2351001)(33646002)(2950100002)(50986999)(6916009)(47776003)(106466001)(77096006)(5660300001)(76176999)(478600001)(54906003)(189998001)(8936002)(305945005)(36386004)(81166006)(2870700001)(2906002)(106002)(316002)(23676003)(8676002)(81156014)(575784001)(39060400002)(5820100001)(356003)(50226002)(4326008)(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; CY1NAM02FT035; 1:V4fWq9lBkdUuKUGHRTKzT5841i+ub9xseo/At6FAIYVr/7A3FIzFMVN7K3ZBxtBZW9ipHaL24y0veigZub/aK32/VNSoC7/5RZ30EB2IM7Ke3GrvkCCahCdSKMKcUJE6 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00342952-82ac-4a1e-bec6-08d526fcc2c6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:rFx57wFYk6ZZNamaDL+VPcOa/EHg+pBduIpfuV0wZzXERNqQlHy9Dfx2sg2lUb/oGr9SuNI8h/eu5Ns06rBiL+G5IXQzZQ4xIjJHeoWGDPxl4c9klclW9l+H7gPYAovcMxNkfiG6KSpTUF+NDZtlAEgaiYiy9jWWYyD68l98/3QoBi2FqvGve+VVADjJiYfq0Ed82XlbLS9P6OcU7do2aa6ZcKgLMTSFCPNMDDOTeVeY+E79xq5B4ugVC4sKtjwCXVnI0DJKGpSOGUNWgKZbZYoT56L+DO239tTvBlacJ9Xy5li3NdUEqQUr9WvOGA37ISiiYp4sBIEFhl0kEyh1drLV4kybo/Ie2yjDpQUixtE=; 25:dUNRslw1v7yDJaJW6LnW5kWOl6QHpkSwJODPfcAIt7RueLNwSoVecmSLXpnOnOR5Fka97o40Vn+IALaPPNxy8SEZqKs5bBgUHfFEXt6Id3fVuZuyvBjkfd+s1efkdICD1i2bRgIvWfOzUWFDZ7rYElwP751deB44Lj027ct7fXu1hG9+qB6LqEYAfU0upNKwKHQENX1peA4Y7QcnjkeWJhhE+Tfr+DD8sh8guco6jBMX2QWbdGy6qApSKn2lM+ih0rhZiNx2573u41m5bcDXWFP6Kj51I0WumXlaLTrs4J4fBEaL45GVYuTI6W40RZ9z4hvBf6K6tLV681lXTA7mqXyGpqyS976nLOya7WuDSA8= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:MQxrZsoNsnBUS+u57S982FmFNPBJJYcve+nTTKtXr69lKwwr+c/3Xu24FwmBG0qgIjF7Y/P/LfXOLBLYQLSMjmF08YKnG2JJZy1mwA1hr3Z3npmT9tDTgXxBLzcHyb1mqmWm8mbj1q0OyFtQhhWKugZft25Ev56IXWrvmBFXXVyi8n2uYsr6KA7+Rc+GDGhyro9ttHI4Jj58VwZE5OR6E1uhVb3CHNK/yvqcJmluJ6Q=; 20:+5FL9SAEQ8luPPiAiNiDvNEQ3SQth4rguQYh4yVwMmSOmA/kOtKdDcsyKeItbasfjlff1GkKdvsnMc7zPKdwvkuWYj0PpTzPu4NzAHklAFSAwmUNYKnRlpah0neOxftaw4N1W10gDfAIsXJkXhO027iz5U3RrArkiIA/X/nXySAWN23smzR2cE5VYf+q9L6tbl7qhH3d5On9QdIrd0YuOCDFXPJvC3V9n6XSwbQ4WjOYWPs2CVyS2H6jyHSkBimhjhp3RhcEktUqxvBWnVZ3oCVyxX244V4azHjlaTed8yxMPZ/u9pQXo0W0CoJgtJLrUv0HzGAVt5qpjVGdErvQ7uDMFb+o/QlTlV6Z5cZB6gpzBDK8/LHNVgeLCVrU6t6tG7lPNXMW/oYS770xI5SKvmwx6RMAL0axzTuLhaitjju+Z46d85I1V6bR4Zw9aqO8xhS9rW2eZrKNXlsVugLCCM335kZ4bGun7nI1LPnacfuQ3bggKfFqLmfFMfPtVup5 X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(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:3SucIxJCaMZK8KWBu72MIbAJlJEAzq/mhCqQfInZ6FcfmXFvp8mmklMCkxCTKFxjJOBquZcApxRijNhwLGAG0dGNOimSHWhdqL6el/6ecPJSV7hGWWwVUsN/tLJU1mVSItYVMNUg7f3Ujuz/zLdBaAZhMzlO22RAb5Y9yglv3Jyg5HqnINPTYgmS8+Tt4ShGmrhhAg2tdcbjehGOMbRLa6Ze2+2NnIKsEWRKv+XncxxWbI7PYmacMh59KgYmmw29BtpFNxqazPfZosoBlLC9Ud+t4vp3llm9ul0lc+GjLxoMhLpXO3/XNCsdS3XMCd4TY3UNTMmEICQC9s2dCJR9kA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:kr/hE2i4H1ugRcQIkXweyMRXz/ceHtvOjIv3eRYL8?= CmvN1aSt6HpXZafpis9ePQLZWrhgm6jpkRthFVcmKBxTrP+MT8bDOXrjr2iXx+hoHy2LxZa4hcaReX8sUNRr0gb18jTyan0T9Yy/65DLOoamEkfrWZd9Djm3fM9wdNlB6Kft5yShBavu5Nlt3vDFKS5VicF5GqxBqUpNH/MVRxGLVRYMdu/uckKmG8ds+U36382sIZDdayYwpUSg/+vjSrfsw8vH70ExJ+SCsQ8VTMPnSW5hleSe7Te0kJKlFT1DaPTb0xmYsbAZY/gQ+oXepZ6cTR/I0GxkbRRx2xG3JaSeqtvn2MToKWW+znX1bzTYdYN5JtpyijA6k/8ooXzmTh6YvgIDyawfAC1ex/OIh/FeQB6G85CKa2aczw8ljFbeEpwwO8msatCN8BaDti1Em+oc4H7LBefIeuwBOVASltUTbXxqdShU/IibHQ2FV1FXVllzBHBK5RVoaFaexgAArJIfK/PeMeqcnCvtCpUlW17Sz9Eo5vPN/OkI/NzWonbq04m7sc6OGlwV9t/DZY0xWuwkP1u9ajttuD5/AHJn7LSpO8IAYXXsar0Lu8TmRFmu3m9iUpd/20um8ZGLeybKx+kmnbH1hK7iFoODaxZm5h9eyBCuq5QmfjMcDNApKF4ITLkAwPggipDowcdIZz39DNctrOJo0ek+n0MPf/CuiqMpaczi+N4lDi72eZFSiDKFiVeuhGFJ7o16vp4YfR9lyfu1MI6gTnMyjnfhfPilV3TnhG17TJQbcQGw8pTwcN7l4xz5Wpywdg2VLcSh/Dxl8EgLi67ivKq0ulw9eJGiJBUCbpngwbLOGpBvzntaliY48KFuWrOJYca6Ivhit9UdgZz3sIJnnbOF3bqGaYkt7J0/FOR6iDHcWHOcA98LaowfQueCz8KrPXHfpUWl3wXpZ4ZxdBWtwCT8rdKeYngBpJGeqj84DH+WY/ZMF4U4VdKHbTdpDUdkA8Plk2wPCAXm27tOAX3ec8SSMaWf8a7S+3QQJHlQKXCC/AliKdZOdqV9lw= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:/gqjB5zP59Nndfz6WH22r0pGlJw1ENDrb/2c1iCrVBYHa9nO85xpLVhOEeg62KzDSEKNr8RKU9/DPkVDyPMbj9KgNfbdiDkLrMABXewq/jcrOOOUELlaDQiKCGWhCKlucP0Z/XvmvujbbulyLipjtT0NJgvFgQhrmkO2T6aK7jkoQ9t+hgnjjztdM7xVB4obisvhsUY9fxirkqiquXy90xn4OhaUK3OupKMWFTqlrnAhpE7JL3bntcneBEBBGbCfLFoN21y7BKW+WULJc5Wt9EBHANE28JV5SdxR9H2VOthvR8blSC6KQvFuB2rVwb9kZ2sfWp4TVSQS8f+w1bDYkB5VX2Mia7qcIUzonL/RMvA=; 5:sGAtgLTyOTRKurCAWZRhsIheBDK0+M6c9g8ezqU81Wu+MAJ1J1QDCXDPsuHgFYP3IIxxHGWHUCr+QO+h8BuAy+4q/S7I25nuz8ik5QuxodSmRgBXol0qtt4mX7fQzO7sTu9Dmsqmu09EkaKHxfeRF5GD8GOBs4UqJpjN67osnXY=; 24:a8mUJ0qzZ4dmUvTzLZZEJ8suulx83kXgFlTDhclQ9YayXQSBfIN7MGrORIlyRljcI4GRgsxgLY+b2EoXkkMqNqYQexKhoO5ew4Td1F9RUxw=; 7:GWzR2dO7iJg5wBuilB1drCuiNWs/2ZZ6MZVkc8JKKG8bKefKhr/Y0pnu2PizCwO6dZKnmkOPCpDsDKgTSU1LBMzUr42/OyiDsEMJueZBy6H2Tvmgg4KsbyqsvtOuIJBFvpSupNIldWlfXbW7xLLFy7EB0fl9Qiw1dOeefWaKv12OsrTAU9yQ/MNJbLZM18Mz2GOu1VFHEKfuadbbm8LkDGOB+q33/T9z55iAPNAWWEM0pBbiaJxZAX4SXKA/R8J6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:17.9680 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00342952-82ac-4a1e-bec6-08d526fcc2c6 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.41.53 Subject: [Qemu-devel] [PATCH v4 26/45] hw/net: 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: "Michael S. Tsirkin" , Jason Wang , Alexander Graf , armbru@redhat.com, alistair23@gmail.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. Manually remove a trailing '.' from hw/net/pcnet.c Signed-off-by: Alistair Francis Cc: Alexander Graf Cc: Jason Wang Cc: "Michael S. Tsirkin" Reviewed-by: Philippe Mathieu-Daudé --- V3: - Drop tailing '.' V2: - Split hw patch into individual directories hw/net/fsl_etsec/etsec.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/smc91c111.c | 5 +++-- hw/net/vhost_net.c | 16 ++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 9da1932970..965effa314 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -347,7 +347,7 @@ static ssize_t etsec_receive(NetClientState *nc, eTSEC *etsec = qemu_get_nic_opaque(nc); #if defined(HEX_DUMP) - fprintf(stderr, "%s receive size:%zd\n", nc->name, size); + error_report("%s receive size:%zd", nc->name, size); qemu_hexdump((void *)buf, stderr, "", size); #endif /* Flush is unnecessary as are already in receiving path */ diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 654455355f..e7c89b41a8 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1070,7 +1070,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) if (!s->looptest) { if (size > 4092) { #ifdef PCNET_DEBUG_RMD - fprintf(stderr, "pcnet: truncates rx packet.\n"); + error_report("pcnet: truncates rx packet"); #endif size = 4092; } diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index 3b16dcf5a1..ae40fd6e6e 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/sysbus.h" #include "net/net.h" #include "hw/devices.h" @@ -362,9 +363,9 @@ static void smc91c111_writeb(void *opaque, hwaddr offset, return; case 12: /* Control */ if (value & 1) - fprintf(stderr, "smc91c111:EEPROM store not implemented\n"); + error_report("smc91c111:EEPROM store not implemented"); if (value & 2) - fprintf(stderr, "smc91c111:EEPROM reload not implemented\n"); + error_report("smc91c111:EEPROM reload not implemented"); value &= ~3; SET_LOW(ctr, value); return; diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index e037db63a3..37d0cce560 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -135,7 +135,7 @@ static int vhost_net_get_fd(NetClientState *backend) case NET_CLIENT_DRIVER_TAP: return tap_get_fd(backend); default: - fprintf(stderr, "vhost-net requires tap backend\n"); + error_report("vhost-net requires tap backend"); return -EBADFD; } } @@ -148,7 +148,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) uint64_t features = 0; if (!options->net_backend) { - fprintf(stderr, "vhost-net requires net backend to be setup\n"); + error_report("vhost-net requires net backend to be setup"); goto fail; } net->nc = options->net_backend; @@ -186,8 +186,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) net->dev.features &= ~(1ULL << VIRTIO_NET_F_MRG_RXBUF); } if (~net->dev.features & net->dev.backend_features) { - fprintf(stderr, "vhost lacks feature mask %" PRIu64 - " for backend\n", + error_report("vhost lacks feature mask %" PRIu64 + " for backend", (uint64_t)(~net->dev.features & net->dev.backend_features)); goto fail; } @@ -197,8 +197,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) if (net->nc->info->type == NET_CLIENT_DRIVER_VHOST_USER) { features = vhost_user_get_acked_features(net->nc); if (~net->dev.features & features) { - fprintf(stderr, "vhost lacks feature mask %" PRIu64 - " for backend\n", + error_report("vhost lacks feature mask %" PRIu64 + " for backend", (uint64_t)(~net->dev.features & features)); goto fail; } @@ -349,7 +349,7 @@ err_start: } e = k->set_guest_notifiers(qbus->parent, total_queues * 2, false); if (e < 0) { - fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e); + error_report("vhost guest notifier cleanup failed: %d", e); fflush(stderr); } err: @@ -370,7 +370,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs, r = k->set_guest_notifiers(qbus->parent, total_queues * 2, false); if (r < 0) { - fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", r); + error_report("vhost guest notifier cleanup failed: %d", r); fflush(stderr); } assert(r >= 0); From patchwork Wed Nov 8 22:58: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: 836072 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="AecBhZcx"; 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 3yXMt9704nz9s4q for ; Thu, 9 Nov 2017 10:28:17 +1100 (AEDT) Received: from localhost ([::1]:34441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZlY-00049Z-3M for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:28:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMW-0000Ue-U8 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMT-0003a1-Qr for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:24 -0500 Received: from mail-bl2nam02on0083.outbound.protection.outlook.com ([104.47.38.83]:62368 helo=NAM02-BL2-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 1eCZMT-0003ZL-JJ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02: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=RqY/2IgXpI75rDzHX5gN/MrHmuHW4Ex2nAeSXbK9zFE=; b=AecBhZcxa+0Dqml56RItXltMPyyQBGxOo45cDFcJFIf+jp5GctxtSIVbVcm8xJ+80GjOFzyYDghBd4KzsC7WpaTEJxO1YBGHb8DU5SJGF1WHj2eYE8x20KRALt8A3d/ac0s3/zSYEHyVsoM2L7U39eMavSjKVwpJxCLxDkE6PCY= Received: from SN4PR0201CA0022.namprd02.prod.outlook.com (2603:10b6:803:2b::32) 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; Wed, 8 Nov 2017 23:02:18 +0000 Received: from SN1NAM02FT037.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) 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; Wed, 8 Nov 2017 23:02:18 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.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 SN1NAM02FT037.mail.protection.outlook.com (10.152.72.89) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:17 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35943 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMP-0003yP-4A; Wed, 08 Nov 2017 15:02:17 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMP-00032X-0t; Wed, 08 Nov 2017 15:02:17 -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 vA8N283S010157; Wed, 8 Nov 2017 15:02:08 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMG-00030I-4d; Wed, 08 Nov 2017 15:02:08 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:10 -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-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39860400002)(2980300002)(438002)(189002)(199003)(36756003)(118296001)(305945005)(4326008)(316002)(2870700001)(33646002)(106466001)(5820100001)(2906002)(8936002)(2351001)(23676003)(189998001)(50226002)(39060400002)(106002)(47776003)(36386004)(63266004)(50466002)(50986999)(54906003)(5660300001)(6916009)(478600001)(356003)(81156014)(81166006)(8676002)(9786002)(2950100002)(76176999)(77096006)(6666003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1338; 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; SN1NAM02FT037; 1:55gU3Qp6EtdnOXBu108fK5KEOH3McaJITYGTc8Fam320G+bQJcQGNA56pcUjA48ehf/JwYup4sweUHWN88ujsZeBLXnFHKForYEqcrqUznxgzxgRRdrlaWqbDQSf0M3n X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63226ca5-da5a-4246-d7ef-08d526fcc27b 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:90qXhiOj20z59qS8PW6KfmEQwul5kB1dL5tqfVV06oXhQ0hjPd5t+YD/Xj8uqDQdAdVxQN5P1VqnukMWiGr+A5PNxEPTRmrUaijDw+S/Ksx8F1uUvFffhwuXQm5QBb7IUXTH6i5QuQwWXyIwgVGzFv9bppf9WYt6onVHWjhDs6w7HWlqX2bMT1b+6pnaJXdsjzyWDanivskrwc9kQxQw15ojkm1B0fgQePwwxQd/NZbSaIB6NiRZJPabnfKyhcn0cxLIpydMERRgWxjgmIc9zzApsRdTOmrIBst+YNfisk0PNMBJIUb6gnvPKw+xjsUAXlMTIi1cb2hF981X5bmZIaK2Fu+GuMDRn6YWl+/7Sco=; 25:U9HdiiGPJG8Ox09BW1eeYEwHp6d9gwYWj63yDN9pojJ+984w1p8a1bP2n5DrJoAN1boV5rq63xZoLlWon8VCy56aBlaox9HU3GaGhUlLGQ9Jr0t1pjtctRygjTJsKYuNj1xOHvCAHrFCerdqRggLG6eqN0ED1GH5+Z+mKDHDw6qQeBKh9dsdYEBP48qVm/PP+bYCQahxrLyRI+0tvryDRhbQyPEPIafyEnX3evToCWpxrmLQ7NUoo0x5oQ7Qa5oRoMp5+ejizo5vhJBnF9cd/WNpIcFwOD6eDGBSWCzkSA3ckNoswtmK7bc3yMVicBJnWdALx9Ah3PVder4GjsJ8PJw3h5u2BIvJ2buUYOTnROI= X-MS-TrafficTypeDiagnostic: DM2PR02MB1338: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 31:8rwmEbqKcPxt+zu5S9mIBE++ORqolAQfHT7oQZD+GbHDHsDgFfxGZXfov4mt9IYn956Yv0b6IlX1ZMAL70dC/UnzG6boPsBHe895SPXTEPZfTEx9ZfbhNQT0M4d62tvLow0Ky9yYNJOcslSyHjdvCmXljB/d2b8mnXEGEc2xEyp3vC620qe8fdTL+S0NHYt4psBXYtFqm+W/UqjBs4RsVcNPJN5rJoFS6OJw3iB6ZPw=; 20:FhKacS71dkFmnMajzAbgg1hs6Lqs6zY4mVwA99PBwGvIvWRO6UjDYoama3by7il4X7o/cCVs50Va/PXDC+7MU798wK+4FgAT+yAl9pmiOIfHV0S8l+7Uw/iM6SBhEdY23MmLBJZvYb7qFAv/XuAtYoL+Sh0HY0wZ7gLMZDOXZFBtheSzFyZCxYhYReMwsq/OTsVMesivZTN0oyGIhiZoQZbfYa9koyzpzOntA1Jl22el8XqYp0gFdNlGK2/ylvWk81kquS39ESySmsEa/V7iUvCNkwKf3uZUDnRit3MaprBKhkqjD8csYdDSsHExsZdGSN9yxA7+6uNltHjNryJN3k/7AA42o/tjVAuHYb8OywMVqhzPNiBvG+wS5FnOsf10nMuFsjbU8rlPaTpLr5K6IQdG58d932IVoXDfJjkRAqNl+Qi7Rx9U0wwfSO6r0t8jzu7QvWBnDkUHl3risrTii8nTTQZFOQVE+tALO2dP2v99DF4e/uRxsVIgWUkJfCwA X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(93006095)(93004095)(3231021)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123564025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(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:H+Ah9uQliBJmAzXTOscPSUSK39prq5tB/qPiBNG9DRezXlIiX585ADAVHSMsyCQ3FT5wyxB32InY4gjMfCW9MATKX0xpwQ7DTazcNtRqEhCM/0GelXp8TUEQOEq1JYAo3T2La+Yf7OOI04YHHwdmAqyGepiIdNS0ZFHELVRq99jbCDpzbDFMfCI4xcpoEY03WR/yBzrbDhs3UAP5CGTPWX25UjenxMLINV3Wr2ZYHiJrYf2LrIWABiQnL0PdTW6jpJsefbJQaHuQJCe96ngcICfPNAYt8YjdhFZBpg/cd/zxYKvbuLwfaXTKekwa0hxkQK8NjSaQ6e6JH4oC1+wwVQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1338; 23:ugVQXTmcu6H/AYOjgg/7tdgd7/qRP19Hjin2nT820?= CVzOb2ZglL3Q9votaIn96/vP4CbTeTxNbpqPw2Ydrg2k3pqJMFReFIbyvRpXLEXosuoGPxDDnxVseqQZcj08bTX25M9eAe9+zFxQTC/JybRFC9q/q6hzwZ976ALRAC+VV2bvgMyNVVFosZvm8t7ZX0kwjvnFk79PvREuNqgM0u0Vjks22kjGJ/mRqkppV+hgca+HCdI1nbBtX4tcuVAFCh+BDl+Tngysa3SEH1VO6HO2cmW6RLNmnPS1chZXvPBi6b59+bmnEPDu96k/t8TtAhx7i5AAJK0cjhpigZMcdRSG2zzzENUtQ0ZzYO6LvEML4Nc+R1Q7Bi3nDtdyT/PRwT6OidA/+HK6H8f5oj5os2aH9E5l5wMoMEzMkcWzB3vGTEO+Fqnf7wbaFe0il4ZVOMMZXM4dEo1r7FqQ0nKT6S4aTCSVKCo0sV1vsz6GoJ/P5LaMaDr/GlfRnJvA2n0Xt05h3kS9D122qAQbWh91p3yvVxG+fykPMqeJ66sSmb6YliLDiBo2Ycf1g9Ki54gMmhl4iLuyHGUStKNMstAV4KfGggM4JgD8bYJwpqj5LPPbceYCh6P55IKcyyfSVK+a7aCaD2C3gj4OzRQrK1aiRr7xMhkw1fFOwY31t8HbvPExn+tWrg/FHYiSp9dR0kG4ZhuN12qgYI8At2tQ80nuuTXwbwaj7fuWky0dbF8N2za2zcjY4gvxfnaSxJ/hqyhenImUM1g3Xe5c61z+bMdQ5ZNNl+zRsqZVw8yS87MD2LnU+QcGb3JQay0QERHnqucGY+txLpzB0nxsdmtMMKBCFieP5qYonxf95pVYgQA7SuyqrzAzWOjS5d0hz6aJgkNNfYhzwZ/lSr7Y2CIOFOTm5jYqHO+YEk5N8Ba1s6ecdGOcogcwmLKnTAY7vv8AW0gue+THq4ttjDV2Tcwo4EIkPrv3gTQNa25Cc8wg0SZRHVit6noMMZZyHWhetFJJsVOlERlkThhnAR8QEmuaADUffxJH3qrj7sjDAAGS6k7BPw74q1PW6eblmFB3e9ARZCDAuio X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 6:ThSYJ6HDo26ox2gbwo5ipR6ldJw5m58MVPukv+AMsjho30gAD1gc/b3xYffIlmYRRS8sNszzezf6J4X2lJO3x4SJRb7yZVGk6qqzUsqh8GyBFB6YaqFEpkfL8qS0u4gWSfnxmdeVUvDzNs4hSh5c2kgsnlQ0EOG+LnhMVyjscPI0+YYoLoEAl02w6WaRbrqdIxgwLAPZ2a9IuOTHUZrTPrGAFFxovy0n8G4M0+LnHz4IDxRDgYOtKSzZBHyvvWeoN9eToVQcc9sCekCfqoEksULJqWTYfuk3gNfexIcnSMf2mwVQyvbepacYxVE3tidZP8llfNo3kTMpcvvAZD7l3aPDx/5YeF/LdDeHiyxuQ2U=; 5:JDUExzED0gZd7XCj0vY9+OJpyHROnpIapAY/f5tJeSTllDtm78nvLtTijYj7vonMgBO4P5mLUnKYXsZSdwL9zHBO7gXpfmP8ZHHoM9Oqwnfj1BG64WRSSX+kF+QJFDYYBEFylG0sMeDPnG8lpA/9k18EvfvcwJNeVP7tM7Pyt7s=; 24:6Vw35ZBLu8cwrkOZ8A6GDFSKH54hzeZbEfVoNgOjddanMW7YSe9LSiVeYBqBahk69U0yPtrfrSWeAo2dA5GLvKd6qzqu5/a9zc8N29qUb1M=; 7:X75Bm+beFTFfxbIB3Zf9JulqyQTEY1pnykWGmeHT9G27CvY/ysw2CgHkg2pUOH1x6nyfYgDWpPxWriUaAys3bveHdT0QyUOttYe4lf7pR4YS0q2xkz9w43K5P/BU88tXbBfpjKcGxF9uGOzL6D40TX3BsVlqM+USANHik65tW2VeaB3S3P36u9n6lYKH7OtHOjSc+EGFmBwIa0yu1hbWXlWc2ULRJ6FUE3q61ie+UxZm4+pZCtXK3lHpX1yMUSqd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:17.7115 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63226ca5-da5a-4246-d7ef-08d526fcc27b 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: DM2PR02MB1338 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.83 Subject: [Qemu-devel] [PATCH v4 27/45] 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 Wed Nov 8 22:58: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: 836067 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="jYvb/gHI"; 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 3yXMp22BQrz9s4q for ; Thu, 9 Nov 2017 10:24:42 +1100 (AEDT) Received: from localhost ([::1]:34419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZi4-0001WT-7l for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:24:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMY-0000Vp-99 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMV-0003aZ-7c for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:26 -0500 Received: from mail-by2nam01on0082.outbound.protection.outlook.com ([104.47.34.82]:44277 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 1eCZMU-0003Za-So for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:23 -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=d+URxuRMjAdYXLWDBRMSbwz1g+J13f2q+iie0JAAVQQ=; b=jYvb/gHIqzjWVWBpEDMzWrg1aquyf4y0mvRh7C9ZWGQz97Khlqr4VXnw7ylw6a1IP8TrMa2c5ABYLoaZs4np9Iv9o0kyixdsCTocsMYCLXOsXC8fe2Po/I5SOvKa9d4nZcsDIhV17vDtZ32z6N/A22cLawj2Ld4F5SYyRIriLoc= Received: from BN6PR02CA0083.namprd02.prod.outlook.com (10.161.158.24) by DM5PR02MB3276.namprd02.prod.outlook.com (10.164.148.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:19 +0000 Received: from CY1NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by BN6PR02CA0083.outlook.office365.com (2603:10b6:405:60::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:18 +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 CY1NAM02FT024.mail.protection.outlook.com (10.152.74.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:18 +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 1eCZMP-0001N2-GH; Wed, 08 Nov 2017 15:02:17 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMP-00032X-9c; Wed, 08 Nov 2017 15:02:17 -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 vA8N2BiU010184; Wed, 8 Nov 2017 15:02:11 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMJ-00030w-0k; Wed, 08 Nov 2017 15:02:11 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:13 -0800 Message-ID: <1dc70f25d82fc829cf85b9be45cb77d88d8f3af9.1510181732.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-23450.000 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)(16586007)(36386004)(81156014)(2351001)(81166006)(50986999)(76176999)(305945005)(8936002)(36756003)(316002)(2906002)(77096006)(54906003)(4326008)(106002)(2950100002)(6916009)(106466001)(8676002)(356003)(575784001)(478600001)(39060400002)(5003940100001)(189998001)(9786002)(5660300001)(50226002)(47776003)(63266004)(48376002)(33646002)(118296001)(50466002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3276; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT024; 1:v6Hyffs/g6RS5LuY0aBIc1h9Ft7mbIu/yhuGAPkw6QUEVb25N+ExKHSXYWZphRVRyYBR0Q83t69LBHHhp55Mi0sopR5aXENqtCzFAppvbTMQdxYKPxom7cAP4wNk8zHO MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09606051-6eb5-4980-89bb-08d526fcc2f5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR02MB3276; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 3:enp5PvM0CNJtwon36KRZvy6ii/7FihuwO4Njj5dhJw+Gn0F1RVAGO5HBAJK1ztvcheCOK4FeEDAz5cb3eYJvyCjFJcdNMeyVkrjwaxFWRWhnMFpW5wg58w/5H4L0FY/9I89HeXGIqMqxvGcmcbCqo5NmEpsI6SSeslMzRMYNyxDHzIawW3gNtkv53V8x7Jcp6b+u+/IFNX8eSAcaDVfjrXWQs03Xu/tA3lv3Qzf4JDKkvtWV1MJuluMjQ7vykDoBHbdL14QgxDdadVOO3F02FI5cVAo38U1agGgmd5+yVXIDhv5TF1CuePynRNmNBd1Ac75djtr+3LEqRafih9/cjqTyWrCsC3gdu4tMIRpZCkE=; 25:XkJOaCwxy3dT86eZEImQ+pzdEPHedVrQH8mXp9L7kpk7YjQjNFTyRImxlnSofQtonOCapEFB1c6VT7/gnu2p0ljhX0LgYZYQB/sqyHqBHqpaGALfT44//dKsF+L373zElAoLL59vcKHaFktCAvKqhCCLdNN7niIGtciJ/Q4Tm90HWzQbZ3vvxGrHxyTlqSr353t1Uw7qgWcAddH5c41iTBEl8FUixFRKGf3R/Pybw0ULkoqKrrk0lKbH+femq2Wnv+3u76wQLkC7IkjXswzKfzp6gRinv42aCW25sUKwHzxpAxwJjIWLJWQJXNOFGqpHGNHZdAf6BWG+egxgo0Atzw== X-MS-TrafficTypeDiagnostic: DM5PR02MB3276: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 31:yYY0yziggTt4bb9Uaaw7mhcK1HZqSCE3x6JwqFXN19x3TdiD8u2HV87DZ27Qb+9Kd3P7h3zhSjVvGwS+xflmJldp6MsTLzC2FegaSZCUz9gAgk9mLHYc+AYTLqr6xrc4lY2yYo8YjEtEaWj39BTwUCmTw4IAMTwep1AC9KA5cJeCVbhVmMqgsLbshRLpDYf5u7jtamjn0juFwK1hpLBBFkgHlCMop6FUd3BsFYQoi/g=; 20:K55GAnXldOCXCTUWJV/vlcqDJzjGKr1Kr8wi9TV/PQRILBsiJZiDtqDq/Zf22OeLDIK04IBx82W9fDqUvP1RPwuxYsH+D4g8FVi/cGajImxl6XJ6jOliATf8gpz0QgzSqT6z9MIYaFyB98ztKdyLEM54nU4OCZr0WGgwYlmMaO7HtjLUqfF+VtcLGBT5paeOyNUcqQaG2c8npfiiym4UW0W46HFoOgc6ojB0Z8PrFKLaYN/iU5V2+PuvPpejTVH0WPRBgqa5GETUitpCw0u9Pf4j5LfHNfQz80aQ2y8Xah1HSPzqt46i2BMTk1ZbJgIP42uKxkbp4DuVpIT28k/pTdJIuGjpC+L3jOxlrgos6xuHNMVdezXMa3+DKA91XwpPzQlrGekpx7u4lt+ht9YGb4ZWA5JrNGf2kx28njpEh2+SokeanBJezIoLdQl9mNwOTlp7eC9TRGzi+28UGLDe/VOQNaYnHFdRjrNjjHfKTjddDiewyg2WKjhh5DGPXrrd X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(3002001)(3231021)(6055026)(6041248)(20161123562025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3276; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3276; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 4:aMr7tulGDCE3Wo6UMkza7iuZ4JolzqBEoobTdI+ybFan+l79c3O7ht8yhV9sds3geVcc39WIWK1Apxlzqe3hXMaKBGa+JEUH+t6VVAIipkiE5h4tJtLoFxlU3ivTzRum0oLkBdP6lUyXcZImjQTbkEuxmniACkBmdasYhb/u7GdnhDoCiiLuOPEG7XDtuO1WFAGoAXH3p1wDwOlEvLBK8PTUK83FMsXktMhXz1kXJqfnrM5QWEPgGz0DgqxDJqCJ7DLD8bHK6dpTqWRbgWoTtPTIfWdM1KvSI41Tr2czwE+TwnEe8lGcry8p5hVJsT9O3s3+kGJ0G2lax3OAnHh/ew== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3276; 23:MYTEj0UcTtGAn9YYUrj02mt2gxh+zVmyOdixiO7ZM?= zY2jsypEBzuPHsgD9KasV00top5bAW1dM3SxZJ9hvc2Tsn1s7U6WTUCHgP1GWgwgCjRFbH+uc1BLbYEZ4W/yNIJiOZRiVdrcBS9TUlwWgcWmJYQDwYpy/L6uck+uMGbHlG0sL3AEhWpuaLXFF9h8rQaUuhlkwhshOJK8rO9oLM16l3BhXKn1xCYw0mIsZMWZxnP9w+2HmgyjefmcJTd0SJ5mSRdypxYal20JJi27c/o1tuVmB7rMkXOpBGBiSlHDyDp0x/hBsOSK4omXMIV3SCvJqmr7CUvif4DXa6MwNeIFxYLg9g/YPFTiD6XtALwyy1AAG5fIbQRdNcEl3xoVKaKa75sW4fXZEc3DQ/sYXzGS0Vj0i4RPqsUnA+L35AElfF74mOMG+PS6Tq1IQ4ikfjkvWN8ZkVVIXI3e0UiT5HicPLproMVnZ+D7ZWWtR/H1PRGVmMfldgU0+2AgMYZRJHxBoPSF9Tz7azuPnU3v15pOeo3Ij1d1ihIBGZkv4DNh6MOcGjLSWP/9kjLjpSdelejs+hBXRd13AqYBMy/Uv861FdD8nL392PQ/6ezfGThXLKBpqyvXb3fh8vQxgstH9mRuy8KWJ7+54YJ4PdQnRQ8re/NpHsd7f99PaK7QIOR3u1ChLH+7JSs7bf3JRz6pDaQvOTDyZrEXgthSF9y/PhAIVHX2JDJ1rCKC+OJeW1t02TbuevJ1sKWO/yCVDuyeVUmo+oilQjlnf1isAaqQpTBvftno/3KVKt/SrdcZC1sXi/yJQuz8XPP3jbcxKlXTrbdi/8tLJDEPE2GdZ77UvDII0kkj/qgRLZfQAPjYHrJVyNRfsO9/XakYSKAUUcMqGbmyioPtg+SL52kUaitGExwiaWMOrxEGG4VC4BgJOafLUZ2nP2/agAXVttLrPL3Ri1bobKJoLh+7IUFBWc4/BcgYDyykE1isRR0RF3imH6kEsR9MxIPyWF85XOUOp8rEV1WmBC6UK59UAb4JxizAOzGObp8Mz/lr+Vbs+2caUopKM4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3276; 6:x+WdrV5j0Juq3Y0/MJhcfO0XTQO/LiPVmjRpy2n75pOSBkgsCUh/oLoscr2JxNs872YvSAi+IApLFZqzgDjOL6ffHZjAM5UvnzQhnVMlLuoKBbWjfZYdugutXDJmQHcrqp8fCgAw+hX2m2H2kE2bePZzTMnJmejRMpAixTUu1LEO7alxpAY37hFmhmIzoCRR7xGJp2rKUCApHkYe635VffHdYiZhc8DtCPt3+iJzt9cw6wNdWU4qztdn77cFsXFgIkntNjh1trPWnG41d8lEvDu7a2hO+kTikQksjUZHtEVXRm7Oq4RDCZVlUnqUB7yYc1HkxI8VWj4ZA+40d97jF1vw3wYGagKvaoROiVRrsPw=; 5:+lYPXlA8+ddW/QgdoNk+qH9Ocj7FE7hs5V+v8PPEVv6X0y8MKoTkHazu8bgJu3cccrXJrafL1vrDN4nZeqIgT7BXzYstR3MBB/kZZvBlgq1Vk6T8hGastP0SIOyVB/Y2/2x6/e5I1pTUhufvYN5dESuGXR6lGmUnZUeFpMBRhCk=; 24:Vp0qQnV1uUyrSvdkPDwOnWacUTQyIamlJp5rbSs8htim1rInl7Gu6ka4YCubZBLZlqG4h5t1wnpFzjgQhELUMHCamZBaHpzhnMv/uc1D4cY=; 7:cuzn5ZwFdZe1r5YLfExpCSuIM8CaqS8TYvk+ExsPcgFQGeVYC5mXZoLoc9xFMzaxoeLvajn0ETfaBfC/y/5eH9Df2OwH5C//tvBtV30DPqSOSk/pjTjMRpbzdtD/8zkkfdir9keHrxI8+tFEyP7TyFDWDQrHOeHT84Q0HCUENqTww58P29O+6S40oJFXDrSY/+cSSfv4fB3Q3Tkn3D6AKazY3oHV2N/CATvUov2E8zJdk1WBIcr01j2uKjbtGBIg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:18.4309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09606051-6eb5-4980-89bb-08d526fcc2f5 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: DM5PR02MB3276 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.82 Subject: [Qemu-devel] [PATCH v4 28/45] 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(). Signed-off-by: Alistair Francis --- V3: - Add g_assert_not_reached() in unused function V2: - Split hw patch into individual directories hw/nvram/eeprom93xx.c | 5 +++-- hw/nvram/fw_cfg.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2fd0e3c29f..5cad031eba 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,8 +106,8 @@ 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"); + error_report("uint16_from_uint8 is used only for backwards compatibility."); + error_report("Never should be used to write a new state."); exit(0); 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 Wed Nov 8 22:58:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836042 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="4vKgCu+S"; 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 3yXMQr5h5wz9rvt for ; Thu, 9 Nov 2017 10:08:04 +1100 (AEDT) Received: from localhost ([::1]:34335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZRy-0004Vm-Pt for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:08:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMY-0000W9-M0 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMV-0003ai-JM for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:26 -0500 Received: from mail-co1nam03on0051.outbound.protection.outlook.com ([104.47.40.51]:12352 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 1eCZMV-0003a8-9h for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:23 -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=SOCnUdJo/1kpcBXRjfvStuvHxBYTEH8ZWoFMAehOlNE=; b=4vKgCu+SHgb/EAT5vO/7tvOyWyDSihAGEwtd7+09nw3Iy7RqKkz7SgTexFusKwO/7CVNnrorzFATALAC273SqeyCKyqIXG6Ks5Cf9IH/lKqLn+XMisQsl5ciwvX4no0BQmijZB7QzVc0hboDxj+R+V/BfSajI/JNiLuW9PDaHoQ= Received: from BN6PR02CA0097.namprd02.prod.outlook.com (10.161.158.38) 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; Wed, 8 Nov 2017 23:02:19 +0000 Received: from BL2NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by BN6PR02CA0097.outlook.office365.com (2603:10b6:405:60::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; Wed, 8 Nov 2017 23:02:18 +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 BL2NAM02FT024.mail.protection.outlook.com (10.152.77.62) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:17 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:35967 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMP-0003yV-Hz; Wed, 08 Nov 2017 15:02:17 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMP-00032X-BJ; Wed, 08 Nov 2017 15:02:17 -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 vA8N2DZ4010230; Wed, 8 Nov 2017 15:02:14 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZML-000326-RG; Wed, 08 Nov 2017 15:02:13 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:15 -0800 Message-ID: <00918ed06283a21ab3ee032c02eb4662e306ff61.1510181732.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-23450.000 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)(356003)(76176999)(48376002)(478600001)(81166006)(9786002)(118296001)(8936002)(2950100002)(6916009)(47776003)(50226002)(77096006)(63266004)(106466001)(33646002)(81156014)(2351001)(50986999)(305945005)(54906003)(5660300001)(36386004)(106002)(5003940100001)(8676002)(16586007)(316002)(2906002)(189998001)(39060400002)(4326008)(50466002)(36756003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1333; 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; BL2NAM02FT024; 1:WofD4efiq8ipyH/fqrgkfj7IC2IKuuuLmpoEJYAO94J5gnV+iMgOFDsB/zp1eoAGXBe0iluhuG5uOPuuOnBlHfPIPCqiUWwRkUQHjt+K+iEpk/RzTpdwYyU2VhyaJb3Y MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd159f03-90fc-443b-b6f9-08d526fcc28e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 3:5LKxNkd2JrgwjZdvBZSYV6DTcH3qPViUNkT9rk+JlZkb0l4ycBN4LNnDZWqh8CZKRvNr5WDQu0grWMHsF/jcj1HPh0924vWiT0KRipEIyGGSMqqOf7UHMEgyFMWzDBrE7kcT5wZS9KQsYpMujMatNfQMQiV9jouQnmc56/mGfjkulQBFWQ5HLJpU9pyBzp9W3qOnE5b0tHj7u7hZeLloOyktqEvi6vAAt0CGABNfwpTh/lDW2HSMIdqSSlxjDipcV1NYpoUzqwsQ/Ehy+PyqCn26uK6vsfcY2UFnLcPztBgL+9803Yj7EaCL6EiJQW4I6LwKer5TVdtjnnGtc1SCUzGwTrEVrRTAtBweczJfgTA=; 25:WR3yWFbF8X1XQpohAJSYUpdJsSDzuafeiND74EfypvKJ/dgebNv9jTm4RSu7ckeAkmV7bdybFVbnjlL363M5i/HGkZF34KVPJh1aTU5r1UkjpbFFIOExm9Mk/+fzw67INQiCRebsh7KaDGe3Mp+G7fLZVbIs1awp8hKYttkaFKUkVaPRZwiJcqkWpDeTLof+SYlrYGMWUWQsf/c/9JZiHWGrdJY13BTSQHYAsJEetx64vRB9ZHR5hA2/wLwfw044gMAFd+1iGFp3XTMFNU+GeKkQpkD29XtEizTc7S29dtaZyW3iWdvVw0AVbntaNaw982DxAk05x9Dvuu89e07dM2lnxkKjezFmCEVL+48JClU= X-MS-TrafficTypeDiagnostic: CY1PR02MB1333: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 31:dASJbEC8MVLYrg9RtDtOnYQ5FWp53YRcnG1K4DigMf1TNRf1dXexUgvCBh59cNxuCT2MsI8Bw/OybkMGjvdFWx0Uvvov8PxLFzTLIPV89qu0PfsZKowM+I7MQCK4FQy2HkSLpEex+Y1xjTD2yajy6Vh4AnRQSAAr+37C0mOWjQtY2EB9MwtbzPBhHVCpj8XkmA4EE7GCPaZR/IdKKxwRYeEAjACBvLZKY2SxXdrLjxA=; 20:2FBtehlIuld/BvNtkKmdsKBkTx6sSgPUAnsWB8dNbHy9bJNN1edULw/+FqvYrLbBYkKjzD8SRz7uRa+f0f9CWD2MNTSW5Mp8bWz0d/GFTFp5SKcnCoeHuWz+R4eF/6r4TurxoPNr6vaKHR0WcldnmQT/hPKO3IOkfof92K7iat1OdI3WkOjfjB00np0fanTIgjLENAZexICnAtMMDFM23Bs1mScedLbcYo7VUPOa1+HIW22k3157To2tuRXv3AuwlgHf4fcTgk8O2FaXP6jaH/b9ggUqiZ40D86l2QzKms7wZNBTY4KhR7ZW80y0ITWd+aq2sBUqdm+TrHkevznDWdhvL17hDDZ5rL/mOcPjioEgGWdttOR158308s9Pqc0h+0O6OS4xmra1mAFz4C9Z5Yt5f5t/mm+OP/fpjPO0Srz6VqZF8Tmkrr4iIyDPGf6qe136H6Rn2WDM2oji7rK23mb0jKJKwxYWdhSJhVEZ0UgwPe2b2cuV61khMXycVIrV X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93004095)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(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:2JBnONF9dBGYKopQxOoHWzJd6i8IKLnfcTxxaOsRXslTsUdz73FYj5zdRbD3t0EmzIJOybELdZ6N+ZS/kl0qf/qqw1E28yUK7PxhDTzUrGgAo+2xsNrBH+4p8maiE+MrJl9vdgiENzdLOv8pvlPGlcTglot0YNoxAdZKNmgwv81QaQ/Jda7ieSXOobMtLx5rZix3sU4aIniN6/uvWwxqv1Lgq+57moGgdUD5iONCGlCwAYR47cAtxDx09KHq2xwqgPJn18pPwSjo8F4ivesyNzPsM6RO5gnsj6DHZwrTsyyg8odqRtK7trAYWSpL9HyqFSsIqCbYaglOgGpYOJKECg== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1333; 23:oLIRO0lPBrCACjauNX2tvPFG7TPA362mwwg+w18jg?= vKrR1K0fnJYLj2deI0XzWtQwMYlJn0jxi9HFAwx1sEnIfo8/CqwQaNfITMObo92Qm2WAD7Qawco2KnV1WkqsnkUC47FYDTTXVeIDdxKtLko+JcwPxFUiOT+XiizG0t7A2nLEkmJqIHLSyRHbUd4rOCeOzbZFb3WG+j2UfhWtHknT+m+oL7PB3xbDOXDKJmQ0p7r+MlIqf1sx34+MWRDsWoFlPTXKVkMVGf0czxXw9CJSQ8dfVjWh6Ye0Hz6Z/ucoTBrTS6udJMyTSMWRaNiix/9rFVNPcrw8fkzJm4pSqpP0rt/LcKhyW6rkzuruhExO5x0CUOJsBV/IwJj4KwG6kw0IYrwr7aAot77iC89cXLc0B7Jt+13zK1kpCDjDfWjoOye4F0J+dXBzMPeU6OViKtnA88Z4ezYAM99ja2UpVSjdDGEXyprkFfkoUWpkmQDOPa86R+ZRmc3910e8BoghERp1oIZiDsO6nzcqWa8QKxZAnDPowwrkwTZkbqgZUnGd/h2LFV6NWU8j/n7xGk3nSxiiQEoU2LCZB4ESGvC/qqlABne1+QcNiTyDtQHE3zO1Kn7xWqDzxFptUU6PGHb4NGtx1oNb2T9HT0ug5rxL6i4cZ0I5Vb3pedA5BpwrWMFvEMiishC271i7/6bwu7RXGK+9gXKJmsAnxXaVS4iu0E1tOxUwszG1xK8DiQ9YEqDoK7vIjpEl2/N7m6UNtiFc3strWrjhve2wskUv8v0efwvveVxaHvrugzWGEnummwvhHQ6j2Wbgo1HZqtedrvYXMdFiJDCRBx98tsAzS08qdf03Gu23ruN0yWkdJjqBP6kdCqbsfADQFEbaE/n+cjqeztACyH7F+/n5b9pC6CYiO1nS3EytWdfkxV3aWGVBpMrvHV1W7XLArkfyT10IqfLoq2P85IkZ5NXV+8R9/CijlZzsW0Gs0aberba/M8yOBvGWQLfGgbpu5rh1cmu5y8RbfPRjAzSi28VMh8XkUwJ2rAX/2fcLOMjICLy/Ynlu85ew9w= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 6:RRd87kOiWkFJLsNjWerW2jAkV2MOzSzbrPHfSMU9NwzKmUjv8eNbOyUfo8J68yLp4y4+G62ZXy3147ZHL9iOJCwhCNsLkGNvv5yw2ife4D3rn2fEKYFE+EKzwv3JFlPAJUB9EuARoSGlaJhD6oMGRN23X18uu3Q1ZWkcaMkWy0HoRsY41UkFLtK0xLzbf8IelG6tXPf24bsJ0H6MnzRFbz6QRNMJCqDmbm0FqS68F48j7Z48gXNreh5Exi0Yw4qdpyPdjhr0RNhmKo5oq58BzP59P9oLsFTEx7Rg2CEoWBgIBvkxMnCgps2gbNK6Zaxu1rdVVqxuoMFBmyeFCE6m7quQry+6Z5ab1lKXe9ku4sM=; 5:40/IJ4J9CS82Cib0RB8yLy3q3RPfKcXEzTfbl9pppcS3tJFJphMG12hH7inaP8xV/eXkPJKt/0FCjdnJ+RLh3uzRuezmNJAtYjjCyJHQVtkOLDTONO9u1WQSBoJguSL4Iv6V03MeoTEETbKiVphuNTAErNZ4cI5lB7F6h5BvR2A=; 24:V5O4ITbDRvhFOLWnBlFqc9Etg83nKwsV3pNfGuLG8XlZXaYCaq5BiHbHXMijCyVcX/FwZ2SE7qvOi4PqWC8ZaFQ73tXSrzGODpO1gKtZHgI=; 7:aI1MfTPwNLEuZ33GN79dZKLpxIq2o9tnJo93GXynRiPM6AFixvBwpobLJCrjxjLZiL8Qa1o0R72Q5cpo4YsVkGZrT/Pl3EKq8D2Bk93Opm9fwchkP2j8UGYqAY39AWIuAfWS7B3b704doejla26dx+PBmWzG9651qBbOFNYGSaxPDK+WliHLRJ9/xZZEG9g1vaKpqzm6hyrc8F9z1Qz3L9HVaVxOrCHm/VKlXOnRHFgTYet7E77nnAeHKYMTfLJL SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:17.7883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd159f03-90fc-443b-b6f9-08d526fcc28e 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: CY1PR02MB1333 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.51 Subject: [Qemu-devel] [PATCH v4 29/45] 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 Wed Nov 8 22:58:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836071 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="N72I4j5y"; 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 3yXMt75KYLz9s4q for ; Thu, 9 Nov 2017 10:28:14 +1100 (AEDT) Received: from localhost ([::1]:34440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZlS-000447-Mq for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:28:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMh-0000d4-Te for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMe-0003eU-PM for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:35 -0500 Received: from mail-sn1nam01on0053.outbound.protection.outlook.com ([104.47.32.53]:24078 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 1eCZMe-0003e4-Ib for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:32 -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=N72I4j5yoKgB5ABpVaWblp0jkE0kPSy+7s5dLyQbS7FXtmzc/APdjhJX3STArFS5+OkZGqgFUK0JsBg9CQ0rQPXJaxm52ctznjoAy0QdICKeDGx4t2jCAkhzjm3mVDqa93fV8s8/lz5sK0tdDF+7bMpZOImEvAsSZ9IoljL+/80= Received: from SN4PR0201CA0060.namprd02.prod.outlook.com (2603:10b6:803:20::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; Wed, 8 Nov 2017 23:02:29 +0000 Received: from CY1NAM02FT061.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by SN4PR0201CA0060.outlook.office365.com (2603:10b6:803:20::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; Wed, 8 Nov 2017 23:02:29 +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 CY1NAM02FT061.mail.protection.outlook.com (10.152.75.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:28 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36224 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMZ-0003yg-QY; Wed, 08 Nov 2017 15:02:27 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMZ-00035r-NN; Wed, 08 Nov 2017 15:02:27 -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 vA8N2Glm010246; Wed, 8 Nov 2017 15:02:17 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMO-00032U-PG; Wed, 08 Nov 2017 15:02:16 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:18 -0800 Message-ID: <038502fbe4a4cf8bca7cc7b50104478e1c821647.1510181732.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-23450.000 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)(81156014)(81166006)(2351001)(54906003)(5820100001)(76176999)(50986999)(106002)(8676002)(316002)(356003)(36756003)(9786002)(305945005)(50466002)(4326008)(189998001)(77096006)(8936002)(39060400002)(47776003)(2870700001)(33646002)(2906002)(50226002)(63266004)(23676003)(478600001)(106466001)(2950100002)(5660300001)(36386004)(6916009)(118296001)(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; CY1NAM02FT061; 1:qvvqxcnvm8QYYyRS2OMwNSGSAJWh7oL5xWLR0cxkkLHzmueiSb6QP6/LJIrbCuY2DgbiZnDlBGjyco6TExwgcxkMxOjFVMx9o08LhFpo/xQWFuw/Ib2xAhee6kY9bKn8 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de98fddc-abe2-4718-6f35-08d526fcc8f2 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:Sn9fs4mCJ8YsXKuAbA7XQPldrnZWg7XXe4b9I8RsPID+jZbyS06cF13MrSM1/4DQmFiRGgdF8l3W0lePFcBEMxHxeg44BU0MCHcnzCdOpxBD+sE7RNQ7KxQaz0Kzwmma8aStY8AiE28JtOq7k7jek9no10JUKIW8AApFeooelZ2zP52lOIkCkiS3X9L3kcIZyw0EwQhkjZLlEUAV0VckycrL9gj2RY0Oref4H0VpHldy+3qr65rCPXRUqRE3NkJfi1BiJRv18EHsZGP6xAQBgMFarsC3tFG+ZLcpX7RyprONdDF1KbsJLTmrOHGTVP9tG3ql2nKkoSCSvOBqpCsr5F1YAbLlDCM/j1N9ogVb7z0=; 25:0X+Q3XN9wum5stOBjbuYRZon+vOrTGe456mrmjMDE/Bz/oYg7CqutQk9AK8a3KeGHFHW2/ZF9AwdJC1ckgtx5EEsymqryxMYCdikO3qDaRgPdv2OgB+jAKvy1IOjBWoPXT6GLo6uUrAfN4w/Os3Wt6I3VJbb/eMBLq28T4ZgCUQzkbyVGlR70Y+OLf4JD4k5YsRC6Jz+/KWybr9T6yY7VveyTHuWnJzONxkhl1SFd5fQ023zGTYxY6OaD3MvxyFxQbH7ziQ3zm4lrrcc+JZTdqRy9y07eJ0Elkjkn//qL8pW/+f0+Esty+aegD3TesvCfwSPYym7PrOLDeAahdslIlStNg1XO+kP+OmQF8gBIvw= X-MS-TrafficTypeDiagnostic: DM2PR02MB1340: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 31:joTOXieAKSwV1vXcCjbLKncmqWKN/g9MMAAzCGKMdStatbymGiz0U0TxNVpncFUiNqbXtVu4A5N2HY3x5NixNfhcfi/lp3wJycGr6dElZYWJ9Jd72B5wpz1absqaO569Z0h/5INxeAKq/4TYtdLAmumSNC7OVVVPskoJnAkJG4EpFYG+CgJvIvDktLHLVx8Xmb8xHZjkw3LO54Lq+OMShZwPMcva8mAlFpRrI7FVNPY=; 20:wq3mw9zrDuvj7z+aILbBfIY1tA3Ew7fgXca+uOZOBW6agdLFTx0AU/K/F96DWT8awzZgMYujXC01YNDOf5eShzmGuk65n1aPr7/H/yWv/uv8ouY9/Pu/t5swZCP+8SbPADP6pRkQEkisN6gMoCZUdXSU7j2jBtqpZHiv0LsCKoM6UVSGRaNl8cIP4rldUpRylgHpLpzzuhoyaaIhruUwvzb5q5XoKysF5wzVZmalcGria11zQ5X4gIqEx6g9z6fPHyl6Yc1qc1lBJPGNRTa6NosS+rl9zgyk5ncF1+SSNoeyyLYg4rWDIJTDxob8Do4fbcvXiQJXeri/MU5qQeflHCsK2ERpZ75TGx9X6Omyvr1cBVFMYfXF0dogQauJbR2Jx3kYJmQNJPm3xDWNlYfXsOnGcQ/XuuVPvaRYbOZxX5ZHCTsUY4mNkiCEWGIS09NKBLwCrnOqJ/FMuKU1uQXL52dH5hcu1kbrsDxhfkWd2IjZ+a71NXE6cTmTijxkWVaR X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(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:RWwGLthFeTJo6Gx+qoRetkiRL00Ww7m+mDXWOTMbUVuO+31pJVR8TUL2W4MvnNmLis6Txz3xIZCXrLYFotj23mnHXfSEKVtw/+hBYHALwScdE6q7QpPN7ntTeEflRxkiGsBuaT0qpn2sWhh/dD4UYaDv1GyFlHdH3s0nlRz5bDBML30Dq3wO7d7BJVl1il+bb9HeJ/E/cFr1+ysmQqXmvI2ga9coATbM/BOTiIPas6+jsNnoLMqu63++fkOY2xC+EDgLvulCoba5ll1KEXIOQa43V0/yfVx8L9wlKbZbrCJonX+KkCZvkDidMaJ0vtibzeW3pG7OvC6nSgciTOHYmw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1340; 23:NwbLoz7l/4RkVYIedKBK+YuVCgxyNAVyLihUVwZBX?= ESWJn+6mmYZTZ25hbqNPJjJ3bTsXZuaiVa66uTRqWniuLr1MHP8qcTGzCDKLhvofoBjn+bJn86j6eB9AGL0Dmb6IcSMtzkcCKOHIBW/roZIk+llHWOfYih94UQQiewofqKGHINuxRuSfWpgvwBygiivlTcrzkKeSkVOy4h7Jnbl4i5DWkyuqgircC+R4Ec/wn1HSBp5otKf/kmXPlz8QG6VIYoDii5V/B9bCx9A6+K5bf84aWuh78AENB0bFhYTQgY7qo0Q756b75su+LuDFr1HMztV4vNSIBDOh7PB/Ft2y/ab1PadyBeJE3oYronBav5wlXGok59bwgjuf/ybwIvUWplqBAyvt2xDbixJYpaLEaM2AubWX6YgmFwdwKVMsTP6N62iQBVDYGYqWbDdJFkrd5LaahACogBgho5SGoeWz2bc/F+H0SOS6dL4LmpSyaIKXV8v9fYzX4x+7O9t/Dk/sq9Mvm8kdyc4Cn4wVffm6ZB6Q+RU5WtjWH9Gd2fZ5WEid+sAA+ORHcpt1f4hq75kE8LaVOJTeQCchk2kkh/sb8e7HByWTLsVbnfawe5chF2rSCQViaCtHfaJCqEGFDptoXj46UXZFXrQWjns3/p439o1I4PNdDKxdfJDlUSQDJBZ/+NEQ0oP9vX5Zw8gtFi62PhEvvAZjMCwUALHjDyci4OBIwjkZKqwuqUMkZhow6aCPxSrG6JLXtmjVWxAbpKFyUxcJ52UhycRb2aCoCU9i/U/O309EqFMN7nvvM0vgyUgclVFgz+KB4btfAONr8OnL4bySX5TfpW+4qhKHSz3Xsq+bQdYNFLiBiuNgXVmyFPZp5TYvpRvrW6mOuBeitEldRGe4Wou20+7b8YbEHjcjdK3GWsXpd+HfRFI73xRjlxJNrSRuxOVYmje65qfuz2fKitNf/XRCGkNaHw7cuMbiUDdnaSXffHldyi9m1zD+clP/urdqvOe0vz62pFlhMvhfbygdm1b2lJXFiCBZIBlMUAsXdUcej0VWWMf4EiMtks= X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 6:MBxhuyM2AvLI96kDAOIsd/tg/nve6cJRiQ8ayCSsRUSA133H/CtI4rg6DJA26/W0VJvatYPZbjL9R6v1kGe0IM1rx0JYCj4yP7b4p8uoa0XYOpJvXXW6/I53G8R5LgD03VTWZQ+BLi8beuf/RN8zdS70tnIQ7c2Z2TurLw6jNsUJE2EKzWQ/q8aD2dejAomiskhULEz8R0Lmfsj/9PSATbmggfX05Vx55Wtbzw33MVaMSPE8fPsn8TE1slf+uzGfFMP+qHa4ggPAW4KfdL0DyIXrzLTVKpGdtAK9hVQld2ywTUjn1Er4tv55ybp4n9KCjGAQncAID3w7tZbC3d+80rdreYWyqiQD6+ZJK+pTyuU=; 5:Hfcaa3/5XOp8VEq+pnkc5tRNad9nh1UGQBmHCNE8y9tUQPgq2q9I94HYGuIHIOT6Bh7h+cA0DI61p3QUXAsmrCZibUMMD7RDcOE0OI34QuknUR7JtUs/wR4sgb9otZObCzQT09KFUzkz602QGLvh1ncwDTMboowErOtdwK50bAw=; 24:l7vDKMURRC1NWUmDvBAgHn6oVxJyEdUQBdIMgfs3RwtieR4M0kfS3/uWDVQmWwnFgOBYZhIlexHRlcoZ4SJ5su3Ec6/0Oln5jd1gxv5WV4E=; 7:anrEa+N+F4dmhwNIvBcv6zmoAfSxqAWg8W7Ix/uJ2LHv5Q071icmRe31MbCTOYJUA+jC9kAUzEJjyAvPMj0sdAJJyD68MuL3DnE+opqyOHYtN4B4YzY0mjd7pr/pdmL+sC5MaKciWqlEXq5IKC184Qo/ZpzIeIvYhIh7ibO4CRkf8nSL80xNYisHBemHBhsHfAyx8MHUYG2b1XsTjmtRAQwheCTsTmz9C8JYKG3/9KCqT8vEtD22cTc6q1mBcWmJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:28.3832 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de98fddc-abe2-4718-6f35-08d526fcc8f2 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.32.53 Subject: [Qemu-devel] [PATCH v4 30/45] 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 Wed Nov 8 22:58:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836076 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="TuN4iQCj"; 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 3yXMyw6p03z9s4q for ; Thu, 9 Nov 2017 10:32:24 +1100 (AEDT) Received: from localhost ([::1]:34458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZpX-0007IY-1d for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:32:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMm-0000hv-8h for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMk-0003gX-A8 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:40 -0500 Received: from mail-cys01nam02on0048.outbound.protection.outlook.com ([104.47.37.48]:64288 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 1eCZMe-0003dq-DX; Wed, 08 Nov 2017 18:02:32 -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=W4RR4JImDTFOQDQNPLAT/1eaScgfpLlScu30dLpLbSY=; b=TuN4iQCjgciQubzqFJbrAp2zevQcEjffYORnc/402sh2XQwjUQ2LaNBqswYwMJ1RToLeg4bC3+ULysdVq+Rd4UTwDKv2rixsE/WmIWlMVoi9kk7/g9WuuQ2bjl2SmJpUYWTtZ2z2/rwFgBdhMVTi89SaJhXEA7fVfJ4SN4pVsQw= Received: from CY4PR02CA0028.namprd02.prod.outlook.com (10.175.57.142) 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; Wed, 8 Nov 2017 23:02:29 +0000 Received: from BL2NAM02FT005.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::202) by CY4PR02CA0028.outlook.office365.com (2603:10b6:903:117::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:29 +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 BL2NAM02FT005.mail.protection.outlook.com (10.152.76.252) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:28 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMZ-0001N8-On; Wed, 08 Nov 2017 15:02:27 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMZ-00035r-Li; Wed, 08 Nov 2017 15:02:27 -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 vA8N2JCx010261; Wed, 8 Nov 2017 15:02:20 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMR-000333-OM; Wed, 08 Nov 2017 15:02:19 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:21 -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-23450.000 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)(50226002)(356003)(106002)(2351001)(5003940100001)(50986999)(76176999)(77096006)(36756003)(478600001)(9786002)(39060400002)(106466001)(316002)(33646002)(16586007)(54906003)(189998001)(2906002)(36386004)(8936002)(63266004)(305945005)(50466002)(6666003)(81166006)(8676002)(81156014)(4326008)(48376002)(5660300001)(118296001)(6916009)(2950100002)(47776003)(21314002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3390; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT005; 1:b4CGO8JHBrg0G2IBUyU0V1P/hQQ+md6q2CY20g3BgBKlkU+rkWbKHEBTx+S1+cvHRoOR3ItshqiilWL5+iBQRGSsJkNx36pOojdt4o8Bb6jnxAu2cjXrgAcvVZQlYoMP MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b9fcc7b-e6c7-4e1e-fca5-08d526fcc92d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:MWHPR02MB3390; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 3:ba1YMH8JDEevlz4gvEd5QDV2d4fvpaZ4WB1tY4kssFXSXTk1P4DAxnNipJCwAQT+MpYnHRdC1YrR4dPucYZdQU380CrARHIB4/6q6RkpuQti7Myzout6JdkLERPx+sF9m/ScnKJNHvzb5+uH7gOSWuP7dQDmcRggK5kBLL5PXBpMGb90venZDxBZkC9w5JfzCN1jm41bxGORPiM4nJ4NMUTxXXMG4iCBW83u3i7xaVHWLvigGeXLNBSj22wSA/3cs14PIce0w/oGUoAZmqcTdKnyoNB/4Ln64jTc82274AkT9fZNEOJwD1tPvHu0jpS+LUmeHXoHex/jhfUEPTV+OntKC6VpEmaL1mxvIA3lX5o=; 25:18vIDLof9BfMbr4DPdyPLCeCLYoqM64VF+uFMLAVa+jTSZDVZx1XR5A2PbZPHS08NnnRvHytFeGxHIAaFMiuqjZdJWjUCBz87TsMM0PnO1jBYkVHbhKCvj6OhB1pLXRynK4JzjfFUVCiD4dPOEthgKoG9s8T0pmA+sCIZ5K0tOR8PMdiCvj64TC6ZumqN6uJVa5jU+Dq/+kdXK5dP+i0oGuGMk/kNeT1WgUKBV80lE3PJ5mlwKTTLTg8b1YGfUZXqyoDx/qyyUEXEQkiKCrDbK3FHx69nm8qOalDSCzy+iiWKQVq/bwxqE3H44IEiA9//psfMn5h0ad4i/lZkowMgg== X-MS-TrafficTypeDiagnostic: MWHPR02MB3390: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 31:Oi6SCOSCVOmiVAI/aKdDU2hLuIOAIg19XfgEzm8ojATayj3Kv2WcFGbTmlwjnLBJzbSf9kelXgh7WP48m/RsRjDqoCuULu6pof/xpKHy3zimFT2/tpAMKbP0cc1TlymkKlJK5c7TxN9HfX/ula4i2PwTGeZ/ygflmehQHZfabRyMy8V4caAq+0izwMFugTGR1Ls5Y7y3IRW/Y/ItnKuggmyFsfKILskuiWFOvQccN2Q=; 20:e+WHh/+kgtk6Y/IA2eG02wuyWtR0tk44/s1wP8kEYst4N5JNSR3Gb6DgJbvt/h15XGBFnWXReybZpzmjEh0BleMlHptuOu7BxgO0SYfs+pRwjadkjSNdRyjbfmHM+oZT8ib5thpFC86HYFUFgPwwBCwp9eL/C8jNORiuTJQfEhDqg8eSpRLSMk7smWMWh7kyAhjkGwITij9HxWasGQqO0ViiSTccZWYMGFTTd5WBuaPFTmPO4t304W0Yhn6H71QCKUvfY7iMqkAoET/zsHPxOXGszh+cqvEVYvE3iHKabAhKygnwpr/FG3mEeaE2PeqGodQo7Bd/cZ2AwaSLDhcelakKNxjFwS1SjQOslSrkUOi2U/0V67NYVZ9zulVcYbGGTSZgzOiQIriKre8oi63vpiHvZUXnZAG9HbZ2XO2GFDPoIKbSneeDAeVA65bycCkULedieli/yphCSph3yMxMi8N/M1zgzrCt3Xeox1WDRNRPJlENDTFC8nyOSDDEMSs1 X-Exchange-Antispam-Report-Test: UriScan:(142945433499172)(788757137089)(192813158149592)(21532816269658); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3231021)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(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:y1sd5IV22xwz9UA6k9+8xEzn2mrmZIdWrgzB2z7qUZY3V2TM48PJRwkdyspcX0RMlOfhnfT3zf0hEIrGLD9YaMWec+HaYI9JQwmy8FQ4Cc0ciktTejygQBu/QXDYMjmiTNNii/cYWw3J7a78g5FIDxLjFE21kMGDbh2xpaqiUOEorDvyqx6tj+xZFexfYulCApsUV6pgug+uWwMg2CRskcNyo9eKZGh88pvxthwKh1/nm81K8OQgzUn8sRwrsZP3kLPP8H0Hpyy5NscUvSCseNRxMfnocttZ4AqLN22//2w/fOMnVskKMTrBZIpPopiytMOV/QE/Krde/kVWVqiQ3NoMnEoIGIdzstAIaNxd8pzrbY6xvJ0bryAVh8kkpnwpBIP44Zefj8/BAYQ0wJCpAw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3390; 23:4Er0YoqQoMscVapohRRDoKgK/Ckf9LMJ+9dJ+dV3a?= wqCUGFUgc6yBsRWkB8XQyr/xbz3lzoLX7xCrXUFImytIJWBJhJN5iFSmg8ms1hDXNZdylAaIr+O4Z6DLFbEuPQLCse1eCfAUWInmHMz74bFE4VkxvZqn85wRjmkUOK+9yxZQ8oEDIWVxrE0hypmJk9WjGp9JT4d7P8w0XM9F9zPDCCscJQwE+47Pa5LKrqH/g2/e2IP3qTBGtDhJg2kIdiRbuJeUOFXf+JWVwOfP8Dl+GsDrOWQlLlhKz4QYTQjRNB4qZkNaCVq8dsRDD0tf6jwua+eX+rzPfdeTIhWyggbGPDO5dea5BtOvjCQbyHIpLI9eOIGG1pcAp5WomJNU+i6Wg++nVIc2tBvQMnrYBNdJ4sJkLPSpyHS87n0/U3JOu5JiHabW4tMd+ClC44eeO6GBoiJtlZfWsxdkRldnZiz5RK/bPUgtwImnIHpVFGxfMln6n1Zlcyw9bm1wltA6D6esZxe2MoY5jgoc89oyBGGkDCroNKzSDbUJQ88TjpSa982RN+kjUS1xUzvdIQnoTNw9yx8bM4JvnrufQcHliWFKqfx67BQCMQlwwsWLNDryB5s6oBeoeEbiTLh2PN3//yvsr/hKvsGEpoGYVOC39qjC6JJRr3HO4uqjA5yHFkceKHEnmg62GlU6bwFiDYkOiYkDKcQ9rmTyaLwfjaQ1+DI8AnQkAoBu14acbPfgotxT7IQYf8VCNdDLYllcA0qX/9HJcIAdIuJaMzQcTjoSl/cG2rwtgHBoggeR/Q+BW+6lbiV6ywgKPqTcKvYDGTj3GrMQF4AlWakQGAkQ6ZYfAsVY6ea3eNysz/Sp3KjQrti1XP6qbkp3mCOcVspFobYM2u1PsvibVTgWFPBGPTaTZAuUSGJQA+KknuHxk9sbJB1oOZXkMshbZcfSmVvU8NIbZFg2jlZL5cSAWgaTWRsrW+nVj7YMiT+v/sL89sj7E1KIwCxl4tQ9A4ud62VWF520yHUE8hw+ei7GjwSec9oW/VaPlZTjeMmYWzu7AB9KcVICdDiecUkEZm1uK7oRQJ8jVth X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3390; 6:O1weJdZn0FzJstDKBNr2e6wgFpYxNoxf7Klx8/otbRHSOrkskPCwVDxZqF8+yTNz4mlWtzFuvRFDXgZwDs8NnhhQbuIKUFuHzpPsMyuqy9HpWe+lRczZ8C4zJrPSLXR45+kmxukah8zYF9K6q7YFxGd2bsGJse0pmh20RCtJv1hvVOvLwJ4DT72NFi66xwLP0M59e9Ih0B3axH73SbcasOUBo98TScWJxvF5g0sOQfImH7/wNypXqbw+RfBOU9mOIcmL4bDbrDSPS5vdx3+qH/CfPr3XyF62u+pcRDq0HjZj0xxhJaR2BXamO9K6EbuyA9WwHe3k3ou44VAz4UbSwduhg9dvUSWcd9cGfh6N2J8=; 5:J+cX/6Ou8b9LANC5fhSBlda8YmqBBvXGCCNzF5mCoGzmh0ASGNOJ6dF96//3Q5bW6TyJue+GyB8TMqRkpRjNFD+zFiT1NeAEp5aYQ0+KYrCBjKKPBQdTQ584hf/0VLV6giOx3DqaXgYMZ6rKEIz7IrRaXGnVmk3PxLrnbi7dUfQ=; 24:RCYWxW8f6cYiZcoJboRWDLJxETgGRxgM2sq+WmkXycFCYR6bhuI3KHR5bUBLNuD1l6ZaWR3Pq0R+hWoxdRXtqIXzno5Oep6l0IjbiC+V8Rw=; 7:S26A5qo7f/3Kj0TNM7J9Weu5p6yIroWYdHSzqN8vvhvfR6La2AOJz5tES8IiNxD9RooMXzaKkCKgwkgJUSGqmmaNeWeMT3UJPNcy50VaqfjsxQeqj/Z9c8uSe1MzAICp9NaRE5VJarOVStSe6/fcSK/ywcI/N2RFEBmbnkrYs3UIpgRczTAmjnzezRizpOks44ajVj7p9ZlEu6uKjoU8iYS1e2I0KgZJBEnCdzyc2mfj4nXtxebqmzVLc96yeOwG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:28.7891 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7b9fcc7b-e6c7-4e1e-fca5-08d526fcc92d 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: MWHPR02MB3390 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.48 Subject: [Qemu-devel] [PATCH v4 31/45] 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 9178e70132..e488fb4f3a 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(); } @@ -815,7 +815,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); } @@ -961,8 +961,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); } @@ -976,8 +976,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); } @@ -1018,7 +1018,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); } } @@ -1031,7 +1031,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 Wed Nov 8 22:58:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836069 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="5bIgk+4U"; 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 3yXMr046PPz9s4s for ; Thu, 9 Nov 2017 10:26:24 +1100 (AEDT) Received: from localhost ([::1]:34434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZji-0002s6-JM for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:26:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMh-0000cb-CT for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMe-0003e8-8Z for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:35 -0500 Received: from mail-sn1nam01on0080.outbound.protection.outlook.com ([104.47.32.80]:58262 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 1eCZMe-0003dn-0P for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:32 -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=5bIgk+4UrKl8o5z6Ha7kQx3x1wstyYhcSzpzXz5BLAKngCqEZZDw4vzijVojfbhOxILJE8XfAJEtoYpnFjnrWHGKN3sUWlXw+Jk53iCOAwhf5SxHrMXZIN2GJgXh8UhXq7n4BCrtht5Z+8SNrj2O7ZFj/JC4oYqnbynZIPxyLZk= Received: from SN4PR0201CA0050.namprd02.prod.outlook.com (2603:10b6:803:20::12) by DM2PR02MB1337.namprd02.prod.outlook.com (2a01:111:e400:50c8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:29 +0000 Received: from CY1NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::206) by SN4PR0201CA0050.outlook.office365.com (2603:10b6:803:20::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:29 +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 CY1NAM02FT062.mail.protection.outlook.com (10.152.75.60) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:28 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMa-0001NE-1E; Wed, 08 Nov 2017 15:02:28 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMZ-00035r-SF; Wed, 08 Nov 2017 15:02:27 -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 vA8N2N6N010326; Wed, 8 Nov 2017 15:02:23 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMU-00034Z-Qd; Wed, 08 Nov 2017 15:02:22 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:24 -0800 Message-ID: <56efb3279d5fe89cee0f066c6ef6a715c180ed27.1510181732.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-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(189002)(199003)(47776003)(33646002)(63266004)(39060400002)(50466002)(48376002)(76176999)(2950100002)(106002)(5660300001)(50986999)(36386004)(4326008)(77096006)(6916009)(8936002)(2906002)(118296001)(8676002)(81166006)(81156014)(9786002)(356003)(478600001)(50226002)(305945005)(316002)(189998001)(54906003)(16586007)(36756003)(5003940100001)(106466001)(2351001)(21314002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1337; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT062; 1:McrqH6lkXfonV3U7JV1mKAmyEqZpJpGPTuIEku6JaETOLbtB0qt/a+/aQVSm7UuqRdtXWmQx/HhqsQ0pGbC+oocutlQ4cXDu7ifmffGnMtnlRl/YmIXsSwGK4W/z8DWN MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79c5513d-5c9b-42f4-f751-08d526fcc910 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM2PR02MB1337; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 3:hL3wjqTEom44MM4ZMMtSOVFh5ygBP0HYTLLuUQ3hFAyaooob2KV8VPRBCZ44pcYH0PPnMjHlX8XYE5YhlV7/6faNEKwv6hRsrormumhm5WwiX5IHN+uD9hIsSIazuZqJvnJfpsf21TJsTkcmCNN9D1GkRMDRa8dZIlYnj5t303wlbmQvlSUuk6dNpJQd6fBeUnz+l2uAEffKBKCY2kqejY9FaECshCP1xHDRC71dScpzHkVo8YDWY49axSTPQwj+AevuZfEapCyVWaZ970gTihNoEua84kmukAfh9WqKcqbfaNem5MPWVPjQA+HvMsmLM9TlC+C/dMs4Sa/599DkMbHppZn9emATREF/kybbQWs=; 25:w9V9OhMOiq1nmADO+7tt1tYlbd+MzwQS7tuqmnpegXsqf/+di8q6zkapAYUIOnBr62ypKXWASJPAoAOrVgd6MZFvdvTE7KMSj8Ma3qf0cn/ykUsIhAbaHXI8oE+XOWxJwanqmNeYieMZA5uK1Jd7FVeQoS6YwTlsw2Ijoh52BEIViWBXnhITvBP0d8pBeQg77WDuH0WthnhKcFs23NZ3dGZdwa9YmEqNp/Y26J/bn2cYmVpmlGD54RCs/UnPLKl8+Cs4GlMkHbBorwOfmgO/RxBpRzTrbZHTxb7f6GXf0ajhG0r+n0ZsT+9LoBMBAb62ixzUO+f7JQ89OJdqt1e5D97jqBnTDbT1K91YnA2oi8Y= X-MS-TrafficTypeDiagnostic: DM2PR02MB1337: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 31:qeig6ApP529PtCcUyPtF96NjjnYu/e6HftJh3qsbfrovFfhZWN+4nj2eSVNaSulTOtc+kE6x9mmqiCFfJJ14fqStI5+JHARp1ajVld2SC7joSIqdP3Qqx4JR6+v+ndQvESR9Oz0DINrodr4Qr3p8O2UPB0bl38s73KDMTxIWXoAGfWDRJ/hhEwd9OAF7N53KSNEh8YWrlRGJ9zHN6WKpkHGjof+ri640d9dTC16TXaE=; 20:3FHU9rfFuHeTvXnQR3jADzsRq4Fy2UI5sUUdao48b5/AZTX5OsTSkaBi0VQYRfEebyKS5dWPntaHj877c6uNfkE1gNxGQbq7qha0OPs0a6mQexLfW3i8mGhmvNHVJBxtXw09wYHzKItPK6kUQU6UuEXQT/jb5iYHPS92yxjZlufiW4wbttDB6JQWazXU/tU6694UybaP3kB1fXiJ/64UWdOAY3lLzS1GdLtR7blhoMPl6rLoLpqG0HbS2rXJLhH0TmPH/+HuzGxaf+2IseCXkYAWKBMudKpun2i7kyqhPz2iIh9N1i4wuRx+uuQ3C9AMA+O3Dsvwel46E2JrGgGC5Df2n6fILnFnoNkS5yCNiFW+RkF+Ix9M1QRsK0JB/CIgQJ5/c5Zz4TZzWK4RMisClnyc6Wt5ZQKT3qXpmbltohDvcMCemhEy7glTD28vjchY5eQyO1mA2jg8qqteWu+dBSGZL9Tae48UF2cvBRXP+FEVvVHmlZbJ7mgsAqXSemjW X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(3231021)(10201501046)(100000703101)(100105400095)(93006095)(93004095)(6055026)(6041248)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1337; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1337; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 4:EJwtDegkGMbaLrm9QG+35IEtt1tTZyJi2D0i5VGJuRr1H+51/kkylJPSUPHq5eRM/O6U2qArMLdFsUfpMsWD76B+1EZg6XC5ZN1CBIvgD+yNGUOjDwMZLeezTB0L1n91VeRpT21eZlNSwLxBi+LfSC5Nqm8txsVn+LDxUHuF55qCnhW5/MaEND0d/vzB5OehruUwXkRb2HfHoCJCq0iNGKibNXXuTOwh3LO0mLutFlyvLNsy9D1Hr2KohRP6zN+mEKGZaswQdDf7AgQtdgonVIBuJ9rkY+bUWzTR6k9FVMH2jLVTXD3+7H7h5v1Ee3PRJqbTawdxSJq3YVsvXP5N8w== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1337; 23:fofdGaK7lDXPX1/1wS+pSIhf5HZx7A2WIwHsMptCG?= S5vc1cb747+jFDnTSiBWhlo4l4DtysXh2PPeQmpLJj9FegsJ19IzApl1woi++uJ7y3eAyXNFlM5tCTqjwPfofh5b2+nmPHSQvW14s+YyesS5+uGRrDpEUK+skOU2wKyTN7Ue+LzXKtNkDXGSkE+KRnPoT8LBv/8dzguDVsPwYT4J64zCG4QMvsvu5KlepMdyQ7ZLstKX0P4XtMVDV0FpqQ/+i9vZQZmyic9u8lWibB2wrYtARknb29atBqjs3jw5KwV+vEFc6aAxfkicf7Gcpb9vrQ256mDh1WHuWDGJ9xfBdEvAesMCjmEpn2j+OxgaYqQgusQfvxdAfPtGPpeNQaVXoN/Aq/fEPLKpIcZVF943xHU6uZBg/e6A48x0tDfRuxFfBYpOOMWMFD1MU/FO3D7HkWEYwwYpl1I1VESDDONZg4wWOTo9MbnvtabyQlCmVW52GLjYCBksFfxs22chX8Tm+IPicMzf5vKF8liDjBjFWP97tpRUJce48rjbWVQa3+Oehih2Oa/g6KuGkXCwrqGMVI1KkjiJ+sdRQziOGLdIcWjmXUVWUt5nx5r9R9tJw47gwfYDxfwgnPShCbdbAJpJYAmG84d1n8XwiuSFcjKr5ZSS542UraBHRKKJo2jSFz+domKj0J4hjIlIZRipP/UZwNVqfCm7bBTazLJ80Gzv7of/287IhsskaXSekhDBZ5ASYr5mS4OZSLUR8AjLbRm04QwnKqIc99I5DTJxk0kURwy+Ev/AkMQ4Iq7smgFzssv5iD5hl4PZ73rZhf0usCpJQrsdYKdNhiTJ+qvPUtH8nEqhrwSeSvNBvr9inVjRsB7EyYzxVIehIgwmHK4vpZ5jZwnbdUA7JAxvZR9tpkINmCXAtmLWen8opmqYFd3+4M+LuMLtUcau8zzWm0/6opyMgWBMhRuL5gTbQxAVuOUTGi3iGhBCiXwF7v+QlL5s5AUTyUeB2sn/+INy7tzXZ326V8+MO/D8OsyU4f3aD2Pa2+cNPJDMgWTEbmvJwvA3ww= X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 6:+7R5bh9lGIFQ44wC1/v2Rk++WeJsymm11kfvvL6b9545cDOdpm457JQBRcbkeVK95VY2rKMFOuKVNZJetBIimkTDzIY2uWB3usz4mIACkKn5jWikabgXn0RDpklYwge3Plg5F+ufNJSfz3T5fRe1C7wH6yELXAcVSANUfThKB4j6J3F/JnPuMDmbepskkDPJ1pd6Z7A7bTmauJsXg4n2XvN3B16+acE2sDNFItGCXGQ3f14xinVlWRs9CgMm5aUT66rqNsy04akjZYWjJg4IX4pYu1JQ1kWKwNb0FRmwUCe85cmPneQovGaTb5Oju9wXQXq8v1pPk7PRrzyI6brY87dUs4uXelZid9q3DBJfdLo=; 5:QCVAS9l8eTXPTeo7PurKWyNFMpURbPcw6ydqbOv7z+Fyqtzr0yJNgx9/pwPsbCsQb2zJ68gP4EWip8iZJKbhKA6XxLCcupGpRmdGCVzTrj7CfLITvYatWQnkkeKx5C35KBbet2k/b3R0BrnOCfDvAiuqQ8Vkb2V3yoqIabDoXcs=; 24:GGfiHji7mTxC058OzLkxieW838MceOaNtC97WlrDjKHwlRGxnqsbagrNn+c3mAoeOch9aloQCdOuNc04jUM7tlyl325ZnGoCVbkZn/RIUCQ=; 7:sSmkC7VtjNlb1oZ2qYToO2Uds0CyDW4ED4nrXpzkqqyFXe5OWyoUsGnX8fAUnlLSH+OIQRz0dd/blrgSjaZrSWcxrMC6J3EFix1XFllpJgLc0B9xoJSn00Yn17eMUHthFp4knYYAG4p7G2Jqh59dOZYtzXoe8sztrx8XW32xa/tY/xg9RdsO9B2rjhusEq6e8Nal6zi/OvMVCnHSZ4mth2MDueLz08bq99us9BNLIJUhbVDI8EQ9Bc6h6847rSql SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:28.7083 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79c5513d-5c9b-42f4-f751-08d526fcc910 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: DM2PR02MB1337 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.80 Subject: [Qemu-devel] [PATCH v4 32/45] 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 Wed Nov 8 22:58:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836074 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="29kjsHjq"; 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 3yXMw41Sfhz9s4q for ; Thu, 9 Nov 2017 10:29:56 +1100 (AEDT) Received: from localhost ([::1]:34444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZn8-0005Dt-7t for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:29:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMi-0000dh-Ey for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMf-0003ez-Az for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:36 -0500 Received: from mail-sn1nam02on0075.outbound.protection.outlook.com ([104.47.36.75]:43472 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 1eCZMf-0003eC-2I for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:33 -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=29kjsHjqSh6w8nGS9VB0EKNTaywbJdsvYMsZoCIeURSspLgjojUP8ohZ2x8ArgMIOK/x1hdfFfGnVYKZI4yiKXKuRAaMKMCGflikn/t86zc+1YQcN1DddFjJRGuz50j8weBvopVp0kIMtuTedRZ79AOotYlXg9n6pflU/moryQw= Received: from MWHPR02CA0018.namprd02.prod.outlook.com (10.168.209.156) 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; Wed, 8 Nov 2017 23:02:29 +0000 Received: from CY1NAM02FT054.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by MWHPR02CA0018.outlook.office365.com (2603:10b6:300:4b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:29 +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 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; Wed, 8 Nov 2017 23:02:28 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36212 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMZ-0003yb-Li; Wed, 08 Nov 2017 15:02:27 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMZ-00035r-IM; Wed, 08 Nov 2017 15:02:27 -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 vA8N2PDx010352; Wed, 8 Nov 2017 15:02:26 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMX-00035b-RH; Wed, 08 Nov 2017 15:02:25 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:27 -0800 Message-ID: <84c9f4caac39c30ac03f742d9096bb0270c3cae3.1510181732.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-23450.000 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)(50986999)(5003940100001)(8936002)(16586007)(118296001)(63266004)(81156014)(81166006)(54906003)(50226002)(76176999)(4326008)(478600001)(316002)(8676002)(6916009)(33646002)(47776003)(77096006)(106466001)(356003)(106002)(2950100002)(48376002)(9786002)(5660300001)(36756003)(305945005)(50466002)(39060400002)(36386004)(189998001)(2906002)(2351001)(107986001)(21314002)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1336; 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; CY1NAM02FT054; 1:5T7IVkuTIPBefk2FVvtq/BZBXnnjN7WtgdsqPbl9qZsnI8U8VFgLCL0pS4Z+0w2pPEgc7HkzT5EypWlugc8nP+i65mHHTDaJ8TSvsrGe3ssb1EfIbKsR7P8gzOAVwPuF MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0d6d4b1-814f-49c6-9a63-08d526fcc8fa X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1336; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 3:RNpbSwGLbZ8W7TTF5S3rUIQCVGYhQol+mAXZVnWJ6kgcY6lBLIfm3nuvOTBJ61LicZuJWu3TaGVXcBVFxR3TeCWF5hicTz/QxbdEGK2LSd1cpW0SPncW0L8GX8/mLRAjWvCfRUCzEjo6yOLrxyNY5c3dRvT1h3AxmYHBo26IjjZo5PgG5rPmw2k+kKHY0VwnZYc/mjfAl1AKn80c96PBDrbxTcuWtkpkR5mNrzM0JA+YSWRXqqmD+7aRvlwSRyje5ochgEQ0tvzvqQsvh4puwvu9KW0U7VJMtUDXd/v40G+pgvCsnOvRNWWOyrSo8hzMoizMsPHfNPaINZMUAazg8FIrosTg8lLuZzHzN/EWEiU=; 25:7Od0MtOhD3LYMGTih0uqjBo3p0VopSKF3V2VkKncLjcH4Ly5Foka/q9UjuKWZe18KQeze4v+iq+QnDvdhTV6NlbdgXf/ELoZNGYkaL4J8x5Q1bFDvPDnCY3apWoR4Gxt4rp/eRoG6ekOiKERHWRkpdAX/Ksu4g7ubmCLPjKTZpLmRSiq07Mz+ovzzS7Tto2PVraZsKOsMmt7lhWPKbstXzZeRxyNec2xDfCBKbGI3hEnpWX/ND7InWFnXgXJhC3Pij6NBuJuCO9CQBVnwku/M3VSVk/RD4aJ0gRJWHqjvhNDd1DCkfHvkpo3XXLtzza64tEwDPcnQ385zAhN/vGi1w== X-MS-TrafficTypeDiagnostic: CY1PR02MB1336: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 31:EoAUDlsdRRZc20m7IgoPee/SRzZkRrbfGqB+tuWCQrliWbo44dkXaVywci9feVz1VAxYDBogdinM/H/zuRkbwhKIQ6RtOip6N6H4/eI1y53PGWEwNgkA9ODWb84JKpGy4nJOp6Xb2TZVegMs1wVhpkpgyHunodlAb5IosQiIxMMOalYrcaA70vghF+QMP0qhwj3VFbKIl9znjJSelWp8rvMzUlWZz4B2JYV6sJZay3w=; 20:2uxBHQE+qZRudytbXvPpZoAk0U1D4H014yr+2KfZ6SPkAs8DW5enVDzYQDQCZZS2rgRYHwbKLf3utCxyaM0EUHpox3J/EdpyV3VmHfRjcxJxzaekzuzTT3sSFdGENFcACals5Gk2SB4pVPDd8+1V8r2pzYXNslvv0ym7v29VZlypb8A89E6Vy1Lc17NTciFkitr24CBWzeUtayrKzLAsQjv8e6DfZX26slGkA6S/4Ib5nuTLkPxdnww4rbrAGhzbwneywkGyMQ7YVIWfk4tHbjqfkcwWPaZLpQukHnjNdehQ8kqR0F4krX/Rs8BSSXHD3Mra5I9Xw/32TSwHm4PSn8FoSNiggcMuwmJcr6kNj3Bwj8fBercRN1axs1QktfYzFiVhWXac5wwDvUxV4sy7jBpnNV44t1d1EuF7dk9AsXSc4tIEQgYr1upxkeIWs/4EAjleOPRGKUM57q4NDZY5QuzksN1xJ+WqHAPJdNxhwmAFpz8qcCWvKCo3hcPtjFpI X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3231021)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(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:QHpWcpgp6Lm87rNzkjS8iWgknzi+FR1pe02h4paa/RHUvl2gNcTNTzOVlG7FI1k2myIQ5LCYBy0H0Pj9XzeGBEbWlY5K7UJWUKVhcoytJfWgcuMOwYmdK8P+oRfekvSz5p9+VeNB7wLtOSbtmxWG6kWA2+XOpaDsaMOHRYQW9ehjTNrMgx8WTLtlDTwfiG5sv8tYhfzyjgEgBUlaXyEE8IN+2Qyl8h5qP6X3dx0S5L1KIRzBzyI5eqH5pUUcq3lc14fpFOS50t0tbRRgPcn/YDXsXm3f5rEjcmWZN0fFH9NYq5vYzj9uD10yJu/t1BO+6t++OJdbmUHLPxUCAkgJtg== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1336; 23:WX3nmBjsafRvnBlW07RrHG9Fe9qp/8cE9KGqJEd4m?= s5Unjrghs96hwLQE12EbH6HgmO96Ux0nhYpe3xa4csJt87TDuTwWzEk0vFW0yyk6pNYZIL9+sRCu/xkRBsYWlEaG4bipQmV5yp4HCKzM36JUTguMVj98Tvy/JPNCBeul23efNhs5sbJEmNN7gVv07TiNqGbqWc0zmgqaFaeEheAsOjbjnB1MJ9EHy7omjPKyEEdsF/NoObxbcDMZ78/1Pd/uvgiOcWy0e+l1UxA0gyEJ150oTtBrvN4TPv0VJ5XS5TkfZWjHD3aTF5PSco2HLVhGAIN47mR9zfcx8+ZRcda3h8UMk5xVe5OXkvHkdo39HzteKpUJ2cM9Uf1h8ePYg0/J6t5Vj79KMzstC9FRIUTfvXgQc3p6f8dAXeOjbP+zfBRuQrUQZcnCKo+WqanOF2DsYNgqqp30tblosyhmQG5NO09IIQ3ENpRhLhUr1UoP83XxCEJrsdGLdpcTUGP9yYcluGOaLF+gEAQ2PF64hqlUujF8Z5C8zPPHEmktWK+Ucg0lS5ZtiggkRDlUJGuFF8pEvKhBYm+RT1InUeiW+PhN9fjVyhKX21hkXGPUN0hVJiDQ8McyPe908smMqvnPJq9+TPMXEwkxrX0bkIytxfERdTGrp3H1Uu1ljJHK2W0STTGl/owz1x++5D2BvBLRU5ljvGgl9oNR9l61FIUuUnho3r35FOx9Ktsr+c+pnvf2M+c8Z1ql3ZXu743mrEyFSB//TTQV+wqS+TkgsFTzTNfV67a6ktIdAAJVz/9u3u8eNN65pDzFCVEIPOxlpV4IkKOjkqbRDhBz1Vr9In4og2K+E+d8vGA2tT4qTUsKKqXEzH7ReZlEZregKvP7iQ0yxIA3ijGnQcCpWRn9RicncZ+4PYMH9mw4kZyaGcFXzZ/9Mbn9A5qaCie92p4NdOqQPPhqa2YtfcghCm5M+iF1MOCaSAQcSiW2+B2wOex9z1bhpaW1jCeKe2nCl2KUSUcRTrr7io6m6p7wZkCxCpvmHkWVA3+t24akiPteX+4aVVAS0XeBNfsszur2oHW/l+qVsm8 X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1336; 6:O8sfaF0PJomhJIFv2MAAmmdy0a0o44Syyp51Fix3/EWirxLxCbRkZHcaA8itHZ/GheylrAs/6jMzs07oaneKsGF71S7g2sFC0IGjvFD4L7oZXlOg3J9EEMNSAUbwwpgWRf1lBNrTTQdwX5B1cUPtaWskxtQ6TBH8CTO1o9BYm4sx9kImcahLdxmfBdAfTFD7wEfFD0chApJblSsVBzdO5rAy7JKxSpb1CrIBYKvaUmJ/u6yTHYXr/rqGD/iRHnwpRf2DBjTLv1dAJvvsxhKry8TkQbHddlDWcUWfT9LV38WSdp0HCxAzU5e0iXZlmlObGCKIIPbY8eOLhgiIUsMLY3en6VojKqd65HQYl30qoA8=; 5:yFDj1VEPlGO1QYoKguz3pp6sw8uBBbExWKL7DPZsj7F/2vf9aOw+WHG5l6/5PBX2FsNF5a0qBP5Q6DL7XTP1wHWyS8KIN3Qr9gyq+pmGd2Fw4qub5Qzy/2b6ruMGmI+6DaCLIZrKmp5ckxRmicBa+SdsdMHdua81cGbuUKQT2+0=; 24:w79n1EB2DKM4bnL05uOUtUmyGIroJElkz24qTseIed1HnCI6GekeiCfB8un/kJKGEq8/pMki8eFaZFDmM2x+NMlGyodqa8z/YjgEr50vYYA=; 7:WIRAJFjEyH6Xw+C7Qi4X1v5/XzMmIxqm+IxgD+9Ki0YyFC7SK3eXJ78MfKrOUtHCHTM2/yuKnNzQ1/n8/L2DFw4mQlemYmo8qy9BeQxw5LtPTgiF6UJc4CEWICdjMVDvek3bIS65/qCXwOSWWTa2t9qtrfvqBZidb2qjrYgbcerEx1uMO2AVTQ+8x24270E9aFlh1z9eFJwsPFgAXqhoaMEx84R5sFJGXThpnzqFgppaXavkOLfQcEuRfG/UYW+T SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:28.3430 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0d6d4b1-814f-49c6-9a63-08d526fcc8fa 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.36.75 Subject: [Qemu-devel] [PATCH v4 33/45] 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 Wed Nov 8 22:58:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836075 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="ims55rTo"; 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 3yXMwX1rV3z9s4q for ; Thu, 9 Nov 2017 10:30:20 +1100 (AEDT) Received: from localhost ([::1]:34446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZnW-0005Oi-9B for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:30:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMr-0000oK-MJ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMo-0003ht-HQ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:45 -0500 Received: from mail-sn1nam01on0057.outbound.protection.outlook.com ([104.47.32.57]:31808 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 1eCZMo-0003hX-Ab for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:42 -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=ims55rToY5/bwgZLYODzcpCP2RhnGwad6JgZeF+v6F/ONJjL99jXXktph8Unjo/IRbMYy4660VTvBjPRYCzjllbphbSd77g9cCY8SjL7Ctr4y1lv90HcM3+Ct/HWCyMSjihnKK32o30JmGVgLeh5ZJNHIKHZmET0ETY58ydOW/E= Received: from CY4PR02CA0032.namprd02.prod.outlook.com (10.175.57.146) by CY1PR02MB1334.namprd02.prod.outlook.com (10.161.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:39 +0000 Received: from CY1NAM02FT029.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by CY4PR02CA0032.outlook.office365.com (2603:10b6:903:117::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; Wed, 8 Nov 2017 23:02:39 +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 CY1NAM02FT029.mail.protection.outlook.com (10.152.75.143) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:39 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36357 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMk-0003yo-MX; Wed, 08 Nov 2017 15:02:38 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMk-00037K-Gh; Wed, 08 Nov 2017 15:02:38 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2Tct010358; Wed, 8 Nov 2017 15:02:29 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMa-000369-T8; Wed, 08 Nov 2017 15:02:28 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:30 -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-23450.000 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)(4326008)(47776003)(8936002)(36386004)(2950100002)(8676002)(81156014)(6916009)(106002)(33646002)(6666003)(81166006)(189998001)(50466002)(118296001)(575784001)(2351001)(77096006)(9786002)(54906003)(305945005)(36756003)(356003)(39060400002)(50986999)(50226002)(48376002)(76176999)(16586007)(478600001)(63266004)(2906002)(316002)(5660300001)(5003940100001)(106466001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1334; 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; CY1NAM02FT029; 1:BtVBiAXe0CjHP9nqGDcQoZ+KxXA4btd+rB+f/TMD/7f6Llyr1YqmpgqnF/oqlfBS2tDJctnoNtqX2RqdAxSYpx0k66rKh60VdfqqE2AIdNM3ZvrY45LUgUolA7cKFuAy MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4a0c103-9cbb-4d61-2c5f-08d526fccf6e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 3:rA796cBMDY5x167C+MFvks02PfdUnFCinIReNhSKKpYhO0Ben1pbM60EwlgHt5eRcovhMcIKSsxyoimLZt1IhhmsR9BVaG4rvv2APvMmC2SxAVQVlJl2yzDBpNtnyZt8OHmkEluAR+7vmWe0TTl6wQOxeFb9YwZo1VRjBbQ+sXaAkocKrcSenrhOEiL7CJiUIYhUX2Mk8uI//ie7fYCqk2osu2xCf/tV53xc0VemaXc2i/YUnugSH55o/S22tafm6d7UZA5ZdNiyst8PfMx5Y43EzL8/4uFWJtYWMVd44r1u8fnf95OAHS5HYYnc2usAxej92nbpv9VPUNK5bNZ3p5n7oYP2BcQU6RoLYQp6FH0=; 25:mumyJcoRtPfGhhdyJgx12xtvW1bekmTEUGu0FeIdcgLjK6ma61rAt6X4pUt0QUkUYOtpYxqkUhiMsEv72KeFUzoFqdYCdy+oOO1aEDUDZoeiAdbDfV2Bssj9xSwp9sX4U/O4PRo05cgBR8UOdySfwPlXZBuIG14yVECsorE8l5OotfcxJcdXDxK29r9dShMv0y+7KbxIz5kjlV7lDf/ekELUuJi7a0jsJ6IxzNuRHU672MiARqW1dfE4JplaGbUIKZAW9kq/hwHWmS5MlQ4enwaWOifnp7RrFkNyZqUlvHdrX7DhVQce4FQMX9Ua4TCxeTkaqs64lvmLW6tGr9JXuAeyf3xJRD/XWyuy4Gp14ic= X-MS-TrafficTypeDiagnostic: CY1PR02MB1334: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 31:zLYPxtTScVKC8fIomwyo1g5QRBLBjXp7nd6n27//0Afm6aTz6/I/pCXCb/iLzjIhkP1Vbx3MXlYM1Z1azJzJYc/ncp68olpnT112t1uSAubUPfE1LflDdpIk0aezxbPOzJFP7yO6ZPHcsIYQ3wUQoTTeP1Jqq2YkpobqbIZNJIs4SQiJW9qaTX2dDHU1Wf6kos6kOzI5y3M8CjlkERZrV3bfBM5RkQWbHbAHGfA6U6o=; 20:ZT/E0T4pLJCL8MKF7x8lYe2vjDke+QlrBxGZMaTFCYrP5/teN8qCFkO2Of04C2E41BnNj8KUKJxq/Cd54byQmGQrnXauYHj843K5uy1/QWTGERweKh3LgNizq0DxwsirTrExeFcARvXoHBNJSKXZwXJdW2wPLboniCOMthHQP/S7u9WmmcD78rsiKfe+hL6KPVHarvT03vU9v1CWy1tAhj+PmoJwPVaGRiHNccJkd0j+x2sc6+/qOfITiU9k6fWSITKn0Ae/oOUJKUo5XNdzyWo+BdVT5xY+JOtSH6sfjkBJDdwqNfA4dkPnwhmumSESVwtCEs1oDId0KQMlVnKOvVOCPRmGneJ6+GjJ+xqUI68i038b+V4puESzFzDXpom+kFnA5v0ZdS9ytnY5qbPlH54cvTWDcJgjmLLA2m4ip9xmgoihgfw6UWCvrQCCRGW6uFMdX9nC1pWVs5EuE/U4uhRwK8TA39JfObUWWguHSLqxqq9defnXXHmzgiyCIt1h X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(3231021)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1334; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1334; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 4:FGa7HqhVgB9msRqeia7UuntTZ1P6pqLEcK5FoWc/1V4NZtDBoSz15MZHIRX6B+VZt5FezACFh1R1emAyH6QhBUzFq1QpyQ8mtw5EaSaVEI+y+JsCcW97iynjqGrNvch1gRY+YxUw1a8A+ox/7Zkr8MsuXLmHsaFPehOspgaVdMmsbJLJCVMD9dvPEHi4DqGNtJIGW1yLWoQbgJt0LKw073M8ZcVo3ht8B49JY8W+VcqitWN2c9FsGY6E7U5tIPPWLK9hIH4e/HdjkfjX+207Fz8jfoPu3BdkFCTxD6KqDX/lFbmDzZ/EtnL30JSG+JlF3Y0Kf88cliOmzl80m7CG4A== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1334; 23:PYrMQxyGy5LHe1E3uTxDoXPSlKTLEy6muFmJH/PQW?= CxugrT0ZbVgVaLG1NiaX/Y1EIdbloCBhs674ff9EDO083KmkDBNKpCq20bgqA8c8fjZRITp2qgHKmA4uAexAe7MAso3uxDP9fE7MEBAe85LfBzQlc4TV0uoeBsnwkREOintugnEsCBAFTj/9LEpDFmGLtwlI4dTSuoXcxKdm3ozO03vHypB8KH2/i7sBQLdeZqJDGYU4R1F7PkIw8Lf/kybN5DZz+nOo8ecUq9ssTqSs1O/D0HwsD0GCeR9r9s0yV9NTVr2E/+wJvcrgotik7wMfSS1h3zq122mrggpoHJciC/oCG2/SzF1Idbo30FXIs0xEhRkxz5Fm2jCbUkguzLfSRZHor157cJUZR8KBKRUMrPYm64Yq7NnCtpIE/rC4yJ2EkJ9Zl5pZLsDWqoKUm2zbqR56oYDEcvw3Uc/eHxwjJrTk1TNp2XM4TRlmztR1pljy+xZhUnPmzh+cTNfAkbAku4GDmNF6M51fPe9bpdVTYxReDwfhujR6VQK4Yr8L/jmRGGfO4dNdbfctqHtVO/aEO2F1jLa6PjyVRpIIt6r+lGe/bONA+BP25P3Zexr9QP4bHnFZIqkQ8yB2r4y72ssU+u1fNRyoXm7l6AXMnXRu6awiEbfe7aMbFx51v+xyBS9OXWIYaNjDHzua2ecZlAbp/5nasI0wP5LaHolvOdylPHlwIwdv81p+KyMAER5B3aX4Mbgp+Lv2WFnNMM2aJEP1hKg1KFsfwhnT74gTbERYD9QVZshvu4xn9b+ppt8X+yrp9zj2BP9w7y71YL9nwLtfFcO/pen8FbKMs4dxbQNjN608xPBeZyGLRECITAHcpPE4bDKdq6HQhApztKFrhiSwKA38Hngzt+/CS7SPGucrltDBuvNlWTHuGP4Oj4zF4nLSQLDP0gX5TikeC85+XU5yYz0i+L4aU/teZ/C2IB74O+E3Brhkv2zcr145DKC5ra5G3pvbdT5t5Bc1xM/N/UCVC8m4go9FRC0TwDWq7CsCMDU1HIySyRLz+/DWQ3xzoIKwxiKVnhPY8ODSmLEjtbzLKxwNkV6Em1ssYIGIGkXdw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1334; 6:QSZyv3fzzi3Cg5ZGeNrgGFF8JwYQRnjJe4J9AnvHOw1/UcQAxhQZMoe/6iTfb432Omk9SqsRqG6Ly5y3g2pr96qcFqbbV9WvhUSGqkjqqWPVmehT7fzxAiSEEtj226gPj6QoR7FupnidfX0F+2Lcq5awF5gsGQIPYohWFnkLxf/dp1jDwpbrRVAVk/Sfd6fBfd2fHVgP/RSo9u/6W/30YE72d1fiWKOMCnIIs48oDOYR6KKNPRmmMrLOMBuok4uPtrXBR6iUxryKL6qgvHPpxAOQUhsHsa0gncX9wOb8HEJ+zZzftyNobA8O702ayq3bi7CY4+ZF/9VC8vZY/leXQB6pETws5MTHVnO2ohAcoZY=; 5:Gk1kiSBcwCDm2Ff3spF8UDTB3ovHiLSv21rfeUAXRVzLy3MhPY1bA3oMJZ/5OwIQxi0q7fzJ65VdEKp/rQSJvnst2TmITOs0lMrtC6MlfgSHqjiaY3MRGLDXM4FrOsQwecEQsoD3+hgp6EQ2kx1ZG+Rd/xXT7OgiOYXijxNDwog=; 24:33kO3AJd3levhOgCZw9eJ5I0br6+K+kThyDLHEXxkEYdUf8rNPVzCGp78uqmvGay7l4W9u42ND0ZdjvLUyaQAIyA6tMDB7p4MJUb2sqBWYs=; 7:da7v04xa6Ya1BjuY7Z3ABSuStgrZ3XcdHz7F9w1rD7UlbYi2/o3PThLqTmKHYoq2cGoe1a/swKde6l7jdgB5D0SIwVCXC5/XuqIb08oGwEIEPG8vDDg/5Auv5JKL+uR73FKr/Ox7mqqkVc1Ku+nDnZrQE9ZZlEai/Alf1rCiJ1ZlF3jUqMJ8AM085hjIJ4IT1ovI7apJ29Y5f0oIfdBdUZDeVpZW+H4W+tI0LkOnBQE+h6CKVjFcvuwXH4ddOQBi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:39.3542 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4a0c103-9cbb-4d61-2c5f-08d526fccf6e 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: CY1PR02MB1334 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.57 Subject: [Qemu-devel] [PATCH v4 34/45] 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 Wed Nov 8 22:58:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836077 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="Dd0Dd4VM"; 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 3yXMzD4wwpz9s4q for ; Thu, 9 Nov 2017 10:32:40 +1100 (AEDT) Received: from localhost ([::1]:34459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZpm-0007gE-RL for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:32:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMt-0000pc-1w for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMp-0003jQ-Uw for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:47 -0500 Received: from mail-sn1nam01on0045.outbound.protection.outlook.com ([104.47.32.45]:42975 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 1eCZMp-0003i5-Lm for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:43 -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=hRCsoIMW55UOloCGqecVJFTRMGJkuDQDQkI4SVbnKTY=; b=Dd0Dd4VMPYO4NlgAOMEdzWM+fAVP6Z5KGQST0Uh8a6xcT7z4SHkM9NYvZFYcAsvOHImy8NuLdwtt1CbacvGqZ+ny/KRacHBLxEgKmb5GMJwkpA4GuaMo/ovba9N+tk4woJyn/K/zNxbPEdy5MosWvnBwqBe/MCqpudjKEaZgd2o= Received: from SN4PR0201CA0033.namprd02.prod.outlook.com (10.162.76.19) 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; Wed, 8 Nov 2017 23:02:40 +0000 Received: from CY1NAM02FT011.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::201) by SN4PR0201CA0033.outlook.office365.com (2603:10b6:803:2e::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; Wed, 8 Nov 2017 23:02:39 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; aurel32.net; dkim=none (message not signed) header.d=none;aurel32.net; 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 CY1NAM02FT011.mail.protection.outlook.com (10.152.75.156) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:38 +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 1eCZMk-0001NL-5X; Wed, 08 Nov 2017 15:02:38 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMk-00037K-1c; Wed, 08 Nov 2017 15:02:38 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2WNo010378; Wed, 8 Nov 2017 15:02:32 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMe-00036Z-3L; Wed, 08 Nov 2017 15:02:32 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:33 -0800 Message-ID: <6374b4a21466bd49548817a37225ce496a8551c9.1510181732.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-23450.000 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)(54906003)(4326008)(36756003)(63266004)(316002)(2906002)(50986999)(76176999)(39060400002)(118296001)(189998001)(77096006)(478600001)(16586007)(5003940100001)(2351001)(50466002)(5660300001)(305945005)(81166006)(8676002)(48376002)(81156014)(106466001)(9786002)(36386004)(356003)(47776003)(33646002)(50226002)(8936002)(106002)(6916009)(2950100002)(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; CY1NAM02FT011; 1:Plo171K4qVmb7ekfwGuD0amn3aTBp8/btgV3pfEv7NrRPp8UTcbxRvJvCNZQ6wDiIPK+ib5AQitY2sK5eZnwEjFR2z29Fw00eWpCu/SQkCmgb/S4a/iOa5BXfWWcqI9Z MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14466e27-7a6e-4959-f881-08d526fccf43 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:T1FD3JgEqyFTupZ3sr0wTm4C2CTkHVlbQlPhs1SF4zmaFV2/pXNDA8WFTWhOgxaZUbr7F+e9F3JamX5vsDsd/uiJrus3M1kz0ge00t9XR51usNsY40/czToadjyUB1Ppc5NY7zM90PTUEDNf1LXwh1RPhnfd7BcARZUtkpT+Es3OTqn6QjeFC18IuaoSiQWPrlBlYPR3xiTVgRmzOevsQeUXkWCZ37nt22Vv7EcOEs4fPuiDDO6l8PoNi7HraKFQqti4wK+AB0IKbMpvKi8p+wULlkycY+HQXiHqpYrlqJtylBhMTlk6Y3+AHEgspI2yRDz9b/ky7iY/7fnxbZTFTJrerNDWW9oDqWEMH/f/bOk=; 25:rS+OCUuHkJh42eKvLgJ5LXFMU7Gzezj5pwM2gRf23ZD5wls8Pk5MXxh9H5/07oQX99gUloHPy07/sc8COVERloNpiTLKSFYfUy9uoXLWBzhEpYOIqpHVuuUAwCF+bxBxSSy5vGCN43rqBQo2ibxKh294MvqZqkDwqeVONVCPcoCIO6jffNfF65BbFFG85+sbxNC0wcqvLmW4VO9dIow+nLbso4lbb+30M22nIIfRstEDTZshPElNOYUvQLSUlZzTcnr4lBFiw6/Rz77BiEI1nopf6wNlxCa3d+xQ8ZQvsWLw49kwpQb8nkWASvi7KwI2OMJaJFAY9ybmyxnezmsA6A== X-MS-TrafficTypeDiagnostic: MWHPR02MB3279: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 31:utFhlaybtJyMg486EXHxx1r+4mY4t6BqCxrd7wpbnUY/BrK1slZjkZpVfrfoQo9iF+IFfJsyyPieV7skLgf/yxWtCgiy8UDPsIMweGcIvxUQJbBViJ3Kbx+CS4MnU4Gli8Jq5+e0SMdPkfES7Um+MXsNKmZQO0Cvqv4rNCB0U7kktIWIPDnHvIs9uBDbv0z75NeDrslb/6UWF8QaMNXlz8YxyZ7sAf+n+ZmFv6bqlz0=; 20:SKm8WiRK4NP18i05eXqwFAdvseQL7kdADbJMouIVC7cMvG4wv9Dxv6EFXhoyoIZrbiQOsneVHt9NdnWEcooW/ZgkwqMFy9KnaCmflAz+nfA0/UTtePDFpdH7J5NXQ5O6MbfP0FSapYaQF1HCkt4G9+8u+SGML5tFCXi7aFUsUGgzRWQyVKzIkgY1qw0wrxBubC4Jm5L91jLyyYtjR9GRqdYQbQl5d7MosRq56fJLfFvdafYMm1ghuOMgl3FkZqLGux7Hg68ymy/Rzzsbp8t3LtiS8B1w6cVSmo8+Os/eBSCinka2He5qKmLj8EM29MlqGhToKyPO7fMSCLZ79rol0agvAEIIOOZrsUwgaILOJXQkcL9eHRw+XadpBGmERF2cNa064qiXccA+Mr6KLnh82Qx1jNAjQBzywyzBPhoiAGkBa8PpZZNiKkrBv9F/oT94YmwGaLObnB5jSuWMHNVmTJbVVzeXJbS35Bpz3qAmU+uaq+rgD2WEnZPyFf1eTm4Y X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(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:ArpIVf+J/lY9j6ervhTAMagqcMOaDiqejbZ/POP2g1X0s3zhWH/KXlS2Do2Z0LJUOiEsL/bLWq/AUUuMzZuBcbOVzH94LFt2zBvPbDmXax1q1LjL7JpTxPWwm7m3Vle0sLL5Wvc9TNbhNDF84Ja4OLB4CLUAQ5iCQxf4F0iaWPqmQaSVYsiv/+Qqznwciq4iVw4LBYdvK1tKqrv1mm4mHNxf7L5UDmM1fHeXXd5KOdtdmhjTaZf5B0CKsPq3+XqiEiSp9BLK3IhB8yb9PYHdJX6QZjeytxs54zxOpy1LAdlT58EN8U9zmJ/dpy85Peo9ivlCrFOJ06YOCoEoZfld3A== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3279; 23:rJDsTM12CnQkB3eUWbQVp5xUf6UANPQq/OLsXRDSX?= /QmozCcuEOXx6oibVL/1DZ5unVH5s7AIyMrApKMXDeLHj3VqBISXvQnpB3JPHz2c2FCNxf8wK0WDlPdZN+76MB8NruGyyjymwfcThzCVaOkcmr18GZGtFx73Czt8Jy9xfIciZNGxxkUACFqKqpfNIBrS1mSW8d9yXdzkEG9tcDdlpCSR9MWKwqpgMLBjysT381QaEpRn8p6xVWJJDTOZ8qE+fs4XumecT1YewC38ks0yAdVMqTt6drGRBH218rPc+J/aVtGdSkOZoK5NtnBRvPJzqmAjJlvxyAbOXkC4gxtlaquHbVBvCWhWVGHwinjFEkSdBJ3lorAICDNWOY/XgMlHWaSeyQenpg/IW8o0oQX/Bx9aN4MiSLis3HPKE2+MVOdDKdLK2/Xq4ZAQZvbEt3rvW0MQG1uJkqcnT9TLtaKfPrEEPs+ck4AuseZYWf6q8+MjNLfhe5za0992ul0cQIFLQ9vGckKqi5iSzncc73LsK6ijqo0OGoLiVl3Z9jLxCIfBjNbRPBFaG2dvn/m+FZmaTDMONlvawdftQ5+8bINKrSAyU7xRbpVjKCIKEqeYkZp/X9WKc/x8q4100P5axCwItZbeSZcN/ypZoH50hbZeo5MKrdicR4ZJZXMqda+U5Arv2ps/ih/z6VOH8MZTsUbyEnPVnw9PeB7erwpPDTMue1qX/yWFEzt683iTcbCxfp4l8f9meKW78ztsnDxTJ6sJSQxkhPfZ/w4VKTqfMmH5Twm1vtBubuZB+bMiQu+OuEVMuQEqOMxLAS9tcSAaL6sc39EunsembLyDUxV1laZrRjoahiE40TPOBhm2uq33tVcvHeHKnbgBd2NSQsWYoc98h3GnbCPkPqOSHbrBgHwoiGF0vf/FKRoWtJESJZoQmRujAt7MGcr+r3e4UtolyVViMsv7THfp+Iy7s2CYVCzGMPHnbS6SzBnXQnfIOxjYjjOPLMP+sNVEFSiCB4HXxwJBtxhFoyXJTqs5ZOWuRQyPg== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3279; 6:aPlfu5qccXv/XOpbav86MjbNO7ORNBKVPKPisJPnoygenFVVCKSc9Pb4hBZHgrx55N/hcl63WvJTYkL6oV5wMY24xe1YSGJ3uFbkhayyooiDmPG24kyIMua2+KiDoSzs2S/kp5BNsl/s1NEu7ZTXhPcHe6YENYGgMpYIqhdf+XA2uuzbX5+7DD2AOAmab5XJ9swEaaVATojUSQLpwcgafiiLr223RluNBH1r1C6MwZ/nkYTCNv0yAqb5HNqlBwS8XmoTNtilS/r/ZnIAoQSmhNDgGUNV85FIxAwKwYVNuDJE8DuaT19OoyqTvplB8TsiDMmvehoIWZoHHkjc6BmGg9jswpCKVCNexuaGshpCfDI=; 5:EFQdIhDWl9oq21P0EKONgtV+EmZah0Q69hN9aHTcEshubNS/Y0GwgG3pua95tL2gv3ZdAy8hiZ7aOa71WtnlsR53OkbM32Ien94v1w3jGiUN8Z07YipY+Uq5QweZq6j+N22thSkeFUlO838p7qTZCy/+/mQJDd3/RHn0zgWJ9P8=; 24:E0KkCeUxN2xX71e/jcFrqoimz4gu5iOg7GPK41SyKhWPdod5ZjPDzUAWCPaVTdciyPt9MiGX2Eos0KI803JKbb5vJ02CXVmxy7YydeP/g/o=; 7:JbIV+7Y8+S+Xzz6aEJbHsMic4hGBIHTafbtmeBIGUQY4Jt0NEo7FABpqt2wjJkXCGjSbD+0qc6Ws+86rsIWS62/JcVyfeS5AnkcfWtx35VLIQfzlVmss834NfVE3upDORajYrAKJWFiHPOUwqBrQJFN/RVDVawAJYQ20vR7PtfmJTrKoPAI14g9F12rqH0vGOZDBwTSv44PlfYAO7UMeiYrtHxy5zmE5MJeQCC2DeayMUzOerlITq2sjrJrt47G8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:38.9682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14466e27-7a6e-4959-f881-08d526fccf43 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.32.45 Subject: [Qemu-devel] [PATCH v4 35/45] hw/sh4: 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, Magnus Damm , armbru@redhat.com, Aurelien Jarno , 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: Magnus Damm Cc: Aurelien Jarno --- V2: - Split hw patch into individual directories hw/sh4/r2d.c | 9 ++++---- hw/sh4/sh7750.c | 64 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 458ed83297..3ef7323f19 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -314,8 +315,8 @@ static void r2d_init(MachineState *machine) SDRAM_BASE + LINUX_LOAD_OFFSET, INITRD_LOAD_OFFSET - LINUX_LOAD_OFFSET); if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); - exit(1); + error_report("could not load kernel '%s'", kernel_filename); + exit(1); } /* initialization which should be done by firmware */ @@ -334,8 +335,8 @@ static void r2d_init(MachineState *machine) SDRAM_SIZE - INITRD_LOAD_OFFSET); if (initrd_size < 0) { - fprintf(stderr, "qemu: could not load initrd '%s'\n", initrd_filename); - exit(1); + error_report("could not load initrd '%s'", initrd_filename); + exit(1); } /* initialization which should be done by firmware */ diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 166e4bd947..64ffc4c1d2 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -23,6 +23,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" @@ -147,9 +148,9 @@ static void porta_changed(SH7750State * s, uint16_t prev) int i, r = 0; #if 0 - fprintf(stderr, "porta changed from 0x%04x to 0x%04x\n", + error_report("porta changed from 0x%04x to 0x%04x", prev, porta_lines(s)); - fprintf(stderr, "pdtra=0x%04x, pctra=0x%08x\n", s->pdtra, s->pctra); + error_report("pdtra=0x%04x, pctra=0x%08x", s->pdtra, s->pctra); #endif currenta = porta_lines(s); if (currenta == prev) @@ -200,13 +201,13 @@ static void portb_changed(SH7750State * s, uint16_t prev) static void error_access(const char *kind, hwaddr addr) { - fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") not supported\n", + error_report("%s to %s (0x" TARGET_FMT_plx ") not supported", kind, regname(addr), addr); } static void ignore_access(const char *kind, hwaddr addr) { - fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") ignored\n", + error_report("%s to %s (0x" TARGET_FMT_plx ") ignored", kind, regname(addr), addr); } @@ -326,47 +327,48 @@ static void sh7750_mem_writew(void *opaque, hwaddr addr, uint16_t temp; switch (addr) { - /* SDRAM controller */ + /* SDRAM controller */ case SH7750_BCR2_A7: s->bcr2 = mem_value; return; case SH7750_BCR3_A7: - if(!has_bcr3_and_bcr4(s)) - error_access("word write", addr); - s->bcr3 = mem_value; - return; + if (!has_bcr3_and_bcr4(s)) { + error_access("word write", addr); + } + s->bcr3 = mem_value; + return; case SH7750_PCR_A7: - s->pcr = mem_value; - return; + s->pcr = mem_value; + return; case SH7750_RTCNT_A7: case SH7750_RTCOR_A7: case SH7750_RTCSR_A7: - ignore_access("word write", addr); - return; - /* IO ports */ + ignore_access("word write", addr); + return; + /* IO ports */ case SH7750_PDTRA_A7: - temp = porta_lines(s); - s->pdtra = mem_value; - porta_changed(s, temp); - return; + temp = porta_lines(s); + s->pdtra = mem_value; + porta_changed(s, temp); + return; case SH7750_PDTRB_A7: - temp = portb_lines(s); - s->pdtrb = mem_value; - portb_changed(s, temp); - return; + temp = portb_lines(s); + s->pdtrb = mem_value; + portb_changed(s, temp); + return; case SH7750_RFCR_A7: - fprintf(stderr, "Write access to refresh count register\n"); - s->rfcr = mem_value; - return; + error_report("Write access to refresh count register"); + s->rfcr = mem_value; + return; case SH7750_GPIOIC_A7: - s->gpioic = mem_value; - if (mem_value != 0) { - fprintf(stderr, "I/O interrupts not implemented\n"); + s->gpioic = mem_value; + if (mem_value != 0) { + error_report("I/O interrupts not implemented"); abort(); - } - return; + } + return; default: - error_access("word write", addr); + error_access("word write", addr); abort(); } } From patchwork Wed Nov 8 22:58: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: 836048 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="focp1wEL"; 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 3yXMWH062Zz9rvt for ; Thu, 9 Nov 2017 10:11:55 +1100 (AEDT) Received: from localhost ([::1]:34357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZVg-0007ci-Vj for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:11:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMs-0000pP-Rx for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMp-0003iT-NV for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:46 -0500 Received: from mail-by2nam01on0058.outbound.protection.outlook.com ([104.47.34.58]:57393 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 1eCZMp-0003hq-BB for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:43 -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=focp1wELWgsmCO19i6J6o5Gjv5DeWzr8lpxpnMCvc2k/EsYK1iONGCqKg4fDSKx+aDTzLx8a9W/1OCWUBdsAgXHWlu52vBp9WeGIquTwkn2KDET/dyekwkEvI57IkB26R44U81iTOJv7EJtQG1WVuEm+UtzDWhGmtslfPedlvCg= Received: from SN4PR0201CA0044.namprd02.prod.outlook.com (10.162.76.30) by DM5PR02MB3386.namprd02.prod.outlook.com (10.164.152.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:40 +0000 Received: from CY1NAM02FT007.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by SN4PR0201CA0044.outlook.office365.com (2603:10b6:803:2e::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; Wed, 8 Nov 2017 23:02:39 +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 CY1NAM02FT007.mail.protection.outlook.com (10.152.75.5) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:39 +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 1eCZMk-0001NR-IM; Wed, 08 Nov 2017 15:02:38 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMk-00037K-AF; Wed, 08 Nov 2017 15:02:38 -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 vA8N2ZZW010388; Wed, 8 Nov 2017 15:02:36 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMg-00036u-VS; Wed, 08 Nov 2017 15:02:35 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:37 -0800 Message-ID: <7836aca1a2f07452ccebffcb3fd8178a08ce7241.1510181732.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-23450.000 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)(199003)(189002)(106466001)(77096006)(47776003)(478600001)(54906003)(6916009)(2950100002)(575784001)(39060400002)(5820100001)(4326008)(2351001)(33646002)(50466002)(356003)(23676003)(106002)(36756003)(316002)(50226002)(76176999)(63266004)(50986999)(8936002)(305945005)(9786002)(2870700001)(8676002)(2906002)(36386004)(81166006)(81156014)(5660300001)(118296001)(189998001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3386; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT007; 1:kGH73KH5+3Q9GJJyIKuatdw57HAte9dUuVs8zsmBny+4VdWAbCYi/UVyTV1kAEWWiMFzlI3bTcbMRrO+RmeWfn8L/Nj6Kg1r0FwDEqLC1frHSjUcDbhbv5sgYb3SeN+k X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b272fcde-9568-4a80-fd28-08d526fccf68 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 3:DZtJdmX1xC0datqX+MvvXtV6/ABaN05YyCkGy1C5iOoMqBMkqdJD8UHF6sBdhNUjMepJsFhDyY4haIWEFl4fgWqg92Jmw7Y5bgBezely313N5rCq/7PScMC4xVaNpJEKka98brBIXmegegN2KybnNsrp2v12giEsQ30HsSQ4BQpUIhzMn3CULKouhg+G1g/FNU0FimrvJRkeBJCmP/HQkT6pd51qXZ6Oiy0JjCKn3g5mDD89APk4uJrVPpB0fVuPu85LxVjUDCNAbHPAWBt2TQsZJM79el+MBjtofrAZlVU9j18a1GM10okKHNdVlKJVE0RMrxlsq/sZcebBKaWecLqNG3tHHflg7w3aHA77RVw=; 25:V+S0Eyr/PFSlWa6ithJg2udfKJHGG3nOFgD7dTzvR/Bq/AqOdhiLYqMaiKNujT2NWwP/bsWP0oJTpFNn0qYthtRN9s5JQETqsS+xkNkWrg+SFf4n/qd0hLfHLLvUaKaUDzOCnyFhpw53370b8045zh45d+pVNHdu57BK0TsomodSP5e50VBkRlKUVdoMAZAv95zo5jAref4G0esIE8hRTUBOZOflvLiJZPj69e0w1kT+bEO5pw9pFSPog4IhWlvhA89Vy+r9poLjuEielNUN6Xbr0oszfpgfmoklMozTaJ5Wb5neuvnZ+ozC/2MjgbMJWvN05myupldgyP1jcE4AFQ== X-MS-TrafficTypeDiagnostic: DM5PR02MB3386: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 31:SOa7M2wRZpnpuzdAI2snC/U+/koBqEiq/O/3EQoBdd8uIxt/baTMAIEoR8/fPKyjsfhJk+L8h61hQm1tt4fvAIDl2DPo1ul7eTy9JwRLwBkn90vqor8hPaBSgcSCauPoP/gy1wAM6fiUgkdQtGl+nGSBqGjb9yga48a8xq3KwKTREa9ldMfhMhMiXsYLD2dauoOLnLiRVvM7pxAdNJCs/rOhYYTZMAtmdTu9jzs6/Hk=; 20:S0ZBjJrCHjz8pvOq1jsPDzE3bogkPV39Ac4JMWizI6lU37iz5WtdHoK68tQDIYMonGgaSwVei1MFf09EJM7zSTlwfzWgOS4XwZa3brgyLfVUTn9gscGGn4glN/xpxQGjc+aOYAvlWwenz1wgU0v9qdvAHF8zRsSSh7ysfrLwj6WOOICz3zcd5+bR8LGM3Rpg/ov5NMJqxSKcYVw9J2AlPbOYAWIiRiFQs8Dsnd/GTsLA7WSYLDiVwZFBKcEvYU50gEt8LEBnhzu1zDQBvO98LCIMQa+VPpwQW/QUfjOHB6/06ghfCk4RGEnaxX94j4WEGeoyRC0wHEchjrQYvfu3jdoYg7VymZc9VQfhOuWFbljPKNwNb2vSIQaKFCoHuu0QkTSRiBeh2hx7HSI+rtJws8KjKVsgVizIVywsfY1Jg7vISSQsvV6VGZgclRFxgJ1NsU7LYix6U1SnlqIe8GiAy4SmGzAHZCwBU164XoLuIU7Ark62TEh5bWQuvHgXPqCy X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93004095)(10201501046)(3231021)(3002001)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3386; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 4:gkOZsZ5HVjMjPDvBCwCSuKEB8CvcXNhdEhpyUdPOR8O1YV4tuinfDFJ1Cjv/tQ/XE9Slv3Q49sMiPy0FwcE63zuCWBu3G0FzUAoe6+QcnS6j2iTQy0hBqlvcKCyItIt5PKhJloYczruqqa1pWEIukVhJhPSrf/lEe1Hl78/xo4YPWb0IQ0eh5XbW2W11Gh3d4CFKiXVRCGWkzunh4qCmflgD30LbvI8NIknqAobxSJ0FApa6rIy5zEsorR4hmAVZE4tC9mcJ6m28jLE/s95LdsHn6j4DGCcdySv+iXnlNiWK5x6dYFkko/NEd1/VpiygrvvNWqXj18F7sqEyyZKckA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3386; 23:ROhXzGUKyAELGLsldaLEkBnmRObKFAQIKu1sjtFb4?= wbskj6qHs+wRCCbunSg6sIVh3cT5rKtzFQUJ0Mw3oMMMYqFqS+ci4W9NNA1TLGnBPMQ4xmeqEOTJr4jL+7mIOllPrXH0APUktvJkTqAiAg2hR1cil1nIvhFK0ADeDY3QH0tsdgMEx8Yr7HMpELZFjzS4dcwa9B6LGPmbC+wJGUw/FHVjKzp3/d3Cxu2Gr5OZryceiZXB0c8q9hwPNLwrsNoly4msVgpvmkcGUWXN4gpdQ/USRBJ2A00ScOl+XM/MbsNL0NT6b+gJq6rVKJHW/gJdR3BQhVBAjbJ76z5g0sWARAiM9bugL2o3qqYe/z2s9pEWGDw4WIabbJ3hcR+Ho3pnNrSq6161F/2GsDCcKG4nOAv0OPl0mGG8FTFLXhDfWmCpLCCB84OTMof5VzTJ5nhJGd8QvUrfK98qifOCY4VCs1psG9x1dlBaydtFfxfA4942by7KJ+JVq1do9GRs/45Nutj2g0CL9ofptSdrgN8EkeqHzHGXEqTWNmusH6Gmu/7nUNpbWioh8bPYkb8MwehLsi4HgmdclUiNjt+o986XsdaD/TdicZ0OHdBrmFw/rSj4ZMlBW9ew076JN7YkmGJaVcfk1jQSi61BR+e55VgABmwLQx5sIvJBTJoC4M/7taAPQmB0/Pgiw7pCAKpE+sjIrtPIWNU6y4Aj/iILh83UblfeCB+VfRmmoTwvlDmtaGUQv70+ERfuK9EK7G9o/nB6Rmi3tE1JSmcJWJll97jlqqtlvbLd66iPxSmPiZ67s2KSJj8qgAJPlq5vZsTl8QgVRPkkKU+T19fh9n3NU6HfvX1sLXFxnjSOb97N39xKfDa+K8UmEO5JBXCT5B+7yismXTFtntiYHGTabiIK0N2MzEd1Ls6PGfu4sOZIhQjiRkdgiHPVaieFc+b9X9BqhtceZ7Ppo4nEO4u/zNTfqJFDkXY0odBfsZBd1ecRgvjTeDeYtY6CgCPJ0AGWnAGaOsZl8dYKjpqKFedAsfhHpnPKUznwfP8W1qI8ueGArJ2+R4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 6:DitQMEXjPPFdfBiWa48SgrjKXYoL4yNWUj9Si/xwwdeICmBe4uQaD6EcKH2VDLDbs0WZ4Lxw6GHBTh+fMRFrqjgzGXDfd7GxeaTXDavLkHDgEbRQOVWsNp7CqjLLbr3iL3zht7pfbYUBkX0VATvSlM7Hq0x0VcKrPWNxMyaF2V5viJ1g8ZM6nNRL+RL3CjM/i3wDtBbbfqYyNoK3USx2q1edBkLx23UA5Lz77b2S0khVw4saPmZPQCF8ugnvp14juSoEKxI5bUg3PuPvIAYelaHg+bymhDnN3xWNTFBTOprXZ+4FqX6bdsT0CKO+3LEAUloJlgsivj9meHzvjclJ/tGKxMavObm9u4LZ7oJsp0g=; 5:MU92d00rtd4UlIrK3XjYWsTlfnlzkz/YmMlHBTxrqOmIIcBUD7cmA/V8un9lDIAjTLhKTc+HoBI2+Z2+DyIeoPMV2bbitXAHdTjW0IhXQAqqxrSPp1dco5+obgSZTnQLJ9n+d9h3zDJmqFD+E3IhkUZbLaPp4bxivm3HK5q7XAU=; 24:RdGnp7rWiGfvbYWHqLlApWaek6Z/0+pR40czF+CvN+ere/zSspRIsFYsTMRG+gs2ZHE9Yd7yVlPzIFHWcAvXoBj7T4voIbUnERYywdCpZR0=; 7:H7PJr1OeGpSmRy53quuu5UBtm/THgzpz6ubWrHnHF58qtR9mG8TrVxg7A2kk0A3jllyJ2ayMMcJH8lyzzPYiNeUZTtLYSkCZAWTYJiAu7DeeRpEno+xf6vEHcXk2qrKtd7XcjNqEZlvAGVk113UK9wAKsiSLMcScadn6+gIW/qhvyvaAlaJ0qDuUG2AGU6KkHd2tzlxQ2A4OvgGuW2l8TT2UYQ6YJdMNA9DGo3+HrVtcK1SeHzTDqG5AW0SFgthI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:39.1483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b272fcde-9568-4a80-fd28-08d526fccf68 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: DM5PR02MB3386 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.58 Subject: [Qemu-devel] [PATCH v4 36/45] 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é --- 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 Wed Nov 8 22:58:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836062 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="2ua8mbHF"; 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 3yXMhN10LWz9s4q for ; Thu, 9 Nov 2017 10:19:48 +1100 (AEDT) Received: from localhost ([::1]:34394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZdK-0005xt-1Y for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:19:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZN1-0000w2-V7 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMy-0003mq-Sk for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:56 -0500 Received: from mail-sn1nam01on0052.outbound.protection.outlook.com ([104.47.32.52]:37755 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 1eCZMy-0003mT-Lb for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:52 -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=2ua8mbHFfM5cBAluGeBmyGUPQxq7suDVaDfYLrpjwMSidHXgHsEJGThwW2f2Oj6s0RGThT1HFjQrwP3OKoYV3W1UKj+4lTK8lAgYckv2Qr918ZRKSAyheAmnLuILm4FmVzIlRYn3CuCmEJg8DZ/JuDTiCaVZ31TR5GEHuNMclHU= Received: from BN6PR02CA0090.namprd02.prod.outlook.com (10.161.158.31) 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_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:02:50 +0000 Received: from CY1NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by BN6PR02CA0090.outlook.office365.com (2603:10b6:405:60::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02:50 +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 CY1NAM02FT024.mail.protection.outlook.com (10.152.74.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:50 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36525 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMv-0003zI-5e; Wed, 08 Nov 2017 15:02:49 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMv-00039K-28; Wed, 08 Nov 2017 15:02:49 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2e34010441; Wed, 8 Nov 2017 15:02:40 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMm-00037o-4U; Wed, 08 Nov 2017 15:02:40 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:40 -0800 Message-ID: <4f468a15ddd6131d0045a0291dbd1b72ceab3bfa.1510181732.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-23450.000 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)(77096006)(54906003)(2870700001)(8936002)(106002)(6916009)(118296001)(106466001)(2950100002)(50986999)(5820100001)(50226002)(478600001)(316002)(76176999)(50466002)(47776003)(2906002)(5660300001)(81166006)(305945005)(81156014)(189998001)(23676003)(33646002)(36756003)(63266004)(9786002)(2351001)(8676002)(356003)(39060400002)(4326008)(36386004)(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; CY1NAM02FT024; 1:6UrwM/TMRXCfDAZ1l5xm6NwrR/wnHDsP0EswZAFKmBac4HFa8mgEHoMku1ED10X9Dn/qAogmh7aZTmkRsVT9I4ha09hTjTITdYgzwEWcInCKHRolRpi3juhqtxrlL2Y1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8753aebe-e007-4308-0fe0-08d526fcd5d0 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:ah/BgBaSrfYsCsRgGRf3qH7NoH8RDzfBjLkzt6h0s+o9hck9qVcZRA3XPCKA1vJXQpUqmG+UJpIPfS4yT/mIsVxaC5UBF0uVJJRtO7Cv0ntjHDCY0HAHKhed2++u+AtYX+sxgQoMfQzMNmgGvCx1rWwK0wmnbPM/0tuGDu2JMSmiXFtRFxmSgIpw4jc2/soh+S/UCfa7vnm4Q637oWLxZ4Egv9/gtzFvRgeigDwstrgpKa8T6YECSMz+IN2CnVz0oRd6+sufm+01bzlhk+JmirYZjQyP6ZkIfFZkZpi6QbgCwX1BVw9T2ATf5zvSR5j+5Ds+M0tF4ribez/aiU+aknPzLpU7QZcylBx1eQI/qgc=; 25:d358SURZhRB2xUAsn3pWHB+a3RZfbRLBDHMO5icm+lHme+5lu7qdkimC0DWGBGnUJGsrYDi8wyibH+oeoK0RxAsG4oS5fpx212Ar9Vg/TbQipjOvXkYFR4nKISyEU6sM9oaoSCXefeYia5WXNDcHpKezPKHrSvMRxvf1vugyIxNExiKtIWcTSB0Jp8gn6QuzIyKBs+huF5WZmeY+da8YZ+06rZliIpfo6aTfSRVhJbhLUauz3QgkiGRwiEFjkJ+8pzVpiCFPnRyVsEDilAOACoG0e98Y8jtrAcelfHz7Vvcl1S6Mdj7viR2GQNlLkXX6DwFfUjZCXyS7UWsr1/Q5hQ== X-MS-TrafficTypeDiagnostic: DM5PR02MB3387: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 31:Lg8Xbj3HMfSqwgEgg5rNQXnnOM2vl5aBWA7pHspxEfO/wA7U/Y83cNeD+/h/krAqUCuZpFB8YA8NrNpIFW6+1UDITI9Oy+kQb+o1SRUYb4AiWUzyAq1H5Xvbre0x7lseZAyQXioJ+E1g05Jbl6/I3MYsgtOto7gl9xn8hs6fITIfH5sQCDf09QWpwd5WfVLzEVZomgpFj4/Tz0ZBwx3ZmL0AZ9uxmt12nWa19pkItJQ=; 20:IRyLPqXRunaGGpxWZ7st+u/NIakwxf9d6qneI6zchdFEXbNMrO6Cp8zk01jYE9Yj/PjLsYPafI8zbbegfI3hE0X3NOG7mNT4Ak9S+VLwD7W4fXCmVoFJ8e2aWevodTjf052NZtd3aqH7L+qXakj0/vzxOq6BEaVntBr53HKlgqZyQ478h1er2/ggJs0lx2AgFg2aNXsDY1SdQsLC50/u/g9gNP0ct0mU0eWKId694gzKqqr2JWY0KNN/Wn4tNe3u39dM6QFtc0vlpttT/PUcU+Cb6Us0tGjTOZPGwZdqlvRpO8DWjOp9bH+b26a3zMOJ7Lb8WoNBZpN0Rnfl4sLcK/3FPcv9ciqwjU+GK7B3AJ0C8T/iORaiRrtuGTZ0IhzMsbE4sERrsER8dn648wQZejIpCpVdNPIuidWBg4U/tz3G4kDPGY0AFgZFLkefQlGEQeS65XK3ORX/1tFK4W5mBaAbtoTPD8UwKAESoSs+8B2NBlyt+XrzcKQNqnFRqS0B X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(3231021)(93006095)(93004095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123564025)(20161123558100)(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:yJcWoTh8GRfrOulmhhBI1CfXesxDOTBmZ0vNMW2mLewVSaO6m5GwO4y1D7xgFQs9Cgi5Fosyt4zPmPNFITVHgatdL0ep6iIWlyCFu3ELkyqqw2gqBaPjQ6f0sSR9otK6b48uR2VwWLMnxbq92nARfE5aF9zhG4nGTBWkVRIypOw0ckDAOwFGu/He6dyWCt0DfNA3f8piunLOmzCrhxRrFBkn9n5ZZd/dOIPjQXfaRfBvcnBSecxknJA7n0lLoJWprJZoBRh0NWlWUZaV7PcHDkmWYgPB8RjDh6V7uFW96XLMeJ6nJVLw5yQY7UB4OTE7hTo5hxKKfv7YxvYEyzfEzw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3387; 23:VcEOUqx1jScRdIu3a76Q8H0UERzM+3OfmtqirfGrI?= oXOa1C4frxe/NwEcFmNR0yNDxaFobVoKTfRKS8Iz5kpCxxUJ5CfbuLNRTuf22LNADu5YsYMY0e02dX4hI160u2IhCSdA0OoarSx2GGvlfFdHjE2xY7l5cfZUgkQSkhuMNWGrRv+CK9bg1KIXPlH8gVU6boyZq96107hNxT8uschtQJwej4VISUIQamJupp984KHspChOTzzE7LZxNNStDE8LxkQt11InjD2GcGxW91jRK5+x4PcHrSlPL0L8dKfFOcv9lpC9qQAJZwOtXdJEO48LOu7kyYDTe6grvhpulTQqUDEAPWDR2KpPRY+22Onec1ptphzZfqRBH4ZwJfiVNxehOyy74oFAPTQ1cDTIiHl81gSpXQ7mcfTHcYKua2EpLkEsZ88RFx9x7/Jvo/UiaS5+GDKtfNDvV/swue0sNR8L+YxoloIJYP1beyvx7RXKuHknJuFJzfJLLqBI0Mx5ArZDwQqCQ1K5jZk3IL1q71QzAnz8J6gEAAdwY/0xppBTeKCRVckG96Xb+FEnvtI8VjtS2sYdagEOWuFHF/SpyXlgRSrVJcHMRMLZ76MyVq04FVUhFCv/lVE8rFXeYpc9LeMaf5lMnugOE9EYu6SkcbFEqtonrNkIdV3bEWOuygXgmPrPBsd4vGSAq/bYfp0nSIfGpoUB9Nv2JFgHouadammNxxTqKQeBFU3gAjyRIAQMygAGZxf8uJemSZ2RNciOuWipZ76iXrhUhxHypmy2OPWlGrl0dSU6DqtobP2svFO0QLK3w08KFUk2VK48SqWbXUAPrUYuefjAF6wk7BXrNaKcQ8MzR9IbhwZnPw2a8+ZHGEJxVeKiqyxHnNyUIQKwubGI+VuMzbDXAp+pahgFiFIhdxpN08dwN06yvSJhPt3jLcq9D6+tGCj0+SUR1IUCiw69hKexnwsjT0aP4zW/WPMBQ+wZpEvvTa5wdHmWiB7LYB+OksnSsoygjICTk2vHrMbfUo9lh+h4Oqp58ajaxCQR51ChCkBOcvleNgiC8P32to= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3387; 6:VjiOTYiVL76+B61+YD3E5eZWzRQ+Fnbs3h1xT/17xmB20KVnGhapH5F2S3+7P+nmNkA09K7/ewj/bcRD7BsyXYQji3vQw+OZgt1PFuvPNNmdLEscPvdbUEvqWSlskUyluqzf0LnHvZ6XCZ3hilPz3HJr2KyPio9DDSdTUIW9Ydu0B117c1m97AAQ/7Y6NL9/9AFYiIm7u105EtHF2HuAAuBb4fwCgd3Jp0B2hLxlf3VubuOcrF7sKNMH9YrA4b2QIsIb9D7N2iAexXAxwOnVC0rpLOobO5fP4F3O+6DwroY/KX5dx/qAjTzOyeiKgLG7Wh9WKXyjGNfn8z1j9h30RU+mbEvkwLgf632tZhMVXKA=; 5:V01tyFFf+4lG2/yk1qUedPISxbUTYnEgRgOYvD9OubGtjBibu0FTTlVDO6K7WW08WVLKL4XcxIzM9MuREizskf0p6r3WdabjSz7wYePFdIxwmVyXAKBNSAowbpKFjC3hbcw0Sb4ZFU72j8KASlD+FG9M4AqZ5Hie4XbEimLrSLY=; 24:J6F/MV+3E27sM8iwxLnB5KE2ZjJp/TCd5YZISuA/Zjr5udTWSYOOdRhQVPrPs38NooFUOgk8fBfeSw3+3+dHR+n3bCur6xSG3URs9YM/rdo=; 7:leKMu0a14ekeYT5z2Wn8p0n5q1G2fG4X2VgG3kkBoCt3IgCZIDEnfttg0Aq+S7y+EkWh9R5HMEweRs0OtrWEg4vc/lwWvVHcltSaFw2LOn5oMLYrUTWI7Ho1K5i7nF2zfNxEx83+fhLfKJT5lfQpvGKcQMaSQAkmGn8ihQ7Pa1SxVFdDDWi+nE7ACdh7A+MQ6cfOkjPd3AAh4O2Q5ttcRHSp18AMczoWe7loMEsH6szicOG3hsNDkMmZbn8zKU6x SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:50.0621 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8753aebe-e007-4308-0fe0-08d526fcd5d0 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.32.52 Subject: [Qemu-devel] [PATCH v4 37/45] 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 Wed Nov 8 22:58:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836078 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="JXa76nrM"; 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 3yXN150ShSz9s4q for ; Thu, 9 Nov 2017 10:34:17 +1100 (AEDT) Received: from localhost ([::1]:34463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZrL-0000Kx-5w for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:34:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZN3-0000wa-IW for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZN0-0003na-CF for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:57 -0500 Received: from mail-cys01nam02on0085.outbound.protection.outlook.com ([104.47.37.85]:43670 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 1eCZN0-0003nP-39 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02: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=/O0IU2PRp3vQdfP2MEMiimaozIhOZMhixXhY72PmrUw=; b=JXa76nrMy51IHyYOHa97/SoWRFWcnJw8dck9wr9EmCYMpsPXH+0UQ/8N8NeWUCedoCctmtGKVThfDvkpQ2KKU4Fu3zFG5mOqfdMylT2uOepnrMKREZzHQp6ETi52Uk8ALsreKjB+MIzfDk8sOb3NKufmCPCFuSvNTAWmuSxhgNo= Received: from BN6PR02CA0043.namprd02.prod.outlook.com (10.173.146.157) 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; Wed, 8 Nov 2017 23:02:50 +0000 Received: from BL2NAM02FT031.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::200) by BN6PR02CA0043.outlook.office365.com (2603:10b6:404:5f::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; Wed, 8 Nov 2017 23:02:50 +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 BL2NAM02FT031.mail.protection.outlook.com (10.152.77.173) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:49 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36518 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMv-0003zC-1e; Wed, 08 Nov 2017 15:02:49 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMu-00039K-TZ; Wed, 08 Nov 2017 15:02:48 -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 vA8N2hD8010465; Wed, 8 Nov 2017 15:02:43 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMp-00038b-4x; Wed, 08 Nov 2017 15:02:43 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:45 -0800 Message-ID: <0dd38e3350c564a1a6ffc2ce48085877fa8c977a.1510181732.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-23450.000 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)(50466002)(189998001)(39060400002)(54906003)(47776003)(478600001)(23676003)(36386004)(6306002)(316002)(77096006)(50986999)(9786002)(356003)(6916009)(2950100002)(118296001)(76176999)(4326008)(106002)(50226002)(305945005)(5820100001)(5660300001)(106466001)(81166006)(2870700001)(8936002)(2351001)(8676002)(63266004)(2906002)(81156014)(33646002)(36756003)(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; BL2NAM02FT031; 1:SSblFrGKgMFit5MMtCzwBNP+n48hUmDIBqryB9dX1ldepDf/gapFbf2F3fAZM1n93xZ+WAmSuLRrx3Zm9faBPE1PVIzWMzF7xbTVa+nttz+VrfuwxC64bOJsjQNuYkOi X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad1e5fa6-4261-42e6-9ba5-08d526fcd58c 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:Y22jNbyy57CRCcSmVLT30RNeIPBx52iauHOFevfCBzpg7M+zgvpO6MSsFkCKjHa6lbDMGuWZNN2ni+yEAU5I0wAdL80AeWjZ4yNPKkwQFGu5bXiU+KdjnRGpygM4DV1IwvSA2ixZZ4BCsDiNKPfNUfx4oHQv9Ik+Dp+Fi6eZFWv6Nicg/UUOAd6kRzYFPrtS4Ig/hnFBzw5gENdGUJhhkJPvnYYf54DOL4wNaFU3feW6LBH310m/BY79/QG0YGoz+dd/IwmX62tSolwIIqpTcfj6wZwrW3dAIcT6yScu78qBLpdiJdAjDzUh4Uz0Tx5ioMcH7gBMOnvEd4gGWHqTsEdTtKZPYvP8kB1oaiQcWZ0=; 25:GPLbPSOtH+tY/JQ45CtAT4EMxMImwGTSRkPg4ZYVkKQ10BAOtKdrcl9+3GnQzY/0N6xCfTfbiXgoUvUvC49ak5g0utPiGb/5EjiyUKjnMMoggdohhUAB7GSLcEfjqZouvOGStp2jo4ZWgpbnnBjOT6LWW87CawZrS6+cW8cOoKYTosCKgouAxnOsvhlV13gRvDtrLU7Pxfr0B8ekBJmg/+jme5XJb7DXy+KZwtL3v/bODZoHx/s14polI32s7iazp3qpsWG9W1d7Cnib+gmw/0GqTcOhrYoJHz4zUVoDnC6PxEuXmvLVCwDQ49Mm+qeG5x3ZkgWMNLg9uVhOpVwE8w== X-MS-TrafficTypeDiagnostic: CY4PR02MB3384: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 31:e87Zb+0hLlGEKNIK+l6stZDLFfIkYEe7jeVNJZV5SorJuo9gy7PTvN0wq2m+K8AGeGfAKYNPvMAnpugxPtOlG+vNZDY1utkxDKu0oaSF6nxsF/Lhv7ov623E6L1FHyaO0musY6Bnj9mYdg0/kffM8JITM804ZFmCIxDpyqXkWkMn+jx9U1MGMzP1nu12Rj4wUupls+5DzgT0COA6e8X1cf6Uiin7ITzaEqpgcTEwHeA=; 20:PAVMUWcZHe+Ox6KCRmkvlRSM/Mi+adPzKgph7HkobGueDo9fn2o7S77jjDQjt5llF9HGJ1Q/7MLi8ExP+C+cIo5cCH15V4PpuglXC/hpbk1+lBIv4TMjQWryBMXf+bE+eP1AecI7yVBV9GHp6Eu8/anYTLWUo0nsoZBBGyoGuilsqD/aOOxvE9JZt0ryZmMMwgicOor98cYAk84pCijnU03JzvjTZX66WSIvw1ufccx7w9jzVlOXS9ct6SbBrp7727KYJsOe7BVIRiaPevO2ebaRa0H3RHzb+P8sa5MguZpWV2K3Bq+fgC3VWZrsSSQi25dXkmD2Pp7RjJiLHQhn/m/Idblp50TFAFU4LL/xlUHg8mTDKulW8J1m5fgwAcE1b9Oszg1zilYvCRCbBjE97AdCdH9Mn43TaXf8OBZAexZDz0gaob3Ytaz7BiidmE2yVhafxCOU1FIziTtK0hK0FZ3VBbvN1E/XMrjJ9GTMwy39A2QgIyUsKyZws+54ZJS1 X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3231021)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(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:U6LD5N3Y94Fnto4imfEdSPwbxrQJyE/p9jQQ8q25EoEIfbQSq2vGqXRWzsrCzty7W3/jqt+7q3CSDAS9c2Pz3fNEB3QHP/r3zGg8rH1aab5Cwc5+m4ub3KzieHT9meWHo4eX+qUP+2erWdLhE6+2Bwu8o1qphaGMmOdLa+L5BE1GzcFsIn0116UmB5ZvQJRdOvH3W0qYejFBgEKJLnAOK7yvkfjy9IHNe6EzpNjSk3i6M6cXAiUXKukjdmR+P3iFsOdMkagXT/TvWgnH99qX2ojMVlexebPJADLpRlJS77UqpqoSwJq2wzJnW3+pBzjsPV8TL7pLKlLdgZoy9RZSzV6D6RQOt1R56Q32AY++KxukqzHNB6FNVwJYpfjeFVkil9X5L7MZjIvyiIzuo/ui+Oj4CTODGtt4VnNfmbhCKDg= X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3384; 23:qVDe1TYlecFBE3c/t4yjCoMZxd1F0Qr/NZm2gC+Fl?= 58VH30k5VTPapi0vWctjL/JhO0QNmCowJcd0OYdXbmB74BlFnjhAM//sSz8HaLAppspgiMqUB6QoTNsaZTJ8aaAMdcpwEnPq9ISbXLcAMDsNABpaaI7gtco6F2exzoLFAI7SvDxuE7jQaS0zLQv2//Fbd+tODJAdSTda2FCjhB7FNdn4fwB9vz47wgeolSRFeJ2J1VCI8nMjNMpjp3ir9pvelpia7RjMw9flXxPbA+yqrY/1grXnbiN+PXaXbOtM6u7eYRAsW/Cr8OHrqxX5FI6fzVPGGbkUW64tZ0VUI5yIdqGMZ71+48oldoL9DqGdy9fRyRqOU9Q0B7MU3PBj/zYvT0mjyse5tuYlmN3SJWROevS0FtTRz1FIVroV3erA2kIbv3LSfOfe9pkONMIoIAr57lpjJMZIX4SldV7NiLY/RQ/NUVmg4WVUk5SJ3dKhosMZa6KQ3cOyxxuhwybNjfEsL+RpDfmjJy3OjiqWHKwGx7PnsptEyd2nmhpT3HvDrNksmzLfscl5tMxdkpsgY8YYymSWK6YjT3aoKTm4e7MJfPPzZ3bhQFExEMyHtDSYxnOk+xW98fu1eSY/JbGr6ls8A5tSNqM3SD2GQ2ru7u2n/tA7lYbMPR1L1az6xHYcXNhs8oXSMxhME8w4PspiTduiDnxj8h6aCRlpdrrMbby9WArzvp1VsOmQcXju61UnogAbFvbmbssfySiw7QAqWxnk1ffdLT38Vjx+IHrTadwKgoP+JPdZp4wP4gXIAEaERKVAmU90UwOTnJHmU0vIllJOHBpare58G4vcaO72XVvO3Z8tB8ITSrjT02Jtrn/mqi4YPlfvjupGuVyrS5B9qf+IJTd7rzakj5rmngztIqKwcsAmAP+r8hseYZyoITvLMurzBJDk3QDDcSIO7xrkmVfYtzBBK6Wimg4Klndsx/vZoThuMpfRmA3ivhdRWNMnvz3LeBvjqoYyhkej8Zcsf8yEUf+jmJFKtU8WsMjRnmCblNwWPely3PRrSKiOGu9hhVFcn7UUKyvyKjrm0FXWLAx X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 6:zq2eLdEwrtEqikmRnnyWzPqYH1a0HoXQGb6+sQvEfiVkbXrBR58IqFR7lTatMy8ckKpo0y9yfdkkTHxRa+xGHbAaUubJFdgEAKzEJaM0tllGI2RD1Gh/DH7a0yZcvh0lcsETfTSp+L+1fHg+kW8CKzB8ax+R6KveVzZPlSBfxbyKKmDCsoecz+jMxrSqUPhhW2A2sMsuv5cUbUeeONYlM3KhFLaZe3OcHbon+1bnhcdnsFRQx00UWLPMbxc9DtXZYdA4VMb0iJRL1lARievnUjWtOFOnvHh/IT0/bICgY+GJKIvWuJ25+u6a72BP51uznwcn0n+lA/GwJS1Ip4UPa5TnNOqu7lz6MP167Px1vHE=; 5:jESTyBDbRFmMpk0F77dUfcBWOmV9rNA5dHFfGeKq7W2U73+xIvoOMLw7qJ8QHWJZiGVicFz1uwwzuMBoVznVK7ZvkwH/6Kl4ZYSXKC9vSlo5wwPUhlW1vFZD2OucVDiGZ/FQj6UWONjh32x+A7gcOYoOOmYCXtG2mrU2U3SlCDE=; 24:GvmtCU4FZqUyn5nKIzVud0lbiC6jQCw9i4AgPXnJVsXy1whMaFOew6H0JghkCgZBaSMPn+fjjs4wT/PuNTQ+yo+TT5kRESrWDNauLW2BvOk=; 7:QqxGecb0FTX9gnvakUhGgsSAFU1qHzTsDS0W69y7+4XOB69LPvGi617Lli1gQflYF2xxyb4aplyzVy+eKLF0Usd8APWB3O08+hqCT0Z4hE6PAcC/iL1NhR9nuX6sSraJK8xrIo7iyy6KrKpxSblrs8WriVFu6y3Pp+mmoc6ElI9duteCJS3HgK4bHTnvaClZQkJzHxKUXqeW1enaG272fI/MPlqaw0+ooG/8dgdLpSbtq9n4+s1MZHepeArx2GXj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:49.6512 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad1e5fa6-4261-42e6-9ba5-08d526fcd58c 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.37.85 Subject: [Qemu-devel] [PATCH v4 38/45] 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 Wed Nov 8 22:58: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: 836057 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="y+ocfOFU"; 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 3yXMbb3Hwbz9s3w for ; Thu, 9 Nov 2017 10:15:38 +1100 (AEDT) Received: from localhost ([::1]:34375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZZH-0002Rm-Lq for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:15:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZN3-0000wZ-HQ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZN0-0003nr-NZ for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:57 -0500 Received: from mail-cys01nam02on0085.outbound.protection.outlook.com ([104.47.37.85]:43670 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 1eCZN0-0003nP-Ej for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02: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=f0auA1vbmctzRI7VYJLpMUXn2CkwBD1eNrm7y5Hxy9A=; b=y+ocfOFU5dImSQDLxgKsMMcOUTdezDUtKf8ci5njHt81WkYXEMDUL38HxhuW/CLtaEyNxPZg5icZzqUV+sQgC00hlIl0j1LCvKMeNrXbcJXogmfvOhkw0RBH4uNWr4H41vqUjitW75VqIyC0WtQQ8BuyxjjcV6RHjsZIvpcyipY= Received: from SN4PR0201CA0007.namprd02.prod.outlook.com (10.161.238.145) 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; Wed, 8 Nov 2017 23:02:50 +0000 Received: from BL2NAM02FT047.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by SN4PR0201CA0007.outlook.office365.com (2603:10b6:803:2b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:02: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 BL2NAM02FT047.mail.protection.outlook.com (10.152.77.9) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:02:49 +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 1eCZMv-0001NX-06; Wed, 08 Nov 2017 15:02:49 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMu-00039K-NN; Wed, 08 Nov 2017 15:02:48 -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 vA8N2k7N010485; Wed, 8 Nov 2017 15:02:46 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMs-00039C-34; Wed, 08 Nov 2017 15:02:46 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:48 -0800 Message-ID: <8f75308c61d00e28e9fa28ba9f84f8ab7df470b9.1510181732.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-23450.000 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)(199003)(189002)(50466002)(189998001)(39060400002)(54906003)(16586007)(47776003)(478600001)(5003940100001)(36386004)(6306002)(48376002)(316002)(77096006)(551934003)(50986999)(9786002)(356003)(6916009)(2950100002)(118296001)(76176999)(4326008)(106002)(50226002)(305945005)(5660300001)(575784001)(106466001)(81166006)(8936002)(2351001)(8676002)(63266004)(2906002)(81156014)(33646002)(36756003)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3384; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT047; 1:9chZ7nC09bUKkB/BnFo33M2wMgCZxIpalW/TmM3i54hSOE/0aFzD5vAsiIoyHuLs1jFXQdmar0uJOXtuJ4Ttg1mz2yQhL0vs0qRyIAkxDeLpEAln5xQ3twjWG/dkEKcr MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9dffaeb7-6b10-4cb6-5aee-08d526fcd5b0 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:4NySxFH6gRnyn1swIkJvXz2M0Zig0JeEiUV4owANQvBSHrp2FTrWF9EJTgE+tpUnfwkDV8tJoIli3pFWCt9zPBVC5fGzAvQSSDpYo4YI8moVjvO/Z4jopfVNffcSAaepZZfe1NEnSu1otkIm5oE8HMgMZQTdKcA4ElczYZmQ311RKBFItkzSqEZKBEQLDp1zO9IXZQA6khMARQFHPb3XQliLQU8e5v1PvLj/bPyGHDnxR6PQKbIKb3iis412ALl+NSNB7vzvyLv0a7AIcb1IdCYl0KyR1UAX5ypJ/xpW94gZbBT3V5gNoNsxiXhf8EoR9/93wPUjOybNuX1EUv9E5o0PVFaax3BmSRNHg9AvzZs=; 25:PEbxIn1qkxTYKSrh5qiZpExYDJst5ZzUWivYQmHpJUZXSYOilMvLhpybKh/LuAjjpqb6csbqxglk/eTmTvSS6QqdFvqgMYH+roGaq/ErrRZWWpcwsg7EohMOxGftRyZYkqaWUdPLKdVjCPlIJVZx+8VIPNoV59e8zqDSHvDZexjRT9dY5Lbk0VDlwIfJH6s17Jzyooz4XiYUNRJ20H+F9DOMzJpN1HxgaThXN6W7Gjcd8l5itLnzXAlccJsOE/PxqMTIt+N83C2SXHfaDA7MDtBKFBHYaBhYOO8lkoF+lMeK7m28KtJdjIz7r9cGhdCF61fTVuIzeUTe9fNF6IGnmg== X-MS-TrafficTypeDiagnostic: CY4PR02MB3384: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 31:GS83NbhNOQUlxNW9FmAIC6diDQMqAHxL9+QF/kUHTDhcw6Mc4R8DPqCEIhXdR2XxwbQPSlQuCCI5poVET+h8rrTAmxObrZBJhGITU5Jop6YILTMQX+sDf4UtXEsBNSyY3oM/Ltp8kqJDixoHEeWhMhvZW05fVugqgEWEHgVmerX6g0oaWfRd80gx+7e6h7rnBSWX5LpTtv2EdmBq+bZClc92f/aDYH1S3n5S9u5n9b0=; 20:Arte3sKDeiSg8VTkvBNKWxR1KPWNsBt1zgYGuw6h7PxYp+3OzwaeZsC+lsjaE9GgdYHQWTW1VO5Iaq77pMgv22o4OomXo13u+qwaAMuiRcWS+HOwO48T1bOmcnjoWnAyGDSyteG6vZnKvgK72cpy6z6Q/DlYk+EYoRIw2Fuea5FENRIM2Ulpldj8tlrk+gT6uive8Z1i8RNq/pQeDwS4ozPVyoQGmmIFbV2QvLLfPeUDMu79ySUn7L07wgNbKMlAnmcASns5FZNvri/nNtw87UfnjXb4qA9EYu0Cwr1dLQOey6RL9vH7FUh88Z482oYBNzxY+YI+Q1Qc0V9AZYftnxurHJXRmc9WaOMnz8jRj8szeJSdfwiTrSJbapBWm4RGEjaeqMx+NAj1v9cgrTcXOBmCGs9KDKUGIXO8Sm/2Ux4kX+q7oPpfxAcSqZU/qV/KyfKyhPYBgnk8k15s0//isZyToB1FyJQV9To6FohrB9L3eX3NrQDK1G9n8Xy1hNxE X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(72170088055959)(22074186197030)(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3231021)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(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:57IkrJ4xHJ8QHGBqcuijoi66DqfFlUtFUSBZaMXsXCw736aBUh0u9h28tK6PUxPO3skNzw3EjpN3+uo42DBXJCunBNuu0KGW4Tp/phdePlFyw8cloEZM5+Fu2r5tUikF6i8OndESWMf1mxKzz5ThtEgy+W/UdmKueAkXEBFPnxn0eP0xrXP6At7a1QSp21RqnbTPNAiqI265fqFEDLSEroHZBgUjrviQXEcvXYuEun8fftGWsHKKNl2P/+2wBDfSOHBORxmy8x1cxYyc+c8ZCHnw8kRTA0vovhB7MQePvWk0+ZCL/46NmtCxTLlTD7zyEITdZh5c5+9P2Hp54piLBh4Sm5k/JzV/wBmnycw3c/waiZh5V4idicOQbSsORnJCjttwCJd7aX80u2RkOCybrSs3hzAUuNTHvJlXHZG72GNRpI9eRusEjrMUTySKHtnN X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3384; 23:SH+ABpuGr5T5o7MCOX7g1xO3ybU/ES8Bfdx2LUnPs?= FqDPys7u8rTmrxRqre77JvPkTTdpiypy0F5+OTm8P0xalplweUrIhUigCdzTc6M3MD3Mp91JC+/eBeTeJ3zCxgMlzFJfONOr3JNXvUkLdMoyBJNW9Cnc34QtciIdf2NKe+eO0vs5RzS4aWMVSEj4xLWxLar9n8vRWdLai1JFyHBDZJ88jekvRFClqIlBsJCK4rsPRg0od/IvpCSstgnR6k5TkJI6ys9asqJdBb9gcHbrbwc/W8lfVW2Gc5iczrVwCQ2WJuxl0NXmpbPa9nf8Y7dGUB1Mx+zTcPYu8Ets5zDzENSOLadyrRqdOA6bttjvSXTS/Cp3dkLNmIxDbP3qhs9QK6Cq8XaOPQT4XSecB04d+tLS1w9espfYSZaWGyIC+uB/9hk2Q4insVBuCUkl0VjK38xh71RV2wBBqqbJZHdArIDXW2zUn28wJpc+hjIZmIbxxyYzocTyvug4PVrFkj1TuzZ6DkzP5q21AP4oeNP5oaEea53sSqOSvWNeqhtsotNapoY6CF8RMmoPEmj/spfCKL1EP5aFhjRg3VspHLt+1YI5aC5u+8uxFgILeb1kjNB6F3XXkGosNAA2GtBBEDy0Aw2rHgUIbrrN8h03W3aYGEbiOmkXYsE9+bpK9fva0f99B5aNKqifHe6bpKuyMnLkAJ6li2VhNrdBXHnPGaPkVMcx4IFTT8IZwlRp3bs5xor05/vT7TlVIXtak99n7kMxDrLeti/Slk1bOem6csxMhM0oQwrNTA8gYDcGy4YkhVJyXd1abRRlZB0WwPtbGALZT8AUyRGjnZGHqrbAPx0VYjIvNSvCrHXJsUZFJQHWAAadXEFjxiMbtCWBE3LiiWc733RIkrgP2raTH/O7j++b7zuP7vAjrziADdLJT7LNqN5i028Pi+s3gm4QJZ0Y442BL36RkYRQTCV6/kEzJHfveZCUQ/jGQOXrXgIflTZEjy+KcFf2P1Oi0UWAIIksribT5OVdDL5PFCEs9BGPtbJmFpDy2QWk1T0/7oRT5mr84N68rbObky6vTDLMg/bkV5fz8sYP7j7U+domZiTwjjiWg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 6:IKQNOosiJOnCABTLNAfmAZ0pHz3FyxYcl9s4lVVQj9bTqTVYapqACHhEw5+ulTKFq4nTN1y4HVxqr/pNObv5ATDiW1dQmvEApbqoKsDbEhA0BIT9nvET4LCa/uPpPzY8iwsdmZkZ+HzmTCLaZ/9kKLkXa2BUpmZCcmqTo5uQAZfxWD+cSa0dnDAa12ROfQD5vkbi257kRqGz/jsN2wkiaFotr7xhDnGYS5ZrPlw81z9JXvv5+AINHka9pCw9pdEZxBk+XZO7BspaiadOTHmWxjY2w75rfUTzGPlnREyRnadT7mfebRiFQL8XMXPzI86khmA6DJp4C6Qso/YuL7K0ZEL939UF/TEAZ5uGOR6eLiw=; 5:D1pzboRhLb8+p96X+R4CagFvy2BGqydDZ4MfRCnsXiZylrG08r2Gi4hvAKSRKpzq4Guk7VU+aHDYtIRjKi9xqeTgWnYVdy1WIJYU7rZcMW4k9rm4anf1HQTMNy/uro8w6sKraAXdA3RwGGN2wSvLlKk9yaKLyWIDK+awP+LVyFU=; 24:VlSzW1HYYmT35jr5FdkwqcojEvFOKC+MkUpXegto7ViK+9ZMKoQkjxYMxhUQMLGriEam2YWHGI0224hlSs9XkEgesjy0O12uciUwH+ACRQA=; 7:odrO4VgqdCl6UKl+My3uqOhWJ/Z4+TxltZIEy3pj8o15LoE9fyy3KDAK1C09mdzCwCijGn+So+m0NKd9uQwY9KTC4PFHVkTGIZj2yBDRVoFBzOCEKIuvR9Tzew0TjO1eo5aT/C/mKa1vlbqOMW8mzY5QmB5R4Qo1htmp9TlQzkYMBr4OZ6gvymg3E291uhy+a43PQDEgG+1/GOPBAslirq7qznqEBUpsoX14yZBd3mYlqp8DpP9nrOImzaIk/ygG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:49.7449 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dffaeb7-6b10-4cb6-5aee-08d526fcd5b0 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: CY4PR02MB3384 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.85 Subject: [Qemu-devel] [PATCH v4 39/45] hw/usb: 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, Gerd Hoffmann , 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 debug prints in usb_net_handle_control() where reverted to use fprintf(stderr, and usb_mtp_cancel_packet() now uses g_assert_not_reached(). Signed-off-by: Alistair Francis Cc: Gerd Hoffmann --- V3: - Use g_assert_not_reached() in usb_mtp_cancel_packet() - Leave the fprintf(stderr in usb_net_handle_control() V2: - Split hw patch into individual directories hw/usb/core.c | 15 ++++++++------- hw/usb/desc.c | 6 +++--- hw/usb/dev-audio.c | 39 ++++++++++++++++++++------------------- hw/usb/dev-bluetooth.c | 4 ++-- hw/usb/dev-mtp.c | 9 +++++---- hw/usb/dev-network.c | 14 +++++++------- hw/usb/hcd-ehci.c | 32 ++++++++++++++++---------------- hw/usb/hcd-musb.c | 4 ++-- hw/usb/hcd-xhci.c | 3 ++- hw/usb/host-legacy.c | 3 ++- 10 files changed, 67 insertions(+), 62 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 241ae66b15..9ffdef055c 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "hw/usb.h" #include "qemu/iov.h" @@ -599,7 +600,7 @@ void usb_packet_copy(USBPacket *p, void *ptr, size_t bytes) iov_from_buf(iov->iov, iov->niov, p->actual_length, ptr, bytes); break; default: - fprintf(stderr, "%s: invalid pid: %x\n", __func__, p->pid); + error_report("%s: invalid pid: %x", __func__, p->pid); abort(); } p->actual_length += bytes; @@ -681,7 +682,7 @@ void usb_ep_dump(USBDevice *dev) }; int ifnum, ep, first; - fprintf(stderr, "Device \"%s\", config %d\n", + error_report("Device \"%s\", config %d", dev->product_desc, dev->configuration); for (ifnum = 0; ifnum < 16; ifnum++) { first = 1; @@ -690,10 +691,10 @@ void usb_ep_dump(USBDevice *dev) dev->ep_in[ep].ifnum == ifnum) { if (first) { first = 0; - fprintf(stderr, " Interface %d, alternative %d\n", + error_report(" Interface %d, alternative %d", ifnum, dev->altsetting[ifnum]); } - fprintf(stderr, " Endpoint %d, IN, %s, %d max\n", ep, + error_report(" Endpoint %d, IN, %s, %d max", ep, tname[dev->ep_in[ep].type], dev->ep_in[ep].max_packet_size); } @@ -701,16 +702,16 @@ void usb_ep_dump(USBDevice *dev) dev->ep_out[ep].ifnum == ifnum) { if (first) { first = 0; - fprintf(stderr, " Interface %d, alternative %d\n", + error_report(" Interface %d, alternative %d", ifnum, dev->altsetting[ifnum]); } - fprintf(stderr, " Endpoint %d, OUT, %s, %d max\n", ep, + error_report(" Endpoint %d, OUT, %s, %d max", ep, tname[dev->ep_out[ep].type], dev->ep_out[ep].max_packet_size); } } } - fprintf(stderr, "--\n"); + error_report("--"); } struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep) diff --git a/hw/usb/desc.c b/hw/usb/desc.c index 85c15addc5..bde39e3903 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "hw/usb.h" #include "hw/usb/desc.h" #include "trace.h" @@ -688,8 +688,8 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p, break; default: - fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __func__, - dev->addr, type, len); + error_report("%s: %d unknown type %d (len %zd)", __func__, + dev->addr, type, len); break; } diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 343345235c..a95e4cdbd9 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -30,6 +30,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "hw/usb.h" #include "hw/usb/desc.h" @@ -398,7 +399,7 @@ static int usb_audio_set_output_altset(USBAudioState *s, int altset) } if (s->debug) { - fprintf(stderr, "usb-audio: set interface %d\n", altset); + error_report("usb-audio: set interface %d", altset); } s->out.altset = altset; return 0; @@ -478,7 +479,7 @@ static int usb_audio_set_control(USBAudioState *s, uint8_t attrib, uint16_t vol = data[0] + (data[1] << 8); if (s->debug) { - fprintf(stderr, "usb-audio: vol %04x\n", (uint16_t)vol); + error_report("usb-audio: vol %04x", (uint16_t)vol); } vol -= 0x8000; @@ -496,8 +497,8 @@ static int usb_audio_set_control(USBAudioState *s, uint8_t attrib, if (set_vol) { if (s->debug) { - fprintf(stderr, "usb-audio: mute %d, lvol %3d, rvol %3d\n", - s->out.mute, s->out.vol[0], s->out.vol[1]); + error_report("usb-audio: mute %d, lvol %3d, rvol %3d", + s->out.mute, s->out.vol[0], s->out.vol[1]); } AUD_set_volume_out(s->out.voice, s->out.mute, s->out.vol[0], s->out.vol[1]); @@ -514,9 +515,9 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, int ret = 0; if (s->debug) { - fprintf(stderr, "usb-audio: control transaction: " - "request 0x%04x value 0x%04x index 0x%04x length 0x%04x\n", - request, value, index, length); + error_report("usb-audio: control transaction: " + "request 0x%04x value 0x%04x index 0x%04x length 0x%04x", + request, value, index, length); } ret = usb_desc_handle_control(dev, p, request, value, index, length, data); @@ -533,7 +534,7 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, length, data); if (ret < 0) { if (s->debug) { - fprintf(stderr, "usb-audio: fail: get control\n"); + error_report("usb-audio: fail: get control"); } goto fail; } @@ -548,7 +549,7 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, length, data); if (ret < 0) { if (s->debug) { - fprintf(stderr, "usb-audio: fail: set control\n"); + error_report("usb-audio: fail: set control"); } goto fail; } @@ -557,9 +558,9 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, default: fail: if (s->debug) { - fprintf(stderr, "usb-audio: failed control transaction: " - "request 0x%04x value 0x%04x index 0x%04x length 0x%04x\n", - request, value, index, length); + error_report("usb-audio: failed control transaction: " + "request 0x%04x value 0x%04x index 0x%04x length 0x%04x", + request, value, index, length); } p->status = USB_RET_STALL; break; @@ -581,7 +582,7 @@ static void usb_audio_handle_reset(USBDevice *dev) USBAudioState *s = USB_AUDIO(dev); if (s->debug) { - fprintf(stderr, "usb-audio: reset\n"); + error_report("usb-audio: reset"); } usb_audio_set_output_altset(s, ALTSET_OFF); } @@ -595,8 +596,8 @@ static void usb_audio_handle_dataout(USBAudioState *s, USBPacket *p) streambuf_put(&s->out.buf, p); if (p->actual_length < p->iov.size && s->debug > 1) { - fprintf(stderr, "usb-audio: output overrun (%zd bytes)\n", - p->iov.size - p->actual_length); + error_report("usb-audio: output overrun (%zd bytes)", + p->iov.size - p->actual_length); } } @@ -611,9 +612,9 @@ static void usb_audio_handle_data(USBDevice *dev, USBPacket *p) p->status = USB_RET_STALL; if (s->debug) { - fprintf(stderr, "usb-audio: failed data transaction: " - "pid 0x%x ep 0x%x len 0x%zx\n", - p->pid, p->ep->nr, p->iov.size); + error_report("usb-audio: failed data transaction: " + "pid 0x%x ep 0x%x len 0x%zx", + p->pid, p->ep->nr, p->iov.size); } } @@ -622,7 +623,7 @@ static void usb_audio_unrealize(USBDevice *dev, Error **errp) USBAudioState *s = USB_AUDIO(dev); if (s->debug) { - fprintf(stderr, "usb-audio: destroy\n"); + error_report("usb-audio: destroy"); } usb_audio_set_output_altset(s, ALTSET_OFF); diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index 0bbceaea0b..dfef258dca 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", __func__, len); + error_report("%s: can't alloc %i bytes", __func__, len); exit(-1); } buf = fifo->data + off; } else { if (fifo->dlen > fifo->dsize) { - fprintf(stderr, "%s: can't alloc %i bytes\n", __func__, len); + error_report("%s: can't alloc %i bytes", __func__, len); exit(-1); } buf = fifo->data + off - fifo->dsize; diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 94c2e94f10..69e2eac259 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include #include @@ -546,7 +547,7 @@ static void inotify_watchfn(void *arg) break; default: - fprintf(stderr, "usb-mtp: failed to parse inotify event\n"); + error_report("usb-mtp: failed to parse inotify event"); continue; } @@ -617,7 +618,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) #ifdef CONFIG_INOTIFY1 int watchfd = usb_mtp_add_watch(s->inotifyfd, o->path); if (watchfd == -1) { - fprintf(stderr, "usb-mtp: failed to add watch for %s\n", o->path); + error_report("usb-mtp: failed to add watch for %s", o->path); } else { trace_usb_mtp_inotify_event(s->dev.addr, o->path, 0, "Watch Added"); @@ -1144,7 +1145,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c) usb_mtp_object_alloc(s, s->next_handle++, NULL, s->root); #ifdef CONFIG_INOTIFY1 if (usb_mtp_inotify_init(s)) { - fprintf(stderr, "usb-mtp: file monitoring init failed\n"); + error_report("usb-mtp: file monitoring init failed"); } #endif break; @@ -1348,7 +1349,7 @@ static void usb_mtp_handle_control(USBDevice *dev, USBPacket *p, static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p) { /* we don't use async packets, so this should never be called */ - fprintf(stderr, "%s\n", __func__); + g_assert_not_reached(); } static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 85fc81bf43..7245182467 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -815,7 +815,7 @@ static int ndis_query(USBNetState *s, uint32_t oid, return sizeof(le32); default: - fprintf(stderr, "usbnet: unknown OID 0x%08x\n", oid); + error_report("usbnet: unknown OID 0x%08x", oid); return 0; } return -1; @@ -1120,9 +1120,9 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p, default: fail: - fprintf(stderr, "usbnet: failed control transaction: " - "request 0x%x value 0x%x index 0x%x length 0x%x\n", - request, value, index, length); + error_report("usbnet: failed control transaction: " + "request 0x%x value 0x%x index 0x%x length 0x%x", + request, value, index, length); p->status = USB_RET_STALL; break; } @@ -1190,7 +1190,7 @@ static void usb_net_handle_dataout(USBNetState *s, USBPacket *p) uint32_t len; #ifdef TRAFFIC_DEBUG - fprintf(stderr, "usbnet: data out len %zu\n", p->iov.size); + error_report("usbnet: data out len %zu", p->iov.size); iov_hexdump(p->iov.iov, p->iov.niov, stderr, "usbnet", p->iov.size); #endif @@ -1260,8 +1260,8 @@ static void usb_net_handle_data(USBDevice *dev, USBPacket *p) } if (p->status == USB_RET_STALL) { - fprintf(stderr, "usbnet: failed data transaction: " - "pid 0x%x ep 0x%x len 0x%zx\n", + error_report("usbnet: failed data transaction: " + "pid 0x%x ep 0x%x len 0x%zx", p->pid, p->ep->nr, p->iov.size); } } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 0134232627..e405b882fb 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -419,7 +419,7 @@ static int ehci_get_pid(EHCIqtd *qtd) case 2: return USB_TOKEN_SETUP; default: - fprintf(stderr, "bad token\n"); + error_report("bad token"); return 0; } } @@ -1033,7 +1033,7 @@ static void ehci_opreg_write(void *ptr, hwaddr addr, /* not supporting dynamic frame list size at the moment */ if ((val & USBCMD_FLS) && !(s->usbcmd & USBCMD_FLS)) { - fprintf(stderr, "attempt to set frame list size -- value %d\n", + error_report("attempt to set frame list size -- value %d", (int)val & USBCMD_FLS); val &= ~USBCMD_FLS; } @@ -1190,7 +1190,7 @@ static int ehci_init_transfer(EHCIPacket *p) while (bytes > 0) { if (cpage > 4) { - fprintf(stderr, "cpage out of range (%d)\n", cpage); + error_report("cpage out of range (%d)", cpage); qemu_sglist_destroy(&p->sgl); return -1; } @@ -1296,7 +1296,7 @@ static void ehci_execute_complete(EHCIQueue *q) break; default: /* should not be triggerable */ - fprintf(stderr, "USB invalid response %d\n", p->packet.status); + error_report("USB invalid response %d", p->packet.status); g_assert_not_reached(); break; } @@ -1345,7 +1345,7 @@ static int ehci_execute(EHCIPacket *p, const char *action) p->async == EHCI_ASYNC_INITIALIZED); if (!(p->qtd.token & QTD_TOKEN_ACTIVE)) { - fprintf(stderr, "Attempting to execute inactive qtd\n"); + error_report("Attempting to execute inactive qtd"); return -1; } @@ -1383,7 +1383,7 @@ static int ehci_execute(EHCIPacket *p, const char *action) p->packet.actual_length); if (p->packet.actual_length > BUFF_SIZE) { - fprintf(stderr, "ret from usb_handle_packet > BUFF_SIZE\n"); + error_report("ret from usb_handle_packet > BUFF_SIZE"); return -1; } @@ -1461,7 +1461,7 @@ static int ehci_process_itd(EHCIState *ehci, case USB_RET_SUCCESS: break; default: - fprintf(stderr, "Unexpected iso usb result: %d\n", + error_report("Unexpected iso usb result: %d", ehci->ipacket.status); /* Fall through */ case USB_RET_IOERROR: @@ -1564,7 +1564,7 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async) /* section 4.8, only QH in async schedule */ if (async && (NLPTR_TYPE_GET(entry) != NLPTR_TYPE_QH)) { - fprintf(stderr, "non queue head request in async schedule\n"); + error_report("non queue head request in async schedule"); return -1; } @@ -1586,8 +1586,8 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async) default: /* TODO: handle FSTN type */ - fprintf(stderr, "FETCHENTRY: entry at %X is of type %d " - "which is not supported yet\n", entry, NLPTR_TYPE_GET(entry)); + error_report("FETCHENTRY: entry at %X is of type %d " + "which is not supported yet", entry, NLPTR_TYPE_GET(entry)); return -1; } @@ -2086,7 +2086,7 @@ static void ehci_advance_state(EHCIState *ehci, int async) break; default: - fprintf(stderr, "Bad state!\n"); + error_report("Bad state!"); again = -1; g_assert_not_reached(); break; @@ -2094,7 +2094,7 @@ static void ehci_advance_state(EHCIState *ehci, int async) if (again < 0 || itd_count > 16) { /* TODO: notify guest (raise HSE irq?) */ - fprintf(stderr, "processing error - resetting ehci HC\n"); + error_report("processing error - resetting ehci HC"); ehci_reset(ehci); again = 0; } @@ -2151,8 +2151,8 @@ static void ehci_advance_async_state(EHCIState *ehci) default: /* this should only be due to a developer mistake */ - fprintf(stderr, "ehci: Bad asynchronous state %d. " - "Resetting to active\n", ehci->astate); + error_report("ehci: Bad asynchronous state %d. " + "Resetting to active", ehci->astate); g_assert_not_reached(); } } @@ -2201,8 +2201,8 @@ static void ehci_advance_periodic_state(EHCIState *ehci) default: /* this should only be due to a developer mistake */ - fprintf(stderr, "ehci: Bad periodic state %d. " - "Resetting to active\n", ehci->pstate); + error_report("ehci: Bad periodic state %d. " + "Resetting to active", ehci->pstate); g_assert_not_reached(); } } diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index d70a91a58c..4729926124 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", __func__, \ - __LINE__, ##__VA_ARGS__) +#define TRACE(fmt, ...) error_report("%s@%d: " fmt "", __func__, \ + __LINE__, ##__VA_ARGS__) #else #define TRACE(...) #endif diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index af3a9d88de..14f4f455a0 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -19,6 +19,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "qemu/timer.h" #include "qemu/queue.h" @@ -39,7 +40,7 @@ #else #define DPRINTF(...) do {} while (0) #endif -#define FIXME(_msg) do { fprintf(stderr, "FIXME %s:%d %s\n", \ +#define FIXME(_msg) do { error_report("FIXME %s:%d %s", \ __func__, __LINE__, _msg); abort(); } while (0) #define TRB_LINK_LIMIT 32 diff --git a/hw/usb/host-legacy.c b/hw/usb/host-legacy.c index 3b57e21b52..56865c40ed 100644 --- a/hw/usb/host-legacy.c +++ b/hw/usb/host-legacy.c @@ -34,6 +34,7 @@ #include "qemu-common.h" #include "hw/usb.h" #include "hw/usb/host.h" +#include "qemu/error-report.h" /* * Autoconnect filter @@ -86,7 +87,7 @@ static int parse_filter(const char *spec, struct USBAutoFilter *f) } if (i < DEV) { - fprintf(stderr, "husb: invalid auto filter spec %s\n", spec); + error_report("husb: invalid auto filter spec %s", spec); return -1; } From patchwork Wed Nov 8 22:58:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836065 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="OZnJ0CyY"; 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 3yXMkz2v1Wz9s4q for ; Thu, 9 Nov 2017 10:22:03 +1100 (AEDT) Received: from localhost ([::1]:34407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZfV-0007jU-Ab for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:22:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZND-00013O-LR for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNA-0003py-Bh for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:07 -0500 Received: from mail-bl2nam02on0065.outbound.protection.outlook.com ([104.47.38.65]:45792 helo=NAM02-BL2-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 1eCZNA-0003pk-72 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03: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=XG89A04baYadCZPzb6KzD4sRJq7ptynF+V/3ZcqfkPg=; b=OZnJ0CyYvRCutBIYRafqbbgmh5oxy5CSMwavw1RiLh4oFfGWHrVGbN5LYmO5YkGtq0E/aoUTCCRiAMyVvkz3CAznctnoiDbW08InXqPn0zICtwbI4k09Sm5WE5KLuKFPowS8/qyyUAx/IN49MFHVKPvCSJWteh56Wx/BSdcYVmc= Received: from MWHPR02CA0013.namprd02.prod.outlook.com (10.168.209.151) by BN6PR02MB3379.namprd02.prod.outlook.com (10.161.153.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:03:02 +0000 Received: from BL2NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by MWHPR02CA0013.outlook.office365.com (2603:10b6:300:4b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:03: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 BL2NAM02FT035.mail.protection.outlook.com (10.152.77.157) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03:01 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36693 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003zU-5F; Wed, 08 Nov 2017 15:03:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003BM-1x; Wed, 08 Nov 2017 15:03:00 -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 vA8N2n0b010495; Wed, 8 Nov 2017 15:02:49 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMu-00039O-SX; Wed, 08 Nov 2017 15:02:48 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:50 -0800 Message-ID: <10f1bca388976b18119fd4fc28d6fdcf7106f7d3.1510181732.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-23450.000 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)(50226002)(8936002)(48376002)(118296001)(106002)(63266004)(33646002)(50466002)(36386004)(4326008)(2906002)(2950100002)(5660300001)(50986999)(2351001)(6916009)(76176999)(16586007)(54906003)(47776003)(5003940100001)(316002)(106466001)(9786002)(6666003)(81166006)(81156014)(189998001)(39060400002)(356003)(575784001)(305945005)(478600001)(8676002)(77096006)(36756003)(21314002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3379; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT035; 1:7Hw0j7VyVnCXFs2cgUQx+5F1bG0KHKlJEjXNojaUo/GBukXYKGV//yKoM3iUDqjmmPl2JJV/75XfKoA53awBr7UaGA61osaz1t7r36yKIA7HBgK/rrkX5Nr/qix8794d MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1aee837e-8dca-4740-cd9e-08d526fcdc65 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 3:7D9hlZKO/jkMy+LpQPEYfy0PBfLFhIMCGuF2+iH/jm5zgnT/Z9yYYaz5C7hBl67nkl7jAN/AiMGyhNKBc4hNItpcciTcUyKz02abu6jApjELe6Siav3PlOPX0gMRhb/aFV4EbcW+aWDBD0YFC2fBKMQJS2W92ZBDKc7wnLeNg7p6AwhN29oYIjcgHpGZ8jFym64kzoLR2Rv1rO2Z5sTIBS1BoslSBMZ+bT7EVp8pRUShLK5aFDJt8maXzP7fEtusaJwYnCTup8LekQvWcLof/S8rjDVMQsPNU3WQJvb52vINTEBmF4hjvL09+rtrai/SPHWSAUrqFWXHPaCG1bg9hvNhy1Ccd62RtowEApbvZro=; 25:OrmZdE6VpSojy3Ba0B5PwT4qbhAeSzkTxP8AIx9kpzXue9QF0hfKXCslf+/O9OTA2xEQlHh+5Hng7YssS2XdKAvTYyc5D0OCCQH8/ZAPYM8g9g7OgAGkypu7aNosCkO1YgeD9IXfNgrvQy+HQFn7g4zglfiYiDfgZjgmL7OgahQpzC/5i5pL3VwcnGGiKbY6+0xQpHslvXIRQ6D5C0te1qk4jv0fha/7edqDK5S4Z4BwqUJSCPqpqQPOrPz1blMn73EhoGFHcUgYrvGh5ynLN5DNx0Yulr2LJKrp5QoVWFnPoH+Mf1iTOsdRRGU/VBud+9W4rRamZJCV9ee5ph4qkA== X-MS-TrafficTypeDiagnostic: BN6PR02MB3379: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 31:ji1vZIeyeE3Nr/2GPgRWZbAuJGtq6sNTDd59/B/S2H7pdchOY9vaQ9bk7+Nbjmr/glGLOPxtKY7+rujFP2Y3oMRCJxq8e0Zn7BFH0B/sLI05lmJ3WZXPh7q3Cw7kYtQVF+ZeqjG1C8WVt1AA1dMgq3l6BO7ryNZn4L0jT6snTLfRWDTGXkdM4aBmMMiOYHC3MY/o+1A4V/0bJXEPH8wz40j7lXncL47FDIgupS24jt0=; 20:DjVOAv2qVcKTglx4hZECLvHFjARGEiII1jdVhR4tuSO6oFrwRweXF0KYQN1MQW+wFv9kAv50QQ8Ep+UZQXn1JclT+/cY8l71Mk0YKuEHj4kGXQxqQ67zySzOnuIsWx5KIz0TB0fyBU9t6OaOz2RRf/ZnvwCwl/knE15zksVVcBUgpWPKl2NLB9OwF4pk+6rIUu9b+kJNJA4QEEzZrjbn7op9wyY6eA5JhA+ppkymkz9otVoe+Ra5Ujl+kezhkoriZieAFX12N/TZ+rCvZR2PsxeL4rkshAvlSwv+hoM016rW1rs6SvxjX3rtL0FOhsSiofo4iD9Zzde4uRMNAmZvYZTH/TytZlRzP/Zgolrydq/c6myZLtfXwNmtaQWIYRNgXmRKV6ucKBRXG+JxFBH6n9bQKJPHU2fwpA/EY2LraevtG3bs3+qLhNq/9H/RGLOscl1491YnE7CWF8WT6LF1jjpzY4oCVUq46fp42kkSTqs/Skj6x5wt8AVHTn5zeXjO X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3231021)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(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:v6IUjaQsxXcLwUcXzODp9EOF4s+xgWo6luDHQv7+IJ/WpGSiFWvGVctOaKlZ4gzz4H4cqKwx8vuoG3l2abIiFrVMYayxrK2FrvJ63eXUg60ZeoQLkBu3xwip9WHbUuFKvcych2pLGadvmQkXtndUxMgKmF6qs83NUwAovx3wvJ4B0gTSVXEgOVyLujnCp7ySeR9VWqAUAwxClsQRwG3HSrBk750wObyGHy8mm/2l6aYmpPYGru/kzzq9TDV5O1R9EFVYu+U6EbnRA3IuBKR+mO+u/HcQY5k85gzIigBodik8l6uPJEUGPp76ILK6ZdlgJ+DXvBlOCMQWD4TX08XrbA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3379; 23:XHsLURfv7iaNAv3vFYxiABdu++pO9imSRt1LaMEW/?= yyivFCvDVdA4M5NrGmDh2Vuw6ilAzyZ/IEpBmd02ijJdImH2+7e7WGEZNSmQtRzJjrqRjPzuq6ANF4zTpvXC4B7ondRdIHhtjKJS6zxHXipI0eZlpVlun4FyM3C9VJ74A51zdsbyChrp2R29DcRtyB05AJ9WVrXAJLN/v41YYFt9DpflZtXiDtvd/t+6Nq4Kw/RyGLvyO0sEDWV+osBlAmOOg2lWanvyaQ7XAG/OzLRgyxHjvnDmysDHhbYCwtmsQjeg171cQcDgX6yi25Cli8cQLNWpi4boezWUu+z07bOoofbdM77D/rr4LEyKojwdYDfHuOjt8mt99bjPVhNpFVSBdkZzVEVWcfqhqS+8U+tM297pTlX6jhsV0z+oSOs7/N/vn3zRKVz5YhkC5J7Ta+BqD/J+Rdj6Nt8smjbM4V7Tu+vId1LcpOCv5i9YTtC3c+7u2nwr1a2AZ55EPq32daqE2LysWp/sSLZSkJiohG6KIfTQIgauoGGremxAsyqiR0IvtPFC275DSHDtLf6dMO0PM5td8YeDQGhaxtmEOJg4V5O70zvxndwiA4NW3Zhi5my9N1xxExGoSLhe0NmKqsVy5ZhK2MVCSYndv8fELbctO4WhRnr58qXrzvqv/wKt6Qv/kzMzmxBHZqnh+QusMDy2hAYSwZ79geqJVihEFzL7kdPXLbuk1mnjYEkTLh6sQva8aqBKm1oGi/7+isTav0WZJiAXk1ouRsm14O48PYtWhILOH4xoZ8ML9q80dmHu7oBvhj+FXqJtgb6F8vfUJtAhY6Lx+k7vQmN0cx8vgFsVHW1G4cqr/WhDSLXpB92QNk/nOnUPuCp8hDn10UEJUISxc8KKtx/oEL5BX7YW6ieIH0k2APScCy5HUmcj87iHpvwoYketmhhpsFExGVXtvt0giVlwTeR7oNFfeyyFTPeQ4FO887/tgzooJpmejrBpUKNSEFE2iSUmoLYITllZgRNGqavaJP0sXrwB1/fPZt5hUFFjN1CD7si0YXmD7N0oMKR91aCKjNlEhiS+xAP1HdcLsHNm7YWT9SJB58jWAodgzzWYbSiHFWV7UpXh3j0YDo= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 6:4GrJhSOyosXWzqDqEpB0xLbxEA7tibr2gpYTF8veyHEFo/+UHaI8WCR/Wl9jk/jm8Y6xMaofp2XxJHIffGFVgKkLrvi/y40ol7EanQ+wFYzB9CQGjIQZx+RD53HEwD4/GvKfPGkR79ro6qubchgrb/LM7lpnfFN9kGoJmTI+RbXiho5c6VTsggjC5uapDhSNiLPm34BXWX0sOsgtqZYZ+n1GerIHRac83FOAHmwjhryfcFn/mIYRWaiaetywciFg0h2xAkgIjQ7Iq8tZoci4dOtuCLyKC1ixPIAxUbsIbPQfTL7eMDoDaix8PjUo5vtbh3N55Xjd+vKB8xF2Kgk5VHZZACbUijww4MGEXkH++lE=; 5:s7vRFNg1LFmkaUT+XropQKlJ/3sK6091A3aM/wJaxQ/WJys/nkbv5tpPdK3RHEATmhkxsNhgig61mTr2Ftuh6S6QkHFbaRGIBcE/wsDX/Unk5xaXam3wq2ImrZ+o24HSTyyi/VPUwhmvXuXLFudRgkGrJ5Elr50kuLbWKsxtq4s=; 24:tz2rtLXrZANOOIe2gl/ALBq69Sh26ZOKX8H7I7SChh4aCepLLWEgZbA6yE62CnvIMPQKhKjk/nUq8YEJ0sMMAk8HOURL1/q62QAr/ZCow7M=; 7:3cTZNE00OkstrT9wBR3jIfBsRaiEvK4ARhIaIlhXmXzOXs2YvVYxK0QT+zkIyoFDNVTdzi0W1SbFNBAJ/vwJWK5rREUb//3d8t8wFJick1hO2YN2uZHD5VS5XsAmawaIW1MUUmTt4RcN+NmRYW0iGXJD/2X1e+UByGwmVS2GPCuSypIiCSfO2P29WGuX2pV+sA1OIyCWxB6xpbig2SZ0xD74xGn4m1hnWpc6GwFFqB2JWlxA0GQqKvJRqVG5foxr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:01.1566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1aee837e-8dca-4740-cd9e-08d526fcdc65 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.38.65 Subject: [Qemu-devel] [PATCH v4 40/45] hw/watchdog: 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 were then manually tweaked to pass checkpatch. Some lines in wdt_i6300esb.c were manuallly changed to qemu_log_mask(). Signed-off-by: Alistair Francis --- V3: - Use qemu_log_mask(LOG_UNIMP,... in wdt_i6300esb.c V2: - Split hw patch into individual directories hw/watchdog/watchdog.c | 11 +++++------ hw/watchdog/wdt_i6300esb.c | 10 +++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 670114ecfe..9594457082 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -20,6 +20,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h" @@ -52,8 +53,7 @@ int select_watchdog(const char *p) /* -watchdog ? lists available devices and exits cleanly. */ if (is_help_option(p)) { QLIST_FOREACH(model, &watchdog_list, entry) { - fprintf(stderr, "\t%s\t%s\n", - model->wdt_name, model->wdt_description); + error_report("\t%s\t%s", model->wdt_name, model->wdt_description); } return 2; } @@ -68,10 +68,9 @@ int select_watchdog(const char *p) } } - fprintf(stderr, "Unknown -watchdog device. Supported devices are:\n"); + error_report("Unknown -watchdog device. Supported devices are:"); QLIST_FOREACH(model, &watchdog_list, entry) { - fprintf(stderr, "\t%s\t%s\n", - model->wdt_name, model->wdt_description); + error_report("\t%s\t%s", model->wdt_name, model->wdt_description); } return 1; } @@ -126,7 +125,7 @@ void watchdog_perform_action(void) case WATCHDOG_ACTION_DEBUG: qapi_event_send_watchdog(WATCHDOG_ACTION_DEBUG, &error_abort); - fprintf(stderr, "watchdog: timer fired\n"); + error_report("watchdog: timer fired"); break; case WATCHDOG_ACTION_NONE: diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index e596b0804d..967f3ebc0d 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -20,7 +20,7 @@ */ #include "qemu/osdep.h" - +#include "include/qemu/log.h" #include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" @@ -186,10 +186,14 @@ static void i6300esb_timer_expired(void *vp) /* What to do at the end of stage 1? */ switch (d->int_type) { case INT_TYPE_IRQ: - fprintf(stderr, "i6300esb_timer_expired: I would send APIC 1 INT 10 here if I knew how (XXX)\n"); + qemu_log_mask(LOG_UNIMP, + "i6300esb: timer expired but System " + "APIC 1 INT10 not emitted\n"); break; case INT_TYPE_SMI: - fprintf(stderr, "i6300esb_timer_expired: I would send SMI here if I knew how (XXX)\n"); + qemu_log_mask(LOG_UNIMP, + "i6300esb: timer expired but System " + "Management Interrupt not emitted\n"); break; } From patchwork Wed Nov 8 22:58:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836081 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="z6Mse+I+"; 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 3yXN3X2JS6z9s4q for ; Thu, 9 Nov 2017 10:36:24 +1100 (AEDT) Received: from localhost ([::1]:34473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZtO-0001rH-FC for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:36:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNH-00017U-NN for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNE-0003qr-Hu for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:11 -0500 Received: from mail-sn1nam01on0065.outbound.protection.outlook.com ([104.47.32.65]:58550 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 1eCZNE-0003qZ-94 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03: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=Yddjkp1sNuRQmKA9/80oGuS4nDQtluQSBfLJkWFNgmk=; b=z6Mse+I+TPWg4tO8CIc0y4uvsB59M37dY5FF8RZVtxTgtxNoJ61nXso2pZjkFhJVyf8KYBQzBCzCvKh5I9W1yOHuBWpiAthn1c7OVOD7S6mASiA20lmLAbcrinar5UaWZJAtaCx7+EDU9PDF0SKLIb8/Y26cL1R/6+Eeuj0l6NA= Received: from MWHPR0201CA0065.namprd02.prod.outlook.com (2603:10b6:301:73::42) by DM2PR02MB1337.namprd02.prod.outlook.com (2a01:111:e400:50c8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:03:05 +0000 Received: from CY1NAM02FT055.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::207) by MWHPR0201CA0065.outlook.office365.com (2603:10b6:301:73::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:03:02 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.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 CY1NAM02FT055.mail.protection.outlook.com (10.152.74.80) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03:01 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36704 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003za-Mq; Wed, 08 Nov 2017 15:03:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003BM-5J; Wed, 08 Nov 2017 15:03:00 -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 vA8N2pav010513; Wed, 8 Nov 2017 15:02:52 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMx-0003A5-NC; Wed, 08 Nov 2017 15:02:51 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:53 -0800 Message-ID: <06b7c057b537c1de173ad4ecc9221dcd4fa1c1da.1510181732.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-23450.000 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)(47776003)(33646002)(63266004)(39060400002)(50466002)(48376002)(76176999)(2950100002)(106002)(5660300001)(50986999)(36386004)(4326008)(77096006)(8666007)(6916009)(8936002)(2906002)(118296001)(8676002)(81166006)(81156014)(9786002)(356003)(478600001)(50226002)(305945005)(316002)(189998001)(54906003)(16586007)(36756003)(5003940100001)(106466001)(2351001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1337; 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; CY1NAM02FT055; 1:UjurErgP9v3K3GQNOufQcC1xtl744Re8yxGBqqGL60qYEa4GQ9z46YjDIMFHzXcXbQwaIFcYF5h+BvXHs+XBVOpSgrah8WpHEEsSiqqKAAFe/8R/CPibUO/4VAUbAD30 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a02ac294-4b3f-4496-2d48-08d526fcdc8d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM2PR02MB1337; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 3:PXiLmlzOdQJWFGvuB+h+DIjwWLTtb0Mycd5/yoHJH6d2WDHucTHthvSkztWtteDQ0XYsqxaFSC3pzZROj39Klxzves23XxPv4LECVy5ER3BdD8+SpfTKxSagFLszdJcCWLkFLSaM5F62pZfppdFmyNe8ekBU+ocRv0V7qG9sfVG1zCNArRDam1+pFHQBSpca0qP93eJYcEjoYnF06N/q09tqIK05RzSbPi0dHmteMgpeO4U2r8YXLElL1sViOWs8Fm6oubDfi8aUmKWNO55aY8pKvwbcoEv+9wQl0AmNuXW7y/k9A4jsD/hE5LQZVfBT6bBJAWCiOSvxgLGYC2czaZ2z6rw85uAcx9t2/SMxiDE=; 25:+lE+qv8OqEJxthEQBZwZTnsMXlDduf3EBC9Azu8pY2mvvhSh/NmPQSegbc/OrH/O6Q59lt1HAXHGJdfVJWcH9NBdQFF+WT8lwnCnKItMmSmq5dmsqDCf/Yz4mcK4tHiTJNSChCcel3mlBW7b+1SVXm4LhvIQ4qZhtYUQZpxRUG/knv2K81b7wRFyCGmY5ALU7G4BXoD+YN7OZzUL1wdXKcdj4+ows0QZcI/CKtq51eqPKXb5n8K//FjO2PsijLGP5iHl7Hd2xd3wibyB5WgZYW2tbp2U20GTF6bpMpU+mlkLdh19Fyj0biA2MYHS7KvaeTnNRqFc0s6ov/6nB5DnPjX6vXVU6OsIrrpZ6K1hylQ= X-MS-TrafficTypeDiagnostic: DM2PR02MB1337: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 31:DA0Ko12LZbnoIn4KoNE4bYVZUHfJQuMsAKCnriSbX8mRtu6oYX9wHgW4/bobuVDii9YgZmZYov5str9cqjiVLIC4Y2K6uKoRInXa5NcJWOtggCjdYdn55xzTs3etou5XW0PqQgfgAIhGU1m2rr3m9z9Lam0Xds767TjFYpYDk1ndIQR6KWXls4k/rXnJc1GIsacxpyrNqyAB+mmBUYdE3AfZEf95hX/FHIuy9R5TEj0=; 20:4yHDq+uUeGUvDXvIGTX0YzxwSpHK1L6zTSHS5DAhEhE0GRf30ftQOgh+XGSmb3dwXm/xyoR2ofUEEbOsJtPwON+wlLXU1Wn0/XD+puozJOPaxe4xVHQz9HFO80anIzrmZajZmvf21sO6O5wcbmCtB3HfrwW1eHn1/3Ih+Bd1G5CWfTgM1TXXCT0WEQi4IrSI1LG0qjhurryCiYtJR6no+0inBoVV4tjemHHmpD4Lzu06f35HI3nm1tP2YFb0wT7Ze3VweygJDfJFXS2FZ42TjXz40XnRAPOegQ56fa4Oe84Gt/Ira4WTk6qJeeYdTIAcPAZfM9cptzcFailCiGl/vNiJq86RDlKwSu1YXs0NTriGstJNvBnTUmsaHSe41LrUHq7aZBHFSw54diWpStGkrfuw6KXWwPzf3aVDtummEWK00X2WqrRjFh7dmjOvnOjNI9/D/HzntL3tXD1140WaNwCmwyRYP4UvXR/+ospojtcjjxhLZfHmz/g6LO4KBAch X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592)(70601490899591); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(3231021)(10201501046)(100000703101)(100105400095)(93006095)(93004095)(6055026)(6041248)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1337; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1337; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 4:yTQrRbh7nNC20qcaHJGXdgcO4vHNZ/r/FjAfgunilmCp5jcG5SpsbyuK8gw7e60qmgIIoLYdyMekfLwBptqfDA5yjCGtFzbKp8um2YOrFAwW7bwhvGpMti6lpqzJSz00+45/PfeHzNrx1Qyx3MohAeSOyzZfEx/fK5JARee+8sz53H2FOdmo6+2lu0LpwBACVIFFxgemUpCLcpM0ih40xVtuCoon9tzX4sEkF2VoACelGLxoi/+AuatoujJ/1jbkL/vNULg9spaWQGj9n+VRyvoPkijoQv+bREjJ0wSxdaX4mI0Yas/tT3CDLj+ykphW1M/DRQToerb1nsob3KaFaLspfoZVEziTX/AsI/UkNMqcHZLc62zoHEwY6FJCrIG/ X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1337; 23:u7u1RBc2LFtG/ihYUgavnXOvER9ffhhbQF/KojtnD?= 91sZpapUd7hHEGFv4VvIE5u0Wn4WerkTO/pvpyje+MlLRJH6Put7KRMrOTqLg6KMiUUYu/0flGpOSxOkNWrqqY+Ngl1E8x80ygUTtdqs0BYi9Jz2Tpm3VPPKBizCpBZAOnhBIJaPZyaxltRI5LEjkEXPuSj8X/hEf+7AHcl1FA3MxarY0KM9FuO6hJL8YcBrT+oAnvY/qEf+m0d1TN6kM5y522bNusHJhX6HRZI/NoeEqKmnY6JIMQbt9DLBriRJGuEF9m2Ga43v+xQEkBjpKwp2GBSQce2bKfyuxlC3j0F+xWwxzMLukXF6JG3WEzAIh49Io7/orFjMzBALM619fhQCWv5fZikTmrDFw7lKlTqAQXKLNnRI9h1ErgwIeK1DjBJXH+CYa9V7kab2cd/z9VvpHox9HT50I5Fkfneczi1qhgAO4yGLr3fcYswshL53aY4ErjgdoJUbsn3jBxZ4DeMNIyRrsGTHfskqhSxRph0PVthbvEdSQnJV+tUVGMlCKa60AAceCaLuDIQBSQ0oObQjd2tfkzAZidXWCng84CRixA616O8I6S40LN5+8aI1QFRaWwJsD6bzcNfF+XB4pMU1KwhgWPnphn6CXnJeKtkUpU4ehGFwEkJ4gTFalKLWkPXIgKelXyJan+c0oKnXj2U39BMWUe1QnY72bGxRB4baxUqt0PeUVmD5u4qFleQqXqf2Dcu6gQFhdgO8zuvUMfLRaERYN5/tvrobgsNJgscNLLO6zyeoDPo7jDOf8xTqYSwePjoLxJ8s+/P0vjxvv9/Hom0A8LqS3EAxgEPoqd+2q00SVwcWqIhpNoK7P28T5OQS8WiqdCNwgiLXHCDkXU769Wk7sTKhH1smohQtRt795V1T/mJK9Gbf9F0uaTO7dpiCKpIU/RJErkFOD0tA2nbWXfCy7XeZ5r6vBipfS0RuXjwXgaVRgkB0l0rCjl8QV++MhgCo267K8mOHAfhT+0+jIYtDUfs76Q7mxcPr146QIO+g9fgQhe8q7B1FXMoMpTIEBApK4BYYlj/PEUZgbPx X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 6:PT1gTvfME3H9/Xc9Kutymyd5ZHR5ZPODLYuha6Jwwe2rZiMBPhwQtj2mo6APaeogXasXWvwlZgpeEGmWQufLjv9gz2GLQ9Kw+3BE0tLeQz/0bF5dwdEEkBivcG/Pk9/b/ryFXCA31/QNd+b+eS3qWePehC39T2wMBqJC3HGgZsgptpGhbdZBcLSA3lYQxxH9IoTrW+stZMoGllBPYc4c7Wbet0Nahk0Mdx+OiDY1M/8QqbUS+vJkUxZc0+ttNxeijL1b1r92h+AT1ylazdjORmYW1SJ1TYS4eB+z4pqvNvEXDvyag9+bxa7f7kge8ToG4Dgn2udIzqMXuvxIsl+KSXflE7t9d6Q4bVMdapjkI3s=; 5:KAWhrj+KDYEx66EKksNayNL0q7OsTqJCtsSnWkhLCQ47x2RIZ97SfbjB2tZgbdS2UiF1FOemoSeignUPu0TUKkssbs/ZBSQtSUbOj/4gX5Ibh09NEul2P1cdzpCcKI1Vy8u5/IiuSBr8LuZRcWqJhDSJHewrSK2LzV49FlDP4AU=; 24:kO1OG7Q4PNPFfVAiHMon5dsOwXg2gy2D9IM8oofVS1aEJtaadwa+yAguIm4SuyoLanBVGwylNPWCiAkHM4cVc570r/Mr7eTVOLdOYzci9vk=; 7:QODMC80WHvQgkDTiDJoQcd2xwVIHCCdzdJ+yQs+OtQndsK/v1XDc1jxZ3/1Lqn+74MTYPoZSa/6uYeqkCxFme9mGHevvZO+Rq06W24Ra0nvzXPngpDenDbTjXEZG5l1HAgQAeqN9QqDUeUokpXPTIfXqnF+GH8MqSV2rzCkcVcij7N2TcrPR9qyBKJYiUD9zR64vMjQoW8j/D/O6c7/46v6otGKY4nykTXjCibgdo2WFqiH0TauQavkY4JpaJ/8P SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:01.2584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a02ac294-4b3f-4496-2d48-08d526fcdc8d 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: DM2PR02MB1337 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.65 Subject: [Qemu-devel] [PATCH v4 41/45] 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 --- 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 Wed Nov 8 22:58:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836080 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="CEmeobDf"; 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 3yXN3G6yDgz9s4q for ; Thu, 9 Nov 2017 10:36:10 +1100 (AEDT) Received: from localhost ([::1]:34472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZtA-0001hR-BT for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:36:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNI-000188-7v for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNG-0003r4-0s for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:12 -0500 Received: from mail-dm3nam03on0067.outbound.protection.outlook.com ([104.47.41.67]:50432 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 1eCZNA-0003pg-9S; Wed, 08 Nov 2017 18:03: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=GtlNESOj93WXxSR8kvBhsw7Q24RKZHt5mzjmGl6EY+g=; b=CEmeobDfcie2/kld9mhnoVu33NsPrFs35tSzjpvjK4LMteB91NhdSr8umHKQXF4K3YFbM303PxPG897JB+nddYOk6/dxs9PZI7bByFd1uF1x5Pjm3v+LR87SzerAtsDd9u1oZZkP+9y7SuDRCntUJ+dREfmKo7dPDiZIWlCgk9s= Received: from SN4PR0201CA0047.namprd02.prod.outlook.com (10.162.76.33) by CY4PR02MB3382.namprd02.prod.outlook.com (10.165.89.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:03:01 +0000 Received: from CY1NAM02FT058.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by SN4PR0201CA0047.outlook.office365.com (2603:10b6:803:2e::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; Wed, 8 Nov 2017 23:03:01 +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 CY1NAM02FT058.mail.protection.outlook.com (10.152.74.149) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03: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 1eCZN6-0001Nq-46; Wed, 08 Nov 2017 15:03:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZN5-0003BM-SW; Wed, 08 Nov 2017 15:03:00 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2s72010538; Wed, 8 Nov 2017 15:02:54 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN0-0003AM-LI; Wed, 08 Nov 2017 15:02:54 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:56 -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-23450.000 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)(4326008)(2950100002)(2906002)(9786002)(39060400002)(189998001)(6916009)(5660300001)(8676002)(50226002)(81166006)(77096006)(36756003)(8936002)(478600001)(81156014)(2870700001)(305945005)(356003)(106466001)(47776003)(316002)(118296001)(5820100001)(2351001)(54906003)(50986999)(63266004)(50466002)(76176999)(36386004)(23676003)(575784001)(33646002)(106002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3382; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT058; 1:f6EOiUh1PA7h6U6BsB4WYy6ka/dzG1R2AzJMkn+SAekN0HBuSS4GVS7X6uH2bSyR/uu5qK7G8fDWD9ItkYo5gMLYTcIdqLG8ZBWJ61d3HS0xeToXl4a7NlnvWNoG170P X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fad43009-8720-4867-7da0-08d526fcdc67 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY4PR02MB3382; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 3:7uKGOSMQGyGMLNF6YmUQBze9tU3aQqxgf+5bsbkZXEp9iH3FWiGR2vI5RzRed8t0lwZu8+nac1AOjX4crLmoDK0MGz2Lgo8fyRCfSbKDQZEQteT9kYRmgLd/tCYO/s0WNezA9Mv9PEMomruX7WUQNSWiDqKUFXKQM4ZDQwN+dy7jQ9D4e4rhrCo8YihQjLyogKCrKcJttdiz0W5TuXfeKV5/Zod4xo2vWr4BN5xQ4RfPLFJ9OXHebhJWJVYtxxTMyrHVLi6RoKmst7HVl0QrdgNPhCycJ+4ep6JjxjWLrtdympKtc+ucr7DAq7MfqB1iqksW6PXt+FGP1hoqAQR761uCYHSnf9g6uQnKGjDo5cg=; 25:PRyM5CCMGNJxzBawHzDD6wG1FinOpDZfKnxxe0ZdMTiIL5kQi/namHoiKp69DBidn9tHkgbvNGCHjjcJhR+8EQ294V8Yvab92nC10jA1h8rcAC2WnBxssP9T7j/e4tKhVR3QTF009pYO0JNngoo/OJlS698L3nogghy1clHqhrSfDPXLHUqeOmSmDkmTiUR9FZu0yxBkUEz/sLKUAvf3LbL9JDHU17Us6TepkiZZa+GA/HiO/7cZJYOLHKu14GUuxc8yo5dSIL8XD/wWXOrnMMWWzDQxl5Sv6YhONibkScaYj0kt+HRx2Mkv9rtlneEmVoiMbdOdnPZRePjXbChhdA== X-MS-TrafficTypeDiagnostic: CY4PR02MB3382: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 31:H+9EjnXQa3sSM4CjukobuZYTL8PN32HggC89L3hjgdShN8HmRc3/nykAYMtmo3L8Nrb0Tf2o85B7u9CIx0wBb2Q8PzNglAU/hLsB0NfSMRrI6WHPcLWokWquJGiKXWIGq8dfsgKm8KaiA4K80AMAe2FZmXdSpnRcuCvEbrd1VgG6o1GYlEHaldZq8HYCe2NTC+UgIHQiVMlGiwjlwb525O30JxBgbCIe+Xhl8/K4MSc=; 20:vdmzEPiMLgjiY0rYysWuMLwvX3W2xtPtXOIfXbJbMI/XOk/bq2VpffkbCMRltj9tcDDkZmPwD689OYVQcDQBKOQ6A5YZ31mfGsXgy5qcG5FQZfKwNT7p6brZokaN0Qh0e89uLFwjlmatN+1qWxFHXRmouJWvCJDh7UBDyyELIzwBpNPJN0J7eUVd0LbbbM7XP6EWlh5j1hpE+S5KP6ul68IiIMVELiw3Y6IDxIousLheZuR1y0XPLK11eD0VQTBjhzHKxjbRJ74KTpNhxlsxzj+OmMRzKKyHk6B2ARBGbIU8QitB/ik+hQWoMSfpHVXKKcRIeJyWXuWs/tulgLFLVnIOrz3INc9S9UPLpK5lcXaAzgDP8TKnV+SGNvepktnxHVnruVtvJ8ocWV+i7sJW2xBRx3ygrCxKdt5UxBNP4t/zetYl5ijIBk22UIjaLwnPy6jHY7dzAhmKsQ/Ng01Gb2jHR/5/qdpx8/gLG9URW2lud8bHzUW++not6998hfiB X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231021)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3382; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3382; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 4:f0HsAsIPZ54U+5rT0nSuunQnuwFR4I5PnHr4x9mRIRyrJyHtdMXkO42CHhvM3xQYsH7eV+lqyO9dndQ1R2WVFjbvjBieRZ4njeq+11AzNWKin1eoaVUNJi6Mer9jPkzliRd+m3FelyYiqhlnlmjtFdAQ9IzqzCTYLhhOy4amdtXEAs8nqsz07YX4hhiyRYKPZG8+EwC8YQ7EQLZapt/gHxtGB8RMHjoEhzvZzPCnt1JKH7Fr7zU0B6SxtHNA81INYDRwaUfRCwThtJYvbGdASaWk0kQnOsuTFBudgESvDQnufG/u0o1DA2d49faYatcsxucVTUi0q/askjWU15aCew== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3382; 23:2e3bNGQQXa+pi9/BaysM4TifMCoQEDvNdNXIZL47d?= VQv75WBkn5NDF/VvwJUmparG2jSMiJU2pAUxKX/ahfdjGmYyujV5WqowLQITpVOdvaDZsmsBBiT9Bqf56eJ/s5CkO8FFbi0E27AgoGoDoyuPR6sRavj1dIlGtrMPVc1cpGzjLYEUXXiKiMwi+2/baYsikOTlsZgEnwqfVtfMnW51sO1d+Oi/Dls8bgFOLyn2yaDRd/pRFS64yl7eOZXVwKnvMB7qm/p7lKKg0kv41/VhhsvMcU42H7IawWLWFDmmF8ovjqxwaC6VjzxnPSD8mJ3XCFodxcVq4S4c/NZpK3EYuD+rvOkig5DRtVhK4BaJn16RBudU18V6oJpUvrc1G+MptQlBuot2Qt6sjXW7p6lIwh2BsrviCV8PYPPB1M7g2WnHV3VKTEtD2TrFeM5t4Q09l+I1VJF0BAY48T38y8MX7MTi2tIAgM0bMn2jVAGBLdKyuqE6EV1re2hO7RIO1VrmYYJM7sma3l4vhyTKmefIzV2nzDDrr+ztq65iHW4QsgM23V8whVT7I/Sw/7BicjjNxQj7UHuMaq1U/NtNtMkYiK0+F0/CzdFuStgaaEUM0Aj5WZKHjUvpKg41JgSCUict7XqTSgyu6g3+b8hyTnzbJwl6xzXxDhvi80slNfsSZFgwOTMwDgyZhpGFPPGjYLLWggw8NguImgyAIu5hdGk29zTQanVw43UJYYKYT7Od7Km2lqPfc2xb4TGMTyjuhA9x9aDtiUXiVaXWKbEhlz9MKySU5LkVvYQs43DnDGN7MKgL5dCAffrLgMUrT+07wUC9OkZtjQAaNCSegyr1y5qGf9YfxXTj/MfFqZTaEoSDLTOUTGi9uRu+tEhnSxkGnb1NwKC9WCNM0KWFkFXKKjs6jBOhScfTjEI3+pfY/Wd40PJ2gNpAr6zDhAEa1nHrBEdLYxdHY66Wu1Tg6WGFWJ3x4wbLaDAyIldnkri9rMAMTis1bFXL6Z7bTKBm535nG7C0a0c46F4rfx9eYTnILUQ00dgTQcrEGdVHp2cw/6NBk4= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 6:OcP7Ne37/3jojbzQwn9udpz6MIZKAbTxoBLLccr39IgCojNdMd3Kmv9sqXnKJO3xUDG7z1JPmF22ZZGoLe8uCk4Zqco3Otv7sP9DkEzZv8cpiHF1pZDLzv1v1PEVaIrGS0AX6YdmLnUg+/8LACFYnf0iOsRPZKrztSxKfmpw4nIoTuSymkebVLACaMWX65PA9Nmh8OJjsLvk/0O9hn++ZrulyNsjyoRANw5vTVw/QOAXTUq0DlbnLBpDHE5SWP/AD/9VYRsNYRWjZBAonDQCSMoIESJXnhKC3UNEglq1O/BU040hfSnmSfwVIlJlyfodVSG9osWShR98IeGRJgkVE/bQpJdTcT2jFkraKHmJnWU=; 5:rEeXnouApF8ys3t1XdJl4zoucelwzdqWpoHy/OiQLCqs0KnDHgf2zfD7TO7xIKa56ay07QhsgdoNvd/FZtNHouqSCSVZfKM2BQo34J/s3Qsji/utng0mEBoRnjvupSEHhJ0kxWWk3WvMfA5AKCEswRBYAoFXZ7zS0PFcZUqou0U=; 24:c2mDQkBb027MghFCBF5XQ3mUDQxlKeiRSR65r1QH07AyfTq/ayJJWrqJi/FcBQz4fpjTMdZlsbufiw8vjQ06BR5ckVJXjxRG28CUAhMVCC4=; 7:lvfLgFpS1mDNIG18VuIutgexxMTtHABOee1POqcpyjvsTcChwSy6y0DNbVlJ+CXcXPCcrikJK9TMadvHTvjCJLQAd3bS7i89SSFXYr+pwimfpya7tynOtsfneiexh5UbLjl6PsjqAPVVtqpvoFTK4NwAszRf3b6kZmFcpZZveaG0WLt5+hHbA/0W+gtbnh5srF7e1r4JAyWAWS5bQF+curaFUdt8YHQGpTaAwYZ5vnNzJvRASRe3lULPArxrp3PC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:00.8552 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fad43009-8720-4867-7da0-08d526fcdc67 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: CY4PR02MB3382 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.67 Subject: [Qemu-devel] [PATCH v4 42/45] util: 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: Kevin Wolf , qemu-block@nongnu.org, Stefan Weil , armbru@redhat.com, alistair.francis@xilinx.com, Paolo Bonzini , 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}' \ {} + The error in aio_poll() was removed manually. Signed-off-by: Alistair Francis Cc: Kevin Wolf Cc: Markus Armbruster Cc: Paolo Bonzini Cc: Stefan Weil Cc: qemu-block@nongnu.org Reviewed-by: Philippe Mathieu-Daudé --- V4: - Remove the error in aio_poll() util/aio-posix.c | 1 + util/coroutine-sigaltstack.c | 2 +- util/error.c | 4 ++-- util/main-loop.c | 2 +- util/mmap-alloc.c | 3 ++- util/module.c | 6 +++--- util/osdep.c | 4 ++-- util/oslib-posix.c | 3 ++- util/oslib-win32.c | 3 ++- util/qemu-coroutine.c | 5 +++-- util/qemu-progress.c | 3 ++- util/qemu-thread-posix.c | 5 +++-- util/qemu-thread-win32.c | 5 +++-- util/qemu-timer-common.c | 3 ++- util/qht.c | 2 +- 15 files changed, 30 insertions(+), 21 deletions(-) diff --git a/util/aio-posix.c b/util/aio-posix.c index 1427f49b4a..8eeba93da6 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/error-report.h" #include "block/block.h" #include "qemu/rcu_queue.h" #include "qemu/sockets.h" diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c index f6fc49a0e5..96a01c2c88 100644 --- a/util/coroutine-sigaltstack.c +++ b/util/coroutine-sigaltstack.c @@ -80,7 +80,7 @@ static void __attribute__((constructor)) coroutine_init(void) ret = pthread_key_create(&thread_state_key, qemu_coroutine_thread_cleanup); if (ret != 0) { - fprintf(stderr, "unable to create leader key: %s\n", strerror(errno)); + error_report("unable to create leader key: %s", strerror(errno)); abort(); } } diff --git a/util/error.c b/util/error.c index 3efdd69162..f524e138ec 100644 --- a/util/error.c +++ b/util/error.c @@ -32,8 +32,8 @@ Error *error_fatal; static void error_handle_fatal(Error **errp, Error *err) { if (errp == &error_abort) { - fprintf(stderr, "Unexpected error in %s() at %s:%d:\n", - err->func, err->src, err->line); + error_report("Unexpected error in %s() at %s:%d:", + err->func, err->src, err->line); error_report_err(err); abort(); } diff --git a/util/main-loop.c b/util/main-loop.c index 7558eb5f53..d8369716b2 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -95,7 +95,7 @@ static int qemu_signal_init(void) sigdelset(&set, SIG_IPI); sigfd = qemu_signalfd(&set); if (sigfd == -1) { - fprintf(stderr, "failed to create signalfd\n"); + error_report("failed to create signalfd"); return -errno; } diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 3ec029a9ea..11887aac69 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h" @@ -51,7 +52,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path) } while (ret != 0 && errno == EINTR); if (ret != 0) { - fprintf(stderr, "Couldn't statfs() memory path: %s\n", + error_report("Couldn't statfs() memory path: %s", strerror(errno)); exit(1); } diff --git a/util/module.c b/util/module.c index c90973721f..1153e3ebb0 100644 --- a/util/module.c +++ b/util/module.c @@ -124,13 +124,13 @@ static int module_load_file(const char *fname) g_module = g_module_open(fname, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if (!g_module) { - fprintf(stderr, "Failed to open module: %s\n", + error_report("Failed to open module: %s", g_module_error()); ret = -EINVAL; goto out; } if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) { - fprintf(stderr, "Failed to initialize module: %s\n", + error_report("Failed to initialize module: %s", fname); /* Print some info if this is a QEMU module (but from different build), * this will make debugging user problems easier. */ @@ -169,7 +169,7 @@ void module_load_one(const char *prefix, const char *lib_name) static GHashTable *loaded_modules; if (!g_module_supported()) { - fprintf(stderr, "Module is not supported by system.\n"); + error_report("Module is not supported by system."); return; } diff --git a/util/osdep.c b/util/osdep.c index 1231f9f876..ec0ec7ed2c 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -466,7 +466,7 @@ void fips_set_state(bool requested) #endif /* __linux__ */ #ifdef _FIPS_DEBUG - fprintf(stderr, "FIPS mode %s (requested %s)\n", + error_report("FIPS mode %s (requested %s)", (fips_enabled ? "enabled" : "disabled"), (requested ? "enabled" : "disabled")); #endif @@ -493,7 +493,7 @@ int socket_init(void) ret = WSAStartup(MAKEWORD(2, 2), &Data); if (ret != 0) { err = WSAGetLastError(); - fprintf(stderr, "WSAStartup: %d\n", err); + error_report("WSAStartup: %d", err); return -1; } atexit(socket_cleanup); diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 77369c92ce..e34ebf094f 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -34,6 +34,7 @@ #include "sysemu/sysemu.h" #include "trace.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qemu/sockets.h" #include #include @@ -91,7 +92,7 @@ int qemu_daemon(int nochdir, int noclose) void *qemu_oom_check(void *ptr) { if (ptr == NULL) { - fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)); + error_report("Failed to allocate memory: %s", strerror(errno)); abort(); } return ptr; diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 69a6286d50..2197a6a4fc 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -30,6 +30,7 @@ * see the license comment there. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include #include "qapi/error.h" #include "sysemu/sysemu.h" @@ -44,7 +45,7 @@ void *qemu_oom_check(void *ptr) { if (ptr == NULL) { - fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError()); + error_report("Failed to allocate memory: %lu", GetLastError()); abort(); } return ptr; diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c index d6095c1d5a..1f7cce6706 100644 --- a/util/qemu-coroutine.c +++ b/util/qemu-coroutine.c @@ -13,6 +13,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "trace.h" #include "qemu-common.h" #include "qemu/thread.h" @@ -110,7 +111,7 @@ void qemu_aio_coroutine_enter(AioContext *ctx, Coroutine *co) trace_qemu_aio_coroutine_enter(ctx, self, co, co->entry_arg); if (co->caller) { - fprintf(stderr, "Co-routine re-entered recursively\n"); + error_report("Co-routine re-entered recursively"); abort(); } @@ -164,7 +165,7 @@ void coroutine_fn qemu_coroutine_yield(void) trace_qemu_coroutine_yield(self, to); if (!to) { - fprintf(stderr, "Co-routine is yielding to no one\n"); + error_report("Co-routine is yielding to no one"); abort(); } diff --git a/util/qemu-progress.c b/util/qemu-progress.c index 3c2223c1a2..84598f0fbb 100644 --- a/util/qemu-progress.c +++ b/util/qemu-progress.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" struct progress_state { @@ -68,7 +69,7 @@ static void sigusr_print(int signal) static void progress_dummy_print(void) { if (print_pending) { - fprintf(stderr, " (%3.2f/100%%)\n", state.current); + error_report(" (%3.2f/100%%)", state.current); print_pending = 0; } } diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index 7306475899..1207ef71d6 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -11,6 +11,7 @@ * */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/thread.h" #include "qemu/atomic.h" #include "qemu/notify.h" @@ -25,14 +26,14 @@ void qemu_thread_naming(bool enable) #ifndef CONFIG_THREAD_SETNAME_BYTHREAD /* This is a debugging option, not fatal */ if (enable) { - fprintf(stderr, "qemu: thread naming not supported on this host\n"); + error_report("thread naming not supported on this host"); } #endif } static void error_exit(int err, const char *msg) { - fprintf(stderr, "qemu: %s: %s\n", msg, strerror(err)); + error_report("%s: %s", msg, strerror(err)); abort(); } diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index 94f3491a87..02b94e22da 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -16,6 +16,7 @@ #endif #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/thread.h" #include "qemu/notify.h" @@ -29,7 +30,7 @@ void qemu_thread_naming(bool enable) /* But note we don't actually name them on Windows yet */ name_threads = enable; - fprintf(stderr, "qemu: thread naming not supported on this host\n"); + error_report("thread naming not supported on this host"); } static void error_exit(int err, const char *msg) @@ -38,7 +39,7 @@ static void error_exit(int err, const char *msg) FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, err, 0, (LPTSTR)&pstr, 2, NULL); - fprintf(stderr, "qemu: %s: %s\n", msg, pstr); + error_report("%s: %s", msg, pstr); LocalFree(pstr); abort(); } diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c index 06d084d364..ab7b702c4f 100644 --- a/util/qemu-timer-common.c +++ b/util/qemu-timer-common.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/timer.h" /***********************************************************/ @@ -37,7 +38,7 @@ static void __attribute__((constructor)) init_get_clock(void) int ret; ret = QueryPerformanceFrequency(&freq); if (ret == 0) { - fprintf(stderr, "Could not calibrate ticks\n"); + error_report("Could not calibrate ticks"); exit(1); } clock_freq = freq.QuadPart; diff --git a/util/qht.c b/util/qht.c index ff4d2e6974..bfab5c7e5e 100644 --- a/util/qht.c +++ b/util/qht.c @@ -154,7 +154,7 @@ static void qht_bucket_debug__locked(struct qht_bucket *b) continue; } if (seen_empty) { - fprintf(stderr, "%s: b: %p, pos: %i, hash: 0x%x, p: %p\n", + error_report("%s: b: %p, pos: %i, hash: 0x%x, p: %p", __func__, b, i, b->hashes[i], b->pointers[i]); corrupt = true; } From patchwork Wed Nov 8 22:58:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836079 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="X4nF+5dH"; 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 3yXN1P1Yf5z9s4q for ; Thu, 9 Nov 2017 10:34:33 +1100 (AEDT) Received: from localhost ([::1]:34464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZrb-0000Ug-9y for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:34:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNE-000146-B5 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNB-0003qC-3y for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:08 -0500 Received: from mail-cys01nam02on0067.outbound.protection.outlook.com ([104.47.37.67]:6176 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 1eCZNA-0003po-OW for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03: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=kVhcx6UKvmQCDwqXlz4mOIxeNq1U8jBFrKsPfVRtnh8=; b=X4nF+5dHXjK7+k0km2ElBCOZkvkqbeqmVChmrSKcyydo4G7XO3L1eRnNRC18lhjsY6ph+RX4gyCtZm+0WW+BtF1mho9MtYdTeeGefl7BmFZG9s+U1mjzKmDTucquIk4nbFf7sEXjOjnwjXm1p6AuIIZPwyxs+R8XieEYu5oH05U= Received: from MWHPR0201CA0017.namprd02.prod.outlook.com (10.167.160.158) 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; Wed, 8 Nov 2017 23:03:01 +0000 Received: from CY1NAM02FT034.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by MWHPR0201CA0017.outlook.office365.com (2603:10b6:301:74::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; Wed, 8 Nov 2017 23:03:00 +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 CY1NAM02FT034.mail.protection.outlook.com (10.152.75.190) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03: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 1eCZN5-0001Nk-Dj; Wed, 08 Nov 2017 15:02:59 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZN5-0003BM-AS; Wed, 08 Nov 2017 15:02:59 -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 vA8N2v5i010572; Wed, 8 Nov 2017 15:02:58 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN3-0003B1-IN; Wed, 08 Nov 2017 15:02:57 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:59 -0800 Message-ID: <3c6c24cb01f7d4812addd84bd170337459c9e95b.1510181732.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-23450.000 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)(6916009)(4326008)(118296001)(39060400002)(36756003)(575784001)(16586007)(316002)(50226002)(50986999)(76176999)(478600001)(5003940100001)(36386004)(63266004)(356003)(305945005)(47776003)(106466001)(189998001)(81156014)(106002)(81166006)(77096006)(2906002)(33646002)(9786002)(2950100002)(5660300001)(8936002)(50466002)(48376002)(8676002)(54906003)(2351001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3392; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT034; 1:AlOXUxj7h7h2+SEHBMFXtrzc8meVj1IXKKZ6+zEkopRfU4QD68e4h1QlfIMPSTPi8QCH+xsPScyaCKGltcvZaWFuaXFpBG2mvH3MW5OHBPUkS2A77QGcf+NU9TrI6DEL MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f204f7e7-ea58-4b57-855a-08d526fcdbe6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:MWHPR02MB3392; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 3:oJbFUW1xZsRsdaC/vmkEWvvWFM9PxvCLG0Ylr8O5FfpXkUcMuS5S+eXDRPVnIhbx1DqRO0OxFlIX28GlQesrRjwEWw0+782Su8CGejU5U6XK1dYoLK11T/4Cu47zvlgMDVE9XHuQm3e2E2jlRt3sWYtOLrLvqF/yfzz4vpThpthfe3vJvI2WJK/cu2JMNMS99mTJrR9xjlJGoA2Oc74znSaP7vWILnNDmyD3tSTL/yOB2KOM/bBGCf73hi2SZq8C1x9Dz15kNtg0ljmFSzrqddAI2suWBh/ZC2buwr7veMIORtsXR0BKmzHoSBtkOjakCh08xhnxWefSSNmxfCobNE5AEEDP5VwpcUc5P1P/Stw=; 25:FL153zo4Mtmw3+5kTi/VdzsTx9BtN6Ewy+K4REIkWpSKGRa9HIqwqNe+PeO58FBYfGXo82YOLgiOO2vqF79Z5u+/jXEZ+39jMIG+YMGwPmNOFqDGetiUwbtbxt/M2yCiDhBHBokp/PLkbWpBvIrp5ytfjTXAf/RLF+OTx9vujlPfhrfiNW8mSPswnNyhu2tyI/cffQOy5PAmBcxXeIWKoMeib2rigPxB3JCKPvcSP9Bmc4HUJb2uKzqagWBMhng3xN5Cy5nkWUEiG1PIDjmn4Zf1X05QifCItOKMvmsLTZ0kE3jQkp9FB99HC+uNTasUmO6/WbbxTpWznNO5kk8zow== X-MS-TrafficTypeDiagnostic: MWHPR02MB3392: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 31:yCd7k8WIx8rpsbaGuK4sYzMzeNG75EoTR284p5ffQneumKgIp4nUND0+z5doFJ85BxU7YG2x0zFk8sWEFollNts53BYjbLd8kgFVbzxmpiJjGehyyjbs/zgC1AougPi+kj3k1oqZMuiDKzuElndZjIXW6rZ895XHhmRK9oi6zXumDXf0idlK9CDk5eThviI8rQT/fGRjt2wTMqVASYkwgmck/kTKY7zkMfsWehtCiLo=; 20:rAs4kbChaWsS9RUYyuRGGlQSIkn0KUOgLv1laPQwJfJHz6lJr2GtDnZT15DGxXK2fk4LtARs1E4yA0YLx0fe5F/MD7MGe3hCaSWUqP9eR9KmQ9kJo4dL7geoPmDEItFBPiU6wCbxM6dcD7I9WeWiEecf6C9s/FXgrCYFb0++I4IepM+dE2e3Ng1MRvRl3BQPBNuC9i5WWXtWt2oQ57hXzfflTiQZ7U8XL+evHBDY3wPJ2VKwPRaDYh2BmBft+LnObFoPDiUFJqjf4kNRriKCLawcZ/j6Y3Tqi9QVxm+PV2g6SEzovIsEiHV33eGlxzD8ZbV1HPJyUneVqDEa2XwFksFnOsxoR6tD7OVAnANTvCQwBAYoqmZHLaM8kUl4AUjF3MNdY77d1BsMjJxjALExA3d37rarSC43eZDE8Fxt1kNV7nl8PKRVgTgNu5EMXw/3IECwPdUZTQXREhKwBOesjCk+nP4ZU3RhrrPAawxJpGb3nDwOAO2+3lNRgThlbpJ5 X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231021)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123555025)(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:ogh4mlZSkf5tRT1+DUgTXvteTI3Iqs4u9UX+gdxNF3u9H1E8BxHpLiQUyWXzkaxeZVROGOxdHEIUo17pVIBsUiopm7XuL7K+Z0DvhNx2YPci105Xw9UztifIwiS+GdNHPTlWVWFXy3scHMlCC8IzU+jZrySCPFZLXEUX25l34sXjjltAl/iHwDme5Hj73AFOk+Xg7GJiiRkwBKc1bk6rguw/FUv3ow5L4fGO3wI99kg9dpFzcdg9PC5i18i90i1CGmKGj8vCEfq+0mtrj73pn6I72M49pA8xPeAQmGxk6HDcLoGsVIi5eLX4WHljgUPHgsXd/p37BbAYSvPQVPyOgw== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3392; 23:ZPyCpLafA1Uc9+//D6GgQtcjxtC8h3UUJX65T5QU1?= vkLp4F2A+jDTN16roCyaU1aRZiCEK6UKZfliTUl3bikdgMrSxX3wCsDGSFRNpHBIotEF140n/RYWBD8EIYwFjMC8SbScpz8OxKDT+SrpE3AQ6BsHK9yJZ2OUFq5gwmZZlD+GuqziF3H3kTzTf/KNfuay2r1u4p8fSz82EjIDmcCYf9pms/7SctykWoobvKxt2aVQNBoJTW89xYAfGxmcQGHf+PE0dCo2PbWUl1XY6p0iCCHxW5JZ/Hx8G/X47oRsrP0ggU20wCQl5TdaqaMH6iFQ6b0gMY1wIGCLtBZ9mW5531t8LN6SPT6LRZcsduRW7Qk2EQtjigBAS47gui7ECY4fEohfEtTdJY8UwirYPoa+TRAZhIfeGkGH5ES7uJRrEvZEEoP6uoexjFw4rpaU3P9Kdqww6+VwPH1X/G4HTVt9DN66Mktk5GZQejMHOmQdJrQErF32dr4uULdP4NJA6LGwApHY5Ts+oSe6bKzJ3QxRu+V25KPzDNzW4U/84Zyc2uOriGqNyItUfbIEEyNJ7Mlz8/+XSRUhfruSiXeEqJVTlwbeG+dzyAduURHhys8718F1zfikQJC2dzp00+Wv0qo5QKwmYi7uUPMuXOg3VI8xHVYc7/o5zJSMVL7HcSBIJE9+p6anrOfU/XAvwElqIhNQlkwSdn8LGvTVRXvTTeHXbgaJZK3BiY5BX9SnsQ4bQxA2V7+7jaH25oY+t8cjpw9ly53zG4ZuBTZkj2BjOXIBaQnJEvIjyKKGIYNk4AIeFmcKE6nDN74UYAd8hiDXqvqh/dL6Z3AIdm8kBrbjbO8JOHuL5RhUZb33FHhtaloSHulV9nREV6tmsg19Y+T0lad3QFF3bvFoKloU42Waj7vgekHHWm0sjMgV2kG50WPA84AlrPuWtLPJUy1uyZJdxRuyS6EnftFiiHcppcDl0mStP86+Fv053tG8t/PBlky0zkrI4onyPuTg91S/Js8GlH+xWKFdCzD95O1Lzkrm3+LCKr9vsWkVXjHyPsBPVuFs2g= X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3392; 6:EmqhNbnm7Qj5s5CkPWPhOsPmhVYpL7tLCx03b2cblswidXREPaqN/Pv941CbWXF/e1j4mqU+NlJJvy1ZDn9hSZHlww7cGNWLcg2HkH65FZl/J3b9TzX5uSJteXXtu4dRTAvsVZFhPuI4FHo3vAzxCc8RBh7X5fq1JmSGWU/uUekWE5VNEqDC14qA5cx4/aTSS5hK43+W5FsYeyln3gi1SfpDq32dCL3ayBoplwWOEXaYoa+iH64b1IYvjxR3M+WuD9gN9qKKn7kGFYOnnMd+vMrN2PQRYswzdAP50M4kzlE+XZ12tNCgASNNogprI3fTkqv0N55f4V18nh9ipzKRkFhINqMVw3ZyZGrNX3d4cz8=; 5:/cIn/MaK6zjDexZQ09US2yxRMLTM6V75b3+JTd+YnlJ5hitJnjFhYU8AlMPbk6hMJhYhZRltRXE8LKgVqX5N32YVNJs3WtUdCo+TeoGS9KQpg4uWDPtcHuFnCjP82r9G4gS4LehWWqk3c6iIDEhzOg+LUymQMwh0AasMwQ03QuM=; 24:hqaF95RpGv6eBNWkZGzpXSfIqKXME0/a/d9d1OqErmGwYOlmwtSNH3Vw6LoGc9NBIT7BfNcUYtfW4vcsEcnbrPrVc1IjECetbksFh41WdRE=; 7:OXR+tfVwpm0TlhtYMzh3jUwhTRmnwdpcpk16ihp26Pt/56nvCHCvwoIS8M4s+BzK1kxL92cQr5F8A8iZcRsvo3ZpWV2H0TY2akKASm8NJpeDZ8FzTuvEDL+l1LEuYcE5YOx2MVr4S+8zj3uBUogffzdRtMM5lixibXaO/goQX7Tw/cbAcXmpgBwa9oZGu/zXXfZUhYCO2HCMmAiZJbul+L4KEc5T3J8Wkxjt617l9nvWU0fwIIf3n3lolAB/grVd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:00.0568 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f204f7e7-ea58-4b57-855a-08d526fcdbe6 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: MWHPR02MB3392 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.67 Subject: [Qemu-devel] [PATCH v4 43/45] ui: 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 , 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" 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: Peter Maydell Cc: Gerd Hoffmann --- ui/cocoa.m | 6 +++--- ui/console.c | 2 +- ui/curses.c | 2 +- ui/cursor.c | 10 +++++----- ui/gtk.c | 10 +++++----- ui/input-linux.c | 3 ++- ui/keymaps.c | 4 ++-- ui/sdl.c | 14 +++++++------- ui/sdl2.c | 8 ++++---- ui/sdl_zoom.c | 3 ++- ui/shader.c | 9 +++++---- ui/spice-display.c | 10 +++++----- ui/vnc-enc-tight.c | 4 ++-- ui/vnc-enc-zlib.c | 4 ++-- ui/vnc-enc-zrle.c | 4 ++-- ui/vnc.c | 2 +- 16 files changed, 49 insertions(+), 46 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 330ccebf90..fd3686bfd1 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -235,7 +235,7 @@ const int mac_to_qkeycode_map[] = { static int cocoa_keycode_to_qemu(int keycode) { if (ARRAY_SIZE(mac_to_qkeycode_map) <= keycode) { - fprintf(stderr, "(cocoa) warning unknown keycode 0x%x\n", keycode); + error_report("(cocoa) warning unknown keycode 0x%x", keycode); return 0; } return mac_to_qkeycode_map[keycode]; @@ -945,7 +945,7 @@ QemuCocoaView *cocoaView; // create a view and add it to the window cocoaView = [[QemuCocoaView alloc] initWithFrame:NSMakeRect(0.0, 0.0, 640.0, 480.0)]; if(!cocoaView) { - fprintf(stderr, "(cocoa) can't create a view\n"); + error_report("(cocoa) can't create a view"); exit(1); } @@ -954,7 +954,7 @@ QemuCocoaView *cocoaView; styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskMiniaturizable|NSWindowStyleMaskClosable backing:NSBackingStoreBuffered defer:NO]; if(!normalWindow) { - fprintf(stderr, "(cocoa) can't create window\n"); + error_report("(cocoa) can't create window"); exit(1); } [normalWindow setAcceptsMouseMovedEvents:YES]; diff --git a/ui/console.c b/ui/console.c index eca854cbd5..b58336c7b2 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1422,7 +1422,7 @@ void register_displaychangelistener(DisplayChangeListener *dcl) /* display has opengl support */ assert(dcl->con); if (dcl->con->gl) { - fprintf(stderr, "can't register two opengl displays (%s, %s)\n", + error_report("can't register two opengl displays (%s, %s)", dcl->ops->dpy_name, dcl->con->gl->ops->dpy_name); exit(1); } diff --git a/ui/curses.c b/ui/curses.c index 85503876c0..11c862520f 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -438,7 +438,7 @@ void curses_display_init(DisplayState *ds, int full_screen) { #ifndef _WIN32 if (!isatty(1)) { - fprintf(stderr, "We need a terminal output\n"); + error_report("We need a terminal output"); exit(1); } #endif diff --git a/ui/cursor.c b/ui/cursor.c index f3da0cee79..9d847031ec 100644 --- a/ui/cursor.c +++ b/ui/cursor.c @@ -18,12 +18,12 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[]) /* parse header line: width, height, #colors, #chars */ if (sscanf(xpm[line], "%u %u %u %u", &width, &height, &colors, &chars) != 4) { - fprintf(stderr, "%s: header parse error: \"%s\"\n", - __func__, xpm[line]); + error_report("%s: header parse error: \"%s\"", + __func__, xpm[line]); return NULL; } if (chars != 1) { - fprintf(stderr, "%s: chars != 1 not supported\n", __func__); + error_report("%s: chars != 1 not supported", __func__); return NULL; } line++; @@ -40,7 +40,7 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[]) continue; } } - fprintf(stderr, "%s: color parse error: \"%s\"\n", + error_report("%s: color parse error: \"%s\"", __func__, xpm[line]); return NULL; } @@ -75,7 +75,7 @@ void cursor_print_ascii_art(QEMUCursor *c, const char *prefix) fprintf(stderr, "o"); /* other */ } } - fprintf(stderr, "|\n"); + error_report("|"); } } diff --git a/ui/gtk.c b/ui/gtk.c index 342e96fbe9..91b269d9d0 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1254,7 +1254,7 @@ static gboolean gd_win_grab(void *opaque) { VirtualConsole *vc = opaque; - fprintf(stderr, "%s: %s\n", __func__, vc->label); + error_report("%s: %s", __func__, vc->label); if (vc->s->ptr_owner) { gd_ungrab_pointer(vc->s); } else { @@ -2215,12 +2215,12 @@ static void gd_set_keycode_type(GtkDisplayState *s) keycodes = XGetAtomName(x11_display, desc->names->keycodes); } if (keycodes == NULL) { - fprintf(stderr, "could not lookup keycode name\n"); + error_report("could not lookup keycode name"); } else if (strstart(keycodes, "evdev", NULL)) { s->has_evdev = true; } else if (!strstart(keycodes, "xfree86", NULL)) { - fprintf(stderr, "unknown keycodes `%s', please report to " - "qemu-devel@nongnu.org\n", keycodes); + error_report("unknown keycodes `%s', please report to " + "qemu-devel@nongnu.org", keycodes); } if (desc) { @@ -2244,7 +2244,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) GdkDisplay *window_display; if (!gtkinit) { - fprintf(stderr, "gtk initialization failed\n"); + error_report("gtk initialization failed"); exit(1); } diff --git a/ui/input-linux.c b/ui/input-linux.c index 9720333b2c..edc5273476 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -5,6 +5,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/config-file.h" @@ -241,7 +242,7 @@ static void input_linux_event(void *opaque) rc = read(il->fd, &p[il->read_offset], read_size); if (rc != read_size) { if (rc < 0 && errno != EAGAIN) { - fprintf(stderr, "%s: read: %s\n", __func__, strerror(errno)); + error_report("%s: read: %s", __func__, strerror(errno)); qemu_set_fd_handler(il->fd, NULL, NULL, NULL); close(il->fd); } else if (rc > 0) { diff --git a/ui/keymaps.c b/ui/keymaps.c index f9762d1497..41c5e42553 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -105,7 +105,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, f = filename ? fopen(filename, "r") : NULL; g_free(filename); if (!f) { - fprintf(stderr, "Could not read keymap file: '%s'\n", language); + error_report("Could not read keymap file: '%s'", language); return NULL; } @@ -150,7 +150,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, if (strstr(rest, "numlock")) { add_to_key_range(&k->keypad_range, keycode); add_to_key_range(&k->numlock_range, keysym); - /* fprintf(stderr, "keypad keysym %04x keycode %d\n", + /* error_report("keypad keysym %04x keycode %d", keysym, keycode); */ } diff --git a/ui/sdl.c b/ui/sdl.c index 7b71a9ac58..29db4c68ad 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -91,7 +91,7 @@ static void sdl_update(DisplayChangeListener *dcl, SDL_BlitSurface(guest_screen, &rec, real_screen, &rec); } else { if (sdl_zoom_blit(guest_screen, real_screen, SMOOTHING_ON, &rec) < 0) { - fprintf(stderr, "Zoom blit failed\n"); + error_report("Zoom blit failed"); exit(1); } } @@ -120,7 +120,7 @@ static void do_sdl_resize(int width, int height, int bpp) tmp_screen = SDL_SetVideoMode(width, height, bpp, flags); if (!real_screen) { if (!tmp_screen) { - fprintf(stderr, "Could not open SDL display (%dx%dx%d): %s\n", + error_report("Could not open SDL display (%dx%dx%d): %s", width, height, bpp, SDL_GetError()); exit(1); } @@ -130,7 +130,7 @@ static void do_sdl_resize(int width, int height, int bpp) * resolution failed. */ if (!tmp_screen) { - fprintf(stderr, "Failed to set SDL display (%dx%dx%d): %s\n", + error_report("Failed to set SDL display (%dx%dx%d): %s", width, height, bpp, SDL_GetError()); return; } @@ -241,12 +241,12 @@ static int check_for_evdev(void) XkbKeycodesNameMask, desc) == Success)) { keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes); if (keycodes == NULL) { - fprintf(stderr, "could not lookup keycode name\n"); + error_report("could not lookup keycode name"); } else if (strstart(keycodes, "evdev", NULL)) { has_evdev = 1; } else if (!strstart(keycodes, "xfree86", NULL)) { - fprintf(stderr, "unknown keycodes `%s', please report to " - "qemu-devel@nongnu.org\n", keycodes); + error_report("unknown keycodes `%s', please report to " + "qemu-devel@nongnu.org", keycodes); } } @@ -988,7 +988,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE; if (SDL_Init (flags)) { - fprintf(stderr, "Could not initialize SDL(%s) - exiting\n", + error_report("Could not initialize SDL(%s) - exiting", SDL_GetError()); exit(1); } diff --git a/ui/sdl2.c b/ui/sdl2.c index 53dd447fd2..f6700e70f5 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -400,7 +400,7 @@ static void handle_keydown(SDL_Event *ev) 160); height = (surface_height(scon->surface) * width) / surface_width(scon->surface); - fprintf(stderr, "%s: scale to %dx%d\n", + error_report("%s: scale to %dx%d", __func__, width, height); sdl_scale(scon, width, height); sdl2_redraw(scon); @@ -686,13 +686,13 @@ static void sdl_mouse_define(DisplayChangeListener *dcl, 0xff0000, 0x00ff00, 0xff, 0xff000000); if (!guest_sprite_surface) { - fprintf(stderr, "Failed to make rgb surface from %p\n", c); + error_report("Failed to make rgb surface from %p", c); return; } guest_sprite = SDL_CreateColorCursor(guest_sprite_surface, c->hot_x, c->hot_y); if (!guest_sprite) { - fprintf(stderr, "Failed to make color cursor from %p\n", c); + error_report("Failed to make color cursor from %p", c); return; } if (guest_cursor && @@ -783,7 +783,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE; if (SDL_Init(flags)) { - fprintf(stderr, "Could not initialize SDL(%s) - exiting\n", + error_report("Could not initialize SDL(%s) - exiting", SDL_GetError()); exit(1); } diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c index b96196bac5..bf73d1f1f9 100644 --- a/ui/sdl_zoom.c +++ b/ui/sdl_zoom.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "sdl_zoom.h" static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth, @@ -81,7 +82,7 @@ int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc, int smooth, else if (src_sfc->format->BitsPerPixel == 16) sdl_zoom_rgb16(src_sfc, dst_sfc, smooth, &zoom); else { - fprintf(stderr, "pixel format not supported\n"); + error_report("pixel format not supported"); return -1; } diff --git a/ui/shader.c b/ui/shader.c index 008458bf94..54afd3fbb6 100644 --- a/ui/shader.c +++ b/ui/shader.c @@ -25,6 +25,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "ui/shader.h" @@ -96,9 +97,9 @@ static GLuint qemu_gl_create_compile_shader(GLenum type, const GLchar *src) glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length); errmsg = g_malloc(length); glGetShaderInfoLog(shader, length, &length, errmsg); - fprintf(stderr, "%s: compile %s error\n%s\n", __func__, - (type == GL_VERTEX_SHADER) ? "vertex" : "fragment", - errmsg); + error_report("%s: compile %s error: %s", __func__, + (type == GL_VERTEX_SHADER) ? "vertex" : "fragment", + errmsg); g_free(errmsg); return 0; } @@ -121,7 +122,7 @@ static GLuint qemu_gl_create_link_program(GLuint vert, GLuint frag) glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length); errmsg = g_malloc(length); glGetProgramInfoLog(program, length, &length, errmsg); - fprintf(stderr, "%s: link program: %s\n", __func__, errmsg); + error_report("%s: link program: %s", __func__, errmsg); g_free(errmsg); return 0; } diff --git a/ui/spice-display.c b/ui/spice-display.c index 586f058f1b..bb6a1af68e 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", __func__); + error_report("%s: abort()", __func__); abort(); } static int interface_flush_resources(QXLInstance *sin) { - fprintf(stderr, "%s: abort()\n", __func__); + error_report("%s: abort()", __func__); abort(); return 0; } @@ -646,7 +646,7 @@ static void interface_update_area_complete(QXLInstance *sin, QXLRect *dirty, uint32_t num_updated_rects) { /* should never be called, used in qxl native mode only */ - fprintf(stderr, "%s: abort()\n", __func__); + error_report("%s: abort()", __func__); abort(); } @@ -671,7 +671,7 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token) #endif default: /* should never be called, used in qxl native mode only */ - fprintf(stderr, "%s: abort()\n", __func__); + error_report("%s: abort()", __func__); abort(); } g_free(cookie); @@ -955,7 +955,7 @@ static void qemu_spice_gl_scanout_texture(DisplayChangeListener *dcl, assert(tex_id); fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc); if (fd < 0) { - fprintf(stderr, "%s: failed to get fd for texture\n", __func__); + error_report("%s: failed to get fd for texture", __func__); return; } dprint(1, "%s: %dx%d (stride %d, fourcc 0x%x)\n", __func__, diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index f38aceb4da..7ac957057d 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -800,7 +800,7 @@ static int tight_init_stream(VncState *vs, int stream_id, MAX_MEM_LEVEL, strategy); if (err != Z_OK) { - fprintf(stderr, "VNC: error initializing zlib\n"); + error_report("VNC: error initializing zlib"); return -1; } @@ -865,7 +865,7 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, /* start encoding */ if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) { - fprintf(stderr, "VNC: error during tight compression\n"); + error_report("VNC: error during tight compression"); return -1; } diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c index 33e9df2f6a..437cfb1307 100644 --- a/ui/vnc-enc-zlib.c +++ b/ui/vnc-enc-zlib.c @@ -80,7 +80,7 @@ static int vnc_zlib_stop(VncState *vs) MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); if (err != Z_OK) { - fprintf(stderr, "VNC: error initializing zlib\n"); + error_report("VNC: error initializing zlib"); return -1; } @@ -109,7 +109,7 @@ static int vnc_zlib_stop(VncState *vs) // start encoding if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) { - fprintf(stderr, "VNC: error during zlib compression\n"); + error_report("VNC: error during zlib compression"); return -1; } diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c index fd63d4f688..a3af8a1c5d 100644 --- a/ui/vnc-enc-zrle.c +++ b/ui/vnc-enc-zrle.c @@ -85,7 +85,7 @@ static int zrle_compress_data(VncState *vs, int level) MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); if (err != Z_OK) { - fprintf(stderr, "VNC: error initializing zlib\n"); + error_report("VNC: error initializing zlib"); return -1; } @@ -104,7 +104,7 @@ static int zrle_compress_data(VncState *vs, int level) /* start encoding */ if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) { - fprintf(stderr, "VNC: error during zrle compression\n"); + error_report("VNC: error during zrle compression"); return -1; } diff --git a/ui/vnc.c b/ui/vnc.c index 9f8d5a1b1f..05fd3922a5 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -71,7 +71,7 @@ static void vnc_set_share_mode(VncState *vs, VncShareMode mode) [VNC_SHARE_MODE_EXCLUSIVE] = "exclusive", [VNC_SHARE_MODE_DISCONNECTED] = "disconnected", }; - fprintf(stderr, "%s/%p: %s -> %s\n", __func__, + error_report("%s/%p: %s -> %s", __func__, vs->ioc, mn[vs->share_mode], mn[mode]); #endif From patchwork Wed Nov 8 22:59:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836082 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="r7tG+QIS"; 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 3yXN5M1v7sz9s4q for ; Thu, 9 Nov 2017 10:37:59 +1100 (AEDT) Received: from localhost ([::1]:34476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZuv-0002rI-CT for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:37:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNP-0001Fa-ML for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNM-0003sW-HN for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:19 -0500 Received: from mail-sn1nam01on0048.outbound.protection.outlook.com ([104.47.32.48]:16414 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 1eCZNM-0003s8-8V for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:16 -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=r7tG+QIS6aS11aOOViO/3y3068jwKrBG+LE/RX3S9gtokPfqx1lxTYimZ7gsXRqsmtHqU5wqeBZQ/LPLfh34SjSUpT7UWspqCLR2+MiCyAAzCU8XlghR+bf+t1zkvvE1dP//FqsEzdl0ZLAfJ4/dK4fympr4erAWoZOFP0qCiT4= Received: from MWHPR02CA0053.namprd02.prod.outlook.com (10.164.133.42) by CY1PR02MB1335.namprd02.prod.outlook.com (10.161.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:03:12 +0000 Received: from BL2NAM02FT054.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by MWHPR02CA0053.outlook.office365.com (2603:10b6:301:60::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:03:12 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.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 BL2NAM02FT054.mail.protection.outlook.com (10.152.77.107) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03:11 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:37152 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZNG-0003zm-Tc; Wed, 08 Nov 2017 15:03:10 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZNG-0003Ga-QG; Wed, 08 Nov 2017 15:03:10 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N311Q010597; Wed, 8 Nov 2017 15:03:01 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN7-0003By-72; Wed, 08 Nov 2017 15:03:01 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:59:03 -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-23450.000 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)(81166006)(33646002)(9786002)(36386004)(356003)(478600001)(189998001)(5660300001)(106466001)(2351001)(106002)(2906002)(305945005)(39060400002)(63266004)(2950100002)(4326008)(6916009)(77096006)(8936002)(16586007)(81156014)(48376002)(50466002)(47776003)(54906003)(36756003)(575784001)(118296001)(76176999)(316002)(5003940100001)(8676002)(50986999)(50226002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1335; 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; BL2NAM02FT054; 1:MM8hmlyvMGhPjdoVyEQbv2DY/GC+8I0IGNOqrAuWyMs2oerRiEzMKYRP927S/mzG4QJSgy6kb7g6jIOaK48ckED5YJ/+Jv2hrmhpyjrpMCHMfuvyDF1HIAhu6dHH2j5t MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43ee47f5-2a20-4cff-b4c4-08d526fce29c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 3:eQQBhJh6G2b4wi4WaVxJKP7RvllXk/2uOrmBwkH6D0xzdfWQCr47e9hZSEoKunt/5/krUC2+GJ74kK9V/IRUvhOk00vOLxJISyXqjvwJ5EyG+On7kdHjfLU8UtfXg/vmzxHRA/zwFVyox8giO1AfI0s/9Puw8afFUIxlbCvaWbeWdEpvUAedRO7UOOhzhAUWBwnjwFhw+j9d2+vq0TwJ1QXIS+o4JgpB4JPyT1srnjzA1AVCfKgoka9KLYTPhnEC+PB37F5SUbC1zhe+iNJJlZheh54RbxI0Z+c/hqeVqt9zuzR1//hyY47VtuoZJn6vL3wTzkr8aXKF7AX6Drjqr62jy3rVyMk7k8p7pQ61GnI=; 25:Vrs7r5JfcM/YbrS8pizeAd9givM6RVJQ0e63ux+zB1f3rFYdtZCzzCiB5uuNX+CnEn4itQn8O2Qpkg0yujcw9gtlA0pxjRIQZ1vtueK4t1OePutViTT91Y0IGY1I5EgWAIZ/EIQyo8F1rZo7OAv/7bXbuvxwfVNZuVyzHIDZLvdlPWHwA46W5dih5GZ6MO6SxkqvFBDvw8vx3NgkIgDWKdOwSnq7ieoO8483W2CTI9gle0+YUmpuCJ1M+LrVongnd9W38qKiPXHlz/ZMrGkUvrCStDbasLs/R3Cshft6hHcttGyOVNjsr/Z9PCX1BvCitUH6yX/NWXUD/eWUXEIfxw== X-MS-TrafficTypeDiagnostic: CY1PR02MB1335: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 31:EvKCQTDI6JJoMiTrrdWJ7xHVTwv4EH0MnrSQm6QwXztWdi1fFOAS5pFTblWJwqe/bYDk4+yh6rdCbkJIp8JmTi5j8urpd4Nvn+J1qlroeenNZLK/NrHQxAP+R+jSol41RYce+0d6sZKpkSo1yKm2JGrHyFR+gEjCUE6QLLy56fPO01eI1uS+f4sVIvzZwVMIJ4vH76hZkJh92q6qgKHIIuiq08u5YTzkriSFKEKSy1Y=; 20:7EP/yd1yzeZ0Aap2RNX2Vx+HmC5EDqHJU0Z0jNsIL6zs71AURNRx/7XtONx5vqKcteXCRh48kfEc4FQCHcFfIbdwusGPBjHOM+0+2OEz6qEPYu9nKUPkDmmfxEsnUiYDMHGaXjJ6VJ+3pNaphUkfrWWSFEsq4ODTt9tcbEPZqvPeVJxaIwcsjrdoGyaHq8chv1BMKT8wO5RxHAr0NhXSqTkcAjbgWQz/sv7jjb4QhBRODqASeV09c7oeRFLLoEYwX+/XyIaRI7geXXJQC969+inTO7baVTawZMZXmUDb4yiiWlOiR+tCOizjqQDxJYq3EDk+LUsNRhA8NPsq95UP05rR8CHqFHliQkSvyev1lQunih9XTEGDNIy4X+/ZCZfDMxBkRCqw6aAg+i8mYlqm9K0LKCY/cvH537wP423krNYXdGtmGT+6JFhmwtn97KJZYGJetpefNLCdEczSuh7kgVxEaFP38FjxTtI4Ga/HndFRFjb2yyQD935ROIBQG2Ym X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1335; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 4:+FWBBGSx496TV8WtC7qtpkdmdxmN77RxSbzf0GN4W5Tis/3lLNJgOOjkQA+LTFki6q2FFx5pebP80JJV9khZmoM25BBfuTM4QLgvvoqtVHwO7SZ2GmyEVYmQqeY2pGjCCuK7BYhFX0XqRcI1KzGsOv6HeFIvXDju+GtXtOIAvHBikU4iWym+9Ooh0m2ockzWWuLuWvg2TGvzzHFNL3xunRcbhYc8egtDCIhPZPMCOAB3necbqrZ5u875PofFdtWFI3RtXMib/w1FGHH5JSysWCxG/okJfvLVOF0qg4UamhZzTkaJKnpfZ4JS2dWZ6amgTgq7mIA8H6j5AcUhCcPPag== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1335; 23:6sNme4PskvLcP2ju8YqA7l+i4i6dRyRf6ccs0arDs?= Z46/67WmYCMgYEjfe2T2oYyGqWInEGxdgNwiUZKXNM3P0cH/ltDFvigB9dFi+I8VIXiWFxj0Lwh2EW9neL8LwsRbe/uoQVpmCdEmpf4URwYMwj9QSbYdASbmvu6lzF1SrP2VPSN0Dv6keBA8DnHa20/Sz7PGV4QLQ+FvYt+40r16lHhmetV/ytFudTf6nJJAZmc4WkWWNtri7V87eqwZamvV0SJZndtbQWT22UVWsNCtXPpNKaABms02pQiPUeCRWuD6/8eo0rzNCTW6XrgrI5qxlAWarnn0yB/vVcVZx7NywMtElHwcwDm44Ruqrq51Q6tuiXk5Yv85jE4M2toj+oEL6pCU6EKPFe5dG1jatnEZ/EZntbW5TYWXK9DZU7LFWmk5EygnMzWj42Pc4tgJ/3w8QyotYJ8gp2CXOoXX2eNmjTlyVpdfRWI5Hl1gvkjojPn+a/jpU3Lg2dzFkkqNEmj7BN4LETI2XnJ7tQkaWlkGhfdpHwO9pJj+ydOngGq+yourkF2SnSnWtaAL0gn/C4vMqtONsIOv68nlWgaX4DT4NUmwrpdJD6WNWxtsqk72rtKMO4Qwrncp2/NAaKEvQgcDx/k2UstYg490Xz0XLjQB2vJYWrdD/ml+zQNL+ovuMR5V4u4Nr/2gD2r1fn3PvlaaRVAjV6gA2P9A70SknJC8GZDk2OYRLp81C/bTgVnrGo/jKCPDOqBbiQ0DfZ+wwa3vUDNlOj2rzdDESSC1fQ9NMiFo21otTtjtzp/mck3ft4taOsBSpSopIuMFNR08EP2SVQe455AghQxSuDgzITdluaFkuSJWOsjjDp+RS5c8Xv65Dtke9qzhBr1vQXm6ljbC6sVMddMttD1QBYglceuoEFrNHGA/RZw1FM2B4fsThmBTBKwwQp1D/1zhjckRtu75rHVoiH2SV29zYo5ghVYiGc91fEkO9Y8Ha3acT/vUGvzRAJKGvpatDvuROT7UE7VN7eVfgDtVfNwxxVkSamvNAU0mQ/d6m4rOSQ+5v0L6NJIVvBfaTrccVlta4cJ/tVdNA5QrHJjEO4BpKab7yqfRQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 6:1SCW+Rc35aiWznj+EVpOuar+6mBbF8d3BNair0r4MXxiog+wszecKXIRqbKKajFgYdgzVtrZ12+I12xcHFutWl7ejve2B/WklCneWtHVI3KNhkaYmYXMFJRDen9vn3rlRMBoBOr9s/IVXdAGawRmlWaKFHZkIJg5iVQ1kylO+Ym2eMzPKt0yvCXp7bgPb+FDEts2tdHmwCwPc2sJpu6SfxYSW0vMjVG4eK+B7bLwwIEt08zhRq0Mqdsc/LXBetLbOjHhQMD7tA+/lN/OIlhCo/bnRC+Yrs+kvbd0ipwUmjPHeGk27tMuMqOZ6smJkYGdYPS04GG4B/gv4sAy1E7q05CGGDHOeDLWiWYIInydl2c=; 5:Nih0bTY8VOMgIRkWbruQLK8+hn36hZgBD8v3vmhrmss+NLuZNHoG+pMU7M2Lt/MxR1Aw/KUeXLpAfZ8buSFys4PWEnW4W+Txw2QolGRHatoKPdtNl/80R0TyqiDoLzcSW/3GWG5re+7mmX2QmMomAGTxTWEVD9LueG5PcnCr3yI=; 24:ftSb2LCCO+6/ThqcwBZtGGsGqJrcZ/pxo3wIVH9dQPNPioBWZI92T7M6l1A3diykF5I+XF96SzRYiOh3uVfrr5RnFnnroXRjkrJlfhiql6I=; 7:aheG0A2tkhGWdw148wgtQ8xXduBKtqoTTWZiQCDMJr1DK72L/z3KtZnpZp+TwngE/hW5FxkP0wjggVU1yPFOhg7MVad4LFDWgPDH/4KPDDxQ5NyfGTFS3SZnX500PZisyqqVNlYiKfV0V4NE/p3ckc2C3q+lgiVGddtETfSKXzvxR0gQMzLi01P+xJXJSverqAr+o/MgIchGZ30LFK1D24rIoppdWn1aHC4yiQYWYLeuksv7T0/fWpWQijM8g5T4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:11.5359 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43ee47f5-2a20-4cff-b4c4-08d526fce29c 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: CY1PR02MB1335 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.48 Subject: [Qemu-devel] [PATCH v4 44/45] 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 Wed Nov 8 22:59:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836083 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="zdRwjTXR"; 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 3yXN5c3lNXz9s4q for ; Thu, 9 Nov 2017 10:38:12 +1100 (AEDT) Received: from localhost ([::1]:34477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZv8-0002zX-KU for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:38:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNO-0001E6-JB for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNL-0003s4-Er for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:18 -0500 Received: from mail-by2nam01on0068.outbound.protection.outlook.com ([104.47.34.68]:18704 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 1eCZNL-0003ro-1r for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03: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=VB3PqBubYdBgHtnb6dS/uOSJJ+VmvYPGj5XXWWI7sJE=; b=zdRwjTXR+VoZQLSKfCfPfI1DBvkYb6Lz0OHZKjWnhgeHADNUuy/OVa+ARs1GNWwIXHbtd95wdO2/wxbo04rC/vRV2eGhSokPlVUKWq+4JIhSFvPqFEs+8UuMZ7AbQTsFWnrc29ZAvXQ+ssgM0BpfPKMmTK8oV0jKFl5Vfe+T9Ew= Received: from BLUPR0201CA0023.namprd02.prod.outlook.com (10.163.116.33) 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; Wed, 8 Nov 2017 23:03:12 +0000 Received: from CY1NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by BLUPR0201CA0023.outlook.office365.com (2a01:111:e400:52e7::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; Wed, 8 Nov 2017 23:03:12 +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 CY1NAM02FT027.mail.protection.outlook.com (10.152.75.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03:11 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:37149 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZNG-0003zh-SH; Wed, 08 Nov 2017 15:03:10 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZNG-0003Ga-Ob; Wed, 08 Nov 2017 15:03: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 vA8N34j5010749; Wed, 8 Nov 2017 15:03:04 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZNA-0003Fd-8X; Wed, 08 Nov 2017 15:03:04 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:59:06 -0800 Message-ID: <5d7b1c5963bacda9bbfb3a31a8fe0e3cbd9548fb.1510181732.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-23450.000 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)(50466002)(189998001)(39060400002)(54906003)(16586007)(47776003)(478600001)(5003940100001)(36386004)(48376002)(316002)(77096006)(50986999)(9786002)(356003)(6916009)(2950100002)(118296001)(76176999)(4326008)(106002)(50226002)(305945005)(5660300001)(106466001)(81166006)(8936002)(2351001)(8676002)(63266004)(2906002)(81156014)(33646002)(36756003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3384; 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; CY1NAM02FT027; 1:nwknalFg7/YOuUxKXaNJEyYnkp+51jiSKroj3tWwXWkHdpGOcUdQqTkGJj/FwfVSl7uYB9GJg0+oNrmmXztYphnzQTl2xeo1H9QMUL1rWYQYtE3rvomsHnwzXpQonBVh MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65101606-2f65-4621-7621-08d526fce28d 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:utmLEAfJxnKV9Kb4Ml2jUQTjbj8L53BlA3KWHD/d6Ax/SBcHXiaI3uZh56kv7iXg5Lx2NYMqdNW9WjShD/bscqWnho/eWsJIdrrVrRPAB/q7l72TMJK/DquE2+ZBcAypokDN4w+JJ3tQWabR1xJlHUIO8IFq8S3iV+MFnFrCy2JbPbr8CnVTkQDHdWuUnaK7uARC9xowqeSc7ftZk7WBHFbluTjPn3nsUIJ48CoQInKCAYlF+2JCBTmZcl1KRhB3sG/Z9Axy7SGMXWritSIocjvd6KSSRLWrW4R373ddp2ECVaYDhEU9Ear+OoIDGbPiAX/lW8Mhvmh/S9LH3ubAiiULeu/TcxfKnmKg1oMlTuU=; 25:11lsoIjL8JlfJYCedQwztOM7Hib0pjjrWawJtEKFTv4YJsa0myvFI0pOovl/ve8uCvPhXxdQWd48G17YL0F5WVSz3TvtI4u2BQ9fImgTAKlVG98B3QYpoxn/FMFo/iNDPIsnQFZKZJ+EzYzCRhEVTU9omREcsQJUZjnG4X7yAvDvxdmU4iO369nUQpycG1ZAc8Gt3uzm+mHyx3O7kQ2/gwHPlcqeW6O/x2mmdCZeHO3dPi1o+zYatiipM03EOum1y5BQ3ztm242XNkvEKF90X8jGHzII6+Behxj4shXCXMTTrVo+uW2OMlqxqowv+tirJI3fRWydylEsCo5i4wp+BA== X-MS-TrafficTypeDiagnostic: CY4PR02MB3384: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 31:lOpqL5+zvb4ipgISuO+ePgHX+7XyjDHmsucaWZI2boqvKefTiLF2EGi0tt2gQ00QOSKTzOCK2kxXMKv865OFkT+XuRUlfQnY6czokgwDDBex3QwiVCo/V5dxqxkzc2h3M2SSRHDHJA1UvIKnwaWDaQlwrJ7Tm+CUC9YVwb3YnK8iwjvy1RRfMhDcoMEEiCyuo9yIKG3Qn0yOK+FK/7F/Z6wr153jZcyIlvz2UsC2bO0=; 20:nrK0AB1HORlbjgeKUjtj7xR8UNEO6i1ejAZNLtyrkXgyHxo3kHdnNjM47TSrtNu520gXm5Yc/Pqsvm1VZho0UUDTCgNIHa4MRDuqOO0YciFDgFz7HASB5XmDOeNVDs6sSaRKMaPwRB9vJ+sGUp4JLzpJrah0kQJdM4jnFCzFbm3y6Q+InyqPnX5XhvKC28ORcw8cnBWwSjEFy1oAxV49w9yA/QNtjbmyvHCRJ4dUoYUAIQ78LeXtHeadcnSRRnNFppU+2pm86AAD6oNB3TxPxbWxcy/UrybMW+Cn3bv5ER8uTlQB83FWCT6S+GYBkelGaIiFnajbDjuJht70QKDnGTTwe35m+DFcogVM3y39V6JR9b+SCz5robhaOPrTDQwQ5k9hUzPBQq6lZ2QK3XDChDYkVMEynlAw1wYNOjosozBsFV+VhdV7n96NNNXVop/5xiMlJwIuVE6kpMCZJv87BwHjpqXZC6lmCbbVJW5OtlrBfTqC5fxwz+C+5shxcTDU X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3231021)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(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:ZHXO2LL23qnTWMoDwivAraIg2RLDM3txi7miTq2svE5nBv+a7usJSFBVg0jZ8M27xwi7RO2qR5GJWfnX52iyStgmO32228KRwvkxUX/5mUk1G5FoOdpmuZle5DYpLAVJd+C4fVbc8grwlgLpXRHC5cv/Z8icJtEplGKjulY2gua/OCZPW+Gf9BK5EecAAhoZR2qBO4pzBcLg9PP8PgNpHwimWQHWuvQ4Z320lSRS+jhsgCM5/R9h51tUR56qVePx8pgT0ZhKL/jjtmcdmmS010lINAKOhh3bIRzmGKNrdPGqh5OXeRnd+CS/4I1lBOrb X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3384; 23:V1NChnQBkezkE8AfXrVJQfzmL/yzgb4ALQjnlDPtt?= MlyuyBx9/IYXytt0K5QZcvH+N5UCN+qP+W/i7otCw/V/GmQwGDL1SlCxgeidR+j7Q5LMhtcenH6Fs9IKRUaR4QKIFbAwb9KfK4W+oAx3B+/ROHhbxm7SxLiF6KEX//lQX00Q2oljsmYN+CN4GyTT8BR7VEPxNpqaaiBxVZmIw87y9QzWFMK7B5lK9T/7sm8DCcGxHXUstaZBgLsJT2Sly8noDobBCWS1lA4/GrH2VqeX4vMFe5OInM7mCKG9W+vgGl70bwiH4qxSL5gaZAQa8BGP8sH6eZuQV4TIBYrB80+ylNA2aqzuVxqFCnz6kcTAfpkHoz6d4q2uf7Zvkh15blgrHPkQKt2ZdccxSb0cihWxtQSHN1aNCVoC1t3wF3CuFg+tT7DNdQPDSpnSSQbuA70ES7LhkXFNacek+XTpU8GlqMzqYHSMNVDLc/fIyrpDZNOgEfB+jWf+PwCVlMNYogBc3gHQjZeWK8uwpdeSwPBbpmwfTGqFDtoZSthztg4EpDWl13NAHbU9kfgOy/t9FF9/1s7NR6tOeSHSBEKVv49F80ND5KUmzeioelxk6QgtCNZhansQHaQWK89UmqbjU8mcKCQ/KhzxlIcQq7lPFR61m1OFFGjuol4AuAIYCw9yTfl0bdvAW1UTI3Oks2i9G7G8kTxmqFIIbXdhDFWn1/VrUxQV8lZBN+333iKkgayqhF5yNTHIxBRbT5wWMOPqdCUNI7U6WTk32HGsNo9qU9abcKiPUnp1QGvNoevCOJLV/lC4rodCg9DDkmp+i1WXtdLS8L5IZ3C1TIK2IwGjqWFW3bbT9rHAXRWO9xUf65fVQb/jSZpGHY7Hr+kIJ+xOhOQsaobrPCZ0SeJ0NDg64/33MD3WZLGIjikt54GE68mN4Lgcm0UVkTnHB7ZceKlqAf+0QfpDNpq+qPWgQZlv4UBN8R1pbFnYoa5VmtGsCYTUyhqbsjBnF5FS8yCv6r5yC4iulEG1WnT4/sfjd+TvV9xJmU8JRjvPFzjAi6JX7AoIjw= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3384; 6:T/CB7cIjdCwnpHjoNEHgEV+xukjZUqWFHI+HCiYRIM/jIwLwt0CXa0vIfaESETD7E+lcUxV6CwYjTzBz/4PUGRDIcivorkdK0rcmbUP6pcdT6zLe2sKkDCmrArJkBNbcECU0UEjeJaTI+POAalUW+hXephNMWTIEnUmmPjzmyflEUhQ46NtNRsbCetRBNuCgYfaB2G11a72HVHSeScLky/znr0cbSKdFZWb87JOlj+2Lkn2KX5Z55o/QXo5O2s2rXf9PPgq1QEmCUsUv9LxnN78u2RRFagLm/ODjmWfLH/52VzanWsWNdA5QZCf8pskOa71noy04LBWENvG7qi7NBy5AQrLbavqn+odbBAixIZU=; 5:eI/j1UM1M048mP5cdWdGjDM/YLv46SjDrCAGH+Ougup6LAxyf+6t1Y6s3OtBTYg5btuMGW0vxmMXKzQuKQJvXY43b7wBi1PGyepl9fZlPa/FerdnwHThmTMvFftejH53PTIr6kZa1pRn4hpEwhU/g329K0dRLDQxQYS6KLHylAc=; 24:XXnUtazSl3ZXfpXsJX8XdKdeufuM1MIVjBd+8dtElP1qnU0Rl1/3Llc+urG+VHeKAry/fhy0x/NPJ42XqVRAUQrJnSuWY4sjHzz0TqE2dnE=; 7:pHbVdzQJsICQZcQ/Z9Z6jI0G+4U/jK+hkiK6ej8PCqN1zTGIGUlhtQJjeqq4pFIReQB99b2O3Y39TzIU3GhYGlIO6SG/8z4kQZddqfR6tPyQzOywOIylJCo+++wNqtbs1E/Z4n0zCfAaPe7qeRS4Ee0LA4Gkg3CZDleRZb0zL3yv+qmJU1fYkCsPTEb7VQ9519BD/Bx3ApgI5HuSI6swsybN0yl2t44KPOMmSlLnQMvlGilQTmSSHX02Wo5fT2j4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:11.4360 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65101606-2f65-4621-7621-08d526fce28d 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.34.68 Subject: [Qemu-devel] [PATCH v4 45/45] 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; }