mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
Ian Campbell
3237645813
Currently __XEN_TOOLS__ is defined in the global CFLAGS used for tools builds, exposing them all to the various unstable hypercall interfaces. However there are places where we do not want this (in particular all the stable libraries now under tools/libs), and there is a risk of such uses slipping in unnoticed (currently there are none, but I tripped over the mixed nature of the HVMOPs just now in some new code I was putting together). Instead only define __XEN_TOOLS__ for things which explicitly want the unstable APIs. The vast majority of these are consumers of libxenctrl, which have opted into unstable interfaces by using libxenctrl already, so adding -D__XEN_TOOLS__ to CFLAGS_libxenctrl covers these without needing to patch the dozen or so tools manually. The libxc build itself, which doesn't use CFLAGS_libxenctrl, now needs the define too. As does gdbsx's own low level hypercall binding library xg. hvmloader no longer needs to undefine the symbol. The ocaml evtchn bindings don't actually need sysctl.h and therefore don't actually need __XEN_TOOLS__ either. qemu-xen-traditional doesn't use CFLAGS_libxenctrl and so we pass the define there (via --extra-cflags) too. Having removed __XEN_TOOLS__ replace it with __XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__ so that in tree code is always using the latest APIs. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
238 lines
7.5 KiB
Makefile
238 lines
7.5 KiB
Makefile
XEN_ROOT = $(CURDIR)/../..
|
|
include $(XEN_ROOT)/tools/Rules.mk
|
|
|
|
MAJOR = 4.6
|
|
MINOR = 0
|
|
|
|
ifeq ($(CONFIG_LIBXC_MINIOS),y)
|
|
# Save/restore of a domain is currently incompatible with a stubdom environment
|
|
override CONFIG_MIGRATE := n
|
|
endif
|
|
|
|
CTRL_SRCS-y :=
|
|
CTRL_SRCS-y += xc_altp2m.c
|
|
CTRL_SRCS-y += xc_core.c
|
|
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
|
|
CTRL_SRCS-$(CONFIG_ARM) += xc_core_arm.c
|
|
CTRL_SRCS-y += xc_cpupool.c
|
|
CTRL_SRCS-y += xc_domain.c
|
|
CTRL_SRCS-y += xc_evtchn.c
|
|
CTRL_SRCS-y += xc_gnttab.c
|
|
CTRL_SRCS-y += xc_misc.c
|
|
CTRL_SRCS-y += xc_flask.c
|
|
CTRL_SRCS-y += xc_physdev.c
|
|
CTRL_SRCS-y += xc_private.c
|
|
CTRL_SRCS-y += xc_csched.c
|
|
CTRL_SRCS-y += xc_csched2.c
|
|
CTRL_SRCS-y += xc_arinc653.c
|
|
CTRL_SRCS-y += xc_rt.c
|
|
CTRL_SRCS-y += xc_tbuf.c
|
|
CTRL_SRCS-y += xc_pm.c
|
|
CTRL_SRCS-y += xc_cpu_hotplug.c
|
|
CTRL_SRCS-y += xc_resume.c
|
|
CTRL_SRCS-y += xc_tmem.c
|
|
CTRL_SRCS-y += xc_vm_event.c
|
|
CTRL_SRCS-y += xc_monitor.c
|
|
CTRL_SRCS-y += xc_mem_paging.c
|
|
CTRL_SRCS-y += xc_mem_access.c
|
|
CTRL_SRCS-y += xc_memshr.c
|
|
CTRL_SRCS-y += xc_hcall_buf.c
|
|
CTRL_SRCS-y += xc_foreign_memory.c
|
|
CTRL_SRCS-y += xc_kexec.c
|
|
CTRL_SRCS-y += xc_resource.c
|
|
CTRL_SRCS-$(CONFIG_X86) += xc_psr.c
|
|
CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c
|
|
CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c
|
|
CTRL_SRCS-$(CONFIG_FreeBSD) += xc_freebsd.c
|
|
CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c
|
|
CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c
|
|
CTRL_SRCS-$(CONFIG_NetBSDRump) += xc_netbsd.c
|
|
CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c
|
|
CTRL_SRCS-y += xc_evtchn_compat.c
|
|
CTRL_SRCS-y += xc_gnttab_compat.c
|
|
|
|
GUEST_SRCS-y :=
|
|
GUEST_SRCS-y += xg_private.c xc_suspend.c
|
|
ifeq ($(CONFIG_MIGRATE),y)
|
|
GUEST_SRCS-y += xc_sr_common.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_sr_common_x86.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_sr_common_x86_pv.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_sr_restore_x86_pv.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_sr_restore_x86_hvm.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_sr_save_x86_pv.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_sr_save_x86_hvm.c
|
|
GUEST_SRCS-y += xc_sr_restore.c
|
|
GUEST_SRCS-y += xc_sr_save.c
|
|
GUEST_SRCS-y += xc_offline_page.c xc_compression.c
|
|
else
|
|
GUEST_SRCS-y += xc_nomigrate.c
|
|
endif
|
|
|
|
vpath %.c ../../xen/common/libelf
|
|
CFLAGS += -I../../xen/common/libelf
|
|
|
|
ELF_SRCS-y += libelf-tools.c libelf-loader.c
|
|
ELF_SRCS-y += libelf-dominfo.c
|
|
|
|
GUEST_SRCS-y += $(ELF_SRCS-y)
|
|
|
|
$(patsubst %.c,%.o,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign
|
|
$(patsubst %.c,%.opic,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign
|
|
|
|
# new domain builder
|
|
GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c
|
|
GUEST_SRCS-y += xc_dom_elfloader.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_dom_bzimageloader.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_dom_decompress_lz4.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_dom_hvmloader.c
|
|
GUEST_SRCS-$(CONFIG_ARM) += xc_dom_armzimageloader.c
|
|
GUEST_SRCS-y += xc_dom_binloader.c
|
|
GUEST_SRCS-y += xc_dom_compat_linux.c
|
|
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_dom_x86.c
|
|
GUEST_SRCS-$(CONFIG_X86) += xc_cpuid_x86.c
|
|
GUEST_SRCS-$(CONFIG_ARM) += xc_dom_arm.c
|
|
|
|
ifeq ($(CONFIG_LIBXC_MINIOS),y)
|
|
GUEST_SRCS-y += xc_dom_decompress_unsafe.c
|
|
GUEST_SRCS-y += xc_dom_decompress_unsafe_bzip2.c
|
|
GUEST_SRCS-y += xc_dom_decompress_unsafe_lzma.c
|
|
GUEST_SRCS-y += xc_dom_decompress_unsafe_lzo1x.c
|
|
GUEST_SRCS-y += xc_dom_decompress_unsafe_xz.c
|
|
endif
|
|
|
|
-include $(XEN_TARGET_ARCH)/Makefile
|
|
|
|
CFLAGS += -Werror -Wmissing-prototypes
|
|
CFLAGS += -I. -I./include $(CFLAGS_xeninclude)
|
|
CFLAGS += -D__XEN_TOOLS__
|
|
|
|
# Needed for posix_fadvise64() in xc_linux.c
|
|
CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE
|
|
|
|
CFLAGS += $(PTHREAD_CFLAGS)
|
|
CFLAGS += $(CFLAGS_libxentoollog)
|
|
CFLAGS += $(CFLAGS_libxenevtchn)
|
|
|
|
CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y))
|
|
CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y))
|
|
|
|
GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
|
|
GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
|
|
|
|
$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \
|
|
$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
|
|
|
# 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 += $(CFLAGS_libxencall) $(CFLAGS_libxenforeignmemory)
|
|
|
|
$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAGS += $(CFLAGS_libxengnttab) $(CFLAGS_libxengntshr)
|
|
|
|
LIB := libxenctrl.a
|
|
ifneq ($(nosharedlibs),y)
|
|
LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
|
|
endif
|
|
|
|
LIB += libxenguest.a
|
|
ifneq ($(nosharedlibs),y)
|
|
LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
|
|
endif
|
|
|
|
genpath-target = $(call buildmakevars2header,_paths.h)
|
|
$(eval $(genpath-target))
|
|
|
|
xc_private.h: _paths.h
|
|
|
|
$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \
|
|
$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): xc_private.h
|
|
|
|
.PHONY: all
|
|
all: build
|
|
|
|
.PHONY: build
|
|
build:
|
|
$(MAKE) libs
|
|
|
|
.PHONY: libs
|
|
libs: $(LIB)
|
|
|
|
.PHONY: install
|
|
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)/libxenctrl.so.$(MAJOR)
|
|
$(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so
|
|
$(INSTALL_DATA) include/xenctrl.h include/xenctrl_compat.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)/libxenguest.so.$(MAJOR)
|
|
$(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenguest.so
|
|
$(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir)
|
|
|
|
.PHONY: TAGS
|
|
TAGS:
|
|
etags -t *.c *.h
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
rm -rf *.rpm $(LIB) *~ $(DEPS) \
|
|
_paths.h \
|
|
$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \
|
|
$(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS)
|
|
|
|
.PHONY: distclean
|
|
distclean: clean
|
|
|
|
.PHONY: rpm
|
|
rpm: build
|
|
rm -rf staging
|
|
mkdir staging
|
|
mkdir staging/i386
|
|
rpmbuild --define "staging$$PWD/staging" --define '_builddir.' \
|
|
--define "_rpmdir$$PWD/staging" -bb rpm.spec
|
|
mv staging/i386/*.rpm .
|
|
rm -rf staging
|
|
|
|
# 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.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxengntshr) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
|
|
|
|
# libxenguest
|
|
|
|
libxenguest.a: $(GUEST_LIB_OBJS)
|
|
$(AR) rc $@ $^
|
|
|
|
libxenguest.so: libxenguest.so.$(MAJOR)
|
|
$(SYMLINK_SHLIB) $< $@
|
|
libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
|
|
$(SYMLINK_SHLIB) $< $@
|
|
|
|
ifeq ($(CONFIG_MiniOS),y)
|
|
zlib-options =
|
|
else
|
|
zlib-options = $(ZLIB)
|
|
endif
|
|
|
|
xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
|
|
xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
|
|
|
|
libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
|
|
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
|
|
$(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
|
|
|
|
-include $(DEPS)
|
|
|