From nobody Tue Feb 10 03:37:07 2026 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1598176032; cv=none; d=zohomail.com; s=zohoarc; b=hV/PATdAMKwKHAFEGI4RN3+hx5ZwoLVHOroZhzP+hs9QrleFtEzIicfOMGj+OMuzdXb3OSL9YBqpirH9M60I+XvUfSW41djI2vJcxp5hpTcV3cpOe3gOKQERyDwoazo56MtF8kriTzQgRjgKfhN9gmYpuZW/qG+P+DgEOqWAEvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598176032; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5ob6GwfA/vAJUQj9W8ZjFEMjdFU4/poIWb7KzKNKmDc=; b=WJDJdSLQrOzwfllSuOtlViePbjk5ri1rD+UClxd3gU04/6jo/BvtDSc+XNTP8IYHVa39jyWYk85S9vdaPhUqBeB5LTGpKpF7TzdyZhE4rPRQ8CFUvxw1zBjfcLWDwL2zZ0V3D8HR4POtsVvlZY37FZtQMKaEcOHv6q0SHbE4oOs= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1598176032244274.0790077845652; Sun, 23 Aug 2020 02:47:12 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k9maR-0008L7-24; Sun, 23 Aug 2020 09:46:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k9mQU-0004sy-Gz for xen-devel@lists.xenproject.org; Sun, 23 Aug 2020 09:36:34 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e884b5a9-0211-4810-8209-b6abe38243cb; Sun, 23 Aug 2020 09:35:29 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 33799B7C2; Sun, 23 Aug 2020 09:35:56 +0000 (UTC) X-Inumbo-ID: e884b5a9-0211-4810-8209-b6abe38243cb X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, xen-devel@dornerworks.com Cc: Juergen Gross , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Samuel Thibault , Josh Whitehead , Stewart Hildebrand , Christian Lindig , David Scott , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH v3 26/38] tools: move libxenctrl below tools/libs Date: Sun, 23 Aug 2020 11:35:07 +0200 Message-Id: <20200823093519.18386-27-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200823093519.18386-1-jgross@suse.com> References: <20200823093519.18386-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" Today tools/libxc needs to be built after tools/libs as libxenctrl is depending on some libraries in tools/libs. This in turn blocks moving other libraries depending on libxenctrl below tools/libs. So carve out libxenctrl from tools/libxc and move it into tools/libs/ctrl. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault (stubdom parts) Acked-by: Marek Marczykowski-G=C3=B3recki = (python parts) Acked-by: Wei Liu --- .gitignore | 8 ++ MAINTAINERS | 2 +- stubdom/Makefile | 9 +- stubdom/grub/Makefile | 4 +- stubdom/mini-os.mk | 2 +- tools/Rules.mk | 8 +- tools/libs/Makefile | 1 + tools/libs/ctrl/Makefile | 71 +++++++++++++ tools/{libxc =3D> libs/ctrl}/include/xenctrl.h | 0 .../ctrl}/include/xenctrl_compat.h | 0 .../ctrl}/include/xenctrl_dom.h | 0 tools/{libxc =3D> libs/ctrl}/xc_altp2m.c | 0 tools/{libxc =3D> libs/ctrl}/xc_arinc653.c | 0 tools/{libxc =3D> libs/ctrl}/xc_bitops.h | 0 tools/{libxc =3D> libs/ctrl}/xc_core.c | 0 tools/{libxc =3D> libs/ctrl}/xc_core.h | 0 tools/{libxc =3D> libs/ctrl}/xc_core_arm.c | 0 tools/{libxc =3D> libs/ctrl}/xc_core_arm.h | 0 tools/{libxc =3D> libs/ctrl}/xc_core_x86.c | 0 tools/{libxc =3D> libs/ctrl}/xc_core_x86.h | 0 tools/{libxc =3D> libs/ctrl}/xc_cpu_hotplug.c | 0 tools/{libxc =3D> libs/ctrl}/xc_cpupool.c | 0 tools/{libxc =3D> libs/ctrl}/xc_csched.c | 0 tools/{libxc =3D> libs/ctrl}/xc_csched2.c | 0 .../ctrl}/xc_devicemodel_compat.c | 0 tools/{libxc =3D> libs/ctrl}/xc_domain.c | 0 tools/{libxc =3D> libs/ctrl}/xc_evtchn.c | 0 tools/{libxc =3D> libs/ctrl}/xc_evtchn_compat.c | 0 tools/{libxc =3D> libs/ctrl}/xc_flask.c | 0 .../{libxc =3D> libs/ctrl}/xc_foreign_memory.c | 0 tools/{libxc =3D> libs/ctrl}/xc_freebsd.c | 0 tools/{libxc =3D> libs/ctrl}/xc_gnttab.c | 0 tools/{libxc =3D> libs/ctrl}/xc_gnttab_compat.c | 0 tools/{libxc =3D> libs/ctrl}/xc_hcall_buf.c | 0 tools/{libxc =3D> libs/ctrl}/xc_kexec.c | 0 tools/{libxc =3D> libs/ctrl}/xc_linux.c | 0 tools/{libxc =3D> libs/ctrl}/xc_mem_access.c | 0 tools/{libxc =3D> libs/ctrl}/xc_mem_paging.c | 0 tools/{libxc =3D> libs/ctrl}/xc_memshr.c | 0 tools/{libxc =3D> libs/ctrl}/xc_minios.c | 0 tools/{libxc =3D> libs/ctrl}/xc_misc.c | 0 tools/{libxc =3D> libs/ctrl}/xc_monitor.c | 0 tools/{libxc =3D> libs/ctrl}/xc_msr_x86.h | 0 tools/{libxc =3D> libs/ctrl}/xc_netbsd.c | 0 tools/{libxc =3D> libs/ctrl}/xc_pagetab.c | 0 tools/{libxc =3D> libs/ctrl}/xc_physdev.c | 0 tools/{libxc =3D> libs/ctrl}/xc_pm.c | 0 tools/{libxc =3D> libs/ctrl}/xc_private.c | 0 tools/{libxc =3D> libs/ctrl}/xc_private.h | 0 tools/{libxc =3D> libs/ctrl}/xc_psr.c | 0 tools/{libxc =3D> libs/ctrl}/xc_resource.c | 0 tools/{libxc =3D> libs/ctrl}/xc_resume.c | 0 tools/{libxc =3D> libs/ctrl}/xc_rt.c | 0 tools/{libxc =3D> libs/ctrl}/xc_solaris.c | 0 tools/{libxc =3D> libs/ctrl}/xc_tbuf.c | 0 tools/{libxc =3D> libs/ctrl}/xc_vm_event.c | 0 tools/{libxc =3D> libs/ctrl}/xencontrol.pc.in | 0 tools/libs/uselibs.mk | 2 + tools/libxc/Makefile | 99 +++---------------- tools/ocaml/xenstored/Makefile | 2 +- tools/python/Makefile | 2 +- tools/python/setup.py | 8 +- 62 files changed, 110 insertions(+), 108 deletions(-) create mode 100644 tools/libs/ctrl/Makefile rename tools/{libxc =3D> libs/ctrl}/include/xenctrl.h (100%) rename tools/{libxc =3D> libs/ctrl}/include/xenctrl_compat.h (100%) rename tools/{libxc =3D> libs/ctrl}/include/xenctrl_dom.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_altp2m.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_arinc653.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_bitops.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_core.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_core.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_core_arm.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_core_arm.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_core_x86.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_core_x86.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_cpu_hotplug.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_cpupool.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_csched.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_csched2.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_devicemodel_compat.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_domain.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_evtchn.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_evtchn_compat.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_flask.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_foreign_memory.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_freebsd.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_gnttab.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_gnttab_compat.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_hcall_buf.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_kexec.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_linux.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_mem_access.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_mem_paging.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_memshr.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_minios.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_misc.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_monitor.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_msr_x86.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_netbsd.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_pagetab.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_physdev.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_pm.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_private.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_private.h (100%) rename tools/{libxc =3D> libs/ctrl}/xc_psr.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_resource.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_resume.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_rt.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_solaris.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_tbuf.c (100%) rename tools/{libxc =3D> libs/ctrl}/xc_vm_event.c (100%) rename tools/{libxc =3D> libs/ctrl}/xencontrol.pc.in (100%) diff --git a/.gitignore b/.gitignore index 5ea48af818..a17d7e1e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,9 @@ tools/libs/hypfs/headers.chk tools/libs/hypfs/xenhypfs.pc tools/libs/call/headers.chk tools/libs/call/xencall.pc +tools/libs/ctrl/_*.[ch] +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 @@ -195,6 +198,11 @@ tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker tools/libvchan/xenvchan.pc tools/libxc/*.pc +tools/libxc/xc_bitops.h +tools/libxc/xc_core.h +tools/libxc/xc_core_arm.h +tools/libxc/xc_core_x86.h +tools/libxc/xc_private.h tools/libxl/_libxl.api-for-check tools/libxl/*.api-ok tools/libxl/*.pc diff --git a/MAINTAINERS b/MAINTAINERS index 33fe51324e..91ca2c9c40 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -226,7 +226,7 @@ M: Stewart Hildebrand S: Supported L: xen-devel@dornerworks.com F: xen/common/sched/arinc653.c -F: tools/libxc/xc_arinc653.c +F: tools/libs/ctrl/xc_arinc653.c =20 ARM (W/ VIRTUALISATION EXTENSIONS) ARCHITECTURE M: Stefano Stabellini diff --git a/stubdom/Makefile b/stubdom/Makefile index 4fd86dd44b..193941827d 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -331,7 +331,7 @@ endif # libraries under tools/libs ####### =20 -STUB_LIBS :=3D toolcore toollog evtchn gnttab call foreignmemory devicemod= el +STUB_LIBS :=3D toolcore toollog evtchn gnttab call foreignmemory devicemod= el ctrl =20 ####### # common handling @@ -397,12 +397,11 @@ $(TARGETS_MINIOS): mini-os-%: ####### =20 .PHONY: libxc -libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libx= enguest.a -libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: mk-headers-$(XEN_TARGET_ARCH) libxe= ntoollog libxenevtchn libxengnttab libxencall libxenforeignmemory libxendev= icemodel cross-zlib +libxc: libxc-$(XEN_TARGET_ARCH)/libxenguest.a +libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxenevtchn libxenctrl cross-zlib +libxc-$(XEN_TARGET_ARCH)/libxenguest.a: mk-headers-$(XEN_TARGET_ARCH) $(NE= WLIB_STAMPFILE) CPPFLAGS=3D"$(TARGET_CPPFLAGS)" CFLAGS=3D"$(TARGET_CFLAGS)" $(MAKE) DESTD= IR=3D CONFIG_LIBXC_MINIOS=3Dy -C libxc-$(XEN_TARGET_ARCH) =20 - libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenct= rl.a - ####### # ioemu ####### diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile index 26dff45a8f..d33fa2f71e 100644 --- a/stubdom/grub/Makefile +++ b/stubdom/grub/Makefile @@ -6,7 +6,9 @@ vpath %.c ../grub-upstream BOOT=3D$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o =20 DEF_CPPFLAGS +=3D -I$(XEN_ROOT)/tools/libs/toollog/include -DEF_CPPFLAGS +=3D -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/in= clude -I. +DEF_CPPFLAGS +=3D -I$(XEN_ROOT)/tools/libs/ctrl/include +DEF_CPPFLAGS +=3D -I$(XEN_ROOT)/tools/libxc/include +DEF_CPPFLAGS +=3D -I$(XEN_ROOT)/tools/include -I. DEF_CPPFLAGS +=3D -I../grub-upstream/stage1 DEF_CPPFLAGS +=3D -I../grub-upstream/stage2 DEF_CPPFLAGS +=3D -I../grub-upstream/netboot diff --git a/stubdom/mini-os.mk b/stubdom/mini-os.mk index 32528bb91f..b1387df3f8 100644 --- a/stubdom/mini-os.mk +++ b/stubdom/mini-os.mk @@ -13,5 +13,5 @@ GNTTAB_PATH =3D $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_= ARCH)/gnttab CALL_PATH =3D $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/call FOREIGNMEMORY_PATH =3D $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/fore= ignmemory DEVICEMODEL_PATH =3D $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/device= model -CTRL_PATH =3D $(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) +CTRL_PATH =3D $(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/ctrl GUEST_PATH =3D $(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) diff --git a/tools/Rules.mk b/tools/Rules.mk index 191fe8e080..6ec480388c 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -15,7 +15,6 @@ XEN_INCLUDE =3D $(XEN_ROOT)/tools/include =20 include $(XEN_ROOT)/tools/libs/uselibs.mk =20 -XEN_libxenctrl =3D $(XEN_ROOT)/tools/libxc XEN_libxenguest =3D $(XEN_ROOT)/tools/libxc XEN_libxenlight =3D $(XEN_ROOT)/tools/libxl # Currently libxlutil lives in the same directory as libxenlight @@ -105,13 +104,10 @@ $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_defs,$(l= ib)))) =20 # code which compiles against libxenctrl get __XEN_TOOLS__ and # therefore sees the unstable hypercall interfaces. -CFLAGS_libxenctrl =3D -I$(XEN_libxenctrl)/include $(CFLAGS_libxentoollog) = $(CFLAGS_libxenforeignmemory) $(CFLAGS_libxendevicemodel) $(CFLAGS_xeninclu= de) -D__XEN_TOOLS__ -SHDEPS_libxenctrl =3D $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn) $(SHLIB= _libxengnttab) $(SHLIB_libxencall) $(SHLIB_libxenforeignmemory) $(SHLIB_lib= xendevicemodel) -LDLIBS_libxenctrl =3D $(SHDEPS_libxenctrl) $(XEN_libxenctrl)/libxenctrl$(l= ibextension) -SHLIB_libxenctrl =3D $(SHDEPS_libxenctrl) -Wl,-rpath-link=3D$(XEN_libxenc= trl) +CFLAGS_libxenctrl +=3D $(CFLAGS_libxentoollog) $(CFLAGS_libxenforeignmemor= y) $(CFLAGS_libxendevicemodel) -D__XEN_TOOLS__ =20 CFLAGS_libxenguest =3D -I$(XEN_libxenguest)/include $(CFLAGS_libxenevtchn)= $(CFLAGS_libxenforeignmemory) $(CFLAGS_xeninclude) -SHDEPS_libxenguest =3D $(SHLIB_libxenevtchn) +SHDEPS_libxenguest =3D $(SHLIB_libxenevtchn) $(SHLIB_libxenctrl) LDLIBS_libxenguest =3D $(SHDEPS_libxenguest) $(XEN_libxenguest)/libxengues= t$(libextension) SHLIB_libxenguest =3D $(SHDEPS_libxenguest) -Wl,-rpath-link=3D$(XEN_libxe= nguest) =20 diff --git a/tools/libs/Makefile b/tools/libs/Makefile index 69cdfb5975..7648ea0e4c 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -9,6 +9,7 @@ SUBDIRS-y +=3D gnttab SUBDIRS-y +=3D call SUBDIRS-y +=3D foreignmemory SUBDIRS-y +=3D devicemodel +SUBDIRS-y +=3D ctrl SUBDIRS-y +=3D hypfs =20 ifeq ($(CONFIG_RUMP),y) diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile new file mode 100644 index 0000000000..f15b5b8435 --- /dev/null +++ b/tools/libs/ctrl/Makefile @@ -0,0 +1,71 @@ +XEN_ROOT =3D $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +SRCS-y +=3D xc_altp2m.c +SRCS-y +=3D xc_core.c +SRCS-$(CONFIG_X86) +=3D xc_core_x86.c +SRCS-$(CONFIG_ARM) +=3D xc_core_arm.c +SRCS-y +=3D xc_cpupool.c +SRCS-y +=3D xc_domain.c +SRCS-y +=3D xc_evtchn.c +SRCS-y +=3D xc_gnttab.c +SRCS-y +=3D xc_misc.c +SRCS-y +=3D xc_flask.c +SRCS-y +=3D xc_physdev.c +SRCS-y +=3D xc_private.c +SRCS-y +=3D xc_csched.c +SRCS-y +=3D xc_csched2.c +SRCS-y +=3D xc_arinc653.c +SRCS-y +=3D xc_rt.c +SRCS-y +=3D xc_tbuf.c +SRCS-y +=3D xc_pm.c +SRCS-y +=3D xc_cpu_hotplug.c +SRCS-y +=3D xc_resume.c +SRCS-y +=3D xc_vm_event.c +SRCS-y +=3D xc_monitor.c +SRCS-y +=3D xc_mem_paging.c +SRCS-y +=3D xc_mem_access.c +SRCS-y +=3D xc_memshr.c +SRCS-y +=3D xc_hcall_buf.c +SRCS-y +=3D xc_foreign_memory.c +SRCS-y +=3D xc_kexec.c +SRCS-y +=3D xc_resource.c +SRCS-$(CONFIG_X86) +=3D xc_psr.c +SRCS-$(CONFIG_X86) +=3D xc_pagetab.c +SRCS-$(CONFIG_Linux) +=3D xc_linux.c +SRCS-$(CONFIG_FreeBSD) +=3D xc_freebsd.c +SRCS-$(CONFIG_SunOS) +=3D xc_solaris.c +SRCS-$(CONFIG_NetBSD) +=3D xc_netbsd.c +SRCS-$(CONFIG_NetBSDRump) +=3D xc_netbsd.c +SRCS-$(CONFIG_MiniOS) +=3D xc_minios.c +SRCS-y +=3D xc_evtchn_compat.c +SRCS-y +=3D xc_gnttab_compat.c +SRCS-y +=3D xc_devicemodel_compat.c + +CFLAGS +=3D -D__XEN_TOOLS__ +CFLAGS +=3D $(PTHREAD_CFLAGS) +CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h + +# Needed for posix_fadvise64() in xc_linux.c +CFLAGS-$(CONFIG_Linux) +=3D -D_GNU_SOURCE + +LIBHEADER :=3D xenctrl.h xenctrl_compat.h xenctrl_dom.h +PKG_CONFIG :=3D xencontrol.pc + +NO_HEADERS_CHK :=3D y + +include $(XEN_ROOT)/tools/libs/libs.mk + +genpath-target =3D $(call buildmakevars2header,_paths.h) +$(eval $(genpath-target)) + +$(LIB_OBJS) $(PIC_OBJS): _paths.h + +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR =3D $(XEN_libxenctrl)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL =3D $(CFLAGS_xeninclude) + +clean: cleanlocal + +.PHONY: cleanlocal +cleanlocal: + rm -f libxenctrl.map diff --git a/tools/libxc/include/xenctrl.h b/tools/libs/ctrl/include/xenctr= l.h similarity index 100% rename from tools/libxc/include/xenctrl.h rename to tools/libs/ctrl/include/xenctrl.h diff --git a/tools/libxc/include/xenctrl_compat.h b/tools/libs/ctrl/include= /xenctrl_compat.h similarity index 100% rename from tools/libxc/include/xenctrl_compat.h rename to tools/libs/ctrl/include/xenctrl_compat.h diff --git a/tools/libxc/include/xenctrl_dom.h b/tools/libs/ctrl/include/xe= nctrl_dom.h similarity index 100% rename from tools/libxc/include/xenctrl_dom.h rename to tools/libs/ctrl/include/xenctrl_dom.h diff --git a/tools/libxc/xc_altp2m.c b/tools/libs/ctrl/xc_altp2m.c similarity index 100% rename from tools/libxc/xc_altp2m.c rename to tools/libs/ctrl/xc_altp2m.c diff --git a/tools/libxc/xc_arinc653.c b/tools/libs/ctrl/xc_arinc653.c similarity index 100% rename from tools/libxc/xc_arinc653.c rename to tools/libs/ctrl/xc_arinc653.c diff --git a/tools/libxc/xc_bitops.h b/tools/libs/ctrl/xc_bitops.h similarity index 100% rename from tools/libxc/xc_bitops.h rename to tools/libs/ctrl/xc_bitops.h diff --git a/tools/libxc/xc_core.c b/tools/libs/ctrl/xc_core.c similarity index 100% rename from tools/libxc/xc_core.c rename to tools/libs/ctrl/xc_core.c diff --git a/tools/libxc/xc_core.h b/tools/libs/ctrl/xc_core.h similarity index 100% rename from tools/libxc/xc_core.h rename to tools/libs/ctrl/xc_core.h diff --git a/tools/libxc/xc_core_arm.c b/tools/libs/ctrl/xc_core_arm.c similarity index 100% rename from tools/libxc/xc_core_arm.c rename to tools/libs/ctrl/xc_core_arm.c diff --git a/tools/libxc/xc_core_arm.h b/tools/libs/ctrl/xc_core_arm.h similarity index 100% rename from tools/libxc/xc_core_arm.h rename to tools/libs/ctrl/xc_core_arm.h diff --git a/tools/libxc/xc_core_x86.c b/tools/libs/ctrl/xc_core_x86.c similarity index 100% rename from tools/libxc/xc_core_x86.c rename to tools/libs/ctrl/xc_core_x86.c diff --git a/tools/libxc/xc_core_x86.h b/tools/libs/ctrl/xc_core_x86.h similarity index 100% rename from tools/libxc/xc_core_x86.h rename to tools/libs/ctrl/xc_core_x86.h diff --git a/tools/libxc/xc_cpu_hotplug.c b/tools/libs/ctrl/xc_cpu_hotplug.c similarity index 100% rename from tools/libxc/xc_cpu_hotplug.c rename to tools/libs/ctrl/xc_cpu_hotplug.c diff --git a/tools/libxc/xc_cpupool.c b/tools/libs/ctrl/xc_cpupool.c similarity index 100% rename from tools/libxc/xc_cpupool.c rename to tools/libs/ctrl/xc_cpupool.c diff --git a/tools/libxc/xc_csched.c b/tools/libs/ctrl/xc_csched.c similarity index 100% rename from tools/libxc/xc_csched.c rename to tools/libs/ctrl/xc_csched.c diff --git a/tools/libxc/xc_csched2.c b/tools/libs/ctrl/xc_csched2.c similarity index 100% rename from tools/libxc/xc_csched2.c rename to tools/libs/ctrl/xc_csched2.c diff --git a/tools/libxc/xc_devicemodel_compat.c b/tools/libs/ctrl/xc_devic= emodel_compat.c similarity index 100% rename from tools/libxc/xc_devicemodel_compat.c rename to tools/libs/ctrl/xc_devicemodel_compat.c diff --git a/tools/libxc/xc_domain.c b/tools/libs/ctrl/xc_domain.c similarity index 100% rename from tools/libxc/xc_domain.c rename to tools/libs/ctrl/xc_domain.c diff --git a/tools/libxc/xc_evtchn.c b/tools/libs/ctrl/xc_evtchn.c similarity index 100% rename from tools/libxc/xc_evtchn.c rename to tools/libs/ctrl/xc_evtchn.c diff --git a/tools/libxc/xc_evtchn_compat.c b/tools/libs/ctrl/xc_evtchn_com= pat.c similarity index 100% rename from tools/libxc/xc_evtchn_compat.c rename to tools/libs/ctrl/xc_evtchn_compat.c diff --git a/tools/libxc/xc_flask.c b/tools/libs/ctrl/xc_flask.c similarity index 100% rename from tools/libxc/xc_flask.c rename to tools/libs/ctrl/xc_flask.c diff --git a/tools/libxc/xc_foreign_memory.c b/tools/libs/ctrl/xc_foreign_m= emory.c similarity index 100% rename from tools/libxc/xc_foreign_memory.c rename to tools/libs/ctrl/xc_foreign_memory.c diff --git a/tools/libxc/xc_freebsd.c b/tools/libs/ctrl/xc_freebsd.c similarity index 100% rename from tools/libxc/xc_freebsd.c rename to tools/libs/ctrl/xc_freebsd.c diff --git a/tools/libxc/xc_gnttab.c b/tools/libs/ctrl/xc_gnttab.c similarity index 100% rename from tools/libxc/xc_gnttab.c rename to tools/libs/ctrl/xc_gnttab.c diff --git a/tools/libxc/xc_gnttab_compat.c b/tools/libs/ctrl/xc_gnttab_com= pat.c similarity index 100% rename from tools/libxc/xc_gnttab_compat.c rename to tools/libs/ctrl/xc_gnttab_compat.c diff --git a/tools/libxc/xc_hcall_buf.c b/tools/libs/ctrl/xc_hcall_buf.c similarity index 100% rename from tools/libxc/xc_hcall_buf.c rename to tools/libs/ctrl/xc_hcall_buf.c diff --git a/tools/libxc/xc_kexec.c b/tools/libs/ctrl/xc_kexec.c similarity index 100% rename from tools/libxc/xc_kexec.c rename to tools/libs/ctrl/xc_kexec.c diff --git a/tools/libxc/xc_linux.c b/tools/libs/ctrl/xc_linux.c similarity index 100% rename from tools/libxc/xc_linux.c rename to tools/libs/ctrl/xc_linux.c diff --git a/tools/libxc/xc_mem_access.c b/tools/libs/ctrl/xc_mem_access.c similarity index 100% rename from tools/libxc/xc_mem_access.c rename to tools/libs/ctrl/xc_mem_access.c diff --git a/tools/libxc/xc_mem_paging.c b/tools/libs/ctrl/xc_mem_paging.c similarity index 100% rename from tools/libxc/xc_mem_paging.c rename to tools/libs/ctrl/xc_mem_paging.c diff --git a/tools/libxc/xc_memshr.c b/tools/libs/ctrl/xc_memshr.c similarity index 100% rename from tools/libxc/xc_memshr.c rename to tools/libs/ctrl/xc_memshr.c diff --git a/tools/libxc/xc_minios.c b/tools/libs/ctrl/xc_minios.c similarity index 100% rename from tools/libxc/xc_minios.c rename to tools/libs/ctrl/xc_minios.c diff --git a/tools/libxc/xc_misc.c b/tools/libs/ctrl/xc_misc.c similarity index 100% rename from tools/libxc/xc_misc.c rename to tools/libs/ctrl/xc_misc.c diff --git a/tools/libxc/xc_monitor.c b/tools/libs/ctrl/xc_monitor.c similarity index 100% rename from tools/libxc/xc_monitor.c rename to tools/libs/ctrl/xc_monitor.c diff --git a/tools/libxc/xc_msr_x86.h b/tools/libs/ctrl/xc_msr_x86.h similarity index 100% rename from tools/libxc/xc_msr_x86.h rename to tools/libs/ctrl/xc_msr_x86.h diff --git a/tools/libxc/xc_netbsd.c b/tools/libs/ctrl/xc_netbsd.c similarity index 100% rename from tools/libxc/xc_netbsd.c rename to tools/libs/ctrl/xc_netbsd.c diff --git a/tools/libxc/xc_pagetab.c b/tools/libs/ctrl/xc_pagetab.c similarity index 100% rename from tools/libxc/xc_pagetab.c rename to tools/libs/ctrl/xc_pagetab.c diff --git a/tools/libxc/xc_physdev.c b/tools/libs/ctrl/xc_physdev.c similarity index 100% rename from tools/libxc/xc_physdev.c rename to tools/libs/ctrl/xc_physdev.c diff --git a/tools/libxc/xc_pm.c b/tools/libs/ctrl/xc_pm.c similarity index 100% rename from tools/libxc/xc_pm.c rename to tools/libs/ctrl/xc_pm.c diff --git a/tools/libxc/xc_private.c b/tools/libs/ctrl/xc_private.c similarity index 100% rename from tools/libxc/xc_private.c rename to tools/libs/ctrl/xc_private.c diff --git a/tools/libxc/xc_private.h b/tools/libs/ctrl/xc_private.h similarity index 100% rename from tools/libxc/xc_private.h rename to tools/libs/ctrl/xc_private.h diff --git a/tools/libxc/xc_psr.c b/tools/libs/ctrl/xc_psr.c similarity index 100% rename from tools/libxc/xc_psr.c rename to tools/libs/ctrl/xc_psr.c diff --git a/tools/libxc/xc_resource.c b/tools/libs/ctrl/xc_resource.c similarity index 100% rename from tools/libxc/xc_resource.c rename to tools/libs/ctrl/xc_resource.c diff --git a/tools/libxc/xc_resume.c b/tools/libs/ctrl/xc_resume.c similarity index 100% rename from tools/libxc/xc_resume.c rename to tools/libs/ctrl/xc_resume.c diff --git a/tools/libxc/xc_rt.c b/tools/libs/ctrl/xc_rt.c similarity index 100% rename from tools/libxc/xc_rt.c rename to tools/libs/ctrl/xc_rt.c diff --git a/tools/libxc/xc_solaris.c b/tools/libs/ctrl/xc_solaris.c similarity index 100% rename from tools/libxc/xc_solaris.c rename to tools/libs/ctrl/xc_solaris.c diff --git a/tools/libxc/xc_tbuf.c b/tools/libs/ctrl/xc_tbuf.c similarity index 100% rename from tools/libxc/xc_tbuf.c rename to tools/libs/ctrl/xc_tbuf.c diff --git a/tools/libxc/xc_vm_event.c b/tools/libs/ctrl/xc_vm_event.c similarity index 100% rename from tools/libxc/xc_vm_event.c rename to tools/libs/ctrl/xc_vm_event.c diff --git a/tools/libxc/xencontrol.pc.in b/tools/libs/ctrl/xencontrol.pc.in similarity index 100% rename from tools/libxc/xencontrol.pc.in rename to tools/libs/ctrl/xencontrol.pc.in diff --git a/tools/libs/uselibs.mk b/tools/libs/uselibs.mk index db73fe314e..8e45e8d917 100644 --- a/tools/libs/uselibs.mk +++ b/tools/libs/uselibs.mk @@ -16,3 +16,5 @@ LIBS_LIBS +=3D devicemodel USELIBS_devicemodel :=3D toollog toolcore call LIBS_LIBS +=3D hypfs USELIBS_hypfs :=3D toollog toolcore call +LIBS_LIBS +=3D ctrl +USELIBS_ctrl :=3D toollog call evtchn gnttab foreignmemory devicemodel diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 1e4065f87c..a52264c74c 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -9,47 +9,10 @@ ifeq ($(CONFIG_LIBXC_MINIOS),y) override CONFIG_MIGRATE :=3D n endif =20 -CTRL_SRCS-y :=3D -CTRL_SRCS-y +=3D xc_altp2m.c -CTRL_SRCS-y +=3D xc_core.c -CTRL_SRCS-$(CONFIG_X86) +=3D xc_core_x86.c -CTRL_SRCS-$(CONFIG_ARM) +=3D xc_core_arm.c -CTRL_SRCS-y +=3D xc_cpupool.c -CTRL_SRCS-y +=3D xc_domain.c -CTRL_SRCS-y +=3D xc_evtchn.c -CTRL_SRCS-y +=3D xc_gnttab.c -CTRL_SRCS-y +=3D xc_misc.c -CTRL_SRCS-y +=3D xc_flask.c -CTRL_SRCS-y +=3D xc_physdev.c -CTRL_SRCS-y +=3D xc_private.c -CTRL_SRCS-y +=3D xc_csched.c -CTRL_SRCS-y +=3D xc_csched2.c -CTRL_SRCS-y +=3D xc_arinc653.c -CTRL_SRCS-y +=3D xc_rt.c -CTRL_SRCS-y +=3D xc_tbuf.c -CTRL_SRCS-y +=3D xc_pm.c -CTRL_SRCS-y +=3D xc_cpu_hotplug.c -CTRL_SRCS-y +=3D xc_resume.c -CTRL_SRCS-y +=3D xc_vm_event.c -CTRL_SRCS-y +=3D xc_monitor.c -CTRL_SRCS-y +=3D xc_mem_paging.c -CTRL_SRCS-y +=3D xc_mem_access.c -CTRL_SRCS-y +=3D xc_memshr.c -CTRL_SRCS-y +=3D xc_hcall_buf.c -CTRL_SRCS-y +=3D xc_foreign_memory.c -CTRL_SRCS-y +=3D xc_kexec.c -CTRL_SRCS-y +=3D xc_resource.c -CTRL_SRCS-$(CONFIG_X86) +=3D xc_psr.c -CTRL_SRCS-$(CONFIG_X86) +=3D xc_pagetab.c -CTRL_SRCS-$(CONFIG_Linux) +=3D xc_linux.c -CTRL_SRCS-$(CONFIG_FreeBSD) +=3D xc_freebsd.c -CTRL_SRCS-$(CONFIG_SunOS) +=3D xc_solaris.c -CTRL_SRCS-$(CONFIG_NetBSD) +=3D xc_netbsd.c -CTRL_SRCS-$(CONFIG_NetBSDRump) +=3D xc_netbsd.c -CTRL_SRCS-$(CONFIG_MiniOS) +=3D xc_minios.c -CTRL_SRCS-y +=3D xc_evtchn_compat.c -CTRL_SRCS-y +=3D xc_gnttab_compat.c -CTRL_SRCS-y +=3D xc_devicemodel_compat.c +LINK_FILES :=3D xc_private.h xc_core.h xc_core_x86.h xc_core_arm.h xc_bito= ps.h + +$(LINK_FILES): + ln -sf $(XEN_ROOT)/tools/libs/ctrl/$(notdir $@) $@ =20 GUEST_SRCS-y :=3D GUEST_SRCS-y +=3D xg_private.c @@ -124,26 +87,14 @@ CFLAGS +=3D $(CFLAGS_libxentoollog) CFLAGS +=3D $(CFLAGS_libxenevtchn) CFLAGS +=3D $(CFLAGS_libxendevicemodel) =20 -CTRL_LIB_OBJS :=3D $(patsubst %.c,%.o,$(CTRL_SRCS-y)) -CTRL_PIC_OBJS :=3D $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) - GUEST_LIB_OBJS :=3D $(patsubst %.c,%.o,$(GUEST_SRCS-y)) GUEST_PIC_OBJS :=3D $(patsubst %.c,%.opic,$(GUEST_SRCS-y)) =20 -$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \ -$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): CFLAGS +=3D -include $(XEN_ROOT)/tools= /config.h +$(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS): CFLAGS +=3D -include $(XEN_ROOT)/tool= s/config.h =20 # libxenguest includes xc_private.h, so needs this despite not using # this functionality directly. -$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \ -$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): CFLAGS +=3D $(CFLAGS_libxencall) $(CFL= AGS_libxenforeignmemory) - -$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAGS +=3D $(CFLAGS_libxengnttab) - -LIB :=3D libxenctrl.a -ifneq ($(nosharedlibs),y) -LIB +=3D libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MIN= OR) -endif +$(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS): CFLAGS +=3D $(CFLAGS_libxencall) $(CF= LAGS_libxenforeignmemory) =20 LIB +=3D libxenguest.a ifneq ($(nosharedlibs),y) @@ -155,10 +106,9 @@ $(eval $(genpath-target)) =20 xc_private.h: _paths.h =20 -$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \ -$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): xc_private.h +$(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS): $(LINK_FILES) =20 -PKG_CONFIG :=3D xencontrol.pc xenguest.pc +PKG_CONFIG :=3D xenguest.pc PKG_CONFIG_VERSION :=3D $(MAJOR).$(MINOR) =20 ifneq ($(CONFIG_LIBXC_MINIOS),y) @@ -189,17 +139,11 @@ libs: $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) install: build $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) - $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libx= enctrl.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrl_compat.h include/xenctr= l_dom.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/lib= xenguest.so.$(MAJOR) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenguest.= so $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) xencontrol.pc $(DESTDIR)$(PKG_INSTALLDIR) $(INSTALL_DATA) xenguest.pc $(DESTDIR)$(PKG_INSTALLDIR) =20 .PHONY: uninstall @@ -210,14 +154,6 @@ uninstall: rm -f $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) rm -f $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR).$(MINOR) rm -f $(DESTDIR)$(libdir)/libxenguest.a - rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xencontrol.pc - rm -f $(DESTDIR)$(includedir)/xenctrl.h - rm -f $(DESTDIR)$(includedir)/xenctrl_compat.h - rm -f $(DESTDIR)$(includedir)/xenctrl_dom.h - rm -f $(DESTDIR)$(libdir)/libxenctrl.so - rm -f $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) - rm -f $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR).$(MINOR) - rm -f $(DESTDIR)$(libdir)/libxenctrl.a =20 .PHONY: TAGS TAGS: @@ -227,8 +163,8 @@ TAGS: clean: rm -rf *.rpm $(LIB) *~ $(DEPS_RM) \ _paths.h \ - xencontrol.pc xenguest.pc \ - $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \ + $(LINK_FILES) \ + xenguest.pc \ $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) =20 .PHONY: distclean @@ -244,19 +180,6 @@ rpm: build mv staging/i386/*.rpm . rm -rf staging =20 -# libxenctrl - -libxenctrl.a: $(CTRL_LIB_OBJS) - $(AR) rc $@ $^ - -libxenctrl.so: libxenctrl.so.$(MAJOR) - $(SYMLINK_SHLIB) $< $@ -libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) - $(SYMLINK_SHLIB) $< $@ - -libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.s= o.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxe= nevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxencall) $(LDLIBS_libxenforeign= memory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) - # libxenguest =20 libxenguest.a: $(GUEST_LIB_OBJS) @@ -277,7 +200,7 @@ xc_dom_bzimageloader.o: CFLAGS +=3D $(filter -D%,$(zlib= -options)) xc_dom_bzimageloader.opic: CFLAGS +=3D $(filter -D%,$(zlib-options)) =20 libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS =3D $(filter -l%,$(zlib= -options)) -libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so +libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB= _LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenev= tchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) =20 -include $(DEPS_INCLUDE) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 692a62584e..89ec3ec76a 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -69,7 +69,7 @@ XENSTOREDLIBS =3D \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/e= ventchn/xeneventchn.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenc= trl.cmxa \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xenb= us.cmxa \ - -ccopt -L -ccopt $(XEN_ROOT)/tools/libxc + -ccopt -L -ccopt $(XEN_ROOT)/tools/libs/ctrl =20 PROGRAMS =3D oxenstored =20 diff --git a/tools/python/Makefile b/tools/python/Makefile index 8d22c03676..8dc755d6e8 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -33,7 +33,7 @@ uninstall: =20 .PHONY: test test: - LD_LIBRARY_PATH=3D$$(readlink -f ../libxc):$$(readlink -f ../xenstore) $(= PYTHON) -m unittest discover + LD_LIBRARY_PATH=3D$$(readlink -f ../libs/ctrl):$$(readlink -f ../xenstore= ) $(PYTHON) -m unittest discover =20 .PHONY: clean clean: diff --git a/tools/python/setup.py b/tools/python/setup.py index 44696b3998..24b284af39 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -9,7 +9,7 @@ extra_compile_args =3D [ "-fno-strict-aliasing", "-Werror"= ] PATH_XEN =3D XEN_ROOT + "/tools/include" PATH_LIBXENTOOLLOG =3D XEN_ROOT + "/tools/libs/toollog" PATH_LIBXENEVTCHN =3D XEN_ROOT + "/tools/libs/evtchn" -PATH_LIBXC =3D XEN_ROOT + "/tools/libxc" +PATH_LIBXENCTRL =3D XEN_ROOT + "/tools/libs/ctrl" PATH_LIBXL =3D XEN_ROOT + "/tools/libxl" PATH_XENSTORE =3D XEN_ROOT + "/tools/xenstore" =20 @@ -18,11 +18,11 @@ xc =3D Extension("xc", include_dirs =3D [ PATH_XEN, PATH_LIBXENTOOLLOG + "/include", PATH_LIBXENEVTCHN + "/include", - PATH_LIBXC + "/include", + PATH_LIBXENCTRL + "/include", "xen/lowlevel/xc" ], - library_dirs =3D [ PATH_LIBXC ], + library_dirs =3D [ PATH_LIBXENCTRL ], libraries =3D [ "xenctrl" ], - depends =3D [ PATH_LIBXC + "/libxenctrl.so" ], + depends =3D [ PATH_LIBXENCTRL + "/libxenctrl.so"= ], extra_link_args =3D [ "-Wl,-rpath-link=3D"+PATH_LIBXENTO= OLLOG ], sources =3D [ "xen/lowlevel/xc/xc.c" ]) =20 --=20 2.26.2