From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086732919447.6453657128708; Fri, 24 Jun 2022 09:05:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355604.583352 (Exim 4.92) (envelope-from ) id 1o4lnZ-0005Gw-6p; Fri, 24 Jun 2022 16:04:45 +0000 Received: by outflank-mailman (output) from mailman id 355604.583352; Fri, 24 Jun 2022 16:04:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnZ-0005G9-0X; Fri, 24 Jun 2022 16:04:45 +0000 Received: by outflank-mailman (input) for mailman id 355604; Fri, 24 Jun 2022 16:04:43 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnX-0004qb-4T for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:43 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5b111485-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:41 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5b111485-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086681; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X2aENXxRDTAvXRj798ueb4NLH5aVs5M0JBRhVknZte8=; b=ClH0kvo4KWT9e2A7r9j16XV0jbMcL3LF/JMm5WwQvBma3xrDRMGVnMIB McTVEtvGsIi/A34gmkNST27LPlkbFX8jq+c2QOV7Q9FsK4IjB139Ikr4M vf2/8cxq0pXuak6cpX5vWuz97UdnfvsUVbcvzouNPAKCxXsYLcENqxRM3 4=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 73701974 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:qskwaqq/lrIITC6px2G7gZflUrpeBmIaZRIvgKrLsJaIsI4StFCzt garIBnTb6yLYGL3KY9xPo7goEMHv5bQn9UyHgU6ry09EipB8JuZCYyVIHmrMnLJJKUvbq7GA +byyDXkBJppJpMJjk71atANlVEliefQAOCU5NfsYkidfyc9IMsaoU8lyrRRbrJA24DjWVvT4 4+q+aUzBXf+s9JKGjNMg068gEsHUMTa4Fv0aXRnOJinFHeH/5UkJMp3yZOZdhMUcaENdgKOf M7RzanRw4/s10xF5uVJMFrMWhZirrb6ZWBig5fNMkSoqkAqSicais7XOBeAAKv+Zvrgc91Zk b1wWZKMpQgBN4T0l9s2YQVjEgZVA/BtoJnGIELhvpnGp6HGWyOEL/RGCUg3OcsT+/ptAHEI/ vsdQNwPRknd3aTsmuv9E7QywJR4RCXoFNp3VnVIxDfFDfEgUNbbTr/D/9Nw1zYsnMFeW/3ZY qL1bBIwN0uYOkwQZj/7DroYh9W22WKidgZbrV3MlfMU5nDV9ANIhe2F3N39JYXRGJQ9clyjj nnd423zDxUeNdqe4TmI6HShgqnIhyyTcJ0WPK218LhtmlL77m4ODBwbU3OrrP//jVSxM/pPJ kpR9icwoKwa8E2wUsK7TxC+uGSDvBMXR5xXCeJSwAOHx7fQ4g2ZLnMZVTMHY9sj3PLaXhRzi AXPxYmwQ2Uy7vvFEhpx64t4sxu7EBAaEkQweRQFaiA7vvK7hoAytEzAG4ML/LGOsjHlJd3h6 2nU8XZm3OhL0p5jO7aTpg6e3W/1znTdZktsv1iMADr4hu9sTNT9D7FE/2Q3+hqpwGyxalCa9 EYJlMGFhAzlJcHczXfdKAnh8VzA2hpkDNE/qQQ2d3XZ327xk0NPhKgJiN2EGG9nM9wfZRjia 1LJtAVa6fd7ZSX3M/cvMtvuV5xyksAM8OgJsNiONrKihbAhHDJrAQk0PRLAt4wTuBJEfV4D1 WezLp/3UCdy5VVPxzuqXeYNuYIWKtQF7TqLH/jTlk3/uZLHPSL9YepVYTOmM7FihIvZ8Vq9z jqqH5bTo/mpeLalOXe/HE96BQ1iEEXX8ris+pIOKLLcc1E4cIzjYteIqY4cl0Vet/w9vo/1E ruVAye0FHKXaaX7FDi3 IronPort-HdrOrdr: A9a23:ZnLoSq9EDDm87aa0KI1uk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="73701974" From: Anthony PERARD To: CC: Anthony PERARD , Andrew Cooper , George Dunlap , "Jan Beulich" , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [XEN PATCH v3 01/25] tools/console: have one Makefile per program/directory Date: Fri, 24 Jun 2022 17:03:58 +0100 Message-ID: <20220624160422.53457-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086733675100003 Content-Type: text/plain; charset="utf-8" Sources of both xenconsoled and xenconsole are already separated into different directory and don't share anything in common. Having two different Makefile means it's easier to deal with *FLAGS. Some common changes: Rename $(BIN) to $(TARGETS), this will be useful later. Stop removing *.so *.rpm *.a as they aren't created here. Use $(OBJS-y) to list objects. Update $(CFLAGS) for the directory rather than a single object. daemon: Remove the need for $(LDLIBS_xenconsoled), use $(LDLIBS) instead. Remove the need for $(CONSOLE_CFLAGS-y) and use $(CFLAGS-y) instead. client: Remove the unused $(LDLIBS_xenconsole) Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- Notes: v2: - create per-directory .gitignore tools/console/Makefile | 49 ++------------------------------ tools/console/client/Makefile | 39 +++++++++++++++++++++++++ tools/console/daemon/Makefile | 50 +++++++++++++++++++++++++++++++++ .gitignore | 2 -- tools/console/client/.gitignore | 1 + tools/console/daemon/.gitignore | 1 + 6 files changed, 94 insertions(+), 48 deletions(-) create mode 100644 tools/console/client/Makefile create mode 100644 tools/console/daemon/Makefile create mode 100644 tools/console/client/.gitignore create mode 100644 tools/console/daemon/.gitignore diff --git a/tools/console/Makefile b/tools/console/Makefile index 207c04c9cd..63bd2ac302 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -1,50 +1,7 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror +SUBDIRS-y :=3D daemon client =20 -CFLAGS +=3D $(CFLAGS_libxenctrl) -CFLAGS +=3D $(CFLAGS_libxenstore) -LDLIBS +=3D $(LDLIBS_libxenctrl) -LDLIBS +=3D $(LDLIBS_libxenstore) -LDLIBS +=3D $(SOCKET_LIBS) - -LDLIBS_xenconsoled +=3D $(UTIL_LIBS) -LDLIBS_xenconsoled +=3D -lrt -CONSOLE_CFLAGS-$(CONFIG_ARM) =3D -DCONFIG_ARM - -BIN =3D xenconsoled xenconsole - -.PHONY: all -all: $(BIN) - -.PHONY: clean -clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM) - $(RM) client/*.o daemon/*.o - -.PHONY: distclean -distclean: clean - -daemon/main.o: CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h -daemon/io.o: CFLAGS +=3D $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(C= FLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) -xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxe= ngnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLA= GS) - -client/main.o: CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h -xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) - $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) - -.PHONY: install -install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(sbindir) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) - -.PHONY: uninstall -uninstall: - rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole - rm -f $(DESTDIR)$(sbindir)/xenconsoled - --include $(DEPS_INCLUDE) +.PHONY: all clean install distclean uninstall +all clean install distclean uninstall: %: subdirs-% diff --git a/tools/console/client/Makefile b/tools/console/client/Makefile new file mode 100644 index 0000000000..44176c6d93 --- /dev/null +++ b/tools/console/client/Makefile @@ -0,0 +1,39 @@ +XEN_ROOT=3D$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS +=3D -Werror +CFLAGS +=3D $(CFLAGS_libxenctrl) +CFLAGS +=3D $(CFLAGS_libxenstore) +CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h + +LDLIBS +=3D $(LDLIBS_libxenctrl) +LDLIBS +=3D $(LDLIBS_libxenstore) +LDLIBS +=3D $(SOCKET_LIBS) + +OBJS-y :=3D main.o + +TARGETS :=3D xenconsole + +.PHONY: all +all: $(TARGETS) + +xenconsole: $(OBJS-y) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(APPEND_LDFLAGS) + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) + +.PHONY: uninstall +uninstall: + rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole + +.PHONY: clean +clean: + $(RM) *.o $(TARGETS) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + +-include $(DEPS_INCLUDE) diff --git a/tools/console/daemon/Makefile b/tools/console/daemon/Makefile new file mode 100644 index 0000000000..0f004f0b14 --- /dev/null +++ b/tools/console/daemon/Makefile @@ -0,0 +1,50 @@ +XEN_ROOT=3D$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS +=3D -Werror +CFLAGS +=3D $(CFLAGS_libxenctrl) +CFLAGS +=3D $(CFLAGS_libxenstore) +CFLAGS +=3D $(CFLAGS_libxenevtchn) +CFLAGS +=3D $(CFLAGS_libxengnttab) +CFLAGS +=3D $(CFLAGS_libxenforeignmemory) +CFLAGS-$(CONFIG_ARM) +=3D -DCONFIG_ARM +CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h + +LDLIBS +=3D $(LDLIBS_libxenctrl) +LDLIBS +=3D $(LDLIBS_libxenstore) +LDLIBS +=3D $(LDLIBS_libxenevtchn) +LDLIBS +=3D $(LDLIBS_libxengnttab) +LDLIBS +=3D $(LDLIBS_libxenforeignmemory) +LDLIBS +=3D $(SOCKET_LIBS) +LDLIBS +=3D $(UTIL_LIBS) +LDLIBS +=3D -lrt + +OBJS-y :=3D main.o +OBJS-y +=3D io.o +OBJS-y +=3D utils.o + +TARGETS :=3D xenconsoled + +.PHONY: all +all: $(TARGETS) + +xenconsoled: $(OBJS-y) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(APPEND_LDFLAGS) + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)/$(sbindir) + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) + +.PHONY: uninstall +uninstall: + rm -f $(DESTDIR)$(sbindir)/xenconsoled + +.PHONY: clean +clean: + $(RM) *.o $(TARGETS) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + +-include $(DEPS_INCLUDE) diff --git a/.gitignore b/.gitignore index 18ef56a780..7cf26051db 100644 --- a/.gitignore +++ b/.gitignore @@ -160,8 +160,6 @@ tools/libs/util/libxenutil.map tools/libs/vchan/headers.chk tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc -tools/console/xenconsole -tools/console/xenconsoled tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 diff --git a/tools/console/client/.gitignore b/tools/console/client/.gitign= ore new file mode 100644 index 0000000000..b096a1d841 --- /dev/null +++ b/tools/console/client/.gitignore @@ -0,0 +1 @@ +/xenconsole diff --git a/tools/console/daemon/.gitignore b/tools/console/daemon/.gitign= ore new file mode 100644 index 0000000000..55c8f84664 --- /dev/null +++ b/tools/console/daemon/.gitignore @@ -0,0 +1 @@ +/xenconsoled --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086734566896.1010350238605; Fri, 24 Jun 2022 09:05:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355601.583329 (Exim 4.92) (envelope-from ) id 1o4lnX-0004r3-90; Fri, 24 Jun 2022 16:04:43 +0000 Received: by outflank-mailman (output) from mailman id 355601.583329; Fri, 24 Jun 2022 16:04:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnX-0004qt-5f; Fri, 24 Jun 2022 16:04:43 +0000 Received: by outflank-mailman (input) for mailman id 355601; Fri, 24 Jun 2022 16:04:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnW-0004qb-11 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:42 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 58b2e4b9-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:39 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 58b2e4b9-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086679; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Itv0TYjJaWvZTLhYwIDcVR+kB+4hcfXSmAszpJaqRIw=; b=d5w6S5JcxLmZpjIopIbB+NpkHkp6qA5FpkUn4OhefwStCBeNdRMKK3tz T0YLG7xGoRDYHQhQlIIQb4iwa10Md1/N5ke+bZ616oWTSgkJhmH74TO7P PzdCNAmZy97juqobN7EGbOVJRCu1+dNesZTKcX5b3JoLyi+M6gyjORwKG 8=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74384146 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:6T68gK8mz+giWA6WQUxrDrUD7H6TJUtcMsCJ2f8bNWPcYEJGY0x3z DAZC2+GPqmIYWfxc9Fxbd+39hwCu5CHyNVmTgdt/H08E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsY0idfic5DnZ74f5fs7Rh2NQw34LlW1nlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCndvuVSt5AfXwor4+EF52DBguAJYZqLCSdBBTseTLp6HHW37lwvEoB0AqJ4wIvO1wBAmi9 9RBdmpLNErawbvrnvTrEYGAhex6RCXvFIoZpnFnyyCfFfs8SIrPa67L+cVZzHE7gcUm8fP2O JZCOWY2MEqojxtnPWslCqIutveUjTqhTBBgk1Co+ZUyyj2GpOB2+Oe0a4eEEjCQfu1Kmm6Iq 2SA+H72ajkXMNGZwHyY/HOpmvTCgyrTX5gbH7m1sPVthTW71mEVTREbS1a/if24kVKlHcJSL VQO/SgjprR081akJuQRRDXh/iTC5ERFHYMNTatqs2lh15Y4/S7eWHQoHgEZVOZ8l4xxayMTh mKywIPmUGkHXKKudZ6NyluFhWrsZHZNdjJaOn9soRgtuIe6/txq5v7bZpM6SfPu0IWocd3l6 2rSxBXSkYn/miLiO0+T2VncywyhqZHSJuLezlWGBzn1hu+ViWPMWmBJ1bQ4xawZRGphZgPd1 EXoYuDHhAz0MbmDlTaWXMIGF6yz6vCOPVX02AAyQcF5pm3ypyb7Iui8BQ2Swm8zaq7onhe5C HI/RCsLvMMDVJdURfUfj32N5zQCkvG7SIWNugH8ZdtSeJlhHDK6ENVVTRfIhQjFyRF0+YlmY MvzWZv8XB4yVPU8pBLrFrh17FPe7n1nrY8lbcuglErPPHv3TCP9dIrpx3PUP75gsv/b8V6Lm zudXuPToyhivCTFSnG/2eYuwZoidyBT6UzewyCPStO+Hw== IronPort-HdrOrdr: A9a23:0/L4CKkrZsycnx7pK6eYLneWYVXpDfIU3DAbv31ZSRFFG/Fxl6 iV8sjzsiWE7gr5OUtQ4exoV5PhfZqxz/JICMwqTNKftWrdyQyVxeNZnOjfKlTbckWUnINgPO VbAsxD4bXLfCFHZK3BgTVQfexO/DD+ytHLudvj X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74384146" From: Anthony PERARD To: CC: Anthony PERARD , Elena Ufimtseva , Wei Liu Subject: [XEN PATCH v3 02/25] tools/debugger/gdbsx: Fix and cleanup makefiles Date: Fri, 24 Jun 2022 17:03:59 +0100 Message-ID: <20220624160422.53457-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086735480100007 Content-Type: text/plain; charset="utf-8" gdbsx/: - Make use of subdir facility for the "clean" target. - No need to remove the *.a, they aren't in this dir. - Avoid calling "distclean" in subdirs as "distclean" targets do only call "clean", and the "clean" also runs "clean" in subdirs. - Avoid the need to make "gx_all.a" and "xg_all.a" in the "all" recipe by forcing make to check for update of "xg/xg_all.a" and "gx/gx_all.a" by having "FORCE" as prerequisite. Now, when making "gdbsx", make will recurse even when both *.a already exist. - List target in $(TARGETS). gdbsx/*/: - Fix dependency on *.h. - Remove some dead code. - List targets in $(TARGETS). - Remove "build" target. - Cleanup "clean" targets. - remove comments about the choice of "ar" instead of "ld" - Use "$(AR)" instead of plain "ar". Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- Notes: v2: - also replace plain "ar" by "$(AR)" tools/debugger/gdbsx/Makefile | 20 ++++++++++---------- tools/debugger/gdbsx/gx/Makefile | 15 +++++++-------- tools/debugger/gdbsx/xg/Makefile | 25 +++++++------------------ 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile index 5571450a89..4aaf427c45 100644 --- a/tools/debugger/gdbsx/Makefile +++ b/tools/debugger/gdbsx/Makefile @@ -1,20 +1,20 @@ XEN_ROOT =3D $(CURDIR)/../../.. include ./Rules.mk =20 +SUBDIRS-y +=3D gx +SUBDIRS-y +=3D xg + +TARGETS :=3D gdbsx + .PHONY: all -all: - $(MAKE) -C gx - $(MAKE) -C xg - $(MAKE) gdbsx +all: $(TARGETS) =20 .PHONY: clean -clean: - rm -f xg_all.a gx_all.a gdbsx - set -e; for d in xg gx; do $(MAKE) -C $$d clean; done +clean: subdirs-clean + rm -f $(TARGETS) =20 .PHONY: distclean distclean: clean - set -e; for d in xg gx; do $(MAKE) -C $$d distclean; done =20 .PHONY: install install: all @@ -28,7 +28,7 @@ uninstall: gdbsx: gx/gx_all.a xg/xg_all.a=20 $(CC) $(LDFLAGS) -o $@ $^ =20 -xg/xg_all.a: +xg/xg_all.a: FORCE $(MAKE) -C xg -gx/gx_all.a: +gx/gx_all.a: FORCE $(MAKE) -C gx diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Mak= efile index 3b8467f799..e9859aea9c 100644 --- a/tools/debugger/gdbsx/gx/Makefile +++ b/tools/debugger/gdbsx/gx/Makefile @@ -2,21 +2,20 @@ XEN_ROOT =3D $(CURDIR)/../../../.. include ../Rules.mk =20 GX_OBJS :=3D gx_comm.o gx_main.o gx_utils.o gx_local.o -GX_HDRS :=3D $(wildcard *.h) + +TARGETS :=3D gx_all.a =20 .PHONY: all -all: gx_all.a +all: $(TARGETS) =20 .PHONY: clean clean: - rm -rf gx_all.a *.o .*.d + rm -f *.o $(TARGETS) $(DEPS_RM) =20 .PHONY: distclean distclean: clean =20 -#%.o: %.c $(GX_HDRS) Makefile -# $(CC) -c $(CFLAGS) -o $@ $< - -gx_all.a: $(GX_OBJS) Makefile $(GX_HDRS) - ar cr $@ $(GX_OBJS) # problem with ld using -m32=20 +gx_all.a: $(GX_OBJS) Makefile + $(AR) cr $@ $(GX_OBJS) =20 +-include $(DEPS_INCLUDE) diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Mak= efile index acdcddf0d5..05325d6d81 100644 --- a/tools/debugger/gdbsx/xg/Makefile +++ b/tools/debugger/gdbsx/xg/Makefile @@ -1,35 +1,24 @@ XEN_ROOT =3D $(CURDIR)/../../../.. include ../Rules.mk =20 -XG_HDRS :=3D xg_public.h=20 XG_OBJS :=3D xg_main.o=20 =20 CFLAGS +=3D -D__XEN_TOOLS__ CFLAGS +=3D $(CFLAGS_xeninclude) =20 +TARGETS :=3D xg_all.a =20 .PHONY: all -all: build +all: $(TARGETS) =20 -.PHONY: build -build: xg_all.a $(XG_HDRS) $(XG_OBJS) Makefile -# build: mk-symlinks xg_all.a $(XG_HDRS) $(XG_OBJS) Makefile -# build: mk-symlinks xg_all.a - -xg_all.a: $(XG_OBJS) Makefile $(XG_HDRS) - ar cr $@ $(XG_OBJS) # problems using -m32 in ld=20 -# $(LD) -b elf32-i386 $(LDFLAGS) -r -o $@ $^ -# $(CC) -m32 -c -o $@ $^ - -# xg_main.o: xg_main.c Makefile $(XG_HDRS) -#$(CC) -c $(CFLAGS) -o $@ $< - -# %.o: %.c $(XG_HDRS) Makefile -- doesn't work as it won't overwrite Rule= s.mk -#%.o: %.c -- doesn't recompile when .c changed +xg_all.a: $(XG_OBJS) Makefile + $(AR) cr $@ $(XG_OBJS) =20 .PHONY: clean clean: - rm -rf xen xg_all.a $(XG_OBJS) .*.d + rm -f $(TARGETS) $(XG_OBJS) $(DEPS_RM) =20 .PHONY: distclean distclean: clean + +-include $(DEPS_INCLUDE) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086738573588.830455244234; Fri, 24 Jun 2022 09:05:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355605.583374 (Exim 4.92) (envelope-from ) id 1o4lna-0005qL-Ma; Fri, 24 Jun 2022 16:04:46 +0000 Received: by outflank-mailman (output) from mailman id 355605.583374; Fri, 24 Jun 2022 16:04:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lna-0005pE-H5; Fri, 24 Jun 2022 16:04:46 +0000 Received: by outflank-mailman (input) for mailman id 355605; Fri, 24 Jun 2022 16:04:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnY-0004qb-PE for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:44 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5b5e355d-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:43 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5b5e355d-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086683; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e4dSMew7ThkfUT4VBhxHq8D2hkxwuVvIslum+Yj9ZTA=; b=Ks++WWr7Udo9du6BL8xg2CUni19gfCprMdkw0J0mYT+uvZQMZhsIBWdJ TlL0j1yaduo+0C2aFNPc3FExEs0wvoTh0OKYJFV4YWs9U2BpbKy5CnHTS tkh5wsTig3xsNcjUiXDtI2A6XVygvs/y9RgjIWEyH0utJH4QqKavaCQRM c=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74208051 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:4hcApa7sKFEclUjXW8oBQgxRtHHHchMFZxGqfqrLsTDasY5as4F+v moYXW2Ebv/cazb1eYsnO4y3801U6JWHzodmSFY6pS5mHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw03qPp8Zj2tQy2YbjX1vX0 T/Pi5a31GGNimYc3l08s8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByKQrr1vNvy7X 47+IISRpQs1yfuP5uSNyd4XemVSKlLb0JPnZnB+A8BOiTAazsA+PzpS2FPxpi67hh3Q9+2dx umhurSvdgA2GbLlo9hecCNDMytaN61a55HYdC3XXcy7lyUqclPpyvRqSko3IZcZ6qB8BmQmG f4wcW5XKErZ3qTvnez9GrIEascLdaEHOKsWvG1gyjfIS+4rW5nZT43B5MNC3Sd2jcdLdRrbT 5VFM2I/NEmZC/FJEkZPOZ4lzd6HvHn+US9ir36pp6sU7kGGmWSd15CyaYGIK7RmX/59gUKwt m/AuWPjDXkyJNGZjDaI7H+oruvOhj/gHpIfEqWi8fxni0HVwXYcYCD6TnPi/6P/0BTnHYsCd QpEoULCsJTe6mS0cd7ieAKRm0LHnSQHe9B0Ge0m9y+Sn/+8DxmiOoQUctJQQIV46ZFuHmFyi Q/hc8DBXmI27uDMIZ6J3vLN9G7pZ3BIRYMXTXVcJTbp9eUPt23aYvjnat94WJC4gdTucd0b6 2Db9XNu71n/YCNi6klawbwkq2j1znQxZlRpjjg7p0r8hu+DWKarZpaz9X/Q5utaIYCSQzGp5 SZZxZDGvblRUcnVy0Rhpdnh+pnzv55p1xWM6WOD4rF7r2j9k5JdVdo4DM5CyLdBbZ9fJG6Bj L77sgJN/p5DVEaXgVtMS9vpUawClPG4ffy8D6y8RoceM/BZKV7clAkzNBH44owYuBV1+U3JE czAKpjE4LdzIfkP8QdasM9HgOFymHxhlDiNLX05pjz+uYejiLeuYe9tGDOzgioRt8tofC29H w5jCva3 IronPort-HdrOrdr: A9a23:9UybOqnS8xO8b5jM/HG4hFOHxnDpDfIU3DAbv31ZSRFFG/Fxl6 iV8sjzsiWE7gr5OUtQ4exoV5PhfZqxz/JICMwqTNKftWrdyQyVxeNZnOjfKlTbckWUnINgPO VbAsxD4bXLfCFHZK3BgTVQfexO/DD+ytHLudvj X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74208051" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 03/25] tools/examples: cleanup Makefile Date: Fri, 24 Jun 2022 17:04:00 +0100 Message-ID: <20220624160422.53457-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086739446100001 Content-Type: text/plain; charset="utf-8" Don't check if a target exist before installing it. For directory, install doesn't complain, and for file it would prevent from updating them. Also remove the existing loop and instead install all files with a single call to $(INSTALL_DATA). Remove XEN_CONFIGS-y which isn't used. Remove "build" target. Add an empty line after the first comment. The comment isn't about $(XEN_READMES), it is about the makefile as a whole. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- Notes: v2: - remove existing loops in install targets and use a single call to $(INSTALL_DATA) to install multiple files. tools/examples/Makefile | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 14e24f4cb3..c839bf5603 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -2,6 +2,7 @@ XEN_ROOT =3D $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 # Xen configuration dir and configs to go there. + XEN_READMES =3D README =20 XEN_CONFIGS +=3D xlexample.hvm @@ -10,14 +11,9 @@ XEN_CONFIGS +=3D xlexample.pvhlinux XEN_CONFIGS +=3D xl.conf XEN_CONFIGS +=3D cpupool =20 -XEN_CONFIGS +=3D $(XEN_CONFIGS-y) - .PHONY: all all: =20 -.PHONY: build -build: - .PHONY: install install: all install-readmes install-configs =20 @@ -26,12 +22,8 @@ uninstall: uninstall-readmes uninstall-configs =20 .PHONY: install-readmes install-readmes: - [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) - set -e; for i in $(XEN_READMES); \ - do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \ - $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \ - done + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) + $(INSTALL_DATA) $(XEN_READMES) $(DESTDIR)$(XEN_CONFIG_DIR) =20 .PHONY: uninstall-readmes uninstall-readmes: @@ -39,14 +31,9 @@ uninstall-readmes: =20 .PHONY: install-configs install-configs: $(XEN_CONFIGS) - [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) - [ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto - set -e; for i in $(XEN_CONFIGS); \ - do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \ - $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \ - done + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto + $(INSTALL_DATA) $(XEN_CONFIGS) $(DESTDIR)$(XEN_CONFIG_DIR) =20 .PHONY: uninstall-configs uninstall-configs: --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086734513184.07253582008457; Fri, 24 Jun 2022 09:05:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355603.583347 (Exim 4.92) (envelope-from ) id 1o4lnY-00059p-RB; Fri, 24 Jun 2022 16:04:44 +0000 Received: by outflank-mailman (output) from mailman id 355603.583347; Fri, 24 Jun 2022 16:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnY-00059Z-Mq; Fri, 24 Jun 2022 16:04:44 +0000 Received: by outflank-mailman (input) for mailman id 355603; Fri, 24 Jun 2022 16:04:42 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnW-0004qc-MM for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:42 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 58be9a20-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:04:39 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 58be9a20-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086679; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SYJTJIKxHEFQcMKNpvz4kHz4LT/E8ZyffBaU/35UM+o=; b=HmzEjoLDOpRxONKwf00fObo3vaIJ5nB6CgEG5DHe/38eBMK1hMnarIcz rh/MIbAT//k992vK1EAAAxeD49R5VToSRF7Dij1YpAchiESf/wDhZYrXf BuLLRGwonlTwa4LqTU1j1syPrT6w5ooL5Gn8DYZuCZ8+pQjC/Qqp6K6rh 0=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74362336 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:nXFssakeiBmCED/TfVVOVYLo5gzbJkRdPkR7XQ2eYbSJt1+Wr1Gzt xJNCGHUMvuIajb2ctEjYYvj8EIF6pHUmINrGQJvqCs9ESMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BCpC48T8kk/vgqoPUUIYoAAgoLeNfYHpn2EgLd9IR2NYy24DnWV/V4 7senuWEULOb828sWo4rw/rrRCNH5JwebxtB4zTSzdgS1LPvvyF94KA3fMldHFOhKmVgJcaoR v6r8V2M1jixEyHBqD+Suu2TnkUiGtY+NOUV45Zcc/DKbhNq/kTe3kunXRa1hIg+ZzihxrhMJ NtxWZOYSwEvPfbdmeghaBhKEjlkP/B+opP7Li3q2SCT5xWun3rExvxvCAc9PJEC+/YxCmZLn RAaAGlTNFbZ3bvwme/lDLk37iggBJCD0Ic3s3d8zTbfHLA+TIrKWani7t5ExjYgwMtJGJ4yY uJGNWExNk+bPXWjPH88A4sHpqCpvEXvbmcAsHexo5E2u3ncmVkZPL/Fb4OOJ43iqd9utlmcj nLL+SL+GB5yHN6VxCeB83msrvTShi69U4UXfJWo+/gvjFCNy2g7DBwNSUD9sfS/klS5Wd9UN woT4CVGkEQp3BX1FJ+nBUT++SPa+E5HMzZNLwEkwAOLzKmP8geVOlMFXD9Zct57jJUaeTN/g zdlgOjV6SxTXKy9ECzAqO/P8GvtaUD5PkdZO3ZaEFJtD83L5dhq00mRFosL/Lud1IWdJN3m/ 9ydQMHSbZ03hNVD6ai09Euvb9mE9smQFV5dCuk6swuYAuJFiG2NPdXABaDzt6ooEWpgZgDpU II4s8af9vsSKpqGiTaARu4AdJnwuavbaGWN2AEzR8F+n9hIx5JFVdoIiN2ZDBcBDyr5UWWxP B+7Vf15vve/w0dGnYcoOtnsWqzGPIDrFMj/V+C8U+eilqNZLVfdlAk3PBb49zm0zCAEzPFuU b/GIJ3EJStLVsxaIM+eGr51PUkDnXtlmws+hPnTknya7FZpTCTEF+5bbATfNb5RAWHtiFy9z uuz/vCik313ONASqAGNmWLPBTjm9UQGOK0= IronPort-HdrOrdr: A9a23:B2ve5Kt8OtcuMScEm3JqsGLs7skDcNV00zEX/kB9WHVpmszxra +TdZMgpHjJYVcqKQgdcL+7WZVoLUmwyXcx2/hyAV7AZniDhILLFuFfBOLZqlWKcREWtNQtsJ uIG5IObuEYZmIVsS+V2mWF+q4bsbq6zJw= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74362336" From: Anthony PERARD To: CC: Anthony PERARD , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH v3 04/25] tools/firmware/hvmloader: rework Makefile Date: Fri, 24 Jun 2022 17:04:01 +0100 Message-ID: <20220624160422.53457-5-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086735734100011 Content-Type: text/plain; charset="utf-8" Setup proper dependencies with libacpi so we don't need to run "make hvmloader" in the "all" target. ("build.o" new prerequisite isn't exactly proper but a side effect of building the $(DSDT_FILES) is to generate the "ssdt_*.h" needed by "build.o".) Make use if "-iquote" instead of a plain "-I". For "roms.inc" target, use "$(SHELL)" instead of plain "sh". And use full path to "mkhex" instead of a relative one. Lastly, add "-f" flag to "mv", in case the target already exist. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- tools/firmware/hvmloader/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/M= akefile index b754220839..fc20932110 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -60,8 +60,7 @@ ROMS +=3D $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) endif =20 .PHONY: all -all: acpi - $(MAKE) hvmloader +all: hvmloader =20 .PHONY: acpi acpi: @@ -73,12 +72,15 @@ smbios.o: CFLAGS +=3D -D__SMBIOS_DATE__=3D"\"$(SMBIOS_R= EL_DATE)\"" ACPI_PATH =3D ../../libacpi DSDT_FILES =3D dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c ACPI_OBJS =3D $(patsubst %.c,%.o,$(DSDT_FILES)) build.o static_tables.o -$(ACPI_OBJS): CFLAGS +=3D -I. -DLIBACPI_STDUTILS=3D\"$(CURDIR)/util.h\" +$(ACPI_OBJS): CFLAGS +=3D -iquote . -DLIBACPI_STDUTILS=3D\"$(CURDIR)/util.= h\" CFLAGS +=3D -I$(ACPI_PATH) vpath build.c $(ACPI_PATH) vpath static_tables.c $(ACPI_PATH) OBJS +=3D $(ACPI_OBJS) =20 +$(DSDT_FILES): acpi +build.o: $(DSDT_FILES) + hvmloader: $(OBJS) hvmloader.lds $(LD) $(LDFLAGS_DIRECT) -N -T hvmloader.lds -o $@ $(OBJS) =20 @@ -87,21 +89,21 @@ roms.inc: $(ROMS) =20 ifneq ($(ROMBIOS_ROM),) echo "#ifdef ROM_INCLUDE_ROMBIOS" >> $@.new - sh ../../misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new echo "#endif" >> $@.new endif =20 ifneq ($(STDVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ../../misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.= new echo "#endif" >> $@.new endif ifneq ($(CIRRUSVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ../../misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) = >> $@.new echo "#endif" >> $@.new endif - mv $@.new $@ + mv -f $@.new $@ =20 .PHONY: clean clean: --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086731761384.8500750294394; Fri, 24 Jun 2022 09:05:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355606.583379 (Exim 4.92) (envelope-from ) id 1o4lnb-0005td-1L; Fri, 24 Jun 2022 16:04:47 +0000 Received: by outflank-mailman (output) from mailman id 355606.583379; Fri, 24 Jun 2022 16:04:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lna-0005sZ-Qh; Fri, 24 Jun 2022 16:04:46 +0000 Received: by outflank-mailman (input) for mailman id 355606; Fri, 24 Jun 2022 16:04:46 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnZ-0004qb-V8 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:46 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5d0cdfcc-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:44 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5d0cdfcc-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086685; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6zroeQWnVKs2sspcMTPF4FS/ihKUgmPZSZni2g/h+iU=; b=YWdVoPFHspWShIHsJGhN168qZLZ4kdsAgWqySBXBPp0Y6N5p8skDNWNo 9o9twQmccGSc2QZx/1LrpKQQN/wr+Nim9oNrUc81f4NxdOEQPdNdKcrIG t3IRfK8wQ8FmjM90pc0hqyLDQgJx9OYSE935R2E74XJLtX143Yic1sAcM Q=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74208073 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:wU33AKy6aB2z7Iu30k96t+c1xirEfRIJ4+MujC+fZmUNrF6WrkUPz mUWWTiAafiPZmCgctojOY2y9x4Ovp7SmoIxHAU4/iAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnj/0bv656yMUOZigHtIQMsadUsxKbVIiGX1JZS5LwbZj2NY224ThWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ Nplv5P3SQg0Aff2l746AwV3Nn1yArVL0eqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6BO 5BBOWIwN3wsZTUSK3wmNMgDgd6P2CC4U2R/k0Ow/aUotj27IAtZj+G2bYu9lsaxbd5Ogk+Sq 2bC/mL4KhIXLtqSzXyC6H3ErvDLtTP2XsQVDrLQ3vx3hFyewEQDBRtQUkG0ydGph0j7V99BJ kg8/is1sbN05EGtVsP6XRCzvDiDpBF0c9haHvA+6QqN4rHJ+AvfDW8BJgOtc/R/6pVwH2Zzk AbUwZW5XlSDrYF5V1qX+fCUoi6NYxIad0hSeQAhEQc6+9TK9dRbYg30cjpzLEKkpoSrRG+om G3S83hWa6Y71pBSifjilbzTq3f1/8WSEFZojunCdjj9hj6VcrJJcGBBBbLzyf9bZLiUQVCa1 JTvs5jPtbteZX1hecHkfQnsIF1Kz6zcWNEkqQQzd6TNDhz0k5JZQahe4StlOGBiOdsedDnib Sf74F0MuscLbSL1MfcvPOpd7vjGK4C6TbwJsdiEBuein7ArLFPXlM2QTRT4M5/RfLgEzvhkZ MbznTeEBncGE6V3pAeLqxMm+eZznEgWnDqLLbiilkjP+efONRa9FOZeWHPTP79R0U9xiFiMm zqpH5DRkEs3vSyXSnS/zLP/2nhQfCZiW8yp+pcJHgNBSyI/cFwc5zbq6etJU+RYc259yo8kI lnVtpdk9WfC IronPort-HdrOrdr: A9a23:xC/hIKiMcIgnQgsOgA0XVsd+oHBQXuIji2hC6mlwRA09TySZ// rBoB19726TtN9xYgBZpTnuAsm9qB/nmaKdpLNhWItKPzOW31dATrsSjrcKqgeIc0aVm9K1l5 0QF5SWYOeAdGSS5vya3ODXKbkdKaG8gcKVuds= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74208073" From: Anthony PERARD To: CC: Anthony PERARD , Andrew Cooper , George Dunlap , "Jan Beulich" , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [XEN PATCH v3 05/25] tools/fuzz/libelf: rework makefile Date: Fri, 24 Jun 2022 17:04:02 +0100 Message-ID: <20220624160422.53457-6-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086733660100002 Content-Type: text/plain; charset="utf-8" Rename ELF_LIB_OBJS to LIBELF_OBJS as to have the same name as in libs/guest/. Replace "-I" by "-iquote". Remove the use of "vpath". It will not works when we will convert this makefile to subdirmk. Instead, we create symlinks to the source files. Since we are creating a new .gitignore for the links, also move the existing entry to it. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- Notes: v2: - create a per-directory .gitignore to add new entry and existing one tools/fuzz/libelf/Makefile | 21 ++++++++++----------- .gitignore | 1 - tools/fuzz/libelf/.gitignore | 2 ++ 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 tools/fuzz/libelf/.gitignore diff --git a/tools/fuzz/libelf/Makefile b/tools/fuzz/libelf/Makefile index 9eb30ee40c..9211f75951 100644 --- a/tools/fuzz/libelf/Makefile +++ b/tools/fuzz/libelf/Makefile @@ -1,25 +1,24 @@ XEN_ROOT =3D $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -# libelf fuzz target -vpath %.c ../../../xen/common/libelf -CFLAGS +=3D -I../../../xen/common/libelf -ELF_SRCS-y +=3D libelf-tools.c libelf-loader.c libelf-dominfo.c -ELF_LIB_OBJS :=3D $(patsubst %.c,%.o,$(ELF_SRCS-y)) +LIBELF_OBJS :=3D libelf-tools.o libelf-loader.o libelf-dominfo.o =20 -$(patsubst %.c,%.o,$(ELF_SRCS-y)): CFLAGS +=3D -Wno-pointer-sign - -$(ELF_LIB_OBJS): CFLAGS +=3D -DFUZZ_NO_LIBXC $(CFLAGS_xeninclude) +CFLAGS +=3D -iquote ../../../xen/common/libelf +$(LIBELF_OBJS): CFLAGS +=3D -Wno-pointer-sign +$(LIBELF_OBJS): CFLAGS +=3D -DFUZZ_NO_LIBXC $(CFLAGS_xeninclude) =20 libelf-fuzzer.o: CFLAGS +=3D $(CFLAGS_xeninclude) =20 -libelf.a: libelf-fuzzer.o $(ELF_LIB_OBJS) +$(LIBELF_OBJS:.o=3D.c): libelf-%.c: ../../../xen/common/libelf/libelf-%.c = FORCE + ln -nsf $< $@ + +libelf.a: libelf-fuzzer.o $(LIBELF_OBJS) $(AR) rc $@ $^ =20 .PHONY: libelf-fuzzer-all libelf-fuzzer-all: libelf.a libelf-fuzzer.o =20 -afl-libelf-fuzzer: afl-libelf-fuzzer.o libelf-fuzzer.o $(ELF_LIB_OBJS) +afl-libelf-fuzzer: afl-libelf-fuzzer.o libelf-fuzzer.o $(LIBELF_OBJS) $(CC) $(CFLAGS) $^ -o $@ =20 # Common targets @@ -31,7 +30,7 @@ distclean: clean =20 .PHONY: clean clean: - rm -f *.o .*.d *.a *-libelf-fuzzer + rm -f *.o .*.d *.a *-libelf-fuzzer $(LIBELF_OBJS:.o=3D.c) =20 .PHONY: install install: all diff --git a/.gitignore b/.gitignore index 7cf26051db..6410dfbc72 100644 --- a/.gitignore +++ b/.gitignore @@ -195,7 +195,6 @@ tools/flask/utils/flask-loadpolicy tools/flask/utils/flask-setenforce tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci -tools/fuzz/libelf/afl-libelf-fuzzer tools/fuzz/x86_instruction_emulator/asm tools/fuzz/x86_instruction_emulator/afl-harness tools/fuzz/x86_instruction_emulator/afl-harness-cov diff --git a/tools/fuzz/libelf/.gitignore b/tools/fuzz/libelf/.gitignore new file mode 100644 index 0000000000..ed634214c9 --- /dev/null +++ b/tools/fuzz/libelf/.gitignore @@ -0,0 +1,2 @@ +/afl-libelf-fuzzer +/libelf-*.c --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086738418422.4432537000473; Fri, 24 Jun 2022 09:05:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355607.583395 (Exim 4.92) (envelope-from ) id 1o4lnc-0006Jb-Im; Fri, 24 Jun 2022 16:04:48 +0000 Received: by outflank-mailman (output) from mailman id 355607.583395; Fri, 24 Jun 2022 16:04:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnc-0006JE-7o; Fri, 24 Jun 2022 16:04:48 +0000 Received: by outflank-mailman (input) for mailman id 355607; Fri, 24 Jun 2022 16:04:47 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnb-0004qb-3R for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:47 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5db7e901-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:46 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5db7e901-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H6lNZDzSWqxu4KmA0eh73M+dV6/C4L+8X1rFIcfviuI=; b=byRBltptZh787kRD6crDvZ13r6JPwg6+bs5aadtzvlhMfWrkmK0HnyBD euLMmxEfLmc3rA7soH/MDF+e936/oVTUky6q61JHJfIZw8luYKnLhqo2D +Vhb9MXvExFTuyowUzZoyaMuKaYVIc4K2skvfzbQ9qYlHlKCrSvpup9Ew U=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74208075 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:eLfogag4YypOK+jahAu2T33DX161YhAKZh0ujC45NGQN5FlHY01je htvXG/Va/6PY2OjKNEnbIqwoE4Hv57Wnd8xTFA/rio0E3kb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oDJ9CU6jefSLlbFILas1hpZHGeIcw98z0M58wIFqtQw24LhXVnR4 YmaT/D3YzdJ5RYlagr41IrbwP9flKyaVOQw5wFWiVhj5TcyplFNZH4tDfjZw0jQG+G4KtWSV efbpIxVy0uCl/sb5nFJpZ6gGqECaua60QFjERO6UYD66vRJjnRaPqrWqJPwwKqY4tmEt4kZ9 TlDiXC/YQ0mea3DhdtHaRYCNHFiEoga9IDfLFHq5KR/z2WeG5ft6/BnDUVwNowE4OdnR2pJ8 JT0KhhUMErF3bjvhuvmFK883azPL+GyVG8bknhm0THeC+dgWZ3ZSr/GzdRZwC0xloZFGvO2i 88xNmY1NESYPEAn1lE/VckAmsi2hyLGUzQH80vWgJoY0mLS9VkkuFTqGIWMIYHbLSlPpW6Dv X7P9Wn9BhAcNfScxCCD/3bqgfXA9QvkXKoCGbv+8eRl6HWR22gSBRs+RVa95/6jhSaWS99Zb kAZ5Ccqhawz71CwCMnwWQWip3yJtQJaXMBfe8U44gyQzqvf4y6CG3MJCDVGbbQbWNQeHGJwk AXTxpWwWGIp4Ob9pW+hGqm8pzz1OScIEjU4anUjHRcqxoXvn5k+p0eaJjp8K5JZnuEZCBmpn W3U9HNj3+pD5SIY//7lpA6a2lpAsrCMF1dovVuPAwpJ+ysjPOaYi5qUBU83BBqqBKKQVRG/s XcNgKByB8heXMjWxERhrAjgdYxFBspp0xWG2DaD57F7q1yQF4eLJOi8Gg1WKkZzKdojcjT0e kLVsg45zMYNYSXyNf4uPN7pU5tCIU3c+TLNDKi8gj1mMvBMmPKvpnkyNSZ8IUi3+KTTrU3PE cjCKpv9ZZrrIa9m0CC3V48g7FPf/QhnnTm7bcmil3yPiOPCDFbIGeZtGAbfNYgRsfLbyDg5B v4CbqNmPT0EC7agCsQWmKZORW03wY8TX8Go8pILKb/YfGKL2ggJUpfs/F/oQKQ994w9qwsC1 i3VtpNwoLYnuUD6FA== IronPort-HdrOrdr: A9a23:WEOs36vjTnPFiW1lnemP18Vr7skDcNV00zEX/kB9WHVpmszxra +TdZMgpHjJYVcqKQgdcL+7WZVoLUmwyXcx2/hyAV7AZniDhILLFuFfBOLZqlWKcREWtNQtsJ uIG5IObuEYZmIVsS+V2mWF+q4bsbq6zJw= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74208075" From: Anthony PERARD To: CC: Anthony PERARD , Andrew Cooper , George Dunlap , "Jan Beulich" , Julien Grall , "Stefano Stabellini" , Wei Liu , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [XEN PATCH v3 06/25] tools/fuzz/x86_instruction_emulator: rework makefile Date: Fri, 24 Jun 2022 17:04:03 +0100 Message-ID: <20220624160422.53457-7-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086739475100003 Content-Type: text/plain; charset="utf-8" Rework dependencies of all objects. We don't need to add dependencies for headers that $(CC) is capable of generating, we only need to include $(DEPS_INCLUDE). Some dependencies are still needed so make knows to generate symlinks for them. We remove the use of "vpath" for cpuid.c. While it works fine for now, when we will convert this makefile to subdirmk, vpath will not be usable. Also, "-iquote" is now needed to build "cpuid.o". Replace "-I." by "-iquote .", so it applies to double-quote includes only. Rather than checking if a symlink exist, always regenerate the symlink. So if the source tree changed location, the symlink is updated. Since we are creating a new .gitignore for the symlink, also move the entry to it. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- Notes: v2: - create a new per-directory .gitignore to add the new entry and existi= ng ones tools/fuzz/x86_instruction_emulator/Makefile | 32 ++++++++----------- .gitignore | 6 ---- .../fuzz/x86_instruction_emulator/.gitignore | 7 ++++ 3 files changed, 21 insertions(+), 24 deletions(-) create mode 100644 tools/fuzz/x86_instruction_emulator/.gitignore diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_= instruction_emulator/Makefile index 1a6dbf94e1..f11437e6a2 100644 --- a/tools/fuzz/x86_instruction_emulator/Makefile +++ b/tools/fuzz/x86_instruction_emulator/Makefile @@ -8,33 +8,27 @@ else x86-insn-fuzz-all: endif =20 -# Add libx86 to the build -vpath %.c $(XEN_ROOT)/xen/lib/x86 +cpuid.c: %: $(XEN_ROOT)/xen/lib/x86/% FORCE + ln -nsf $< $@ =20 -x86_emulate: - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/arch/x86/$@ +x86_emulate: FORCE + ln -nsf $(XEN_ROOT)/xen/arch/x86/$@ =20 x86_emulate/%: x86_emulate ; =20 -x86-emulate.c x86-emulate.h wrappers.c: %: - [ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$* +x86-emulate.c x86-emulate.h wrappers.c: %: $(XEN_ROOT)/tools/tests/x86_emu= lator/% FORCE + ln -nsf $< $@ =20 -CFLAGS +=3D $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -I. +CFLAGS +=3D $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -iquote . +cpuid.o: CFLAGS +=3D -iquote $(XEN_ROOT)/xen/lib/x86 =20 GCOV_FLAGS :=3D --coverage %-cov.o: %.c $(CC) -c $(CFLAGS) $(GCOV_FLAGS) $< -o $@ =20 -x86.h :=3D $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ - x86-vendors.h x86-defns.h msr-index.h) \ - $(addprefix $(XEN_ROOT)/tools/include/xen/lib/x86/, \ - cpuid.h cpuid-autogen.h) -x86_emulate.h :=3D x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) - -# x86-emulate.c will be implicit for both -x86-emulate.o x86-emulate-cov.o: x86_emulate/x86_emulate.c $(x86_emulate.h) - -fuzz-emul.o fuzz-emulate-cov.o cpuid.o wrappers.o: $(x86_emulate.h) +x86-emulate.h: x86_emulate/x86_emulate.h +x86-emulate.o x86-emulate-cov.o: x86-emulate.h x86_emulate/x86_emulate.c +fuzz-emul.o fuzz-emul-cov.o wrappers.o: x86-emulate.h =20 x86-insn-fuzzer.a: fuzz-emul.o x86-emulate.o cpuid.o $(AR) rc $@ $^ @@ -51,7 +45,7 @@ all: x86-insn-fuzz-all =20 .PHONY: distclean distclean: clean - rm -f x86_emulate x86-emulate.c x86-emulate.h + rm -f x86_emulate x86-emulate.c x86-emulate.h wrappers.c cpuid.c =20 .PHONY: clean clean: @@ -67,3 +61,5 @@ afl: afl-harness =20 .PHONY: afl-cov afl-cov: afl-harness-cov + +-include $(DEPS_INCLUDE) diff --git a/.gitignore b/.gitignore index 6410dfbc72..8b6886f3fd 100644 --- a/.gitignore +++ b/.gitignore @@ -195,12 +195,6 @@ tools/flask/utils/flask-loadpolicy tools/flask/utils/flask-setenforce tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci -tools/fuzz/x86_instruction_emulator/asm -tools/fuzz/x86_instruction_emulator/afl-harness -tools/fuzz/x86_instruction_emulator/afl-harness-cov -tools/fuzz/x86_instruction_emulator/wrappers.c -tools/fuzz/x86_instruction_emulator/x86_emulate -tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh diff --git a/tools/fuzz/x86_instruction_emulator/.gitignore b/tools/fuzz/x8= 6_instruction_emulator/.gitignore new file mode 100644 index 0000000000..65c3cf9702 --- /dev/null +++ b/tools/fuzz/x86_instruction_emulator/.gitignore @@ -0,0 +1,7 @@ +/asm +/afl-harness +/afl-harness-cov +/cpuid.c +/wrappers.c +/x86_emulate +/x86-emulate.[ch] --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086741592636.2790529955325; Fri, 24 Jun 2022 09:05:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355610.583427 (Exim 4.92) (envelope-from ) id 1o4lnf-0007A8-Rv; Fri, 24 Jun 2022 16:04:51 +0000 Received: by outflank-mailman (output) from mailman id 355610.583427; Fri, 24 Jun 2022 16:04:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnf-00078r-FL; Fri, 24 Jun 2022 16:04:51 +0000 Received: by outflank-mailman (input) for mailman id 355610; Fri, 24 Jun 2022 16:04:50 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnd-0004qb-R9 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:49 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5ef24dfc-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:48 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5ef24dfc-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+tvgdAnTgDFIQbMFRm+czYIkxCdj45NAL3MUbvPerCo=; b=GoukUCllQxy0X5MKyNwMM+1CjV/d50HEcX/+wFPWQ7ANjr6Lq1P2gRfS WqgkX9PxODoBNd28i6Hji84k9//+UnPIre4M3dMvjnTfx8hbJE1WZs1jf QcjVw0lnD1Wt7xpuxOMPd8GJwn8vKQhNbxCdsYbTTOVtWaRZeE+C3i42u w=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 73702016 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:BBze+a0VFFfRqw9vXPbD5Zpxkn2cJEfYwER7XKvMYLTBsI5bp2cGn WAaCGGGOa3bM2TwKdp/bonl9U4C6sCBnddgSQJqpC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkjk7xdOCn9xGQ7InQLlbGILes1htZGEk1Ek/NtTo5w7Rj2tAy3YDja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1uvLqSZiAABZbn2/4WDRoASyVRJpNZreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNamFO JJDMWMxBPjGSzhxBk03VaJuoLmtg33PTH5ahHuY4oNitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzREhwccdCS1zeB2natnfPU2zP2XpoIE7+1/eIsh0ecrlH/EzVPCwH9+6PgzBfjBZQPc CT45xbCs4AR/WqJYf7UZCaT42SP4B1EA95/CNMlvVTlJrXv3+qJOoQVZmcfNYJ+75JuGmxCO kyhxI2wW2E22FGBYTfEr+rP82vvUcQABTVaDRLoWzfp9DUKTGsbqhvUBuhuH6eu5jEeMWGhm mvaxMTSalh6sCLq60lY1Qqe695UjsKVJjPZHy2ONo5f0it3ZZS+e6uj4kXB4PBLIe6xFwfc4 iBcypHBsLhWUvlhcRBhps1XRNlFAN7VWAAwfHY1R8Vxn9hT0yTLkX9sDMFWex4yb5dslc7Ba 07PowJBjKJu0I+RRfYvOeqZUp1ypYC5TIiNfq2EP7JmP8kqHCfarX4GWKJl9z20+KTaufpkY snznAfFJStyNJmLOxLsFrlEj+N0l3tgrY4RLLiipymaPXOlTCb9Yd843JGmMojVMIvsTN3pz uti IronPort-HdrOrdr: A9a23:jkEzSqAWyXVAdWzlHemU55DYdb4zR+YMi2TC1yhKJyC9Ffbo8f xG/c5rrSMc5wxwZJhNo7y90ey7MBbhHP1OkO4s1NWZLWrbUQKTRekIh+bfKn/baknDH4ZmpN 5dmsNFaeEYY2IUsS+D2njbL+od X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="73702016" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 07/25] tools/hotplug: cleanup Makefiles Date: Fri, 24 Jun 2022 17:04:04 +0100 Message-ID: <20220624160422.53457-8-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086743503100014 Content-Type: text/plain; charset="utf-8" Remove "build" targets. Use simply expanded variables when recursively expanded variable aren't needed. (Use ":=3D" instead of "=3D".) Don't check if a directory already exist when installing, just create it. Fix $(HOTPLUGPATH), it shouldn't have any double-quote. Some reindentation. FreeBSD, "hotplugpath.sh" is already installed by common/. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- tools/hotplug/FreeBSD/Makefile | 11 +++-------- tools/hotplug/Linux/Makefile | 16 ++++++---------- tools/hotplug/Linux/systemd/Makefile | 16 +++++++--------- tools/hotplug/NetBSD/Makefile | 9 +++------ tools/hotplug/common/Makefile | 16 ++++++---------- 5 files changed, 25 insertions(+), 43 deletions(-) diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile index de9928cd86..a6552c9884 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -2,18 +2,15 @@ XEN_ROOT =3D $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 # Xen script dir and scripts to go there. -XEN_SCRIPTS =3D vif-bridge block +XEN_SCRIPTS :=3D vif-bridge block =20 -XEN_SCRIPT_DATA =3D +XEN_SCRIPT_DATA :=3D =20 -XEN_RCD_PROG =3D rc.d/xencommons rc.d/xendriverdomain +XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendriverdomain =20 .PHONY: all all: =20 -.PHONY: build -build: - .PHONY: install install: install-scripts install-rcd =20 @@ -44,12 +41,10 @@ install-rcd: do \ $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \ done - $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(XEN_SCRIPT_DIR) =20 .PHONY: uninstall-rcd uninstall-rcd: rm -f $(addprefix $(DESTDIR)$(INITD_DIR)/, $(XEN_RCD_PROG)) - rm -f $(DESTDIR)$(XEN_SCRIPT_DIR)/hotplugpath.sh =20 .PHONY: clean clean: diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 0b1d111d7e..9a7b3a3515 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -2,7 +2,7 @@ XEN_ROOT =3D $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 # Xen script dir and scripts to go there. -XEN_SCRIPTS =3D vif-bridge +XEN_SCRIPTS :=3D vif-bridge XEN_SCRIPTS +=3D vif-route XEN_SCRIPTS +=3D vif-nat XEN_SCRIPTS +=3D vif-openvswitch @@ -22,16 +22,13 @@ XEN_SCRIPTS +=3D launch-xenstore =20 SUBDIRS-$(CONFIG_SYSTEMD) +=3D systemd =20 -XEN_SCRIPT_DATA =3D xen-script-common.sh locking.sh logging.sh +XEN_SCRIPT_DATA :=3D xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA +=3D xen-hotplug-common.sh xen-network-common.sh vif-commo= n.sh XEN_SCRIPT_DATA +=3D block-common.sh =20 .PHONY: all all: subdirs-all =20 -.PHONY: build -build: - .PHONY: install install: install-initd install-scripts subdirs-install =20 @@ -41,9 +38,9 @@ uninstall: uninstall-initd uninstall-scripts subdirs-unin= stall # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd install-initd: - [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) - [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG= _DIR) - [ -d $(DESTDIR)$(LIBEXEC_BIN) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) + $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) init.d/sysconfig.xendomains $(DESTDIR)$(SYSCONFIG_DIR)/xe= ndomains $(INSTALL_DATA) init.d/sysconfig.xencommons $(DESTDIR)$(SYSCONFIG_DIR)/xe= ncommons $(INSTALL_PROG) xendomains $(DESTDIR)$(LIBEXEC_BIN) @@ -64,8 +61,7 @@ uninstall-initd: =20 .PHONY: install-scripts install-scripts: - [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/sys= temd/Makefile index a5d41d86ef..26df2a43b1 100644 --- a/tools/hotplug/Linux/systemd/Makefile +++ b/tools/hotplug/Linux/systemd/Makefile @@ -1,12 +1,12 @@ XEN_ROOT =3D $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -XEN_SYSTEMD_MODULES =3D xen.conf +XEN_SYSTEMD_MODULES :=3D xen.conf =20 -XEN_SYSTEMD_MOUNT =3D proc-xen.mount +XEN_SYSTEMD_MOUNT :=3D proc-xen.mount XEN_SYSTEMD_MOUNT +=3D var-lib-xenstored.mount =20 -XEN_SYSTEMD_SERVICE =3D xenstored.service +XEN_SYSTEMD_SERVICE :=3D xenstored.service XEN_SYSTEMD_SERVICE +=3D xenconsoled.service XEN_SYSTEMD_SERVICE +=3D xen-qemu-dom0-disk-backend.service XEN_SYSTEMD_SERVICE +=3D xendomains.service @@ -14,7 +14,7 @@ XEN_SYSTEMD_SERVICE +=3D xen-watchdog.service XEN_SYSTEMD_SERVICE +=3D xen-init-dom0.service XEN_SYSTEMD_SERVICE +=3D xendriverdomain.service =20 -ALL_XEN_SYSTEMD =3D $(XEN_SYSTEMD_MODULES) \ +ALL_XEN_SYSTEMD :=3D $(XEN_SYSTEMD_MODULES) \ $(XEN_SYSTEMD_MOUNT) \ $(XEN_SYSTEMD_SERVICE) =20 @@ -30,10 +30,8 @@ distclean: clean =20 .PHONY: install install: $(ALL_XEN_SYSTEMD) - [ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) - [ -d $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) $(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) @@ -48,5 +46,5 @@ $(XEN_SYSTEMD_MODULES): rm -f $@.tmp for mod in $(LINUX_BACKEND_MODULES) ; do \ echo $$mod ; \ - done > $@.tmp + done > $@.tmp $(call move-if-changed,$@.tmp,$@) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index f909ffa367..1cd3db2ccb 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -2,22 +2,19 @@ XEN_ROOT =3D $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 # Xen script dir and scripts to go there. -XEN_SCRIPTS =3D +XEN_SCRIPTS :=3D XEN_SCRIPTS +=3D locking.sh XEN_SCRIPTS +=3D block XEN_SCRIPTS +=3D vif-bridge XEN_SCRIPTS +=3D vif-ip XEN_SCRIPTS +=3D qemu-ifup =20 -XEN_SCRIPT_DATA =3D -XEN_RCD_PROG =3D rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xe= ndriverdomain +XEN_SCRIPT_DATA :=3D +XEN_RCD_PROG :=3D rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/x= endriverdomain =20 .PHONY: all all: =20 -.PHONY: build -build: - .PHONY: install install: install-scripts install-rcd =20 diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index ef48bfacc9..e8a8dbea6c 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -1,22 +1,19 @@ XEN_ROOT =3D $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -HOTPLUGPATH=3D"hotplugpath.sh" +HOTPLUGPATH :=3D hotplugpath.sh =20 # OS-independent hotplug scripts go in this directory =20 # Xen scripts to go there. -XEN_SCRIPTS =3D -XEN_SCRIPT_DATA =3D $(HOTPLUGPATH) +XEN_SCRIPTS :=3D +XEN_SCRIPT_DATA :=3D $(HOTPLUGPATH) =20 genpath-target =3D $(call buildmakevars2file,$(HOTPLUGPATH)) $(eval $(genpath-target)) =20 .PHONY: all -all: build - -.PHONY: build -build: $(HOTPLUGPATH) +all: $(HOTPLUGPATH) =20 .PHONY: install install: install-scripts @@ -25,9 +22,8 @@ install: install-scripts uninstall: uninstall-scripts =20 .PHONY: install-scripts -install-scripts: build - [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) +install-scripts: all + $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086733302460.13597047337566; Fri, 24 Jun 2022 09:05:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355609.583411 (Exim 4.92) (envelope-from ) id 1o4lne-0006kY-9u; Fri, 24 Jun 2022 16:04:50 +0000 Received: by outflank-mailman (output) from mailman id 355609.583411; Fri, 24 Jun 2022 16:04:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lne-0006it-3l; Fri, 24 Jun 2022 16:04:50 +0000 Received: by outflank-mailman (input) for mailman id 355609; Fri, 24 Jun 2022 16:04:49 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnd-0004qb-9U for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:49 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5db7fb44-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:47 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5db7fb44-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vEj0fZWMl+R77ejhJIT+1IS4qvoqXeRC/IzY/VGgI/8=; b=Km1O2OJmT93Ntpt7BpOcwoBC/OiFR3GXeu9Pz7A4wDI0dgVr6TFUQg3k DoADTNV4rv2/fz6iFTn9sbzUkjcx0E+qCLLAZ0aCC4+0TCtbymuM8Nipq LRJ5WAqO0AOGlt89DdrQbJ34KVOnCHjwuVH0V3QHOfdtuMy6c5jCOulx3 k=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74787670 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:eKgX8KvXsG72mnAmmStQltDTo+fnVB9eMUV32f8akzHdYApBsoF/q tZmKWzQb/eJYDajKItzaI2y8BlT6sKEzNBjTVY5+3szEC4V+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/nOHNIQMcacUsxLbVYMpBwJ1FQywYbVvqYy2YLjW13X5 YuoyyHiEATNNwBcYzp8B52r8HuDjNyq0N/PlgVjDRzjlAa2e0g9VPrzF4noR5fLatA88tqBb /TC1NmEElbxpH/BPD8HfoHTKSXmSpaKVeSHZ+E/t6KK2nCurQRquko32WZ1he66RFxlkvgoo Oihu6BcRi92H7PTsfswCCJHUDFMGLJEo5b4Al2G5Jn7I03uKxMAwt1rBUAye4YZ5vx2ESdF8 vlwxDIlN07ZwbjsmfTiF7cq1p9LwMrDZevzvllpyy3ZCvA3B4jOWazQ6fdT3Ssqh9AIFvHbD yYcQWUzM0SfPUIXUrsRIKABmLysp3PBST9ntECoqqA2w1fO7CUkhdABN/KKI4fXFK25hH2wu Wbu72n/RBYAO7S32TeDt36hmOLLtSf6Q54JUq218OZwh1+ezXBVDwcZPWZXutHg1BT4AYgGb RVJpGx+9sDe6XBHUPGifgOniWGp5SUDGMpiNvI4syiy6Y/ttlPx6nc/ctJRVDA3nJZoGGJyj QLRwIOB6S9H6+PMFy/EnluAhXbrYHVOczdfDcMRZVFdi+QPtr3fmf4mojxLNKeuxuP4Fjjrq 9xhhHhv3u5D5SLnOkjSwLwmv95PjsKQJuLNzl+LNl9JFysgDGJfW6Sm6ELA8dFLJ5uDQ1+Ks RAswpbDsrhWXMjSyHTVH43h+Y1FAd7faFUwZnY/d6TNChz3oyLzFWyuyGsWyLhV3jYsJmayP R67VfJ5755PJnq6BZJKj3aKI51yl8DITI29PtiNN4YmSsUhJWevoXA1DWbNjj+FraTZufxmU XttWZ33Vihy5GUO5GfeetrxJpdxl35nmz+MFMulp/lluJLHDEOopX4+GAPmRogEAGms+W05L /432xO29ihi IronPort-HdrOrdr: A9a23:aWuwSq/k9T98F7hChqZuk+AiI+orL9Y04lQ7vn2ZKSY5TiVXra CTdZUgpHvJYVMqMk3I9uruBEDtex3hHP1OkOws1NWZLWrbUQKTRekP0WKL+Vbd8kbFh4xgPM lbEpSXCLfLfCVHZcSR2njFLz73quP3j5xBho3lvglQpRkBUdAG0+/gYDzraXGfQmN9dPwEPa vZ3OVrjRy6d08aa8yqb0N1JdQq97Xw5evbiQdtPW9e1DWz X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74787670" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 08/25] tools/libfsimage: Cleanup makefiles Date: Fri, 24 Jun 2022 17:04:05 +0100 Message-ID: <20220624160422.53457-9-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086735517100008 Content-Type: text/plain; charset="utf-8" Remove the need for "fs-*" targets by creating a "common.mk" which have flags that are common to libfsimage/common/ and the other libfsimages/*/ directories. In common.mk, make $(PIC_OBJS) a recursively expanded variable so it doesn't matter where $(LIB_SRCS-y) is defined, and remove the extra $(PIC_OBJS) from libfsimage/common/Makefile. Use a $(TARGETS) variable to list things to be built. And $(TARGETS) can be use in the clean target in common.mk. iso9660/: Remove the explicit dependency between fsys_iso9660.c and iso9660.h, this is handled automaticaly by the .*.d dependency files, and iso9660.h already exist. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- tools/libfsimage/common/Makefile | 11 +++-------- tools/libfsimage/ext2fs-lib/Makefile | 9 --------- tools/libfsimage/ext2fs/Makefile | 9 --------- tools/libfsimage/fat/Makefile | 9 --------- tools/libfsimage/iso9660/Makefile | 11 ----------- tools/libfsimage/reiserfs/Makefile | 9 --------- tools/libfsimage/ufs/Makefile | 9 --------- tools/libfsimage/xfs/Makefile | 9 --------- tools/libfsimage/zfs/Makefile | 9 --------- tools/libfsimage/Rules.mk | 26 ++++++++------------------ tools/libfsimage/common.mk | 11 +++++++++++ 11 files changed, 22 insertions(+), 100 deletions(-) create mode 100644 tools/libfsimage/common.mk diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Mak= efile index 0c5a34baea..79f8cfd28e 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,5 +1,5 @@ XEN_ROOT =3D $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/libfsimage/Rules.mk +include $(XEN_ROOT)/tools/libfsimage/common.mk =20 MAJOR :=3D $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) MINOR =3D 0 @@ -13,12 +13,10 @@ LDFLAGS +=3D $(PTHREAD_LDFLAGS) =20 LIB_SRCS-y =3D fsimage.c fsimage_plugin.c fsimage_grub.c =20 -PIC_OBJS :=3D $(patsubst %.c,%.opic,$(LIB_SRCS-y)) - -LIB =3D libxenfsimage.so libxenfsimage.so.$(MAJOR) libxenfsimage.so.$(MAJO= R).$(MINOR) +TARGETS =3D libxenfsimage.so libxenfsimage.so.$(MAJOR) libxenfsimage.so.$(= MAJOR).$(MINOR) =20 .PHONY: all -all: $(LIB) +all: $(TARGETS) =20 .PHONY: install install: all @@ -40,9 +38,6 @@ uninstall: rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR) rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR).$(MINOR) =20 -clean distclean:: - rm -f $(LIB) - libxenfsimage.so: libxenfsimage.so.$(MAJOR) ln -sf $< $@ libxenfsimage.so.$(MAJOR): libxenfsimage.so.$(MAJOR).$(MINOR) diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs= -lib/Makefile index 431a79068e..b9b560df75 100644 --- a/tools/libfsimage/ext2fs-lib/Makefile +++ b/tools/libfsimage/ext2fs-lib/Makefile @@ -9,13 +9,4 @@ FS_LIBDEPS =3D $(EXTFS_LIBS) # Include configure output (config.h) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Mak= efile index c62ae359ac..fe01f98148 100644 --- a/tools/libfsimage/ext2fs/Makefile +++ b/tools/libfsimage/ext2fs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y =3D fsys_ext2fs.c =20 FS =3D ext2fs =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile index 7ee5e7588d..58bcc0751d 100644 --- a/tools/libfsimage/fat/Makefile +++ b/tools/libfsimage/fat/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y =3D fsys_fat.c =20 FS =3D fat =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/M= akefile index bc86baf2c0..acf3164046 100644 --- a/tools/libfsimage/iso9660/Makefile +++ b/tools/libfsimage/iso9660/Makefile @@ -4,15 +4,4 @@ LIB_SRCS-y =3D fsys_iso9660.c =20 FS =3D iso9660 =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - -fsys_iso9660.c: iso9660.h - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs= /Makefile index 5acfedf25e..42b751e007 100644 --- a/tools/libfsimage/reiserfs/Makefile +++ b/tools/libfsimage/reiserfs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y =3D fsys_reiserfs.c =20 FS =3D reiserfs =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile index f32b9178bd..cca4f0a588 100644 --- a/tools/libfsimage/ufs/Makefile +++ b/tools/libfsimage/ufs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y =3D fsys_ufs.c =20 FS =3D ufs =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/xfs/Makefile b/tools/libfsimage/xfs/Makefile index 54eeb6e35e..ebac7baf14 100644 --- a/tools/libfsimage/xfs/Makefile +++ b/tools/libfsimage/xfs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y =3D fsys_xfs.c =20 FS =3D xfs =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile index 084e5ec08d..434a9c3580 100644 --- a/tools/libfsimage/zfs/Makefile +++ b/tools/libfsimage/zfs/Makefile @@ -28,13 +28,4 @@ LIB_SRCS-y =3D zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fs= i_zfs.c fsys_zfs.c =20 FS =3D zfs =20 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index bb6d42abb4..cf37d6cb0d 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -1,25 +1,18 @@ -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS +=3D -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -D= FSIMAGE_FSDIR=3D\"$(FSDIR)\" -CFLAGS +=3D -Werror -D_GNU_SOURCE -LDFLAGS +=3D -L../common/ - -PIC_OBJS :=3D $(patsubst %.c,%.opic,$(LIB_SRCS-y)) - -FSDIR =3D $(libdir)/xenfsimage +include $(XEN_ROOT)/tools/libfsimage/common.mk =20 FSLIB =3D fsimage.so +TARGETS +=3D $(FSLIB) =20 -.PHONY: fs-all -fs-all: $(FSLIB) +.PHONY: all +all: $(TARGETS) =20 -.PHONY: fs-install -fs-install: fs-all +.PHONY: install +install: all $(INSTALL_DIR) $(DESTDIR)$(FSDIR)/$(FS) $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)/$(FS) =20 -.PHONY: fs-uninstall -fs-uninstall: +.PHONY: uninstall +uninstall: rm -f $(addprefix $(DESTDIR)$(FSDIR)/$(FS)/, $(FSLIB)) if [ -d $(DESTDIR)$(FSDIR)/$(FS) ]; then \ rmdir $(DESTDIR)$(FSDIR)/$(FS); \ @@ -28,7 +21,4 @@ fs-uninstall: $(FSLIB): $(PIC_OBJS) $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lxenfsimage $(FS_LIBDEPS) $(A= PPEND_LDFLAGS) =20 -clean distclean:: - rm -f $(PIC_OBJS) $(FSLIB) $(DEPS_RM) - -include $(DEPS_INCLUDE) diff --git a/tools/libfsimage/common.mk b/tools/libfsimage/common.mk new file mode 100644 index 0000000000..77bc957f27 --- /dev/null +++ b/tools/libfsimage/common.mk @@ -0,0 +1,11 @@ +include $(XEN_ROOT)/tools/Rules.mk + +FSDIR :=3D $(libdir)/xenfsimage +CFLAGS +=3D -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -D= FSIMAGE_FSDIR=3D\"$(FSDIR)\" +CFLAGS +=3D -Werror -D_GNU_SOURCE +LDFLAGS +=3D -L../common/ + +PIC_OBJS =3D $(patsubst %.c,%.opic,$(LIB_SRCS-y)) + +clean distclean:: + rm -f $(PIC_OBJS) $(TARGETS) $(DEPS_RM) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086732028573.076678689568; Fri, 24 Jun 2022 09:05:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355608.583406 (Exim 4.92) (envelope-from ) id 1o4lnd-0006ej-PQ; Fri, 24 Jun 2022 16:04:49 +0000 Received: by outflank-mailman (output) from mailman id 355608.583406; Fri, 24 Jun 2022 16:04:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnd-0006dn-LP; Fri, 24 Jun 2022 16:04:49 +0000 Received: by outflank-mailman (input) for mailman id 355608; Fri, 24 Jun 2022 16:04:48 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnc-0004qb-0f for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:48 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5e372a70-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:46 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5e372a70-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qi8ktRfGxKz6TVNBfNc+szyw4+rNfchyhf2q4Nw7GMs=; b=LhGgRGkZtR1KvHYOYtPeJ8I9EBTe2tOk3L7sVfvykV5m0NkLWdoTvdVB wdPP8OOo70hhqoulII07BDuzjRjYy9mN2waisjtA6vXcQHcMIh1tUEitD mo+fqBZOr7ERPTyMimC3VRqP2PEoykcF5dFCVzfKPOY57VnKvvAX+JGqd U=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 73702017 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:3wOXxq2nMSAqJSfmN/bD5Zpxkn2cJEfYwER7XKvMYLTBsI5bp2FSx 2UYXz+Hb/uKajH0fthyaom28UJS78TcnNYyQFNlpC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkjk7xdOCn9xGQ7InQLlbGILes1htZGEk1Ek/NtTo5w7Rj2tAy3YDja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1uvLqSZiAABZbn2/4WDRoASyVRJpNZreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNamFO JJDMWMwBPjGSwVsIUYpOIo8p7ihpGHPVxJ+91LWjJNitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzREhwccdCS1zeB2natnfPU2zP2XpoIE7+1/eIsh0ecrlH/EzVPCwH9+6PgzBfjBZQPc CT45xbCs4AR/WqJYf7UZCaT42SP4B1EA95/CNMlvVTlJrXv3+qJOoQVZmcfNYJ+75JuGmxCO kyhxI2wW2E22FGBYTfEr+rP82vvUcQABTVaDRLoWzfp9DUKTGsbqhvUBuhuH6eu5jEeMWGhm mvaxMTSalh6sCLq60lY1Qqe695UjsKVJjPZHy2ONo5f0it3ZZS+e6uj4kXB4PBLIe6xFwfc4 iBcypHBsLhWUvlhcRBhps1XRNlFAN7VWAAwfHY1R8Vxn9hT0yTLkX9sDMFWex4yb5dslc7Ba 07PowJBjKJu0I+RRfYvOeqZUp1ypYC5TIiNfq2EP7JmP8kqHCfarX4GWKJl9z20+KTaufpkY snznAfFJStyNJmLOxLsFrlEj+N0l3tgrY4RLLiipymaPXOlTCb9Yd843JGmMojVMIvsTN3pz uti IronPort-HdrOrdr: A9a23:w3tZ6a/xZKD7vDcso19uk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="73702017" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 09/25] tools/xenpaging: Rework makefile Date: Fri, 24 Jun 2022 17:04:06 +0100 Message-ID: <20220624160422.53457-10-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086733652100001 Content-Type: text/plain; charset="utf-8" - Rename $(SRCS) to $(OBJS-y), we don't need to collect sources. - Rename $(IBINS) to $(TARGETS) - Stop cleaning "xen" and non-set variable $(LIB). Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- tools/xenpaging/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 04743b335c..e2ed9eaa3f 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -5,33 +5,33 @@ CFLAGS +=3D $(CFLAGS_libxentoollog) $(CFLAGS_libxenevtchn= ) $(CFLAGS_libxenctrl) $( LDLIBS +=3D $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxen= ctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) LDFLAGS +=3D $(PTHREAD_LDFLAGS) =20 -POLICY =3D default +POLICY :=3D default =20 -SRC :=3D -SRCS +=3D file_ops.c xenpaging.c policy_$(POLICY).c -SRCS +=3D pagein.c +OBJS-y :=3D file_ops.o +OBJS-y +=3D xenpaging.o +OBJS-y +=3D policy_$(POLICY).o +OBJS-y +=3D pagein.o =20 CFLAGS +=3D -Werror CFLAGS +=3D -Wno-unused =20 -OBJS =3D $(SRCS:.c=3D.o) -IBINS =3D xenpaging +TARGETS :=3D xenpaging =20 -all: $(IBINS) +all: $(TARGETS) =20 -xenpaging: $(OBJS) +xenpaging: $(OBJS-y) $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) =20 install: all $(INSTALL_DIR) -m 0700 $(DESTDIR)$(XEN_PAGING_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN) =20 uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(IBINS)) + rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(TARGETS)) =20 clean: - rm -f *.o *~ $(DEPS_RM) xen TAGS $(IBINS) $(LIB) + rm -f *.o *~ $(DEPS_RM) TAGS $(TARGETS) =20 distclean: clean =20 @@ -39,6 +39,6 @@ distclean: clean =20 .PHONY: TAGS TAGS: - etags -t $(SRCS) *.h + etags -t *.c *.h =20 -include $(DEPS_INCLUDE) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086742069765.1645794167304; Fri, 24 Jun 2022 09:05:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355611.583438 (Exim 4.92) (envelope-from ) id 1o4lnh-0007ZA-CV; Fri, 24 Jun 2022 16:04:53 +0000 Received: by outflank-mailman (output) from mailman id 355611.583438; Fri, 24 Jun 2022 16:04:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnh-0007YT-7K; Fri, 24 Jun 2022 16:04:53 +0000 Received: by outflank-mailman (input) for mailman id 355611; Fri, 24 Jun 2022 16:04:51 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnf-0004qb-Bx for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:51 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5f689afe-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:50 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5f689afe-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086690; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=06doEHilS6AKmsVA0dHPUnjlMaGNmuuqrJF1JZCOe3k=; b=M392P2F8vHceH75PhI2aXuB9FTGIEnHWqlm6emfUcPvsJhII8Vy9WvHi 8sWeEZJ6dVXB9mLG3DSPs6MP9Uh1UoT9nbsamKSH71epL5yB47l1j+scZ 7kUW6YPk+gy+akZuAUJelKjb3uWM7tZCOgVW0fvz9/18/E4Rz/oPWW2dk U=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74384185 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:9k7tQqv6Z6iLx6UJV8NT3JcTVufnVB9eMUV32f8akzHdYApBsoF/q tZmKWGGOfeKY2KkfIp1bI208x9T7ZOHxtc1G1NopHg9RSxB+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/nOHNIQMcacUsxLbVYMpBwJ1FQywYbVvqYy2YLjW13X5 YuoyyHiEATNNwBcYzp8B52r8HuDjNyq0N/PlgVjDRzjlAa2e0g9VPrzF4noR5fLatA88tqBb /TC1NmEElbxpH/BPD8HfoHTKSXmSpaKVeSHZ+E/t6KK2nCurQRquko32WZ1he66RFxlkvgoo Oihu6BcRi8oPbCRifgaWiMFHh9xfp1F5OPKIVWG5Jn7I03uKxMAwt1rBUAye4YZ5vx2ESdF8 vlwxDIlN07ZwbjsmfTiF7cq1p9LwMrDZevzvllpyy3ZCvA3B4jOWazQ6fdT3Ssqh9AIFvHbD yYcQWUzN0ScOk0SUrsRIJkhsPuFt2uuTwYbiVTWuKNt3zPOzRMkhdABN/KKI4fXFK25hH2wu Wbu72n/RBYAO7S32TeDt36hmOLLtSf6Q54JUq218OZwh1+ezXBVDwcZPWZXutHg1BT4AYgGb RVJpGx+9sDe6XBHUPH8XADlsWKDtyRBVuRfUN059F2AyofttlPx6nc/ctJRVDA3nJZoGGJyj QLRwIOB6S9H6+PMFy/EnluAhXbrYHVOczdfDcMRZVFdi+QPtr3fmf4mojxLNKeuxuP4Fjjrq 9xhhHhv3u5D5SLnOkjSwLwmv95PjsKQJuLNzl+LNl9JFysgDGJfW6Sm6ELA8dFLJ5uDQ1+Ks RAswpbDsrhWXMjSyHTVH43h+Y1FAd7faFUwZnY/d6TNChz3oyLzFWyuyGsWyLhV3jYsJmayP R67VfJ5755PJnq6BZJKj3aKI51yl8DITI29PtiNN4YmSsUhJWevoXA1DWbNjj+FraTZufxmU XttWZ33Vihy5GUO5GfeetrxJpdxl35nmz+MFMulp/lluJLHDEOopX4+GAPmRogEAGms+m05L /432xO29ihi IronPort-HdrOrdr: A9a23:3Z4m0atrXF3O64HgX2SeRV7I7skDcNV00zEX/kB9WHVpmszxra +TdZMgpHjJYVcqKQgdcL+7WZVoLUmwyXcx2/hyAV7AZniDhILLFuFfBOLZqlWKcREWtNQtsJ uIG5IObuEYZmIVsS+V2mWF+q4bsbq6zJw= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74384185" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 10/25] tools/xentop: rework makefile Date: Fri, 24 Jun 2022 17:04:07 +0100 Message-ID: <20220624160422.53457-11-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086743481100013 Content-Type: text/plain; charset="utf-8" Add "xentop" to "TARGETS" because this variable will be useful later. Always define all the targets, even when configured with --disable-monitor, instead don't visit the subdirectory. This mean xentop/ isn't visited anymore during "make clean" that's how most other subdirs in the tools/ works. Also add missing "xentop" rules. It only works without it because we still have make's built-ins rules and variables, but fix this to not have to rely on them. Use $(TARGETS) with $(INSTALL_PROG), and thus install into the directory rather than spelling the program name. In the "clean" rule, use $(RM) and remove all "*.o" instead of just one object. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- Notes: v2: - use $(RM) in clean. - remove all *.o instead of just one object in "clean" rule. - in "install" rule, make use of $(TARGETS). install into a dir rather than to a specific path, in case there's more targets. tools/Makefile | 2 +- tools/xentop/Makefile | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 79b4c7e3de..0c1d8b64a4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,7 +17,7 @@ SUBDIRS-$(CONFIG_XCUTILS) +=3D xcutils SUBDIRS-$(CONFIG_X86) +=3D firmware SUBDIRS-y +=3D console SUBDIRS-y +=3D xenmon -SUBDIRS-y +=3D xentop +SUBDIRS-$(XENSTAT_XENTOP) +=3D xentop SUBDIRS-y +=3D libfsimage SUBDIRS-$(CONFIG_Linux) +=3D vchan =20 diff --git a/tools/xentop/Makefile b/tools/xentop/Makefile index 0034114684..7bd96f34d5 100644 --- a/tools/xentop/Makefile +++ b/tools/xentop/Makefile @@ -13,36 +13,33 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -ifneq ($(XENSTAT_XENTOP),y) -.PHONY: all install xentop uninstall -all install xentop uninstall: -else - CFLAGS +=3D -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) LDLIBS +=3D $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIB= S) -lm CFLAGS +=3D -DHOST_$(XEN_OS) =20 # Include configure output (config.h) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h -LDFLAGS +=3D $(APPEND_LDFLAGS) + +TARGETS :=3D xentop =20 .PHONY: all -all: xentop +all: $(TARGETS) + +xentop: xentop.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) =20 .PHONY: install -install: xentop +install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(sbindir) =20 .PHONY: uninstall uninstall: rm -f $(DESTDIR)$(sbindir)/xentop =20 -endif - .PHONY: clean clean: - rm -f xentop xentop.o $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) =20 .PHONY: distclean distclean: clean --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 165608696509352.92355216928661; Fri, 24 Jun 2022 09:09:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355715.583594 (Exim 4.92) (envelope-from ) id 1o4lrV-000139-2Z; Fri, 24 Jun 2022 16:08:49 +0000 Received: by outflank-mailman (output) from mailman id 355715.583594; Fri, 24 Jun 2022 16:08:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lrU-00012w-UX; Fri, 24 Jun 2022 16:08:48 +0000 Received: by outflank-mailman (input) for mailman id 355715; Fri, 24 Jun 2022 16:08:47 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnh-0004qb-0t for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:53 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6071422d-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:52 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6071422d-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DRUZBzwipLHVi3LrT/VXUcevANDycChtXk37Vv5NYiY=; b=DMYhPAbbIc7N/O7kItuByodH0U9FFH9dzWv3JiFilWWwddpzcD65hns+ pJCC4B3+hO+ggq9zGahMlkOAkBLtdaKI0MaBidwZXzhfKKco2ifaOojNs 1W0ER5u0yU9ClQOq8NkKtDXv8bXB9Tx/pqBi6gAwyqFiYa/JrDlGKHSV2 k=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74362364 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:8i+vGa/vvvkbrBPzjb/gDrUDyX6TJUtcMsCJ2f8bNWPcYEJGY0x3n TYWD2CGMveCN2v1fdknYIji8U8P756DyYAxQANl+Ho8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsY0idfic5DnZ74f5fs7Rh2NQw34LlW1nlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCnaSUdT8QIbbPo8UmcUEHPx9nH50dpLCSdBBTseTLp6HHW37lwvEoB0AqJ4wIvO1wBAmi9 9RBdmpLNErawbvrnvTrEYGAhex6RCXvFIoZpnFnyyCfFfs8SIrPa67L+cVZzHE7gcUm8fP2O JZCN2A0MkiojxtnZhQTOLcymfaUonDAehx4igikpPI4yj2GpOB2+Oe0a4eEEjCQfu1Kmm6Iq 2SA+H72ajkKOdraxTeb/3aEgu7UgTi9SI8UDKe/9PNhnBuU3GN7NfENfQLl+7/j0Bf4Ao8Bb RxPksYzkUQs3HSPcuHEQAa7m1+/nEZDd+RJMd1htA7Yn8I4/D2l6ng4oi9pMYJ76pdtGGR1h jdljPuyW2Ux7eT9pWa1s+7N8GjsYXV9wXoqP3dscOcT3zX0TGjfZDrrR80rLqO6h8ad9drYk 2HT93hWa1n+YKc2O0SHEbPv2WvESmDhFFJd2+kudjvNAvlFTICkfZe0zlPQ8OxNKo2UJnHY4 iVaw5DPtb9SVcnS/MBofAnrNOvxjxpiGG20vLKSN8N5q2TFF4CLJ+i8Hw2S1G82a51ZKFcFk WfYuB9L5Y87AUZGmZRfOtrrY+xzlPCIPY28Cpj8M4ofCrAsJVTv1Hw/OiatM5XFzRFEfVcXY szAL65BzB8yVMxa8dZBb71Mj+Z1mn9vnj27qFKS503P7IdyrUW9Ed8tWGZipMhjhE9YiG05K +piCvY= IronPort-HdrOrdr: A9a23:YDMGN6uB8UFkI1xjn5bcU5m/7skDTtV00zEX/kB9WHVpmszxra 6TdZMgpHnJYVcqKQkdcL+7WJVoLUmxyXcx2/h1AV7AZniAhILLFvAA0WKK+VSJcEeSygce79 YFT0EXMqyIMbEQt6fHCWeDfOrIuOP3kpyVuQ== X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74362364" From: Anthony PERARD To: CC: Anthony PERARD , George Dunlap , Wei Liu Subject: [XEN PATCH v3 11/25] tools/xentrace: rework Makefile Date: Fri, 24 Jun 2022 17:04:08 +0100 Message-ID: <20220624160422.53457-12-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086966693100001 Content-Type: text/plain; charset="utf-8" Remove "build" targets. Use "$(TARGETS)" to list binary to be built. Cleanup "clean" rule. Also drop conditional install of $(BIN) and $(LIBBIN) as those two variables are now always populated. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > --- Notes: v2: - fix typo in title - drop conditional install of $(BIN) and $(LIBBIN) tools/xentrace/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 9fb7fc96e7..0995fa9203 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -14,36 +14,31 @@ SBIN =3D xentrace xentrace_setsize LIBBIN =3D xenctx SCRIPTS =3D xentrace_format =20 -.PHONY: all -all: build +TARGETS :=3D $(BIN) $(SBIN) $(LIBBIN) =20 -.PHONY: build -build: $(BIN) $(SBIN) $(LIBBIN) +.PHONY: all +all: $(TARGETS) =20 .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) - [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) -ifneq ($(BIN),) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) -endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) - [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) =20 .PHONY: uninstall uninstall: rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(LIBBIN)) rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS)) rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(SBIN)) -ifneq ($(BIN),) rm -f $(addprefix $(DESTDIR)$(bindir)/, $(BIN)) -endif =20 .PHONY: clean clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) =20 .PHONY: distclean distclean: clean --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086738488447.6938854661555; Fri, 24 Jun 2022 09:05:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355612.583451 (Exim 4.92) (envelope-from ) id 1o4lnj-00081P-Tr; Fri, 24 Jun 2022 16:04:55 +0000 Received: by outflank-mailman (output) from mailman id 355612.583451; Fri, 24 Jun 2022 16:04:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnj-00080y-Mk; Fri, 24 Jun 2022 16:04:55 +0000 Received: by outflank-mailman (input) for mailman id 355612; Fri, 24 Jun 2022 16:04:54 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lni-0004qc-I8 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:54 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 617cdfd6-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:04:53 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 617cdfd6-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cq0Zb+dmEm/n03sfWJhUW4S7VwgI0ziQPkbqQdTYp0c=; b=ecyKfyyNpERVin3i8JpZ9G9/a46aAs6QSPH/5+dxdZJ3dyFBbQFXUmQL GhaII6EC9QFMMOXn1TqVyWd9T5Q2JmBt8E588ZX+SKeqG9GmXXGQMyJ3Q RldhOumZ+ei3RF02NSa/GM70jDZO60CTUTbZ8hnlPmEifNU/1b3e7HG9l o=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74208110 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:xdIZRq9B1i9W19uAfT4hDrUDnX6TJUtcMsCJ2f8bNWPcYEJGY0x3z zYZWD2APPaIMGP2ct1/ad6+9hwBucfXy9A2QQs+q3w8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsY0idfic5DnZ74f5fs7Rh2NQw34LlW1nlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCnbauGD8uJ/bBo/smXAdqTxNzN4Je9YaSdBBTseTLp6HHW37lwvEoB0AqJ4wIvO1wBAmi9 9RBdmpLNErawbvrnvTrEYGAhex6RCXvFIoZpnFnyyCfFfs8SIrPa67L+cVZzHE7gcUm8fP2O JZDMWo2NUyojxtnMxQ5WK1jmv+RmnzRUyJd8g6TlIFo2j2GpOB2+Oe0a4eEEjCQfu1OhVqRr G/C+2X/AzkZOcaZxD7D9Wij7sfQmQvrVYRUE6e3ntZoj0eU3Xc7EwANWB2wpvzRol6zXZdTJ lIZ/gIqrLMu7wq7Q9/lRRq6rXWY+BkGVLJ4Eec39QWMwar8+BuCCy4PSTspQN47sM47QxQ62 1nPmMnmbQGDq5XMFyjbrO3N62rvZ25FdgfueBPoUyMv/Yjbp5hogynQddl9IvKHg9faATzJl mXiQDcFu1kDsSIa//zloA6f2G/0+cihoh0dvVuOAD/8hu9tTMv8PtHztwCGhRpVBNzBJmRtq kTojCR3AAomKZiW3BKAT+wWdF1Cz6bUaWaM6bKD8nRIythMx5JAVdoJiN2GDB01WvvogBewC KMphStf5YVIIFyhZrJtboS6BqwClPa9S4y9B6mLMoIWPfCdkTNrGgk0PSZ8OEi9+HXAbIllY cvLGSpSJSxy5VtbIMqeGL5GjO5DKtEWzmLPX5HrpymaPU6lTCfNE98taQLWBshgtf/siFiFo r53aprRoz0CAbKWX8Ui2dNKRbz8BSNgXs6eRg0+XrPrHzeK70l7WqGIn+9+Ktc790mX/8+Rl kyAtoZj4AKXrRX6xc+iNhiPtJuHsU5DkE8G IronPort-HdrOrdr: A9a23:bQzovqOcWgvRKMBcTsejsMiBIKoaSvp037Eqv3ofdfUzSL3+qy nOpoVj6faaslcssR0b9OxofZPwI080lqQFhbX5X43DYOCOggLBR+tfBMnZsljd8kXFh4hgPM xbHZSWZuedMbEDt7eY3DWF X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74208110" From: Anthony PERARD To: CC: Anthony PERARD , Andrew Cooper , George Dunlap , "Jan Beulich" , Julien Grall , "Stefano Stabellini" , Wei Liu , Juergen Gross Subject: [XEN PATCH v3 12/25] .gitignore: Cleanup ignores of tools/libs/*/{headers.chk,*.pc} Date: Fri, 24 Jun 2022 17:04:09 +0100 Message-ID: <20220624160422.53457-13-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086739451100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Bertrand Marquis Reviewed-by: Juergen Gross --- Notes: v2: - move new .gitignore entries to the one in tools/libs/ .gitignore | 26 -------------------------- tools/libs/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 8b6886f3fd..1de28c833c 100644 --- a/.gitignore +++ b/.gitignore @@ -106,26 +106,8 @@ tools/config.cache config/Tools.mk config/Stubdom.mk config/Docs.mk -tools/libs/toolcore/headers.chk -tools/libs/toolcore/xentoolcore.pc -tools/libs/toollog/headers.chk -tools/libs/toollog/xentoollog.pc -tools/libs/evtchn/headers.chk -tools/libs/evtchn/xenevtchn.pc -tools/libs/gnttab/headers.chk -tools/libs/gnttab/xengnttab.pc -tools/libs/hypfs/headers.chk -tools/libs/hypfs/xenhypfs.pc -tools/libs/call/headers.chk -tools/libs/call/xencall.pc tools/libs/ctrl/libxenctrl.map -tools/libs/ctrl/xencontrol.pc -tools/libs/foreignmemory/headers.chk -tools/libs/foreignmemory/xenforeignmemory.pc -tools/libs/devicemodel/headers.chk -tools/libs/devicemodel/xendevicemodel.pc tools/libs/guest/libxenguest.map -tools/libs/guest/xenguest.pc tools/libs/guest/xc_bitops.h tools/libs/guest/xc_core.h tools/libs/guest/xc_core_arm.h @@ -145,21 +127,13 @@ tools/libs/light/testidl.c tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* -tools/libs/light/xenlight.pc -tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map -tools/libs/stat/xenstat.pc -tools/libs/store/headers.chk tools/libs/store/list.h tools/libs/store/utils.h -tools/libs/store/xenstore.pc tools/libs/store/xs_lib.c -tools/libs/util/*.pc tools/libs/util/libxlu_cfg_y.output tools/libs/util/libxenutil.map -tools/libs/vchan/headers.chk tools/libs/vchan/libxenvchan.map -tools/libs/vchan/xenvchan.pc tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 diff --git a/tools/libs/.gitignore b/tools/libs/.gitignore index 4a13126144..1ad7c7f0cb 100644 --- a/tools/libs/.gitignore +++ b/tools/libs/.gitignore @@ -1 +1,3 @@ +*/*.pc +*/headers.chk */headers.lst --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086749938503.4252243341497; Fri, 24 Jun 2022 09:05:49 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355613.583462 (Exim 4.92) (envelope-from ) id 1o4lnn-0008SV-7l; Fri, 24 Jun 2022 16:04:59 +0000 Received: by outflank-mailman (output) from mailman id 355613.583462; Fri, 24 Jun 2022 16:04:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnn-0008SK-2g; Fri, 24 Jun 2022 16:04:59 +0000 Received: by outflank-mailman (input) for mailman id 355613; Fri, 24 Jun 2022 16:04:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnl-0004qc-E3 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:57 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 62e59467-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:04:56 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 62e59467-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086696; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DRGeCKQgwOk/UNXsa1d505aRXj+pmL/UOsklwZQeiFU=; b=I+MksVtG6MTNz6Nn1xvQjLW1EDKt6shiRYJJ3yBQW5oUc6sKr0gT/iuT 4RShp4Xxxs81bXEKpEgd7SZrbamCCAnKIYDEWkcf92/Ix4ctb7cP8//uy 2PrIpGmvRLhMyeYfvafZTS+/lVKOmWrQ48+BCA9aLOYkye37Iyj8lPWLG Q=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74787692 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:zKbMeaxgaEDdRUT38vB6t+dvxirEfRIJ4+MujC+fZmUNrF6WrkVVm mZOUTuFb/7cM2amc4skPdvg9x8Ovp6Dx9ExTFQ5qCAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnj/0bv656yMUOZigHtIQMsadUsxKbVIiGX1JZS5LwbZj2NY224ThWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ Nplnse5TiYHP4DwmuEvcyJeA3lFO6l+9+qSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6BO 5VJNmQ+NnwsZTUWHl4uCYhktt23oWvaVGRos3akvIQetj27IAtZj+G2bYu9lsaxbcdahEGDv Urd4n/0RBodMbS31j6t4n+qwOjVkkvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 3H44QJ38/J0rhbyCICgAVvo+xZooyLwRfJ7SOQ9yS+M55bW5jS5PW4UFgVHbOQp4ZpeqSMR6 rOZoz/4LWUx7ePNEi/Fqef8QSCaYnZMczJbDcMQZU5cuoS4/tlu5v7aZow7eJNZmOEZDt0ZL 9qiiCElz4segscQv0lQ1QCW2mn8znQlo+Nc2+k2Yo5GxlkgDGJdT9b0gWU3FN4ZRGpjcnGPv WIfh++V5/0UAJeGmUSlGbtQQunxtq/abGWE3jaD+qXNERz3oxZPmqgAiAyS2W8zappUEdMXS BW7VfxtCG97YyLxMP4fj3OZAMU216nwfenYugTvRoMWOPBZLVbflAk3PBL49z29wSAEzPBkU b/GIJnEMJrvIfk+pNZAb7xGiuFDK+FX7T67eK0XODz9gOTHOiLKGOxbWLZMB8hghJ65TMzu2 443H6O3J993CYUSvgG/HVYvEG03 IronPort-HdrOrdr: A9a23:nvL99a078SDYc1CBdUnA6QqjBIokLtp133Aq2lEZdPRUGvb3qy nIpoV86faUskdoZJhOo7C90cW7LU80sKQFhLX5Xo3SOzUO2lHYT72KhLGKq1aLdhEWtNQtsZ uIG5IOceEYZmIasS+V2maF+q4bsbu6zJw= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74787692" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Juergen Gross" Subject: [XEN PATCH v3 13/25] tools/libs/util: cleanup Makefile Date: Fri, 24 Jun 2022 17:04:10 +0100 Message-ID: <20220624160422.53457-14-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086751565100001 Content-Type: text/plain; charset="utf-8" Remove -I. from CFLAGS, it isn't necessary. Removed $(AUTOSRCS), it isn't used. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Bertrand Marquis Reviewed-by: Juergen Gross --- tools/libs/util/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index ffe507b379..493d2e00be 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -11,7 +11,7 @@ OBJS-y +=3D libxlu_pci.o =20 CFLAGS +=3D -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS +=3D -I. $(CFLAGS_libxenctrl) +CFLAGS +=3D $(CFLAGS_libxenctrl) =20 CFLAGS +=3D $(PTHREAD_CFLAGS) LDFLAGS +=3D $(PTHREAD_LDFLAGS) @@ -29,7 +29,6 @@ ifeq ($(BISON),) endif =20 AUTOINCS =3D libxlu_cfg_y.h libxlu_cfg_l.h libxlu_disk_l.h -AUTOSRCS =3D libxlu_cfg_y.c libxlu_cfg_l.c =20 LIBHEADER :=3D libxlutil.h PKG_CONFIG_NAME :=3D Xlutil --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086930122766.7646917836299; Fri, 24 Jun 2022 09:08:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355646.583517 (Exim 4.92) (envelope-from ) id 1o4lqx-0006Ju-Ed; Fri, 24 Jun 2022 16:08:15 +0000 Received: by outflank-mailman (output) from mailman id 355646.583517; Fri, 24 Jun 2022 16:08:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lqx-0006Jh-9S; Fri, 24 Jun 2022 16:08:15 +0000 Received: by outflank-mailman (input) for mailman id 355646; Fri, 24 Jun 2022 16:08:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnl-0004qb-SO for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:04:57 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6362446f-f3d7-11ec-bd2d-47488cf2e6aa; Fri, 24 Jun 2022 18:04:56 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6362446f-f3d7-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086696; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UgBJmLW71oTGL7rE/nyRfmo9v19OgU/6PqXrnkS62aw=; b=FnlATABxyLu0/K1Qn4PuBXCjH5Ted+500K5KXo1FJWvvRD8uNviOHaeb mMsF1VxRoM1yqpnXMeIVAv+bPk3R+LyCTwy0Pq87JP7FlPJFfZipC6iAM vsFv0oD/+DYVj2YcNbHsposWmQNr+eNk4FX3RV8BSTx1H6rw1rk5NhuKa s=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 76935332 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:q8tK2K2q6N2S/JHIoPbD5ddxkn2cJEfYwER7XKvMYLTBsI5bpzYGn DAeDW3Ua/6JZ2Wged4iO4W/o0IO65HQzdVhGQc6pC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkjk7xdOCn9xGQ7InQLlbGILes1htZGEk1Ek/NtTo5w7Rj2tAy3YDja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1AhbivRTcsGpb2p+gjCUF5DzAjbJJJreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNamAN pFEMmE1BPjGSwQXN20JLLc+oPeXrULcfCN0hF6Ip6VitgA/yyQuieOwYbI5YOeiSd1Om0eEp krP52njHgwBL9ub1CaE9XS3wOTImEvTR4Y6BLC+sPlwjzW71mEVTREbS1a/if24kVKlHcJSL VQO/SgjprR081akJvHxUBG1r2SNlgINUNpXVesh4UeCzbS83uqCLjFaFHgbMoVg7ZJoA2xxv rOUoz/3LTFflKKZeXe5zY2roQ3oYQkJPDJTWiBRGGPp/OLfTJEPYgPnF4g+Tvbu04WqSVkc0 BjR8nFg2ux7YdojkvzioAuZ22/ESo3hFFZd2+nBYo6yAuqVjqaBbpfg11XU5O0owG2xHgjY5 yhsdyRzAYkz4XCxeM+lGrxl8EmBvartDdElqQcH82Md3zqs4WW/Wotb/StzIkxkWu5dJ2K3O BeC4FwNvMcMVJdPUUORS9jpYyjN5fiIKDgYfqqMMoomjmZZLmdrAx2ClWbPhjuwwSDAYIk0O IuBcNbEMEv2/Z9PlWLsL89EiOdD7nlnmQv7GMCqpzz6gOH2TCPEFt843K6mM7lRAFWs+16Or b6y9qKiln1ibQEJSnOGr9dNcQ9bdiZT6FKfg5U/S9Nv6zFOQAkJY8I9C5t+E2C5t8y5Ttv1w 0w= IronPort-HdrOrdr: A9a23:4N5mOqjyY5S2aKl1zz0ybWr4EHBQXtwji2hC6mlwRA09TySZ// rAoB19726StN9xYgBYpTnuAsi9qB/nmKKdpLNhX4tKPzOW3FdATrsD0WKK+VSJcEfDH6xmpM JdmsBFebvN5DNB4/oSjjPVLz9Z+qjlzJyV X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="76935332" From: Anthony PERARD To: CC: Anthony PERARD , Daniel De Graaf , "Daniel P. Smith" , Wei Liu Subject: [XEN PATCH v3 14/25] tools/flask/utils: list build targets in $(TARGETS) Date: Fri, 24 Jun 2022 17:04:11 +0100 Message-ID: <20220624160422.53457-15-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086930533100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Henry Wang --- tools/flask/utils/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index db567b13dc..6be134142a 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -4,10 +4,10 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) =20 -CLIENTS :=3D flask-loadpolicy flask-setenforce flask-getenforce flask-labe= l-pci flask-get-bool flask-set-bool +TARGETS :=3D flask-loadpolicy flask-setenforce flask-getenforce flask-labe= l-pci flask-get-bool flask-set-bool =20 .PHONY: all -all: $(CLIENTS) +all: $(TARGETS) =20 flask-loadpolicy: loadpolicy.o $(CC) $(LDFLAGS) $< $(LDLIBS) $(LDLIBS_libxenctrl) -o $@ @@ -29,7 +29,7 @@ flask-set-bool: set-bool.o =20 .PHONY: clean clean: - $(RM) *.o $(CLIENTS) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) =20 .PHONY: distclean distclean: clean @@ -37,10 +37,10 @@ distclean: clean .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(sbindir) =20 .PHONY: uninstall uninstall: - rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(CLIENTS)) + rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(TARGETS)) =20 -include $(DEPS_INCLUDE) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086739566382.5150996276992; Fri, 24 Jun 2022 09:05:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355616.583473 (Exim 4.92) (envelope-from ) id 1o4lnt-0000lZ-1a; Fri, 24 Jun 2022 16:05:05 +0000 Received: by outflank-mailman (output) from mailman id 355616.583473; Fri, 24 Jun 2022 16:05:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lns-0000kn-LY; Fri, 24 Jun 2022 16:05:04 +0000 Received: by outflank-mailman (input) for mailman id 355616; Fri, 24 Jun 2022 16:05:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnq-0004qc-VI for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:02 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 656edef2-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:00 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 656edef2-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AvHTHvehrcxwVAzIH4QeC8DG622elqZioP/rCdCMY4Q=; b=NEjOe9I9L8eU4Aajhgy25p0mgG6XXIIeGkqV8Ym5XoO7J1gCg41E/YEB kv1AchNILcmquAdiG1GW7pQtZizv/4nbBOhlb3cDg1wBVh2giy8vY+TMC 0qkjJBeVbrVm/eAUhKNDdCIViW0CKVIOygCHXRjBncAa8NHWY7PDvYh0G k=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74384212 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:7qkL9q6EJxPxb1XyrvgjrQxRtGDHchMFZxGqfqrLsTDasY5as4F+v jNMWGnXOanZa2bweYt0ady29R9VvZ7Qy9BnT1NvrSpjHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw03qPp8Zj2tQy2YbjX1vX0 T/Pi5a31GGNimYc3l08s8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByKQrr1vNvy7X 47+IISRpQs1yfuP5uSNyd4XemVSKlLb0JPnZnB+A8BOiTAazsA+PzpS2FPxpi67hh3Q9+2dx umhurSzZCZ5Hrf1l94YCTZVF39cBfx5w4budC3XXcy7lyUqclPpyvRqSko3IZcZ6qB8BmQmG f4wcW5XKErZ3qTvnez9GrIEascLdaEHOKsWvG1gyjfIS+4rW5nZT43B5MNC3Sd2jcdLdRrbT 5VFMmozNk2aC/FJEltPOr8Bt8C0vX68WSV1p3Kb+ulvxHeGmWSd15CyaYGIK7RmX/59nEmCo Xnd13/kGRxcP9uaoRKa9lq8i+mJmjn0MKoCGbv9+vN0jVm7wm0IFAZQRVa9ueO+iEO1R5RYM UN8x8Y1hfFsrgrxFIC7BkDm5i7f1vIBZzZOO+4XyVGt0JPb2QPDKWUAEBx5OeMdjeZjEFTGy WS1c8PV6S1H6ePIFyrGq+/L/VteKgBOczZcOHZsoR8tpoC6/dpt1k+nosNLSvbdszHjJd3nL 9lmRgAajq5bs8ME3r7TEbvv02P1/cihouLYC2zqsoOZAuBRPtfNi3SAswSz0Bq5BN/xoqO9l HYFgdOCy+sFEIuAkieAKM1UQuz3v67UaWKA2QYwd3XEy9hL0yT7FWy3yGEWGauUGpxcJW+Bj LH742u9G6O/zFP1NPQqMupd+uwhzLT6FMSNa804muFmO8ArHCfepXkGTRfJgwjFzRh9+Ylia MzzWZv9Uh4n5VFPkWPeqxE1iuRwmEjTBAr7GPjG8vhQ+eDPOifLFehUawXmgyJQxPrsnTg5O u13b6OioyizmsWnCsUL2eb/9Ww3EEU= IronPort-HdrOrdr: A9a23:4t1VPqoJaMCqR9ovrIH8W0EaV5oTeYIsimQD101hICG8cqSj+f xG+85rsyMc6QxhIE3I9urhBEDtex/hHNtOkOws1NSZLW7bUQmTXeJfBOLZqlWKcUDDH6xmpM NdmsBFeaTN5DNB7PoSjjPWLz9Z+qjkzJyV X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74384212" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Juergen Gross" Subject: [XEN PATCH v3 15/25] libs/libs.mk: Rename $(LIB) to $(TARGETS) Date: Fri, 24 Jun 2022 17:04:12 +0100 Message-ID: <20220624160422.53457-16-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086741461100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Bertrand Marquis Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 58d8166b09..e02f91f95e 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -23,9 +23,9 @@ LDLIBS +=3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIB= S_libxen$(lib))) PIC_OBJS :=3D $(OBJS-y:.o=3D.opic) =20 LIB_FILE_NAME =3D $(FILENAME_$(LIBNAME)) -LIB :=3D lib$(LIB_FILE_NAME).a +TARGETS :=3D lib$(LIB_FILE_NAME).a ifneq ($(nosharedlibs),y) -LIB +=3D lib$(LIB_FILE_NAME).so +TARGETS +=3D lib$(LIB_FILE_NAME).so endif =20 PKG_CONFIG ?=3D $(LIB_FILE_NAME).pc @@ -55,7 +55,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) =20 .PHONY: all -all: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$(LIB= NAME).map $(LIBHEADERS) +all: headers.chk $(TARGETS) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$= (LIBNAME).map $(LIBHEADERS) =20 ifneq ($(NO_HEADERS_CHK),y) headers.chk: @@ -124,7 +124,7 @@ TAGS: =20 .PHONY: clean clean:: - rm -rf $(LIB) *~ $(DEPS_RM) $(OBJS-y) $(PIC_OBJS) + rm -rf $(TARGETS) *~ $(DEPS_RM) $(OBJS-y) $(PIC_OBJS) rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(M= AJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16560867396001021.630555314499; Fri, 24 Jun 2022 09:05:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355618.583488 (Exim 4.92) (envelope-from ) id 1o4lnv-0001FZ-UI; Fri, 24 Jun 2022 16:05:07 +0000 Received: by outflank-mailman (output) from mailman id 355618.583488; Fri, 24 Jun 2022 16:05:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnv-0001Co-It; Fri, 24 Jun 2022 16:05:07 +0000 Received: by outflank-mailman (input) for mailman id 355618; Fri, 24 Jun 2022 16:05:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lns-0004qc-Vh for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:05 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 672b381d-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:03 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 672b381d-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086703; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TsefgdfY0tcRhsq+woEvspQFjwDZdlkGaeHqzm9V7cQ=; b=FQAm0jRg7yFdGPSEc6W9jwfvmdria3uINiXArUiY8IebA7wfjFCc+s8q qB7FWL548LsWMvf9gghLe3/h0gfT3n+K9sHVdF7ZQMMy0aRdpgG4PtUBA r1DFaDX4/vn+fVDsiBmY6ce/6fL1ZDVJUxLFnYBnNQLXxEcoFf0qRsrwp 4=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 73702048 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:PEA8rKkhkzc3Bt2TbsKbwRro5gzZJkRdPkR7XQ2eYbSJt1+Wr1Gzt xIYW2mAa/iLajDwe9lxO9y/9EICsZKAy9FqQFZo+ys8EyMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BCpC48T8kk/vgqoPUUIYoAAgoLeNfYHpn2EgLd9IR2NYy24DnWV/V4 7senuWEULOb828sWo4rw/rrRCNH5JwebxtB4zTSzdgS1LPvvyF94KA3fMldHFOhKmVgJcaoR v6r8V2M1jixEyHBqD+Suu2TnkUiGtY+NOUV45Zcc/DKbhNq/kTe3kunXRa1hIg+ZzihxrhMJ NtxWZOYZAhxBOqcudgkAzpDKRxBF/FF/ebYGC3q2SCT5xWun3rExvxvCAc9PJEC+/YxCmZLn RAaAGlTNFbZ3bvwme/lDLk37iggBJCD0Ic3s3d8zTbfHLA+TIrKWani7t5ExjYgwMtJGJ4yY uJGMmU3NkycM3WjPH8pFYJmnOi6lkDaWCRGulusuJAVs0zqmVkZPL/Fb4OOJ43iqd9utkSXv GXd5EziHwoXcteYzFKt7XaEluLJ2yThV+o6BLC+s/JnnlCX7mgSEwENE0u2p+GjjUyzUM4ZL FYbkhfCtoBrqhbtFIOkGUTl/jjU5XbwRua8DcUX51m3jfr13z/JJXM+cwFrNN8j7dAPEGlCO kCyoz/5OdB+mOTLFCzFrerM8mPa1Ts9djFbO3JdJecRy5y6+dxo0EqSJjp2OPTt5uAZDw0c1 NxjQMIWo7wIxfAG2Kyglbwsq2L9/8OZJuLZC+i+Y45E0u+aTNT8D2BQwQKHhcus1a7AJrV7g FAKmtKF8McFBoyXmSqGTY0lRe/0ua7dYWSD3QY3QPHNEghBHVb5Jei8BxkuTHqFz+5eIWO5C KMtkVk5CGBv0IuCMvYsPtPZ5zUCxqn8D9X1Ps3pgi51SsEpLmevpXg2DWbJhjyFuBV8wMkXZ MbAGe7xXClyNEiS5GfvLwvr+eRwnX5WKKK6bc2T8ilLJpLENSDMF+taYQDQBg37hYvdyDjoH x9kH5Pi431ivCfWOUE7LaZ7wYg2EEUG IronPort-HdrOrdr: A9a23:UmlaBajZ+Y2OCDQogC9iuRL1MXBQXtwji2hC6mlwRA09TySZ// rAoB19726StN9xYgBYpTnuAsi9qB/nmKKdpLNhX4tKPzOW3FdATrsD0WKK+VSJcEfDH6xmpM JdmsBFebvN5DNB4/oSjjPVLz9Z+qjlzJyV X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="73702048" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Juergen Gross" Subject: [XEN PATCH v3 16/25] libs/libs.mk: Remove the need for $(PKG_CONFIG_INST) Date: Fri, 24 Jun 2022 17:04:13 +0100 Message-ID: <20220624160422.53457-17-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086741483100008 Content-Type: text/plain; charset="utf-8" We can simply use $(PKG_CONFIG) to set the parameters, and add it to $(TARGETS) as necessary. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Bertrand Marquis Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index e02f91f95e..7aee449370 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -37,10 +37,10 @@ PKG_CONFIG_LIB :=3D $(LIB_FILE_NAME) PKG_CONFIG_REQPRIV :=3D $(subst $(space),$(comma),$(strip $(foreach lib,$(= patsubst ctrl,control,$(USELIBS_$(LIBNAME))),xen$(lib)))) =20 ifneq ($(CONFIG_LIBXC_MINIOS),y) -PKG_CONFIG_INST :=3D $(PKG_CONFIG) -$(PKG_CONFIG_INST): PKG_CONFIG_PREFIX =3D $(prefix) -$(PKG_CONFIG_INST): PKG_CONFIG_INCDIR =3D $(includedir) -$(PKG_CONFIG_INST): PKG_CONFIG_LIBDIR =3D $(libdir) +TARGETS +=3D $(PKG_CONFIG) +$(PKG_CONFIG): PKG_CONFIG_PREFIX =3D $(prefix) +$(PKG_CONFIG): PKG_CONFIG_INCDIR =3D $(includedir) +$(PKG_CONFIG): PKG_CONFIG_LIBDIR =3D $(libdir) endif =20 PKG_CONFIG_LOCAL :=3D $(PKG_CONFIG_DIR)/$(PKG_CONFIG) @@ -55,7 +55,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) =20 .PHONY: all -all: headers.chk $(TARGETS) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$= (LIBNAME).map $(LIBHEADERS) +all: headers.chk $(TARGETS) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIB= HEADERS) =20 ifneq ($(NO_HEADERS_CHK),y) headers.chk: @@ -127,7 +127,6 @@ clean:: rm -rf $(TARGETS) *~ $(DEPS_RM) $(OBJS-y) $(PIC_OBJS) rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(M= AJOR) rm -f headers.chk headers.lst - rm -f $(PKG_CONFIG) =20 .PHONY: distclean distclean: clean --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086745242925.6631167056636; Fri, 24 Jun 2022 09:05:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355617.583478 (Exim 4.92) (envelope-from ) id 1o4lnu-0000tH-8z; Fri, 24 Jun 2022 16:05:06 +0000 Received: by outflank-mailman (output) from mailman id 355617.583478; Fri, 24 Jun 2022 16:05:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnt-0000r3-My; Fri, 24 Jun 2022 16:05:05 +0000 Received: by outflank-mailman (input) for mailman id 355617; Fri, 24 Jun 2022 16:05:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnr-0004qc-VN for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:03 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 67526923-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:02 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 67526923-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086702; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nUZOfBqCn5La2Rq50ef3cLNXGuInKFbPM4f0Kz8ZjEw=; b=U44QaZfzvIGNLuSYSB9zt5XpFF9/XG2Je3fBcg6RPSi9hqrVzuLsbuEj hP31PnuMAcIul5Og0zg3BmPQ+xXFy5ZVwKnIipdo4XhCYrSvGNETgAIEo RkuE9qLimGzK7XuursGTezh5a57V0/T2BoHjFDWXfJRQl4gZImPM+LhmR 8=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74787718 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:Pekj9qzCshs3SyY3t+x6t+dvxirEfRIJ4+MujC+fZmUNrF6WrkVRn WoWDWGGOfnbYGrwf9Ena4i18U0HucPRnNAwGQRo+CAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnj/0bv656yMUOZigHtIQMsadUsxKbVIiGX1JZS5LwbZj2NY224ThWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NplhbKpQwITIpLwg8MCSD5hShpUEIQc5+qSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6BO 5VJNmU2PHwsZTVEE2YlBq46u9uJi0ftXxlfqHufqek4tj27IAtZj+G2bYu9lsaxbcdahEGDv Urd4n/0RBodMbS31j6t4n+qwOjVkkvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 3H44QJ38/J0rhbyCICgAVvo+xZooyLwRfJgPfQw7TuR9ZbPxBmCIVFddRRsQYY54ZpeqSMR6 rOZoz/4LWUx7ePNEi/Fqef8QSCaYnZMczJbDcMQZU5cuoS4/tlu5v7aZow7eJNZmOEZDt0ZL 9qiiCElz4segscQv0lQ1QCW2mn8znQlo+Nc2+k2Yo5GxlkgDGJdT9b0gWU3FN4ZRGpjcnGPv WIfh++V5/0UAJeGmUSlGbtQQunxtq/abGWE3jaD+qXNERz3oxZPmqgAiAyS2W8zappUEdMXS BW7VfxtCG97YyLxMP4fj3OZAMU216nwfenYugTvRoMWOPBZLVbflAk3PBL49z29wSAEzPBkU b/GIJnEMJrvIfk+pNZAb7xGiuFDK+FX7T67eK0XODz9gOTHOiLKGOxbWLZMB8hghJ65TMzu2 443H6O3J993C4USvgG/HVYvEG03 IronPort-HdrOrdr: A9a23:lsjL9q4JE9CmtxjY7QPXwPDXdLJyesId70hD6qhwISY6TiX+rb HJoB17726NtN9/YhEdcLy7VJVoBEmskKKdgrNhWotKPjOW21dARbsKheCJrgEIWReOktK1vZ 0QCpSWY+eQMbEVt6nHCXGDYrQd/OU= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74787718" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Juergen Gross" Subject: [XEN PATCH v3 17/25] libs/libs.mk: Rework target headers.chk dependencies Date: Fri, 24 Jun 2022 17:04:14 +0100 Message-ID: <20220624160422.53457-18-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086745481100017 Content-Type: text/plain; charset="utf-8" There is no need to call the "headers.chk" target when it isn't wanted, so it never need to be .PHONY. Also, there is no more reason to separate the prerequisites from the recipe. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Bertrand Marquis Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 7aee449370..f778a7df82 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -55,22 +55,20 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_INCLUD= E) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR =3D $(CURDIR) =20 .PHONY: all -all: headers.chk $(TARGETS) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIB= HEADERS) +all: $(TARGETS) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIBHEADERS) =20 ifneq ($(NO_HEADERS_CHK),y) -headers.chk: +all: headers.chk + +headers.chk: $(LIBHEADERS) $(AUTOINCS) for i in $(filter %.h,$^); do \ $(CC) -x c -ansi -Wall -Werror $(CFLAGS_xeninclude) \ -S -o /dev/null $$i || exit 1; \ echo $$i; \ done >$@.new mv $@.new $@ -else -.PHONY: headers.chk endif =20 -headers.chk: $(LIBHEADERS) $(AUTOINCS) - headers.lst: FORCE @{ set -e; $(foreach h,$(LIBHEADERS),echo $(h);) } > $@.tmp @$(call move-if-changed,$@.tmp,$@) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086934549714.7677180607801; Fri, 24 Jun 2022 09:08:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355662.583550 (Exim 4.92) (envelope-from ) id 1o4lr2-0007CW-GD; Fri, 24 Jun 2022 16:08:20 +0000 Received: by outflank-mailman (output) from mailman id 355662.583550; Fri, 24 Jun 2022 16:08:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lr2-0007CA-Bg; Fri, 24 Jun 2022 16:08:20 +0000 Received: by outflank-mailman (input) for mailman id 355662; Fri, 24 Jun 2022 16:08:19 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnv-0004qc-W5 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:08 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 68d89563-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:05 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 68d89563-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086706; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tyXg2EhFGm7DWQjDWYVLoXwH1ePwX2W5U//FqRQR1+A=; b=XQaczMrdsZsx5bP5lEnnKI9U/XMvImfvjCr0/Rjm1e9SInZGwlkKfNx3 7bP4n+W6f9b3e6DgZ1e6istOZDO7k34WYiwj/YQZ1kzKxTPJiEkYgua1a 1GEMoH+/MPNFO4vOZWqX9UWUmjFf5QTRhcq5L2YbeY0CByYJSfAO+mPqU 4=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74208140 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:CNulR6nu2NgbS3LUXnvdqdro5gzZJkRdPkR7XQ2eYbSJt1+Wr1Gzt xIXX27SOPmCZDf9KYp1a43k8E1T6MOBndRgSwM/pH80FCMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BCpC48T8kk/vgqoPUUIYoAAgoLeNfYHpn2EgLd9IR2NYy24DnWV/V4 7senuWEULOb828sWo4rw/rrRCNH5JwebxtB4zTSzdgS1LPvvyF94KA3fMldHFOhKmVgJcaoR v6r8V2M1jixEyHBqD+Suu2TnkUiGtY+NOUV45Zcc/DKbhNq/kTe3kunXRa1hIg+ZzihxrhMJ NtxWZOYbCgnGrbR38okDUdfHBtUZL188+/VPi3q2SCT5xWun3rExvxvCAc9PJEC+/YxCmZLn RAaAGlTNFbZ3bvwme/lDLk37iggBJCD0Ic3s3d8zTbfHLA+TIrKWani7t5ExjYgwMtJGJ4yY uJGNWA3PE2cO3WjPH9NIsIRm9yunUDkLSRhhXy+v/QSz1PqmVkZPL/Fb4OOJ43iqd9utkSXv GXd5EziHwoXcteYzFKt7XaEluLJ2yThV+o6BLC+s/JnnlCX7mgSEwENE0u2p+GjjUyzUM4ZL FYbkhfCtoBrqhbtFIOkGUTl/jjU5XbwRua8DcUfxw+p0beTzT/HWG8LdBQYeOYt5N0pEGlCO kCyoz/5OdB+mOTLFCzFrerM8mPa1Ts9djFbO3JdJecRy5y6+dxo0EqSJjp2OPTt5uAZDw0c1 NxjQMIWo7wIxfAG2Kyglbwsq2L9/8OZJuLZC+i+Y45E0u+aTNT8D2BQwQKHhcus1a7AJrV7g FAKmtKF8McFBoyXmSqGTY0lRe/0ua7dYWSD3QY3QPHNEghBHVb5Jei8BxkuTHqFz+5eIWO5C KMtkVk5CGBv0IuCMvYsPtPZ5zUCxqn8D9X1Ps3pgi51SsEpLmevpXg2DWbJhjyFuBV8wMkXZ MbAGe7xXClyNEiS5GfvLwvr+eRwnX5WKKK6bc2T8ilLJpLENSDMF+taYQDQBg37hYvdyDjoH x9kH5Pi431ivCfWOEE7LaZ7wYg2EEUG IronPort-HdrOrdr: A9a23:Hc1K86lMkwF9Eu8TzpxlfpyZgoXpDfIU3DAbv31ZSRFFG/Fxl6 iV8sjzsiWE7gr5OUtQ4exoV5PhfZqxz/JICMwqTNKftWrdyQyVxeNZnOjfKlTbckWUnINgPO VbAsxD4bXLfCFHZK3BgTVQfexO/DD+ytHLudvj X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74208140" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Juergen Gross" Subject: [XEN PATCH v3 18/25] tools: Introduce $(xenlibs-rpath,..) to replace $(SHDEPS_lib*) Date: Fri, 24 Jun 2022 17:04:15 +0100 Message-ID: <20220624160422.53457-19-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086936562100001 Content-Type: text/plain; charset="utf-8" This patch introduce a new macro $(xenlibs-dependencies,) to generate a list of all the xen library that a library is list against, and they are listed only once. We use the side effect of $(sort ) which remove duplicates. This is used by another macro $(xenlibs-rpath,) which is to replace $(SHDEPS_libxen*). In libs.mk, we don't need to $(sort ) SHLIB_lib* anymore as this was used to remove duplicates and they are no more duplicates. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Juergen Gross --- tools/Rules.mk | 29 ++++++++++++++++------------- tools/libs/libs.mk | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 47424935ba..23979ed254 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -61,13 +61,8 @@ endif # public headers. Users of libfoo are therefore transitively # using libbaz's header but not linking against libbaz. # -# SHDEPS_libfoo: Flags for linking recursive dependencies of -# libfoo. Must contain SHLIB for every library which -# libfoo links against. So must contain both -# $(SHLIB_libbar) and $(SHLIB_libbaz). -# # SHLIB_libfoo: Flags for recursively linking against libfoo. Must -# contains SHDEPS_libfoo and: +# contains $(call xenlibs-rpath,foo) and: # -Wl,-rpath-link=3D # # CFLAGS_libfoo: Flags for compiling against libfoo. Must add the @@ -79,23 +74,31 @@ endif # libfoo. # # LDLIBS_libfoo: Flags for linking against libfoo. Must contain -# $(SHDEPS_libfoo) and the path to libfoo.so +# $(call xenlibs-rpath,foo) and the path to libfoo.so # # Consumers of libfoo should include $(CFLAGS_libfoo) and # $(LDLIBS_libfoo) in their appropriate directories. They should not # include any CFLAGS or LDLIBS relating to libbar or libbaz unless # they use those libraries directly (not via libfoo) too. -# -# Consumers of libfoo should not directly use $(SHDEPS_libfoo) or -# $(SHLIB_libfoo) + +# Give the list of Xen library that the libraries in $(1) are linked again= st, +# directly or indirectly. +define xenlibs-dependencies + $(sort $(foreach lib,$(1), \ + $(USELIBS_$(lib)) $(call xenlibs-dependencies,$(USELIBS_$(lib))))) +endef + +# Flags for linking recursive dependencies of Xen libraries in $(1) +define xenlibs-rpath + $(addprefix -Wl$(comma)-rpath-link=3D$(XEN_ROOT)/tools/libs/,$(call xe= nlibs-dependencies,$(1))) +endef =20 define LIB_defs FILENAME_$(1) ?=3D xen$(1) XEN_libxen$(1) =3D $$(XEN_ROOT)/tools/libs/$(1) CFLAGS_libxen$(1) =3D $$(CFLAGS_xeninclude) - SHDEPS_libxen$(1) =3D $$(foreach use,$$(USELIBS_$(1)),$$(SHLIB_libxen$$(u= se))) - LDLIBS_libxen$(1) =3D $$(SHDEPS_libxen$(1)) $$(XEN_libxen$(1))/lib$$(FILE= NAME_$(1))$$(libextension) - SHLIB_libxen$(1) =3D $$(SHDEPS_libxen$(1)) -Wl,-rpath-link=3D$$(XEN_libxe= n$(1)) + SHLIB_libxen$(1) =3D $$(call xenlibs-rpath,$(1)) -Wl,-rpath-link=3D$$(XEN= _libxen$(1)) + LDLIBS_libxen$(1) =3D $$(call xenlibs-rpath,$(1)) $$(XEN_libxen$(1))/lib$= $(FILENAME_$(1))$$(libextension) endef =20 $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_defs,$(lib)))) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index f778a7df82..d7e1274249 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -32,7 +32,7 @@ PKG_CONFIG ?=3D $(LIB_FILE_NAME).pc PKG_CONFIG_NAME ?=3D Xen$(LIBNAME) PKG_CONFIG_DESC ?=3D The $(PKG_CONFIG_NAME) library for Xen hypervisor PKG_CONFIG_VERSION :=3D $(MAJOR).$(MINOR) -PKG_CONFIG_USELIBS :=3D $(sort $(SHLIB_libxen$(LIBNAME))) +PKG_CONFIG_USELIBS :=3D $(SHLIB_libxen$(LIBNAME)) PKG_CONFIG_LIB :=3D $(LIB_FILE_NAME) PKG_CONFIG_REQPRIV :=3D $(subst $(space),$(comma),$(strip $(foreach lib,$(= patsubst ctrl,control,$(USELIBS_$(LIBNAME))),xen$(lib)))) =20 --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086981690392.4427170697405; Fri, 24 Jun 2022 09:09:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355733.583610 (Exim 4.92) (envelope-from ) id 1o4lrq-0002LK-Ua; Fri, 24 Jun 2022 16:09:10 +0000 Received: by outflank-mailman (output) from mailman id 355733.583610; Fri, 24 Jun 2022 16:09:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lrq-0002JR-Pu; Fri, 24 Jun 2022 16:09:10 +0000 Received: by outflank-mailman (input) for mailman id 355733; Fri, 24 Jun 2022 16:09:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnx-0004qc-00 for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:09 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 69dc418e-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:06 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 69dc418e-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086706; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oByBK99qnefbrQHrEHd3FvzvjmDsAemolWu+MnoHJUY=; b=KlenXAgY4asI04rH0XzRv/eSvW2hK8KHenlJGMHdZl4LEV7fhnSvsN/T 8NJYTkVOtKRyX0ldOoWUvwr8MHm5eysTxmZwERs3hjESsCIXZPm0aRTjy 0pP0UNVidgC0bus0yyXpGwFF5fNhye/tsLgvb05VC8A5NBsn892q8AmHX I=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74787734 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:4SRl5KKYYc2C+uY6FE+RiZUlxSXFcZb7ZxGr2PjKsXjdYENS3jEOx mdODT/VPK6JNmL3fohya4u/oU8E68SAmNIxGQRlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokf0/0vrav67xZVF/fngqoDUUYYoAQgsA14+IMsdoUg7wbRh3NQ02YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 I1AicHrUF53BZ/B28VDSBNSOXllYLITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQqqBN 5VGMmYHgBLofiN/axQrGawHnuKTo1jcdxdppWKIjP9ii4TU5FMoi+W8WDbPQfSISt9ShV2wv X/d8iLyBRRyHMOb4SqI9DSrnOCntTP2XsceGaO18tZugUaP3SoDBRsOT1y5rPKlzEmkVLpix 1c8o3R06/JorQryE4e7D0bQTGO4UgA0A9dsTrYjsV+2+KeXwliCDGIuFiUcd4lz3CMpfgDGx mNljvuwW2Ex6ObIES3NnluHhWjsYHZIdAfucQdBFFJYuIe7/enfmzqVFr5e/LiJYsoZ8N0a6 xSDt2AAiroalqbnPI3rrAmc01pASnUkJzPZBzk7vUr/t2uVnKb/O+SVBaHztJ6s1rqxQFibp 2QjkMOD9u0IBpzlvHXTHbtVRODwuKrdaGK0bbtT838JrWzFF5mLLehtDMxWfh81Yq7ohxezC KMshe+hzMAKZyb7BUOGS4mwF94r3cDdKDgRbdiNNoAmSsEoLGevpXgyDWbNjzGFuBV9yskXZ MbEGftA+F5HUMyLOhLtHLxDuVLqrwhjrV7uqWfTlUX5iOTCOy/OF9/o8jKmN4gE0U9Nmy2Nm /43CidA40w3vDHWCsUPzbMuEA== IronPort-HdrOrdr: A9a23:Tumu16tlwYBGiZSir3qv+dzt7skDcNV00zEX/kB9WHVpmszxra +TdZMgpHjJYVcqKQgdcL+7WZVoLUmwyXcx2/hyAV7AZniDhILLFuFfBOLZqlWKcREWtNQtsJ uIG5IObuEYZmIVsS+V2mWF+q4bsbq6zJw= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74787734" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Juergen Gross" Subject: [XEN PATCH v3 19/25] tools: Introduce $(xenlibs-ldlibs, ) macro Date: Fri, 24 Jun 2022 17:04:16 +0100 Message-ID: <20220624160422.53457-20-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086982738100002 Content-Type: text/plain; charset="utf-8" This can be used when linking against multiple in-tree Xen libraries, and avoid duplicated flags. It can be used instead of multiple $(LDLIBS_libxen*). For now, replace the open-coding in libs.mk. The macro $(xenlibs-libs, ) will be useful later when only the path to the libraries is wanted (e.g. for checking for dependencies). Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Juergen Gross --- tools/Rules.mk | 16 ++++++++++++++-- tools/libs/libs.mk | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 23979ed254..ce77dd2eb1 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -93,12 +93,24 @@ define xenlibs-rpath $(addprefix -Wl$(comma)-rpath-link=3D$(XEN_ROOT)/tools/libs/,$(call xe= nlibs-dependencies,$(1))) endef =20 +# Provide a path for each library in $(1) +define xenlibs-libs + $(foreach lib,$(1), \ + $(XEN_ROOT)/tools/libs/$(lib)/lib$(FILENAME_$(lib))$(libextension)) +endef + +# Flags for linking against all Xen libraries listed in $(1) +define xenlibs-ldlibs + $(call xenlibs-rpath,$(1)) $(call xenlibs-libs,$(1)) \ + $(foreach lib,$(1),$(xenlibs-ldlibs-$(lib))) +endef + define LIB_defs FILENAME_$(1) ?=3D xen$(1) XEN_libxen$(1) =3D $$(XEN_ROOT)/tools/libs/$(1) CFLAGS_libxen$(1) =3D $$(CFLAGS_xeninclude) SHLIB_libxen$(1) =3D $$(call xenlibs-rpath,$(1)) -Wl,-rpath-link=3D$$(XEN= _libxen$(1)) - LDLIBS_libxen$(1) =3D $$(call xenlibs-rpath,$(1)) $$(XEN_libxen$(1))/lib$= $(FILENAME_$(1))$$(libextension) + LDLIBS_libxen$(1) =3D $$(call xenlibs-ldlibs,$(1)) endef =20 $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_defs,$(lib)))) @@ -108,7 +120,7 @@ $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_defs,$(lib= )))) CFLAGS_libxenctrl +=3D -D__XEN_TOOLS__ =20 ifeq ($(CONFIG_Linux),y) -LDLIBS_libxenstore +=3D -ldl +xenlibs-ldlibs-store :=3D -ldl endif =20 CFLAGS_libxenlight +=3D $(CFLAGS_libxenctrl) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index d7e1274249..2b8e7a6128 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -18,7 +18,7 @@ CFLAGS +=3D -Werror -Wmissing-prototypes CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) =20 -LDLIBS +=3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) +LDLIBS +=3D $(call xenlibs-ldlibs,$(USELIBS_$(LIBNAME))) =20 PIC_OBJS :=3D $(OBJS-y:.o=3D.opic) =20 --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086946860237.8713714938458; Fri, 24 Jun 2022 09:09:06 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355682.583561 (Exim 4.92) (envelope-from ) id 1o4lrF-0007ue-RW; Fri, 24 Jun 2022 16:08:33 +0000 Received: by outflank-mailman (output) from mailman id 355682.583561; Fri, 24 Jun 2022 16:08:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lrF-0007uX-Nw; Fri, 24 Jun 2022 16:08:33 +0000 Received: by outflank-mailman (input) for mailman id 355682; Fri, 24 Jun 2022 16:08:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lnz-0004qc-0I for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:11 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6ad30624-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:09 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6ad30624-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RMuLHf57LSFQbWtEVhf+qOkim9vFt3YxGp2RAYL9V7U=; b=VRRJ8BjhybhMdwGuj+Q+zknGXs1HssrvVUWjWCZvrShPV3zKMgEXl7Cs uebxJAiD/XM1XJB5RZWoga21ts7ADR6wHf5VXIOaslV6a7GNGyER7P1um ka5yKewmo3BC7c1pFjD6L7BhUpvOxQY43F8xEf4HQ/TMbzRdjR2WaURwH 4=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74384231 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:R54Z7KJvEaWBmuacFE+RtZUlxSXFcZb7ZxGr2PjKsXjdYENS3jRUz WZOXjyCOP/ZMWb0Kdokbdu19h4DvpTXy94wQAJlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokf0/0vrav67xZVF/fngqoDUUYYoAQgsA14+IMsdoUg7wbRh3NQ02YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 NVrmJruWB47Ap3rw+4DQjlHOGJAbYQTrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQqqFN 5ZDMmMHgBLofwRIGlIWLbMEk/aBuHXQTmcbpgm+nP9ii4TU5FMoi+W8WDbPQfSQQt5fhEGfp WTu8GHwAxVcP9uaoRKa9lq8i+mJmjn0MKoCGbv9+vN0jVm7wm0IFAZQRVa9ueO+iEO1R5RYM UN8x8Y1hfFsrgrxFIC7BkDm5i7f1vIBZzZOO+0cxQfT27PG3za+XWIaXx5eQ58Y5OZjEFTGy WS1c8PV6S1H6ePIFyrGq+/L/VteKgBOczZcOHZsoR8tpoC6/dpt1k+nosNLSvbdszHjJd3nL 9lmRgAajq5bs8ME3r7TEbvv02P1/cihouLYC2zqsoOZAuBRPtfNi3SAswSz0Bq5BN/xoqO9l HYFgdOCy+sFEIuAkieAKM1UQuz3v67UaWKA2QYwd3XEy9hL0yT7FWy3yGEWGauUGpxcJW+Bj LH742u9G6O/zFP1NPQqMupd+uwhzLT6FMSNa804muFmO8ArHCfepXkGTRfJgwjFzRh9+Ylia MzzWZv9Uh4n5VFPkWPeqxE1iuRwmEjTBAr7GPjG8vhQ+eDPOifLFehUawXmgyJQxPrsnTg5O u13b6OioyizmsWlCsUL2eb/9Ww3EEU= IronPort-HdrOrdr: A9a23:frGmRKyRAf/pcTCs/02fKrPwFL1zdoMgy1knxilNoRw8SKKlfq eV7ZImPH7P+U4ssR4b+exoVJPtfZqYz+8R3WBzB8bEYOCFghrKEGgK1+KLqFeMJ8S9zJ846U 4JSdkGNDSaNzlHZKjBjzVQa+xQouW6zA== X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74384231" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Nick Rosbrook" Subject: [XEN PATCH v3 20/25] tools: Introduce $(xenlibs-ldflags, ) macro Date: Fri, 24 Jun 2022 17:04:17 +0100 Message-ID: <20220624160422.53457-21-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086948569100003 Content-Type: text/plain; charset="utf-8" This avoid the need to open-coding the list of flags needed to link with an in-tree Xen library when using -lxen*. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Henry Wang --- tools/golang/xenlight/Makefile | 2 +- tools/Rules.mk | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 64671f246c..00e6d17f2b 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -27,7 +27,7 @@ GOXL_GEN_FILES =3D types.gen.go helpers.gen.go # so that it can find the actual library. .PHONY: build build: xenlight.go $(GOXL_GEN_FILES) - CGO_CFLAGS=3D"$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog) $(APPEND_CFLA= GS)" CGO_LDFLAGS=3D"$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_l= ibxenlight) -L$(XEN_libxentoollog) $(APPEND_LDFLAGS)" $(GO) build -x + CGO_CFLAGS=3D"$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog) $(APPEND_CFLA= GS)" CGO_LDFLAGS=3D"$(call xenlibs-ldflags,light toollog) $(APPEND_LDFLAGS)= " $(GO) build -x =20 .PHONY: install install: build diff --git a/tools/Rules.mk b/tools/Rules.mk index ce77dd2eb1..26958b2948 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -105,6 +105,14 @@ define xenlibs-ldlibs $(foreach lib,$(1),$(xenlibs-ldlibs-$(lib))) endef =20 +# Provide needed flags for linking an in-tree Xen library by an external +# project (or when it is necessary to link with "-lxen$(1)" instead of usi= ng +# the full path to the library). +define xenlibs-ldflags + $(call xenlibs-rpath,$(1)) \ + $(foreach lib,$(1),-L$(XEN_ROOT)/tools/libs/$(lib)) +endef + define LIB_defs FILENAME_$(1) ?=3D xen$(1) XEN_libxen$(1) =3D $$(XEN_ROOT)/tools/libs/$(1) --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086929525671.7924239793706; Fri, 24 Jun 2022 09:08:49 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355647.583522 (Exim 4.92) (envelope-from ) id 1o4lqx-0006M6-QZ; Fri, 24 Jun 2022 16:08:15 +0000 Received: by outflank-mailman (output) from mailman id 355647.583522; Fri, 24 Jun 2022 16:08:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lqx-0006KY-HT; Fri, 24 Jun 2022 16:08:15 +0000 Received: by outflank-mailman (input) for mailman id 355647; Fri, 24 Jun 2022 16:08:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lo3-0004qc-0f for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:15 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6c74b4c8-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:12 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6c74b4c8-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086712; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pBOCOfGvGT0Sraw3NBsPSjR52CXZ/ChD1FyPAVw+iMU=; b=eDYKIzy4K62rJW4cnEeQ+Bs3qsgnt8VpnEMqYoIpRuTxUy7eJm2vGXf3 B34+3aABU68hK87miM18p2a8JqD7apd0Wy0GvHHbLHoNKtdYSr+yNZm8K docpvwKkT6rHENRN9BkpkTyAqKvprcLYeKpqVpTK0yxbg083SMS+5KgQ5 s=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74362408 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:xUFXnaMa7d7XakbvrR3sl8FynXyQoLVcMsEvi/4bfWQNrUon3z0Hy 2cYXm+DaKvbYWCkc9xzYI+x80sCuZDcyNExGwto+SlhQUwRpJueD7x1DKtR0wB+jCHnZBg6h ynLQoCYdKjYdleF+lH1dOKJQUBUjclkfJKlYAL/En03FFUMpBsJ00o5wbZn2NIw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zy 95z9qWxVwAQMPPFyOI6Y0ECLCRDIvgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gRQa2AP ZZBOVKDajyDZTduAU5MAa4ds+eF20TbYRNGkWmK8P9fD2/7k1UqjemF3MDuUsOObdVYmACfv G2u13T0BFQWOcKSzRKB82mwnanfkCXjQoUQGbaksPlwjzWuKnc7UUNMEwHh+L/g1xD4C4k3x 1EoFjQGrqMMt3WqUN7EUUOx8HijjkZGZN9tDLhvgO2S8ZY48zp1F0BdEGMfMId77JBmLdA5/ gTXxo20XFSDpJXQECvArenM8FteLABPdQc/iTk4oRzpCjUJiKU6lVrxQ9lqC8ZZZfWlSGirk 1hmQMXT7oj/bPLnNI3hpDgrexr2+vD0ovcdv207pF6N4AJjf5KCbIe181Xd5vsoBN/HEwfZ5 CldxJTGtL9m4XSxeMqlGr1l8FaBt5643MD02wYzT/HNCRz3k5JcQWygyG4nfxo4Wir1UTTof FXSqWts2XOnB1PzNfUfS9voU6wClPG8ffy4BqG8RocfOfBZKV7YlByCkGbNhggBZmB3yvphU XpaGO7xZUsn5VNPlmvoHrlBju5wmEjTBwr7HPjG8vhu6pLGDFb9dFvPGAHmgjwRhE9cnDjoz g== IronPort-HdrOrdr: A9a23:jbA+uqnjoAlil2h8e4qYsLG2plbpDfIq3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7wr5OUtQ4OxoV5PgfZqxz/NICMwqTNWftWrdyQ+VxeNZjbcKqgeIc0aVygce79 YET0EXMqyXMbEQt6jHCWeDf+rIuOP3k5yVuQ== X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74362408" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 21/25] tools/helper: Cleanup Makefile Date: Fri, 24 Jun 2022 17:04:18 +0100 Message-ID: <20220624160422.53457-22-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086930495100001 Content-Type: text/plain; charset="utf-8" Use $(TARGETS) to collect targets. Collect library to link against in $(LDLIBS). Remove extra "-f" flags that is already part of $(RM). Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu Tested-by: Luca Fancellu --- Notes: v3: - apply changes to the new "init-dom0less" helper. - make use of the new macro $(xenlibs-ldlibs,) tools/helpers/Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 8d78ab1e90..7c9d671b32 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -5,13 +5,13 @@ XEN_ROOT =3D $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -PROGS +=3D xen-init-dom0 +TARGETS +=3D xen-init-dom0 ifeq ($(CONFIG_Linux),y) ifeq ($(CONFIG_X86),y) -PROGS +=3D init-xenstore-domain +TARGETS +=3D init-xenstore-domain endif ifeq ($(CONFIG_ARM),y) -PROGS +=3D init-dom0less +TARGETS +=3D init-dom0less endif endif =20 @@ -20,6 +20,7 @@ $(XEN_INIT_DOM0_OBJS): CFLAGS +=3D $(CFLAGS_libxentoollog) $(XEN_INIT_DOM0_OBJS): CFLAGS +=3D $(CFLAGS_libxenstore) $(XEN_INIT_DOM0_OBJS): CFLAGS +=3D $(CFLAGS_libxenlight) $(XEN_INIT_DOM0_OBJS): CFLAGS +=3D $(CFLAGS_libxenctrl) +xen-init-dom0: LDLIBS +=3D $(call xenlibs-ldlibs,ctrl toollog store light) =20 INIT_XENSTORE_DOMAIN_OBJS =3D init-xenstore-domain.o init-dom-json.o $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS +=3D $(CFLAGS_libxentoollog) @@ -28,6 +29,7 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS +=3D $(CFLAGS_libxen= ctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS +=3D $(CFLAGS_libxenstore) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS +=3D $(CFLAGS_libxenlight) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS +=3D -include $(XEN_ROOT)/tools/confi= g.h +init-xenstore-domain: LDLIBS +=3D $(call xenlibs-ldlibs,toollog store ctrl= guest light) =20 INIT_DOM0LESS_OBJS =3D init-dom0less.o init-dom-json.o $(INIT_DOM0LESS_OBJS): CFLAGS +=3D $(CFLAGS_libxentoollog) @@ -35,30 +37,31 @@ $(INIT_DOM0LESS_OBJS): CFLAGS +=3D $(CFLAGS_libxenstore) $(INIT_DOM0LESS_OBJS): CFLAGS +=3D $(CFLAGS_libxenlight) $(INIT_DOM0LESS_OBJS): CFLAGS +=3D $(CFLAGS_libxenctrl) $(INIT_DOM0LESS_OBJS): CFLAGS +=3D $(CFLAGS_libxenevtchn) +init-dom0less: LDLIBS +=3D $(call xenlibs-ldlibs,ctrl evtchn toollog store= light guest foreignmemory) =20 .PHONY: all -all: $(PROGS) +all: $(TARGETS) =20 xen-init-dom0: $(XEN_INIT_DOM0_OBJS) - $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenctrl) $(LDLIB= S_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLA= GS) + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS) $(APPEND_LDFLAGS) =20 init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) - $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollo= g) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIB= S_libxenlight) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS) $(APPEND_LD= FLAGS) =20 init-dom0less: $(INIT_DOM0LESS_OBJS) - $(CC) $(LDFLAGS) -o $@ $(INIT_DOM0LESS_OBJS) $(LDLIBS_libxenctrl) $(LDLIB= S_libxenevtchn) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libx= enlight) $(LDLIBS_libxenguest) $(LDLIBS_libxenforeignmemory) $(APPEND_LDFLA= GS) + $(CC) $(LDFLAGS) -o $@ $(INIT_DOM0LESS_OBJS) $(LDLIBS) $(APPEND_LDFLAGS) =20 .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - for i in $(PROGS); do $(INSTALL_PROG) $$i $(DESTDIR)$(LIBEXEC_BIN); done + for i in $(TARGETS); do $(INSTALL_PROG) $$i $(DESTDIR)$(LIBEXEC_BIN); done =20 .PHONY: uninstall uninstall: - for i in $(PROGS); do rm -f $(DESTDIR)$(LIBEXEC_BIN)/$$i; done + for i in $(TARGETS); do rm -f $(DESTDIR)$(LIBEXEC_BIN)/$$i; done =20 .PHONY: clean clean: - $(RM) -f *.o $(PROGS) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) =20 distclean: clean --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086930248866.4924605745331; Fri, 24 Jun 2022 09:08:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355652.583538 (Exim 4.92) (envelope-from ) id 1o4lqz-0006lC-6O; Fri, 24 Jun 2022 16:08:17 +0000 Received: by outflank-mailman (output) from mailman id 355652.583538; Fri, 24 Jun 2022 16:08:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lqy-0006jo-RX; Fri, 24 Jun 2022 16:08:16 +0000 Received: by outflank-mailman (input) for mailman id 355652; Fri, 24 Jun 2022 16:08:15 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lo5-0004qc-1Q for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:17 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6e40166c-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:13 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6e40166c-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086713; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S8/hwL2N26ebpBrr2BTp9NQzqw/JJLwRIQMFuynDLXQ=; b=ftg7FbNNJxiLX+Ax7R0/z9W6m6sU52764kHALcCqXgIq05akE6oCxsnl qLH04GugxvJm4qH4NLD/Rj85iErbb62IhmvZUFqzJNSk7uFgtPemcVxE2 6gwtEQfrSOcvp/p8RUT2U7aTVuXkPzyrW39gok9yFhelFyJpBkjnxotbA A=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74362409 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:sz7SNqIpVG7lSwGMFE+RmJUlxSXFcZb7ZxGr2PjKsXjdYENS0WYDm jcZXzzUMvqMYTemKdB1PYzn809XsMTSn4I2TFZlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokf0/0vrav67xZVF/fngqoDUUYYoAQgsA14+IMsdoUg7wbRh3NQ02YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 MccrL3tWVskBaSWv+ItAyF3FyhwA6ITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQqqFO ZBFMWsHgBLoP0xhZUoNMrMFxb2rjWn8MCVig2qujP9ii4TU5FMoi+W8WDbPQfSVQe1Fk0Deo XjJl0zpDxdfONGBxD6t9nO3mvSJjS79QJgVFrCz6rhtmlL7+4AIIERIDx3h+6D/0xPgHYIEQ 6AJxsYwhbpj7W32XoXwZBTih3i07iYzX9NeLeJvvWlh1ZHoDxal6nksF2AcNoR96ZdpFVTGx XfSwYq3WGUHXKm9DCvEq+zK9W7a1T09dzdqWMMScecSDzAPSqkXhwmHcNtsGbXdYjbdSWCpm GDiQMTTatwuYS83O0aTpwmvb8qE/MShc+LMzly/spiZxg14fpW5QIej9ELW6/1NRK7AEATf5 CBVwpfCtLhRZX1oqMBraL9VdF1Oz6btDdEhqQQ3Q8lJG8qFoRZPgry8EBkhfRw0Y67oiBfiY VPJuBM52aK/yECCNPctC6roUpxC5fG5SbzNC6CFBvITM8MZXFLWo0lTibu4gjmFfL4EyvpkZ /92sK+EUB4nNEiQ5GDnGb5DjeB6nX5WKKG6bcmT8ilLGIG2PBa9IYrp+nPUBgzlxMtoeDnoz us= IronPort-HdrOrdr: A9a23:az2aT60Y5gbwrYYEgUr6DAqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74362409" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 22/25] tools/console: Use $(xenlibs-ldlibs,) Date: Fri, 24 Jun 2022 17:04:19 +0100 Message-ID: <20220624160422.53457-23-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086930530100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- tools/console/client/Makefile | 3 +-- tools/console/daemon/Makefile | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/console/client/Makefile b/tools/console/client/Makefile index 44176c6d93..e2f2554f92 100644 --- a/tools/console/client/Makefile +++ b/tools/console/client/Makefile @@ -6,8 +6,7 @@ CFLAGS +=3D $(CFLAGS_libxenctrl) CFLAGS +=3D $(CFLAGS_libxenstore) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h =20 -LDLIBS +=3D $(LDLIBS_libxenctrl) -LDLIBS +=3D $(LDLIBS_libxenstore) +LDLIBS +=3D $(call xenlibs-ldlibs,ctrl store) LDLIBS +=3D $(SOCKET_LIBS) =20 OBJS-y :=3D main.o diff --git a/tools/console/daemon/Makefile b/tools/console/daemon/Makefile index 0f004f0b14..99bb33b6a2 100644 --- a/tools/console/daemon/Makefile +++ b/tools/console/daemon/Makefile @@ -10,11 +10,7 @@ CFLAGS +=3D $(CFLAGS_libxenforeignmemory) CFLAGS-$(CONFIG_ARM) +=3D -DCONFIG_ARM CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h =20 -LDLIBS +=3D $(LDLIBS_libxenctrl) -LDLIBS +=3D $(LDLIBS_libxenstore) -LDLIBS +=3D $(LDLIBS_libxenevtchn) -LDLIBS +=3D $(LDLIBS_libxengnttab) -LDLIBS +=3D $(LDLIBS_libxenforeignmemory) +LDLIBS +=3D $(call xenlibs-ldlibs,ctrl store evtchn gnttab foreignmemory) LDLIBS +=3D $(SOCKET_LIBS) LDLIBS +=3D $(UTIL_LIBS) LDLIBS +=3D -lrt --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086982174334.1682462959287; Fri, 24 Jun 2022 09:09:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355731.583605 (Exim 4.92) (envelope-from ) id 1o4lrq-0002D0-Dr; Fri, 24 Jun 2022 16:09:10 +0000 Received: by outflank-mailman (output) from mailman id 355731.583605; Fri, 24 Jun 2022 16:09:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lrq-0002Cr-8w; Fri, 24 Jun 2022 16:09:10 +0000 Received: by outflank-mailman (input) for mailman id 355731; Fri, 24 Jun 2022 16:09:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lo7-0004qc-1N for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:19 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6db82574-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:14 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6db82574-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fDQ/vJNJxx9MBaOwB2oL0yR7kNW2eRPokZWwFVGVAsQ=; b=PmdY29JVwAOMKBPwTB41fUjBt+YXlePgcHhHTRCL4S3KYnZr00hysaoj tefkI2iKlVvbABUKgojQ0ikdJ9qWx/Bebjnytl5q4SIAhUkR9ngBkWrY/ j+qTrYlVMgxhMFRODRvKyBPPDUQ+6F7KkQGbUJe5BHhx7kEF/fIYTgbDh w=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 76935370 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:bCZZ7a32KuCpMNdmffbD5Zpxkn2cJEfYwER7XKvMYLTBsI5bpzUBy GpMDW3UbP/cNDT9Lo1xbNy2904G78eGm9VrGgpupC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkjk7xdOCn9xGQ7InQLlbGILes1htZGEk1Ek/NtTo5w7Rj2tAy3YDja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1Vl77tQy4xLJScgdk8QUJePgohI5VJreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNamAN pFEMmU3BPjGSyNDOVoYMrgmpf+hhXbeXTthtlG3lYNitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzREhwccdCS1zeB2natnfPU2zP2XpoIE7+1/eIsh0ecrlH/EzVPCwH9+6PgzBfjBZQPc CT45xbCs4Aq1m72RPDlTSTouUOlrEUadvEPDdU1vVTlJrXv3+qJOoQVZmcfNYJ+75JuGmxCO kyhxI2wW2E22FGBYTfEr+rP82vvUcQABTVaDRLoWzfp9DUKTGsbqhvUBuhuH6eu5jEeMWGhm mvaxMTSalh6sCLq60lY1Qqe695UjsKVJjPZHy2ONo5f0it3ZZS+e6uj4kXB4PBLIe6xFwfc4 iBcypHBsLhWUvlhcRBhps1XRNlFAN7VWAAwfHY1R8Vxn9hT0yTLkX9sDMFWex4yb5dslc7Ba 07PowJBjKJu0I+RRfYvOeqZUp1ypYC5TIiNfq2EP7JmP8kqHCfarX4GWKJl9z20+KTaufpkY snznAfFJStyNJmLOxLsFrlEj+N0l3tgrY4RLLiipymaPXOlTCb9Yd843JGmNIjVMIvsTN3pz uti IronPort-HdrOrdr: A9a23:y/KiH6F3TRHJsio3pLqE0MeALOsnbusQ8zAXP0AYc3Jom6uj5q aTdZUgpGfJYVkqOE3I9ertBEDEewK4yXcX2/h3AV7BZniEhILAFugLhuGO/9SjIVybygc079 YYT0EUMrzN5DZB4voSmDPIceod/A== X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="76935370" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 23/25] tools/helpers: Fix build of xen-init-dom0 with -Werror Date: Fri, 24 Jun 2022 17:04:20 +0100 Message-ID: <20220624160422.53457-24-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086982727100001 Content-Type: text/plain; charset="utf-8" Missing prototype of asprintf() without _GNU_SOURCE. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Henry Wang --- tools/helpers/xen-init-dom0.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/helpers/xen-init-dom0.c b/tools/helpers/xen-init-dom0.c index 37eff8868f..764f837887 100644 --- a/tools/helpers/xen-init-dom0.c +++ b/tools/helpers/xen-init-dom0.c @@ -1,3 +1,5 @@ +#define _GNU_SOURCE + #include #include #include --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086957473467.91591552573743; Fri, 24 Jun 2022 09:09:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355702.583583 (Exim 4.92) (envelope-from ) id 1o4lrO-0000XH-P5; Fri, 24 Jun 2022 16:08:42 +0000 Received: by outflank-mailman (output) from mailman id 355702.583583; Fri, 24 Jun 2022 16:08:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lrO-0000X2-In; Fri, 24 Jun 2022 16:08:42 +0000 Received: by outflank-mailman (input) for mailman id 355702; Fri, 24 Jun 2022 16:08:41 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4loB-0004qc-2N for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:23 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6f0614cd-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:15 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6f0614cd-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n/V1L71RdFQfMeSoM2sfB601hpOlEv718nuVnaqP+yY=; b=Mxz3IsSDUYEwGIqT8q2T7SLu60oSPbZO0/W90gmvaHxNuCH3E5EyY/Q4 XcKPFJubZ15ILLAD0xR+iBqyrl7i1edYTL2HPgxvMr0aymcfLf6xKeeJz VT1LNCEDDu+UrX+xABzZ944XinAKl4OiBn06w3f6yJV0WhO8ZUE1PaTXK 8=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74384250 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:s0YkjaqdO65Bk1NcMNl7GikLILdeBmJRZRIvgKrLsJaIsI4StFCzt garIBnXP6yKY2D9ftB/bdi3p0hTupCAx9I3SAtpq39kFXsa8puZCYyVIHmrMnLJJKUvbq7GA +byyDXkBJppJpMJjk71atANlVEliefQAOCU5NfsYkidfyc9IMsaoU8lyrRRbrJA24DjWVvT4 4+q+aUzBXf+s9JKGjNMg068gEsHUMTa4Fv0aXRnOJinFHeH/5UkJMp3yZOZdhMUcaENdgKOf M7RzanRw4/s10xF5uVJMFrMWhZirrb6ZWBig5fNMkSoqkAqSicais7XOBeAAKv+Zvrgc91Zk b1wWZKMpQgBLpPjl90wcD1iEAZOG78Bx+ftGWa4iJnGp6HGWyOEL/RGCUg3OcsT+/ptAHEI/ vsdQNwPRknd3aTsmuv9E7QywJR4RCXoFNp3VnVIxDfFDfEgUNbbTr/D/9Nw1zYsnMFeW/3ZY qL1bBIwME+QP0cSYj/7DroGrNiOm37BIgQI8l+W9Zor6WWKyQ9uhe2F3N39JYXRGJQ9clyjj n3C13T0BFcdLtP34SqI9Degi/HCmQv/WZkOD/uo+/hymlqRy2cPThoMWjOGTeKR0xDkHYgFc gpNp3Ro/fNaGFGXosfVTyOXr0epnTomWP1gNf9911mn8rTT2lPMboQbdQKteODKpedvG2F0j gTUx4y5bdB8mObLECzAr994uRv3YHFIdjFaOEfoWCNfu7HeTJcPYgUjpzqJOIq8lZXLFD752 FhmRwBu1uxI3abnO0hWlG0rYg5ARbCTF2bZHi2NAgqYAvpRPeZJnbCA51nB9upnJ42EVFSHt 3Vss5HAsb5WVcDUy3DVGLpl8FSVCxCtamW0bblHT/EcG8mFoSb/Lei8HhkkTKuWDir0UWCwO xKC0e+gzJRSIGGrfcdKXm5FMOxzlfKIPY28Dpj8N4MSCrAsJF7v1Hw/Pia4gjGy+HXAZIliY P93h+73Vi1EYUmmpRLrL9ogPUgDnHFgnD2PGsGgkXxKE9O2PRaodFvMC3PWBshR0U9OiFm9H wp3XydS9yhibQ== IronPort-HdrOrdr: A9a23:6SU69KhbQzLtZFRWXCxw4w10+nBQXtwji2hC6mlwRA09TySZ// rAoB19726StN9xYgBYpTnuAsi9qB/nmKKdpLNhX4tKPzOW3FdATrsD0WKK+VSJcEfDH6xmpM JdmsBFebvN5DNB4/oSjjPVLz9Z+qjlzJyV X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74384250" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu Subject: [XEN PATCH v3 24/25] tools: Add -Werror by default to all tools/ Date: Fri, 24 Jun 2022 17:04:21 +0100 Message-ID: <20220624160422.53457-25-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086958717100001 Content-Type: text/plain; charset="utf-8" And provide an option to ./configure to disable it. A follow-up patch will remove -Werror from every other Makefile in tools/. ("tools: Remove -Werror everywhere else") Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Luca Fancellu --- tools/configure.ac | 1 + tools/Rules.mk | 4 ++++ config/Tools.mk.in | 1 + tools/configure | 26 ++++++++++++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/tools/configure.ac b/tools/configure.ac index 1094d896fc..06311b99c2 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -79,6 +79,7 @@ m4_include([../m4/header.m4]) AX_XEN_EXPAND_CONFIG() =20 # Enable/disable options +AX_ARG_DEFAULT_ENABLE([werror], [Build tools without -Werror]) AX_ARG_DEFAULT_DISABLE([rpath], [Build tools with -Wl,-rpath,LIBDIR]) AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring t= ools]) diff --git a/tools/Rules.mk b/tools/Rules.mk index 26958b2948..a165dc4bda 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -133,6 +133,10 @@ endif =20 CFLAGS_libxenlight +=3D $(CFLAGS_libxenctrl) =20 +ifeq ($(CONFIG_WERROR),y) +CFLAGS +=3D -Werror +endif + ifeq ($(debug),y) # Use -Og if available, -O0 otherwise dbg_opt_level :=3D $(call cc-option,$(CC),-Og,-O0) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 6c1a0a676f..d0d460f922 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -1,5 +1,6 @@ -include $(XEN_ROOT)/config/Paths.mk =20 +CONFIG_WERROR :=3D @werror@ CONFIG_RUMP :=3D @CONFIG_RUMP@ ifeq ($(CONFIG_RUMP),y) XEN_OS :=3D NetBSDRump diff --git a/tools/configure b/tools/configure index a052c186a5..986cb1d933 100755 --- a/tools/configure +++ b/tools/configure @@ -716,6 +716,7 @@ ocamltools monitors githttp rpath +werror DEBUG_DIR XEN_DUMP_DIR XEN_PAGING_DIR @@ -805,6 +806,7 @@ with_xen_scriptdir with_xen_dumpdir with_rundir with_debugdir +enable_werror enable_rpath enable_githttp enable_monitors @@ -1490,6 +1492,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE= =3Dno) --enable-FEATURE[=3DARG] include FEATURE [ARG=3Dyes] --disable-largefile omit support for large files + --disable-werror Build tools without -Werror (default is ENABLED) --enable-rpath Build tools with -Wl,-rpath,LIBDIR (default is DISABLED) --enable-githttp Download GIT repositories via HTTP (default is @@ -4111,6 +4114,29 @@ DEBUG_DIR=3D$debugdir_path =20 # Enable/disable options =20 +# Check whether --enable-werror was given. +if test "${enable_werror+set}" =3D set; then : + enableval=3D$enable_werror; +fi + + +if test "x$enable_werror" =3D "xno"; then : + + ax_cv_werror=3D"n" + +elif test "x$enable_werror" =3D "xyes"; then : + + ax_cv_werror=3D"y" + +elif test -z $ax_cv_werror; then : + + ax_cv_werror=3D"y" + +fi +werror=3D$ax_cv_werror + + + # Check whether --enable-rpath was given. if test "${enable_rpath+set}" =3D set; then : enableval=3D$enable_rpath; --=20 Anthony PERARD From nobody Sat May 4 20:38:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1656086946068171.63933418913507; Fri, 24 Jun 2022 09:09:06 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.355686.583572 (Exim 4.92) (envelope-from ) id 1o4lrJ-0008MF-AX; Fri, 24 Jun 2022 16:08:37 +0000 Received: by outflank-mailman (output) from mailman id 355686.583572; Fri, 24 Jun 2022 16:08:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4lrJ-0008Ly-6m; Fri, 24 Jun 2022 16:08:37 +0000 Received: by outflank-mailman (input) for mailman id 355686; Fri, 24 Jun 2022 16:08:35 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4loG-0004qc-3F for xen-devel@lists.xenproject.org; Fri, 24 Jun 2022 16:05:28 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 712368b8-f3d7-11ec-b725-ed86ccbb4733; Fri, 24 Jun 2022 18:05:18 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 712368b8-f3d7-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1656086718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3uym4CH2Pdfd2UaOFcD0mM6SQZlHE9RUzweK8v6Cy2k=; b=KH0hGnwEH9EI3GnVBbxf4Bgm2ySRK/OU98Ok48vZ4U3SI7UskgYu0qnY AwmssSlnfBsiziBl8WF73obUgK55ul22mNrdI6EkxIDmfuqJ+gKnEjzfE innKX3w9jhuUUD4tqep6lPGnecyzEHY9lXN74H7oNQlzteZxVsJU/drgr A=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 74362426 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:h3Nrz64T2m12XUyIm5wBtQxRtPHHchMFZxGqfqrLsTDasY5as4F+v mYZCm+FOqmPZTGmc9lzPNu08h8PuJTcy9BmTFNo+CgzHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw03qPp8Zj2tQy2YbjX1vX0 T/Pi5a31GGNimYc3l08s8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByKQrr1vNvy7X 47+IISRpQs1yfuP5uSNyd4XemVSKlLb0JPnZnB+A8BOiTAazsA+PzpS2FPxpi67hh3Q9+2dx umhurSXTgovM6zltt4vXgBHCR1bJrZhoYPYdC3XXcy7lyUqclPpyvRqSko3IZcZ6qB8BmQmG f4wcW5XKErZ3qTvnez9GrIEascLdaEHOKsWvG1gyjfIS+4rW5nZT43B5MNC3Sd2jcdLdRrbT 5VFMmQ1ME6eC/FJEmYdCZxmt+WivCj2Vjl89FvErvU5+lGGmWSd15CyaYGIK7RmX/59kl6Do 2Pa/0zwGhwAKMGE0j2B726tgenU2yj8Xeo6GLK0+/FwiXWP12cTD1sQTlL9rv6n4mayUsxSA 1YZ8S0vqe417kPDZtvyRRqju1afowURHdFXFoUS9wWl2qfSpQGDCQAsXjNHLdArqsIybTgrz UOS2cPkAyR1t7+YQm7b8a2bxRuuOC09PWIEIygeQmMt7t3upoh1kxzOS8p4HbC8ptrvEDr0z naBqy1WulkIpZdVjePhpwmB2m/y4MiSJuIo2unJdkWi4wV0ZaeLXb6l8EfB0dNbN6HAckbU6 RDohPOiAPAy4YClzXLQHr1WQen2t55pIxWH3wcxQsBJGyCFvif6INsOuGwWyFJBaJ5sRNP/X KPEVeq9Drd3NWDiU6J4apnZ5y8Cnfm5ToSNuhw5g7NzjnlNmOyvpngGiba4hTyFraTVufhX1 W2nWcitF20GLq9s0SC7QewQuZdymH1gnTuCHM+nl0z4uVZ7WJJzYe1dWLdpRrBR0U95iF+Nr 4Y32zWikX2zr9ESkgGIqNVOfDjm3FAwBIzsqtw/S9Nv1jFOQTl7Y9eImOtJU9U8w8x9y7eZl lngCxQw4Aeu2hX6xfCiNykLhEXHBs0k8xrW/EUEYD6V5pTUSdz+sv5BK8RmJudPGS4K5accc sTpsv6oWpxnIgkrMRxHBXUhhOSOrCiWuD8= IronPort-HdrOrdr: A9a23:q57Wy6PjjrF7qsBcTvmjsMiBIKoaSvp037Eqv3oedfUzSL3/qy nOpoVi6faaslYssR0b9exofZPwJE80lqQFhrX5X43SPzUO0VHAROoJgLcKgQeQfxEWntQtrJ uIGJIeNDSfNzdHZL7BkWuFL+o= X-IronPort-AV: E=Sophos;i="5.92,218,1650945600"; d="scan'208";a="74362426" From: Anthony PERARD To: CC: Anthony PERARD , Wei Liu , "Elena Ufimtseva" , Tim Deegan , "Daniel De Graaf" , "Daniel P. Smith" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Juergen Gross , Christian Lindig , David Scott Subject: [XEN PATCH v3 25/25] tools: Remove -Werror everywhere else Date: Fri, 24 Jun 2022 17:04:22 +0100 Message-ID: <20220624160422.53457-26-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624160422.53457-1-anthony.perard@citrix.com> References: <20220624160422.53457-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1656086946636100001 Content-Type: text/plain; charset="utf-8" Patch "tools: Add -Werror by default to all tools/" have added "-Werror" to CFLAGS in tools/Rules.mk, remove it from every other makefiles as it is now duplicated. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig > Reviewed-by: Juergen Gross --- tools/console/client/Makefile | 1 - tools/console/daemon/Makefile | 1 - tools/debugger/kdd/Makefile | 1 - tools/flask/utils/Makefile | 1 - tools/fuzz/cpu-policy/Makefile | 2 +- tools/misc/Makefile | 1 - tools/tests/cpu-policy/Makefile | 2 +- tools/tests/depriv/Makefile | 2 +- tools/tests/resource/Makefile | 1 - tools/tests/tsx/Makefile | 1 - tools/tests/xenstore/Makefile | 1 - tools/xcutils/Makefile | 2 -- tools/xenmon/Makefile | 1 - tools/xenpaging/Makefile | 1 - tools/xenpmd/Makefile | 1 - tools/xentop/Makefile | 2 +- tools/xentrace/Makefile | 2 -- tools/xl/Makefile | 2 +- tools/debugger/gdbsx/Rules.mk | 2 +- tools/firmware/Rules.mk | 2 -- tools/libfsimage/common.mk | 2 +- tools/libs/libs.mk | 2 +- tools/ocaml/common.make | 2 +- tools/xenstore/Makefile.common | 1 - 24 files changed, 9 insertions(+), 27 deletions(-) diff --git a/tools/console/client/Makefile b/tools/console/client/Makefile index e2f2554f92..62d89fdeb9 100644 --- a/tools/console/client/Makefile +++ b/tools/console/client/Makefile @@ -1,7 +1,6 @@ XEN_ROOT=3D$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) CFLAGS +=3D $(CFLAGS_libxenstore) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h diff --git a/tools/console/daemon/Makefile b/tools/console/daemon/Makefile index 99bb33b6a2..9fc3b6711f 100644 --- a/tools/console/daemon/Makefile +++ b/tools/console/daemon/Makefile @@ -1,7 +1,6 @@ XEN_ROOT=3D$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) CFLAGS +=3D $(CFLAGS_libxenstore) CFLAGS +=3D $(CFLAGS_libxenevtchn) diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile index 26116949d4..a72ad3b1e0 100644 --- a/tools/debugger/kdd/Makefile +++ b/tools/debugger/kdd/Makefile @@ -1,7 +1,6 @@ XEN_ROOT =3D $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) CFLAGS +=3D -DXC_WANT_COMPAT_MAP_FOREIGN_API LDLIBS +=3D $(LDLIBS_libxenctrl) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 6be134142a..88d7edb6b1 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,7 +1,6 @@ XEN_ROOT=3D$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenctrl) =20 TARGETS :=3D flask-loadpolicy flask-setenforce flask-getenforce flask-labe= l-pci flask-get-bool flask-set-bool diff --git a/tools/fuzz/cpu-policy/Makefile b/tools/fuzz/cpu-policy/Makefile index 41a2230408..6e7743e0aa 100644 --- a/tools/fuzz/cpu-policy/Makefile +++ b/tools/fuzz/cpu-policy/Makefile @@ -17,7 +17,7 @@ install: all =20 .PHONY: uninstall =20 -CFLAGS +=3D -Werror $(CFLAGS_xeninclude) -D__XEN_TOOLS__ +CFLAGS +=3D $(CFLAGS_xeninclude) -D__XEN_TOOLS__ CFLAGS +=3D $(APPEND_CFLAGS) -Og =20 vpath %.c ../../../xen/lib/x86 diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 0e02401227..1c6e1d6a04 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,7 +1,6 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror # Include configure output (config.h) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h CFLAGS +=3D $(CFLAGS_libxenevtchn) diff --git a/tools/tests/cpu-policy/Makefile b/tools/tests/cpu-policy/Makef= ile index 93af9d76fa..c5b81afc71 100644 --- a/tools/tests/cpu-policy/Makefile +++ b/tools/tests/cpu-policy/Makefile @@ -36,7 +36,7 @@ install: all uninstall: $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGETS)) =20 -CFLAGS +=3D -Werror -D__XEN_TOOLS__ +CFLAGS +=3D -D__XEN_TOOLS__ CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(APPEND_CFLAGS) =20 diff --git a/tools/tests/depriv/Makefile b/tools/tests/depriv/Makefile index 3cba28da25..7d9e3b01bb 100644 --- a/tools/tests/depriv/Makefile +++ b/tools/tests/depriv/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=3D$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror -Wno-declaration-after-statement +CFLAGS +=3D -Wno-declaration-after-statement =20 CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(CFLAGS_libxenctrl) diff --git a/tools/tests/resource/Makefile b/tools/tests/resource/Makefile index b3cd70c06d..a5856bf095 100644 --- a/tools/tests/resource/Makefile +++ b/tools/tests/resource/Makefile @@ -27,7 +27,6 @@ install: all uninstall: $(RM) -- $(DESTDIR)$(LIBEXEC_BIN)/$(TARGET) =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(CFLAGS_libxenctrl) CFLAGS +=3D $(CFLAGS_libxenforeginmemory) diff --git a/tools/tests/tsx/Makefile b/tools/tests/tsx/Makefile index d7d2a5d95e..a4f516b725 100644 --- a/tools/tests/tsx/Makefile +++ b/tools/tests/tsx/Makefile @@ -26,7 +26,6 @@ uninstall: .PHONY: uninstall uninstall: =20 -CFLAGS +=3D -Werror CFLAGS +=3D -I$(XEN_ROOT)/tools/libs/ctrl -I$(XEN_ROOT)/tools/libs/guest CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(CFLAGS_libxenctrl) diff --git a/tools/tests/xenstore/Makefile b/tools/tests/xenstore/Makefile index 239e1dce47..202dda0d3c 100644 --- a/tools/tests/xenstore/Makefile +++ b/tools/tests/xenstore/Makefile @@ -27,7 +27,6 @@ install: all uninstall: $(RM) -- $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/,$(TARGETS)) =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenstore) CFLAGS +=3D $(APPEND_CFLAGS) =20 diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index e40a2c4bfa..3687f6cd8f 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -13,8 +13,6 @@ include $(XEN_ROOT)/tools/Rules.mk =20 TARGETS :=3D readnotes lsevtchn =20 -CFLAGS +=3D -Werror - CFLAGS_readnotes.o :=3D $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFL= AGS_libxenguest) CFLAGS_lsevtchn.o :=3D $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) =20 diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 3e150b0659..679c4b41a3 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -13,7 +13,6 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenevtchn) CFLAGS +=3D $(CFLAGS_libxenctrl) LDLIBS +=3D $(LDLIBS_libxenctrl) diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index e2ed9eaa3f..835cf2b965 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -12,7 +12,6 @@ OBJS-y +=3D xenpaging.o OBJS-y +=3D policy_$(POLICY).o OBJS-y +=3D pagein.o =20 -CFLAGS +=3D -Werror CFLAGS +=3D -Wno-unused =20 TARGETS :=3D xenpaging diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index e0d3f06ab2..8da20510b5 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -1,7 +1,6 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror CFLAGS +=3D $(CFLAGS_libxenstore) =20 LDLIBS +=3D $(LDLIBS_libxenstore) diff --git a/tools/xentop/Makefile b/tools/xentop/Makefile index 7bd96f34d5..70cc2211c5 100644 --- a/tools/xentop/Makefile +++ b/tools/xentop/Makefile @@ -13,7 +13,7 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) +CFLAGS +=3D -DGCC_PRINTF $(CFLAGS_libxenstat) LDLIBS +=3D $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIB= S) -lm CFLAGS +=3D -DHOST_$(XEN_OS) =20 diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 0995fa9203..b188ba70d6 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -1,8 +1,6 @@ XEN_ROOT=3D$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror - CFLAGS +=3D $(CFLAGS_libxenevtchn) CFLAGS +=3D $(CFLAGS_libxenctrl) LDLIBS +=3D $(LDLIBS_libxenevtchn) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index b7f439121a..5f7aa5f46c 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -5,7 +5,7 @@ XEN_ROOT =3D $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror -Wno-format-zero-length -Wmissing-declarations \ +CFLAGS +=3D -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS +=3D -fPIC =20 diff --git a/tools/debugger/gdbsx/Rules.mk b/tools/debugger/gdbsx/Rules.mk index 920f1c87fb..0610db873b 100644 --- a/tools/debugger/gdbsx/Rules.mk +++ b/tools/debugger/gdbsx/Rules.mk @@ -1,6 +1,6 @@ include $(XEN_ROOT)/tools/Rules.mk =20 -CFLAGS +=3D -Werror -Wmissing-prototypes=20 +CFLAGS +=3D -Wmissing-prototypes=20 # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion =20 CFLAGS-$(clang) +=3D -Wno-ignored-attributes diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk index 278cca01e4..d3482c9ec4 100644 --- a/tools/firmware/Rules.mk +++ b/tools/firmware/Rules.mk @@ -11,8 +11,6 @@ ifneq ($(debug),y) CFLAGS +=3D -DNDEBUG endif =20 -CFLAGS +=3D -Werror - $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) =20 $(call cc-option-add,CFLAGS,CC,-fcf-protection=3Dnone) diff --git a/tools/libfsimage/common.mk b/tools/libfsimage/common.mk index 77bc957f27..4fc8c66795 100644 --- a/tools/libfsimage/common.mk +++ b/tools/libfsimage/common.mk @@ -2,7 +2,7 @@ include $(XEN_ROOT)/tools/Rules.mk =20 FSDIR :=3D $(libdir)/xenfsimage CFLAGS +=3D -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -D= FSIMAGE_FSDIR=3D\"$(FSDIR)\" -CFLAGS +=3D -Werror -D_GNU_SOURCE +CFLAGS +=3D -D_GNU_SOURCE LDFLAGS +=3D -L../common/ =20 PIC_OBJS =3D $(patsubst %.c,%.opic,$(LIB_SRCS-y)) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 2b8e7a6128..e47fb30ed4 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -14,7 +14,7 @@ MINOR ?=3D 0 =20 SHLIB_LDFLAGS +=3D -Wl,--version-script=3Dlibxen$(LIBNAME).map =20 -CFLAGS +=3D -Werror -Wmissing-prototypes +CFLAGS +=3D -Wmissing-prototypes CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) =20 diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index d5478f626f..0c8a597d5b 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -9,7 +9,7 @@ OCAMLLEX ?=3D ocamllex OCAMLYACC ?=3D ocamlyacc OCAMLFIND ?=3D ocamlfind =20 -CFLAGS +=3D -fPIC -Werror -I$(shell ocamlc -where) +CFLAGS +=3D -fPIC -I$(shell ocamlc -where) =20 OCAMLOPTFLAG_G :=3D $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/= \1/p') OCAMLOPTFLAGS =3D $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINC= LUDE) -cc $(CC) -w F -warn-error F diff --git a/tools/xenstore/Makefile.common b/tools/xenstore/Makefile.common index 21b78b0538..ddbac052ac 100644 --- a/tools/xenstore/Makefile.common +++ b/tools/xenstore/Makefile.common @@ -9,7 +9,6 @@ XENSTORED_OBJS-$(CONFIG_NetBSD) +=3D xenstored_posix.o XENSTORED_OBJS-$(CONFIG_FreeBSD) +=3D xenstored_posix.o XENSTORED_OBJS-$(CONFIG_MiniOS) +=3D xenstored_minios.o =20 -CFLAGS +=3D -Werror # Include configure output (config.h) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h CFLAGS +=3D -I./include --=20 Anthony PERARD