From nobody Sun May 5 04:21:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503082373974629.2062439975283; Fri, 18 Aug 2017 11:52:53 -0700 (PDT) Received: from localhost ([::1]:50026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dimO4-0005nS-Gu for importer@patchew.org; Fri, 18 Aug 2017 14:52:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dimMW-0004dQ-9Z for qemu-devel@nongnu.org; Fri, 18 Aug 2017 14:51:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dimMT-0002hd-5i for qemu-devel@nongnu.org; Fri, 18 Aug 2017 14:51:16 -0400 Received: from mail-by2nam03on0065.outbound.protection.outlook.com ([104.47.42.65]:38336 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 1dimMS-0002gw-Rk for qemu-devel@nongnu.org; Fri, 18 Aug 2017 14:51:13 -0400 Received: from MWHPR02CA0001.namprd02.prod.outlook.com (10.168.209.139) by BN6PR02MB2466.namprd02.prod.outlook.com (10.173.141.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Fri, 18 Aug 2017 18:51:10 +0000 Received: from CY1NAM02FT017.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by MWHPR02CA0001.outlook.office365.com (2603:10b6:300:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Fri, 18 Aug 2017 18:51:09 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT017.mail.protection.outlook.com (10.152.75.181) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Fri, 18 Aug 2017 18:51:08 +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 1dimML-0006IO-6X; Fri, 18 Aug 2017 11:51:05 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dimML-0008Af-34; Fri, 18 Aug 2017 11:51:05 -0700 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v7IIowjB015315; Fri, 18 Aug 2017 11:50:58 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dimME-00088u-7q; Fri, 18 Aug 2017 11:50:58 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6DyuO1DVQyUvXzhY+beJnA5tk4C5aacg9cSANKC/40w=; b=1ypf9uE3zWl6xAuCPfXSnWnnFzwwlJKA/m7y3vkn6jm0EcfoUZCeNggFyNiprsbqvvGWUHXEwynR1Nm8znMLEGIFXv6C0AL9krD7w4RnvOuLQi9KpSXDPi+QMEMG3OaquXi32XrTX0uVGk8hQgismzy3Uhr/Lt03V8D7WKISJAs= 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 (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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; From: Alistair Francis To: , Date: Fri, 18 Aug 2017 11:47:32 -0700 Message-ID: <54e6458745493d10901964624479a7d9a872f481.1503077821.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23266.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(189002)(199003)(63266004)(106466001)(81166006)(478600001)(36756003)(81156014)(8676002)(2950100002)(54906002)(48376002)(39060400002)(77096006)(33646002)(6666003)(50466002)(5003940100001)(50986999)(5660300001)(76176999)(50226002)(47776003)(118296001)(189998001)(8936002)(356003)(2906002)(305945005)(4326008)(626005)(36386004)(9786002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB2466; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT017; 1:3Dcze/MS4plI6XgFiBPl6+FLBTnwpBuzuvxHUg2lhgMoyWGiFPJl+alqV5bPYvvyBKTQ9rpU7OPcBwaCpwvAO+cPMEN82+tUePMud4r3zATdnpo1A3hwl/jm9/XRgxju MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f1c8b6ba-7e39-4992-3ae7-08d4e66a171c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN6PR02MB2466; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2466; 3:/l+DChgJi3s74l4munBoZhyi15qRXTjewRj+lKyZ9eXVW6M7Jj9rdqloz7mw8CjDknU2OzTMsSrZ/BUlT4LmNN8u3KbELuJV4C/gyusetdCjPoLyVhHOnE7A0j9VWNGNggwHVrGPmFfIhgfrWsVay3KB+3yLNekdAtsWk6Q1fK2hgAhWT4zyH06/ajldq4+fued/iYH6kH6cnxMtLkNE4Lbs6SeQCGoEMvYjYg0e92qwJJ0quf++tXSeg3LNlVxWYyyzXtZVf975BXJU6Z4hyTTDySEJm1+TTOSxCCz1Bjk3OeXiwWrcj8W5qQQuHUqs5qXYmZeIgWc0xmq/jzes1EXSLIJWdrzKEQPTPHmUzmM=; 25:Jv0I+1LcvXMcGxFjres28cX11YQy2tUmtZoRnPTHzU1WDyg41O35i0rHi8rXHxjMsFLYxMHO5IBSGpciRhb/L19tdRK9PkqH06PF8m8y2YOxha5ctm59g3WNkY8Xa/BuaT9jYSO3OBIVLcLXEmUw04AZxBAKDKtrIfpKibui01zAdhO1604ZlXuwPvf8WQemHbYXTameHtt6L2dpmyksVvzsb7ohB9aT77FeJx/6Fcv5GXLTViYnVlZ6n9NP1OsUmDsVQ3YqKQ28jDaMR8IO9rptLxvbMLdPeeLiqA7OOkC4ml0wUzX9AmVcged/jpeBDUCy4yzQJ2IfUuo/OGkO8Q== X-MS-TrafficTypeDiagnostic: BN6PR02MB2466: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2466; 31:tAd9bHMSALfDY/1nk9rzai2rhc+IdbgicLKYg7kNa6ZMFRPULWYDARhhjdugzpbID3lrx/mJPHZ6HoFo24NxNXoX+kOryqDtu8EIpUYh1WxaE9D6xLpFDQHeAur8c6oCXr1l7KDG3MglmzPJbEXp36QmMw8pKbqorc0S2JF6YR1SnlSuE58ts4poQzsiCutl91bklbN+e0SGi4cbP3gK+CTW4yXtrKartVnzhGPu7qU=; 20:vzslagdo4xVfKpK1NO/HkZpxaRniGDCoH4pXJVXCjBfQRW+a0/qS15mO6tJvJ4QHeetlAijPAKapMi+qJAFOrQcY36FjhdUYEZ0Zkds6FNuHZ9Nqql/HCQJ+38qjfFIvwIIaIBpN8pLP1qP0WcFpLJuyVRKmyRa53qN06ipxuTqUSyOc7aKU6QEqa0/+E+SNwA0Mm2DeP9tpOoYBS6yMn2nSNqE48WrnyxSAxxMGEhf6XZdFB1GIaTEOKozwymZlpWSubV7Rj7cBL0M6wvwAT7X/a51oVqmsxRINHDQ6CkuOb6mLJR1XGKFmRekKkU6D1N5pU07+DDr3P7clzV/gObE4BWJmirVVSdycCs9kcXxdifI1d8YeMjKtLZ2NQldA8ckg9br/OusE+cPciFjM79cqmtenOzJ9YuiucE68ZshqoGm2/sjb3z3mBua71aiU7AZ2mOh8G4tDxlOU1Yvee0CMz7oxkdqny1FibJ/Aeb9g2Uv6CxYXPIqDBn7OOUAM 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)(601004)(2401047)(13018025)(8121501046)(13016025)(5005006)(100000703101)(100105400095)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB2466; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB2466; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2466; 4:dFMHi5g5wrjgg0B7TiwjCOpzQCPIV0aE2bLJGxYDejU/xg1PGV3CEOt+FQofDDD4bcWlw5jhISqBct9XxRmqoL5osEz3xCaZYYYmvu9ltfjZ53/60XjS6M163F2mfIJsSZkelNBEzfcdL1i49fI6d4TRph8MqWMEI2eNvt01q8gREoBJlTCGN2vsqXmf4mG04qYZRGxCg9RMJ9wKouVweMATsk8vXeetk6Pe1rOZ1kogENeyRQUaFyn8gl0MLzeb+IvnMldDkODap5t181bUPdVPCuMu3fi3HcUAat1xliI= X-Forefront-PRVS: 040359335D X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2466; 23:h3sficg//5NrL4Gz3NvB7+xO1xnROqS7DIZ4p4Xho9Pvjorqw3pGFLNJNfhJKohwYFvESr7zGGGOcDATVSdq0rqf6zloPjDqzFU5/dR9VRP/HzE9oqykwi/u8BqNFofwnCb4ux0DmjMkyLNuqvRW1AhQYEVWuj40VbA1BRUNTD+rR1zMJpOl6PVS8HqJNf1c2ONeCrOUmoW+KtXEiE9po8SBL/oTAx9bNkEHDOrpHWhqZrVJe4xG3nfeKMFyvsty2Rf9lWs7iqKXyLxDGUcx1f4uwrV7Qs/EJ2hyhUpW2hxhaTapDJB/FshBCyY385KzC6QwOJIJY3SBMJy+jYovLUdZOyvCmdUtSmRJj7ODRCPdrDJNlwegsqwLKrLjICMjWGkg5NAHMs7jDury0SmeoXGDuCHleUinYLT8Y9P7P0/Xub1cWqjM/SOaMtvfxlNR1SfgfoPogopTXUouewskwgDpa8eIkLz9g5oihyK1z4lZHC8Dhk2b0DFvwNiCG/jjbqJvSdKonChLeFDK/u7fjccRsmt38uZ2OieDr1QrAmQt2QLwOXf+lkeW27K55pEpf5xBw0xks6tc0MGdCFYPl789u+KsTbKuXVseMy5glyeUCz1vF9e+GzALFVykUlf1SAPfbRf6M+I0KZkRQsLCsAbGQqpKKG0HEw/FhGHo954ertXylIGZysB+ES3vssedLzYrYze5pEnWfdJl5G7lnLVi1YTt2+daLgxqf+R/rVMOfoY2EivikIuGxgxBSTVCS949adZzvZHs3RfkqlXJYFzm7y3G+YNjqq/iTXrWgjJi80ZBm+gZQBORePNf0em6V1i2OOfNWNZWUAc1aXTSrShSBoAHZqhbODEu4ZuIUD0G5oCv2B0x0qS8qyirZAQquvGhmpV7Uu5KoVUSjtygeIgPDOYC6y5PEYEJXC9cbiom7QtGTGJ4I5B6fqkkmwDO X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2466; 6:FmNHjytWoZVlq/HWoc7twpSWRodY93I/KZxDGRwDQoBZfdMwp6S/7hWHqeo2m/LTvoZnw6T+RZAT4ACF3X300G36x/R+REbGdBfELyFxdx5GtmKKjNb0YYmZMcxcAM96f6g4lchm0BqF8kkQWYXRWZ3jQGmZLiVm1JEq92wFziJIfh+vzu6kK3Xer55BmXTupHTbeCql6dyG4Gx81Kpao0Gb1Gfm4L56ILlDnZMUopFlFwVcbpjnBZv8gnnGjb9cY/uJw4ML03e5Dg4uzqd2tZaQhdyckR2EZpXA+cQvkI6nwWrxo4QVI4KW5V3ISvtI9hESXet2eWIxXYWd9g2Bgw==; 5:uoL1p71/B8kyhIlV/1zJEp9ZW7SPW7VbiUNyT4pwKSMOqF3z+Rf4ap2oAjh1ibPsfuFSKnLnsIPPESt6Km0NTmBBYTdYpkmRox0ilAnahWiuXrRqX5AjYm8uJaxa04tMMQUNxkXy0A/nyCXrdrmEFw==; 24:Fk3Lf/MJCdtT3t9kTQWMPjtdym333N2cd2PADDz6/11EYW7QuCUY0M2HSq19eBRGPXe45ZSpGMv6lunWjIWn+KX9s+auKZoVS+hrL3x1x5s=; 7:mPW6k0n4F6bMxxDTBvFAncqQJWLrg+nGpCrA2KMbqHUwAlhcom1J3x54W3URqsc3Olzo1PP4ZMWNBi3cM8DvihSTxLyi0LuEtVgnMO6rPm2NjxdFJ/nthhsTDM1dckdSi6znx9Fy//+BUcnPxZAFFgVnh7Lq1tWk6TjrRgvx/my63Le4ALI9L55o3ox5tpM8DjrvMOTe/ghihcxuLE6W8PSPC3aANCve0RnB3hEY1iQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 18:51:08.3480 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR02MB2466 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.65 Subject: [Qemu-devel] [PATCH v1 1/2] Makefile: Remove libqemustub.a 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, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Using two libraries (libqemuutil.a and libqemustub.a) would sometimes result in circular dependencies. To avoid these issues let's just combine both into a single library that functions as both. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 7 +++---- Makefile.target | 2 +- docs/devel/build-system.txt | 14 +++++--------- tests/Makefile.include | 6 +++--- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 81447b1f08..f111e93c63 100644 --- a/Makefile +++ b/Makefile @@ -344,7 +344,7 @@ subdir-dtc:dtc/libfdt dtc/tests dtc/%: mkdir -p $@ =20 -$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj= -y) \ +$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) =20 ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) @@ -364,12 +364,11 @@ Makefile: $(version-obj-y) ###################################################################### # Build libraries =20 -libqemustub.a: $(stub-obj-y) -libqemuutil.a: $(util-obj-y) $(trace-obj-y) +libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) =20 ###################################################################### =20 -COMMON_LDADDS =3D libqemuutil.a libqemustub.a +COMMON_LDADDS =3D libqemuutil.a =20 qemu-img.o: qemu-img-cmds.h =20 diff --git a/Makefile.target b/Makefile.target index 7f42c45db8..0a80caf79c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -193,7 +193,7 @@ all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) =20 $(QEMU_PROG_BUILD): config-devices.mak =20 -COMMON_LDADDS =3D ../libqemuutil.a ../libqemustub.a +COMMON_LDADDS =3D ../libqemuutil.a =20 # build either PROG or PROGW $(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index 2af1e668c5..5f32e53248 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -232,15 +232,11 @@ The utility code that is used by all binaries is buil= t into a static archive called libqemuutil.a, which is then linked to all the binaries. In order to provide hooks that are only needed by some of the binaries, code in libqemuutil.a may depend on other functions that are -not fully implemented by all QEMU binaries. To deal with this there is a -second library called libqemustub.a which provides dummy stubs for all -these functions. These will get lazy linked into the binary if the real -implementation is not present. In this way, the libqemustub.a static -library can be thought of as a portable implementation of the weak -symbols concept. All binaries should link to both libqemuutil.a and -libqemustub.a. e.g. - - qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a libqemustub.a +not fully implemented by all QEMU binaries. To deal with this there are +dummy stubs for all these functions in libqemuutil.a. +All binaries should link to both libqemuutil.a and libqemustub.a. e.g. + + qemu-img$(EXESUF): qemu-img.o ..snip.. libqemuutil.a =20 =20 Windows platform portability diff --git a/tests/Makefile.include b/tests/Makefile.include index 37c1bed683..80527a8763 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -553,7 +553,7 @@ QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests =20 =20 # Deps that are common to various different sets of tests below -test-util-obj-y =3D libqemuutil.a libqemustub.a +test-util-obj-y =3D libqemuutil.a test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) test-qapi-obj-y =3D tests/test-qapi-visit.o tests/test-qapi-types.o \ tests/test-qapi-event.o tests/test-qmp-introspect.o \ @@ -608,8 +608,8 @@ 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 \ - libqemuutil.a libqemustub.a -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o = hw/core/ptimer.o libqemustub.a + libqemuutil.a +tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o = hw/core/ptimer.o $(test-util-obj-y) =20 tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) =20 --=20 2.11.0 From nobody Sun May 5 04:21:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1503082374000320.27168504089855; Fri, 18 Aug 2017 11:52:54 -0700 (PDT) Received: from localhost ([::1]:50025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dimO4-0005nJ-3g for importer@patchew.org; Fri, 18 Aug 2017 14:52:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dimMW-0004dM-0C for qemu-devel@nongnu.org; Fri, 18 Aug 2017 14:51:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dimMS-0002hN-UJ for qemu-devel@nongnu.org; Fri, 18 Aug 2017 14:51:16 -0400 Received: from mail-by2nam01on0051.outbound.protection.outlook.com ([104.47.34.51]:9952 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 1dimMS-0002gl-Gf for qemu-devel@nongnu.org; Fri, 18 Aug 2017 14:51:12 -0400 Received: from SN4PR0201CA0066.namprd02.prod.outlook.com (10.171.31.156) by CY4PR02MB2248.namprd02.prod.outlook.com (10.169.181.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Fri, 18 Aug 2017 18:51:09 +0000 Received: from CY1NAM02FT055.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::202) by SN4PR0201CA0066.outlook.office365.com (2603:10b6:803:20::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21 via Frontend Transport; Fri, 18 Aug 2017 18:51:09 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) 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.1.1341.15 via Frontend Transport; Fri, 18 Aug 2017 18:51:08 +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 1dimML-0006IM-3w; Fri, 18 Aug 2017 11:51:05 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dimMK-0008Af-W0; Fri, 18 Aug 2017 11:51:05 -0700 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 v7IIp0hs011123; Fri, 18 Aug 2017 11:51:01 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dimMG-000890-Nb; Fri, 18 Aug 2017 11:51:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=riIMeLwt6ZAKGHpo8T25QIJFJJ0H3c+kjSH2KCzpTnY=; b=nzcXZkfuyBoUiySKX/ajwQTNvhSHHoS/hD2piEwwI0iyb5haHD1CFi9wTE/OnHVUFeTRC/aGGACCvWKQiQrWvFlq2CIrWMehDvGxmGE1NjJsmejaFq+8NmlYIFq8ArYrDFNuGOFLP5CAHFS316yN97fuGkcznZkXydsHlzswL0w= 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 (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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; From: Alistair Francis To: , Date: Fri, 18 Aug 2017 11:47:35 -0700 Message-ID: <2c94ac3bb116cc6b8ebbcd66a254920a69665515.1503077821.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23266.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(189002)(199003)(50986999)(9786002)(76176999)(305945005)(54906002)(39060400002)(81166006)(81156014)(5660300001)(356003)(2906002)(2950100002)(6666003)(8676002)(8936002)(50226002)(189998001)(36386004)(50466002)(33646002)(47776003)(626005)(48376002)(36756003)(4326008)(478600001)(118296001)(77096006)(63266004)(5003940100001)(106466001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB2248; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT055; 1:WbxyF1yPPBESKUsKfoQ6uSy7tOLbo7JRKHH4BQ0LuBWrnBtvQ2cLkNLB3V9HleXvcyyVGWr+9B4DqIoidsVb21UbjjSTtmu7xgF179NOG1DLM9M26MUXXXhfRh3wIKtt MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d16ba6cb-f2c6-4cb5-c114-08d4e66a16d2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR02MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2248; 3:ggfcFJgZtsbWsHlyHqXvhyGI68fYmLZLnF/7KE5ySHoVtQelL+KGxpMvSatJrT9qz1S3DhPQQVnO/SfiY9ySfa3Ibo9jvZWc1yGHQ1daQYC1omkOL63iFxyKlFd3wC2hrz5AwXy/C1fV2IJMh0iCHAUr+q+ITJcfSWV3WcswMbtUHySRVrpCkEQ5T8lg+aB1JlK677faLKB1RQ7Y4eiE+NAeH5Z0QlKIlomlj4JXkiOZRvcb5Tm809w6I4ia24P/sSOSYo6u+Clh1JkHpNvu/YtByEK67FTLN67N+AMmVECwLhqHO1dSqzBpr5DaTuzA8pbE8iIjjUQzDfF82ZGEqRxgyg3LPe2I94OpD3xeR2s=; 25:KwwU/X3X0G4PjnCHRHEdNBdzZ0jNKp+brvnMIS8s84nxpz5q1hBfb/2iUh6JXFYE3ymFFUVOuOE6p5BKfXXsQJfnXfdjqJmU9fXLQkuct/vSXPLULnK7DYr2UdpB1W2HJG4D6KTJY0xXUTcYXlrRMtLvWi+PFm5NOATgKoHxF6O6yLNukhRpOJmE7jg6bg/H4j46n6Rxf0jl0v1IStSA8Y0vxcMVR5pD6Tgz9JOt5iJmJaUZxIQriQU9LeyKivKsoavGRfC7FTN4aLF9qIt79Ua49ihA78ySo0tEyELqrL8PgecwNN4BkeJTESsnkxJFClKvrFaKFoxwmBDwnVpdBg== X-MS-TrafficTypeDiagnostic: CY4PR02MB2248: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2248; 31:p8a7N+TihWWrx5EXObKEvHRftsWmalJXq2ZKrUe9XsSwBZymS049ZN0iJPRM1BRbHbOzkTrxIeeCz3WrWJCZ9NRkZqsIZme7JIbHR/qDRSTxCtOHOjRdsPOKIgmRG2k42eW4kLCj65QSwuHKP0J2UeqHp0nwQRpTb1MbM+CCU2Z/gIEFTXKPPYGkq+VrZKSg2r6oKxkCnacPTzHEssOXzYPM34pZbG75wUM+TqF7e1Y=; 20:A/7T9nG3yrDw677PTjIks1KzO9pSI3dbox/6XotQzQNk0oy9SdT4c/fyyGDlbrCtAZAYVk1TWqnURyefvb30XltIdIMv6wqVMesnaxUYu81a1jw/F5Ab/NnNH28yWn+WE0rxR/ECyipnrzhpgr6sxuH6x4wsireQ5zn3N0uVx+TzbKdbt+udSPDMA3ksxnUh0WPwhcxw0BLG3laB6BP4cU4zDLWVnydoniiMxk3tWrFAVlJ+euPs2b3PV/2X+EB1qxXt3OQ2LHs2SMOGkn1yojenKa6BGaUN2wA3/B2DZdwVJ12Bu98bJWN9Wh0nKszzF6QQzleByyIf6MW0JBxrGYSwxke9HlUG9GCuBlSVmZoodAXuFjLn2PFxIZ53+pmCa//TyV72erh8ZuTSNLF0Ggerl9zU7TBS7zxVo+NXeGmocwJEDqXKfl0tLGO79A5ByW2uhMSzh8TdVN/2vgpkIMWMUfkviPrVytygaEgrJ62XO/DVRPkrg+Krcfx5nOz/ 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)(601004)(2401047)(13018025)(8121501046)(5005006)(13016025)(10201501046)(100000703101)(100105400095)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123560025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB2248; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2248; 4:dhROy/BVTDrAXRT06/BWHHbiiYbkuQfEgEqSJjEcWgwv9sLBxIxx9jVcMcEgmUeyThZ14aO50gGggQku5qVQPXibUV1ldLO2GyUneYU1WvYK/+P74FwEdJMWrJlvFnV8AskF4kPqwE8RM/9z/9w6m4UybbbNBE1Tsno88Hhb5eX6EeCDDGHFwf5et74wKE/zCBgqf4amPcuBMecgyTFsIAwBKbnRPIs/WTqXEtzMExCanOM+7h3Lur4Og79mCeaAzC9QAxUrVsIllvSz8sq7BLyKRbe89YcTbRSeUiFOfQg= X-Forefront-PRVS: 040359335D X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2248; 23:MHzr2R1L5yLmQIHryroBw8EGRXlGcD6eYUw1rwdKtr2dWE2icJpN3FYD+5n3EcAZBZlJqvijRFCqlIwofdimjF6cj1NUZdJgiCkZ8pu5TNMW8H+nYxnQvW+JdIfzCB2arTBKI0hHE7s1ff+Oo017ap8ya79gE/Ry+WepTngWhvfAiy2cdPI8n5zKfxK/pX8SRdZdW1viEfavPIoVqu6UlHSAHSLQX5cj9YUy8kBz98UPN/QGkOgjjboiJg2pBjYe74kpNXcNUz5jUfMj0uK47HR+kIy3HBhD8V/ymvuova/zzkJ/Iao1j8wBPVNsXdyx1f6ZxN/5+JdGGdh9bDwqW1NXCGKUFm1uDgcaqiCx+WdL44rETKYDE5BEb28cqECb+C6FfYcuWGBicoNnzgy+7Pik0z4pSViT6yKDS8mM/5XtanE7CmgWD4Q3xgxA0WCwc4AJKn5W58bow2ZKU2jKsbHlx/vffWA8Lb4/FSi9VRjimC54kqUKFC4MNcRU5KlpHnMvPgTyV65rpGJopfH9X0PutHgsgaXLi7LQYP1wxu3vox43aC1SgFDLtoi1icNw+FrRW5zVkDyKSIc+Ti2wICPcJFPOYrFGgbt54pSyW+GeJZlLXl4vGfaHK7ghhFIqihVd69uvMtwLDcKkG/wIX2+oDeBHnSbAmWY/392j7pvOpGcqySwvNprHE0YPgbVXxZtiMrI0LHwDRGI8YKgPfpyZemXTlEkWWTtRtIi29Nh62UXbKNGzJMYHDd7RQsBpdumEa4Clx/UBV9N2IaqgQrisdfELbviN0+BZQ2/ZDwrn1E3Dm8puMqxQek4XcBc7w1VohvLtQ9XJMMqxuU2HSzXs09SEidzV58OJEepXWNeHF6IrOisF4PTQtm6fbXeXg9mcbmWRdFxNpw7t7npv6SRiaRDF0pmP4g1uT5OGdNlUh7KCUYHlrHRHJhJrAS3l X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2248; 6:/go1HUVAVS2uVwuCoGC110JAAKzxQNVUys28Q7tIuaNGzWfBO0UuhbvqEzDuwpWF2B/gMZFb128EOWxplr5ZYp7SYIzAxjUlLDpOjVq+Jylwc5QhAewkf4GHwT04bZ9ISVd3EBiRDUTgcMZEARPnM2xUxDVeurbOMr5ncL57PA0N7Bj7hsOD3oaEquvA5PEqOhZ+/KjvXwxeMtMQ24UFnqrWKniiB2fgEgK53Rn8kRm0JRU4oOjc50FLRuEG2Zv7+/ZxDUlEyTs/aOx3npBY9UKPZunU0cdEb+wBIIyNxk35y+NQ/0hI7fDLtkclLGWA5zy9+1mxZES2Wd7pgSrxCw==; 5:qteUxURkvkaSsdS0spZTdFYjn4/4xQIsK8SbnZ96HEvfG/jEAAk4q8807ZD1YYItZkl1T8gM/a4+HeeSM4KnN31+9HEaXgpetKOspCmwgBQ+2NyVt1coIy4Ny8ei3E2B0QMH4+RAVyu+/lruJFdR5A==; 24:83KR2ekA8d+qf/V5tT7Yw86SROxf1ci9fQoyXen6D4zdKo7ovOAemplnBrTPoIafqT0Jpzw8bg1Q6UYZogAyjq2vfBmAeF+dg1hjNc3gFbY=; 7:slcWtWadWgFZZTC4EpaOf3NGIyzD8K0qfiKYqiqRW5u0hXN2QvQjND15ejcTBeDxEOJsCi0LZEvfGVrTCXCy5JC9esx09DMDSc35lf0AJxgTk6DOhltaQ8V68YswUSJnmT0Lb12GLcqFTCznDr9Zf4mTFb42COWKURMFpBMfe4q+AdxshZpQ0tin4yKpAHIvRyO8S0ny+T0tHhz6turLw9vzVbzDLr5UZMlpqYLwHF8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 18:51:08.2258 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR02MB2248 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.51 Subject: [Qemu-devel] [PATCH v1 2/2] 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, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 lines and chagnes to the test Makefile were manually updated to allow the code to compile. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- This was split out of my original series fixing QEMU warnings. 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 80527a8763..91d5a4544f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -584,7 +584,7 @@ tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-o= bj-y) tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(tes= t-crypto-obj-y) tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o migrati= on/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" =20 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 init= ial) return initial; } if (debug < 0 || debug > max || errno !=3D 0) { - fprintf(stderr, "warning: %s not in [0, %d]", name, max); + warn_report("%s not in [0, %d]", name, max); return initial; } return debug; --=20 2.11.0