From patchwork Mon Sep 11 19:53: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: 812571 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="2hfXBSC0"; 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 3xrdxy4t06z9s0Z for ; Tue, 12 Sep 2017 05:57:42 +1000 (AEST) Received: from localhost ([::1]:60218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drUpw-0006Lb-Ew for incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 15:57:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drUpE-0006JU-4c for qemu-devel@nongnu.org; Mon, 11 Sep 2017 15:56:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drUpA-0002KR-7u for qemu-devel@nongnu.org; Mon, 11 Sep 2017 15:56:56 -0400 Received: from mail-co1nam03on0045.outbound.protection.outlook.com ([104.47.40.45]:30592 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 1drUp9-0002Je-ST for qemu-devel@nongnu.org; Mon, 11 Sep 2017 15:56:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QUOx+lPm6gWRPErNXoEL9Li8pfRmyOVoTF5jWaLXaFo=; b=2hfXBSC0uWgLHyCeFwvfWZivPt7q9SkfDHXw7LyS5miV0NysqRlp8IwkEaTvdG6T+qQwnyvoeW9VpLyJW7lzBlzZtWTqaunCuXghLu/1C2+s5uHbUR2K/u7KV/nkC8Mx1+BUlRuaCW03MjqiboNbsj2OdjzycearOBaW0e/0Yew= Received: from SN4PR0201CA0048.namprd02.prod.outlook.com (10.162.76.34) by BLUPR0201MB1922.namprd02.prod.outlook.com (10.162.239.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Mon, 11 Sep 2017 19:56:48 +0000 Received: from BL2NAM02FT046.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) 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_P256) id 15.20.56.8 via Frontend Transport; Mon, 11 Sep 2017 19:56:48 +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 BL2NAM02FT046.mail.protection.outlook.com (10.152.76.118) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Mon, 11 Sep 2017 19:56:48 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45362 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1drUp5-0001Q5-HW; Mon, 11 Sep 2017 12:56:47 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1drUp5-00005y-EM; Mon, 11 Sep 2017 12:56:47 -0700 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 v8BJueNd017543; Mon, 11 Sep 2017 12:56:40 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1drUoy-00005C-Da; Mon, 11 Sep 2017 12:56:40 -0700 From: Alistair Francis To: Date: Mon, 11 Sep 2017 12:53:05 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23322.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(5820100001)(305945005)(47776003)(106466001)(2351001)(36386004)(36756003)(478600001)(189998001)(6916009)(2906002)(2870700001)(2950100002)(50226002)(50466002)(5660300001)(77096006)(110136004)(39060400002)(50986999)(76176999)(9786002)(6666003)(4326008)(33646002)(356003)(63266004)(8676002)(81156014)(54906002)(81166006)(8936002)(118296001)(23676002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0201MB1922; 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; BL2NAM02FT046; 1:ZrcXNR2qRK3tvOShiZhtrgsBiEvNYUvGv9M0K5WrmyjU8b0LwASTCMxwjCO+VOpni0OuVU8VnKSaAHbfJ0VEOBZqFGqr/SpNcF7BuiSjz5wpuMGYELWo4PNr9QijvlpU X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 885e14ad-a219-45ff-ce66-08d4f94f3ccf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0201MB1922; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 3:jL51oCHIgAslqbw44cAjXeDJ5SYOl/5Fr+u/RTjrtH49m4X07NNex2uuZ8Q+iv7XYMryzyboqwBe4WfL2WHnbdjMuLizgqvczP3r7Ci1ta9ho61kvyMLeneSaob/12ZL+7DeiisVuTxbg1ARGKMWnDj9CRlQ4VgqKFL09llx1movVsKUtVFC+bbY8Rc4lv29Srtz41CmhkgUrRlLY8KQvQ+4CiY51LHNtqqWz+1LXDJpPQH2Yqhrv327JftxiY4326nYrnG6xBuI0l1h87K+KtY5ayDwKa4it6bOeVwPGZwRZ4ArZiDu+sIh6xJyf3nL27zoW5CwhaqIHaaBsOzhk8PsKvvgkWaBHmZN2+08rt8=; 25:BkuRc7vogPB5y4FGwJHai7oIo0EwtmNAqQeb6xgxxJgVTSJflYms7MaUkAct/2bMKEpYwSdJ+bxNbwrcdNkZZDX6DKJt8grbvxCig3FnwoPjgTaZgS2NvzTBx1XHmDfEaXb52nfEaUmK0pqoyzwlZoQyMXllQ5V3o5XoEzI3YKLjbl0tmxu8K6H7ml4wKIUHycWMTkZGliqJQuoXERcoK7mCtRSwjF65bFq2y+SZI0of8u6Uw1zrY99VXQQFLJEYAqDPJv4yBbyX+JC5YxYuWQz5Yk0h8CvFG77TB0lGUDSIlZr4gIvCtdJ9/v4kFvISMlVmqmZToPhabOAIEGYurg== X-MS-TrafficTypeDiagnostic: BLUPR0201MB1922: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 31:wpRHBaQgoQHmsyssenWbhO1YCJZZAyAgyL3HVTW8I+Pu7bfRkrJYVt7tAmLfouvmkW6T9JR/BnhRO5vyWd9giAKFMxPYFUSullE/0y0IjcvmO/BJKqRzrZdQ3b2tQXy+sV7LdjK8lGQ2q6NPni2k6cEzLYYkiHz5pJ+3uBx8tzm1trB7m2cRQZ+H7tj2/sRL2zY/+Dtp3FmnrShV1Pa0BT9myAi2fOTA/snjM5izxs4=; 20:GRvq/M+YUH5PYQF0bjqYdkqjSHGLAW/xtt/hGHruzF9sHH5+eH2xMMNJd3n8TJBh0zognuYdn1CRPR9uYLbdMZy0XfuGUcKu4h+UKsAXvUjIHXfZk+eUKEnusdX+fflAHKX08nN2Yu58cn6CSwIOJqsuBP6ztf2WxQBJq1QfEFicIpCfhGdd+7+o1FjX/0Pj6x4Z+SRbZRkFcrO0WRt3nP1ffHTYQWI+ml0lWwwP/n6jNIuC9lBP6wemyfGbQMStZ9lQftLu24rGUDVmh1t1rp6JMUIc+Efa0PkeghJCeFCSgGFcxMaQ9/uIUWoFzkTWF4KJqwO4P7hrXX3kwALE+xVkfGIrvO11JyY7u/E+U9afiQDp0lx4xGMJBLNfO+GYcb+twV079zk/0H4isYnUFR7DYHWov4tbQK+O4Y6G0zWAq0XWlkPkbyfNtwEgfimM5Bt0e8LN6mTLsw9MSeGGccyFBWtVp2fm+EcEG3PUcuPZtXCSparzUYGy/2V5TJA6 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)(3002001)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0201MB1922; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0201MB1922; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 4:kjZqJFQHv4IEBK5SaNbW15XSnd+P5z6FnkV+YYs9VTzXl56M9Tv+KEJRlllvKt312KalCKhZrzihWP9neQXUHtGuDQMBDKxx3O4Kdf9ueUp78v9d7JBHG8dy2Qtp9BZBbYiBdaBqbG0YLxxTPP12RgtWGYnO6fZ1I3N7aJhGHrb9nZ7QZXiCNbZVZAr6RqGR99r0ws7u9LWBXX3POaaOscExfGsQftRqGfK4ULXvZPqyAcPaCHqI8OXEN+jvkADkV1qEjF4/FmK4OGrVpgvrH9eqJ4WuPhYle8tW3M+VT3E= X-Forefront-PRVS: 04270EF89C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0201MB1922; 23:74t2zGhed/vdbvOPRnrzCvk8UAeF49V7rHLvKDm?= s6F3Rnnbe+4g6dryypnMJkUmFjoAH6welduemXluGb6jPT2YnYTlPLPD9bdhajWSx9vcDjSvkrOxkGSNhg8sIvqfZoQ4sPW6+RP6StQvtNYEmTkeTeOlepiSHdGjMXYv2rei8tTydsuMxQ6iNkkLXSOv2rFKSRCsgP7/oSsRNVGypljWJMNJ8esx21xppo5yY7a/DSXDhslIy8atU/Qh2bZW/OloTVj1++LieUyVfna9+krtNv57aJmtBJ1mquh6HNwfX0+BARwEHU82byu32NjOeiulxrpfvFBlOmj1WStsIp9qxs7ocbD/ecrMW/5hKUrjOpVsfs+lGsoF4Ubfhs9u/15ITRCIod18uiaUzVcz0uTqYpNrnrOgOnx3LOVdZinB7tgpzUGw+Fj7p2nLY7r5kw9vy6WoBMRq1XCqDHFm10DXaMHPeuyylos64htvgn48PoyLsQqI5ZkiQ27LgXWBQRa6OJHgnD5WA7YE1r7XzW5uNsXScjzpaaCVuE1HHjEawmtlsQ6WtJmOc9WyORkUX5pM+Y69ytMNp38lUrSfcxyIiOvpAfWT23TgQQAGBtMcBz7SxnGRL8D3m1b7uEdB4s+Akt0uv9yrO2yFa85N45cLATnSZSLC1oiMs2t8CcnH8Oem9JbeavOfpH7/zOFBqIpIeYS+GokHcyBh4vuYoe72fz4/TK5mCQz0PvhxgtxJ6JsfEEVHHiVwLvnV0X0tmR8DLLCyLiNjE+dRf5a/UYR4nV1gsJ8yQf+oeK1shhG4MCZtd/80rFF7dl/3qHXXy+hyVDlhfNknlkm7AVNeTOKJ3ek/gF8/N5k9eC8qXn+gdVxeIDCTri645MWIFlIvVp0wveyDIihFP46GYWbp0qCARY2w59MOhvqY+5pNumMeh4r5x+JRwVCA67bNh4IOA3yUj/SO9wXKIi7SajaDFndyw2zY/nY66ugG5OfWjdMHqBl3KitnVZqzLY7uUSESz+RpOEo61JszS8UYOePaCZA== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 6:R6fmn/aWEQlXMF3W4bdFoTuvobyWYRcnysnKjUrMyMxSSwJOQRj4oXS9eW8sZ56WJSkvtN7KkXPlksiQSeUzj0JKXHMrZ6NYHRAoEXMalJfstOVmV5gSHQZfdrbie6M5RT+HNMJMqpfDrX1VIB7L5zaLuYEelCx1kpLLRh4vMhMOlMUODxCm/qgzzKs4qFK6xxchN+j+e5SQd98OtFI7yiWB3HSz/GwgXcw1Kmu6yxm5upmRc1D5oG1XFQ+vBjud8eoMRaeTBfI+vEQIZ6M+Y49N4OK4hWewSN8DsnkZtBcoMxxzf6kkhVngsgC3K9gjLXhoWTmcSp+unnK8pJbxqQ==; 5:eXaxuykK4hgfZmnzFnxyS5drZR3JNlmINlqESPWpU2a4wbiR5Tci8RYRxRD4fNkiOLwHDMKnFJ5e6WmaAMx45oVpW+OZLUxL5c0Q7+jb9z1MCx3zywQkJqIQzIJkkkiPLu2SZfmKHi+TiUIdW9gouw==; 24:iTKoWvMmwA4xLxrE87zIYP4lakjM4du6TEoJogc1d3iIFuVoUzrifuUJ5miwsD7Ids3M5t6A+fjBEvexoYA6dh30cBwR/CXmr5o8CAwn2es=; 7:oR/e4e6DBcFp2fq8jEejZiskK3ucJweaL9k1OFBo+bvAGp1456K7TKcUFo7CZr7Sxj2roKahQXV9BoZ1u3rz2+ff4oHDPcBVUdUZ1OyhFAAuToCPi/QIi84UBEl8LxEbpEYQuhsmxifnYDeY1CuHpCh6ClF4/R4RIQT8Ycf+g67agsF3U4+mKBxJ9KMYUw4G+S1gekQrjmvG0BSpOnaq3YCDnQG9QJ2JKi3FTYoVk/s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2017 19:56:48.2191 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0201MB1922 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.45 Subject: [Qemu-devel] [PATCH v4 8/8] Convert remaining single line fprintf() to warn_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, pbonzini@redhat.com, armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Convert any remaining uses of fprintf(stderr, "warning:"... to use warn_report() instead. This helps standardise on a single method of printing warnings to the user. All of the warnings were changed using this command: find ./* -type f -exec sed -i 's|fprintf(.*".*warning[,:] |warn_report("|Ig' {} + The #include line and the change to the test Makefile were manually updated to allow the code to compile. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster --- This pattern matches any case of fprintf(stderr, "warning:"... and is the most open pattern match in the series. tests/Makefile.include | 2 +- util/cutils.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 3d6726e95c..2647aaaa65 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -593,7 +593,7 @@ tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(test-crypto-obj-y) tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o migration/page_cache.o $(test-util-obj-y) -tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o +tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o $(test-util-obj-y) tests/test-int128$(EXESUF): tests/test-int128.o tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y) diff --git a/util/cutils.c b/util/cutils.c index 1534682083..b33ede83d1 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -30,6 +30,7 @@ #include "qemu/iov.h" #include "net/net.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" void strpadcpy(char *buf, int buf_size, const char *str, char pad) { @@ -601,7 +602,7 @@ int parse_debug_env(const char *name, int max, int initial) return initial; } if (debug < 0 || debug > max || errno != 0) { - fprintf(stderr, "warning: %s not in [0, %d]", name, max); + warn_report("%s not in [0, %d]", name, max); return initial; } return debug;