mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
libx86: generate cpuid-autogen.h in the libx86 include dir
This avoids all users needing to opencode local generation of the file. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Wei Liu <wei.liu2@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Roger Pau Monné authored and Andrew Cooper committed
1 parent
0e96f3d52e
commit
eddf9559c9
8 files changed
+22
-20
No files matched your search
+1
-1
@@ -311,7 +311,6 @@ xen/arch/*/efi/runtime.c
|
||||
xen/include/headers*.chk
|
||||
xen/include/asm
|
||||
xen/include/asm-*/asm-offsets.h
|
||||
xen/include/asm-x86/cpuid-autogen.h
|
||||
xen/include/compat/*
|
||||
xen/include/config/
|
||||
xen/include/generated/
|
||||
@@ -319,6 +318,7 @@ xen/include/public/public
|
||||
xen/include/xen/*.new
|
||||
xen/include/xen/acm_policy.h
|
||||
xen/include/xen/compile.h
|
||||
xen/include/xen/lib/x86/cpuid-autogen.h
|
||||
xen/test/livepatch/config.h
|
||||
xen/test/livepatch/xen_bye_world.livepatch
|
||||
xen/test/livepatch/xen_hello_world.livepatch
|
||||
|
||||
@@ -23,8 +23,11 @@ xen/.dir:
|
||||
ln -sf $(XEN_ROOT)/xen/include/acpi acpi
|
||||
ifeq ($(CONFIG_X86),y)
|
||||
ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm
|
||||
mkdir -p xen/lib
|
||||
ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86 xen/lib/x86
|
||||
mkdir -p xen/lib/x86
|
||||
for f in $(filter-out %autogen.h,$(patsubst $(XEN_ROOT)/xen/include/xen/lib/x86/%,%,Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h))); do \
|
||||
ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86/$$f xen/lib/x86/$$f; \
|
||||
done
|
||||
$(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT)
|
||||
endif
|
||||
touch $@
|
||||
|
||||
|
||||
@@ -147,15 +147,6 @@ $(eval $(genpath-target))
|
||||
|
||||
xc_private.h: _paths.h
|
||||
|
||||
ifeq ($(CONFIG_X86),y)
|
||||
|
||||
_xc_cpuid_autogen.h: $(XEN_ROOT)/xen/include/public/arch-x86/cpufeatureset.h $(XEN_ROOT)/xen/tools/gen-cpuid.py
|
||||
$(PYTHON) $(XEN_ROOT)/xen/tools/gen-cpuid.py -i $^ -o $@.new
|
||||
$(call move-if-changed,$@.new,$@)
|
||||
|
||||
build: _xc_cpuid_autogen.h
|
||||
endif
|
||||
|
||||
$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \
|
||||
$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): xc_private.h
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ enum {
|
||||
#define XEN_CPUFEATURE(name, value) X86_FEATURE_##name = value,
|
||||
#include <xen/arch-x86/cpufeatureset.h>
|
||||
};
|
||||
#include "_xc_cpuid_autogen.h"
|
||||
|
||||
#include <xen/lib/x86/cpuid.h>
|
||||
|
||||
|
||||
@@ -141,14 +141,13 @@ headers++.chk: $(PUBLIC_HEADERS) Makefile
|
||||
endif
|
||||
|
||||
ifeq ($(XEN_TARGET_ARCH),x86_64)
|
||||
.PHONY: lib-x86-all
|
||||
lib-x86-all:
|
||||
$(MAKE) -C xen/lib/x86 all
|
||||
|
||||
$(BASEDIR)/include/asm-x86/cpuid-autogen.h: $(BASEDIR)/include/public/arch-x86/cpufeatureset.h $(BASEDIR)/tools/gen-cpuid.py FORCE
|
||||
$(PYTHON) $(BASEDIR)/tools/gen-cpuid.py -i $< -o $@.new
|
||||
$(call move-if-changed,$@.new,$@)
|
||||
|
||||
all: $(BASEDIR)/include/asm-x86/cpuid-autogen.h
|
||||
all: lib-x86-all
|
||||
endif
|
||||
|
||||
clean::
|
||||
rm -rf compat config generated headers*.chk
|
||||
rm -f $(BASEDIR)/include/asm-x86/cpuid-autogen.h
|
||||
rm -f $(BASEDIR)/include/xen/lib/x86/cpuid-autogen.h
|
||||
@@ -2,7 +2,7 @@
|
||||
* Explicitly intended for multiple inclusion.
|
||||
*/
|
||||
|
||||
#include <asm/cpuid-autogen.h>
|
||||
#include <xen/lib/x86/cpuid-autogen.h>
|
||||
|
||||
#define FSCAPINTS FEATURESET_NR_ENTRIES
|
||||
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
include $(XEN_ROOT)/Config.mk
|
||||
|
||||
.PHONY: all
|
||||
all: cpuid-autogen.h
|
||||
|
||||
cpuid-autogen.h: $(XEN_ROOT)/xen/include/public/arch-x86/cpufeatureset.h $(XEN_ROOT)/xen/tools/gen-cpuid.py
|
||||
$(PYTHON) $(XEN_ROOT)/xen/tools/gen-cpuid.py -i $< -o $@.new
|
||||
$(call move-if-changed,$@.new,$@)
|
||||
@@ -2,6 +2,8 @@
|
||||
#ifndef XEN_LIB_X86_CPUID_H
|
||||
#define XEN_LIB_X86_CPUID_H
|
||||
|
||||
#include <xen/lib/x86/cpuid-autogen.h>
|
||||
|
||||
struct cpuid_leaf
|
||||
{
|
||||
uint32_t a, b, c, d;
|
||||
|
||||