Xen project Mailing List

[PATCH v2 1/2] x86/cpu-policy: move CPU policy library code

To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>

Date: Wed, 7 Jan 2026 15:17:00 +0100

Autocrypt: addr=jbeulich@xxxxxxxx; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL

Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>

Delivery-date: Wed, 07 Jan 2026 14:17:10 +0000

List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

... to a dedicated subdir of x86's private lib/ sub-tree. For the CPU policy harnesses and libxenguest use $(lib-y) as set by the new Makefile.common, whereas for the emulator harnesses stick to building just cpuid.o for the time being. Requested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> --- v2: New. --- tools/fuzz/cpu-policy/Makefile | 7 +++++-- tools/fuzz/x86_instruction_emulator/Makefile | 2 +- tools/libs/guest/Makefile.common | 7 +++++-- tools/tests/cpu-policy/Makefile | 7 +++++-- tools/tests/x86_emulator/Makefile | 2 +- xen/arch/x86/arch.mk | 1 + xen/arch/x86/lib/Makefile | 2 ++ xen/arch/x86/lib/cpu-policy/Makefile | 1 + xen/arch/x86/lib/cpu-policy/Makefile.common | 3 +++ xen/{lib/x86 => arch/x86/lib/cpu-policy}/cpuid.c | 0 xen/{lib/x86 => arch/x86/lib/cpu-policy}/msr.c | 0 xen/{lib/x86 => arch/x86/lib/cpu-policy}/policy.c | 0 xen/{lib/x86 => arch/x86/lib/cpu-policy}/private.h | 0 xen/lib/Makefile | 2 -- xen/lib/x86/Makefile | 3 --- 15 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 xen/arch/x86/lib/cpu-policy/Makefile create mode 100644 xen/arch/x86/lib/cpu-policy/Makefile.common rename xen/{lib/x86 => arch/x86/lib/cpu-policy}/cpuid.c (100%) rename xen/{lib/x86 => arch/x86/lib/cpu-policy}/msr.c (100%) rename xen/{lib/x86 => arch/x86/lib/cpu-policy}/policy.c (100%) rename xen/{lib/x86 => arch/x86/lib/cpu-policy}/private.h (100%) delete mode 100644 xen/lib/x86/Makefile diff --git a/tools/fuzz/cpu-policy/Makefile b/tools/fuzz/cpu-policy/Makefile index 6e7743e0aa12..76ecf20e8dbd 100644 --- a/tools/fuzz/cpu-policy/Makefile +++ b/tools/fuzz/cpu-policy/Makefile @@ -20,9 +20,12 @@ install: all CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ CFLAGS += $(APPEND_CFLAGS) -Og -vpath %.c ../../../xen/lib/x86 +vpath %.c $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy -afl-policy-fuzzer: afl-policy-fuzzer.o msr.o cpuid.o +lib-y := +include $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy/Makefile.common + +afl-policy-fuzzer: afl-policy-fuzzer.o $(lib-y) $(CC) $(CFLAGS) $^ -o $@ -include $(DEPS_INCLUDE) diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile index d104b15f4fbf..4e4877a20322 100644 --- a/tools/fuzz/x86_instruction_emulator/Makefile +++ b/tools/fuzz/x86_instruction_emulator/Makefile @@ -21,7 +21,7 @@ vpath %.h ../../tests/x86_emulator CFLAGS += -iquote ../../tests/x86_emulator # Add libx86 to the build -vpath %.c $(XEN_ROOT)/xen/lib/x86 +vpath %.c $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy x86_emulate: mkdir -p $@ diff --git a/tools/libs/guest/Makefile.common b/tools/libs/guest/Makefile.common index a026a2f662b0..b928a4a246a9 100644 --- a/tools/libs/guest/Makefile.common +++ b/tools/libs/guest/Makefile.common @@ -33,9 +33,12 @@ LIBELF_OBJS += libelf-dominfo.o OBJS-y += $(LIBELF_OBJS) ifeq ($(CONFIG_X86),y) # Add libx86 to the build -vpath %.c ../../../xen/lib/x86 +vpath %.c $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy -OBJS-y += cpuid.o msr.o policy.o +lib-y := +include $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy/Makefile.common + +OBJS-y += $(lib-y) endif # new domain builder diff --git a/tools/tests/cpu-policy/Makefile b/tools/tests/cpu-policy/Makefile index 24f87e2eca2a..d8e4d222f4e4 100644 --- a/tools/tests/cpu-policy/Makefile +++ b/tools/tests/cpu-policy/Makefile @@ -42,11 +42,14 @@ CFLAGS += $(APPEND_CFLAGS) LDFLAGS += $(APPEND_LDFLAGS) -vpath %.c ../../../xen/lib/x86 +vpath %.c $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy + +lib-y := +include $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy/Makefile.common %.o: Makefile -test-cpu-policy: test-cpu-policy.o msr.o cpuid.o policy.o +test-cpu-policy: test-cpu-policy.o $(lib-y) $(CC) $^ -o $@ $(LDFLAGS) -include $(DEPS_INCLUDE) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 376cfe244d1c..e18725d0c303 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -17,7 +17,7 @@ vpath x86_emulate/%.h $(XEN_ROOT)/xen/arch/x86 HOSTCFLAGS += -iquote $(XEN_ROOT)/xen/arch/x86 # Add libx86 to the build -vpath %.c $(XEN_ROOT)/xen/lib/x86 +vpath %.c $(XEN_ROOT)/xen/arch/x86/lib/cpu-policy CFLAGS += $(CFLAGS_xeninclude) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 0203138a819a..be6c76d2934b 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -4,6 +4,7 @@ export XEN_IMG_OFFSET := 0x200000 ARCH_LIBS-y += arch/x86/lib/lib.a +ALL_LIBS-y += arch/x86/lib/cpu-policy/lib.a CFLAGS += -DXEN_IMG_OFFSET=$(XEN_IMG_OFFSET) diff --git a/xen/arch/x86/lib/Makefile b/xen/arch/x86/lib/Makefile index b9a65c662a56..fe9a27187992 100644 --- a/xen/arch/x86/lib/Makefile +++ b/xen/arch/x86/lib/Makefile @@ -6,3 +6,5 @@ lib-y += generic-hweightl.o lib-y += memcpy.o lib-y += memset.o lib-y += scrub-page.o + +obj-y += cpu-policy/ diff --git a/xen/arch/x86/lib/cpu-policy/Makefile b/xen/arch/x86/lib/cpu-policy/Makefile new file mode 100644 index 000000000000..b12cf7836d4c --- /dev/null +++ b/xen/arch/x86/lib/cpu-policy/Makefile @@ -0,0 +1 @@ +include $(srcdir)/Makefile.common diff --git a/xen/arch/x86/lib/cpu-policy/Makefile.common b/xen/arch/x86/lib/cpu-policy/Makefile.common new file mode 100644 index 000000000000..35475af78048 --- /dev/null +++ b/xen/arch/x86/lib/cpu-policy/Makefile.common @@ -0,0 +1,3 @@ +lib-y += cpuid.o +lib-y += msr.o +lib-y += policy.o diff --git a/xen/lib/x86/cpuid.c b/xen/arch/x86/lib/cpu-policy/cpuid.c similarity index 100% rename from xen/lib/x86/cpuid.c rename to xen/arch/x86/lib/cpu-policy/cpuid.c diff --git a/xen/lib/x86/msr.c b/xen/arch/x86/lib/cpu-policy/msr.c similarity index 100% rename from xen/lib/x86/msr.c rename to xen/arch/x86/lib/cpu-policy/msr.c diff --git a/xen/lib/x86/policy.c b/xen/arch/x86/lib/cpu-policy/policy.c similarity index 100% rename from xen/lib/x86/policy.c rename to xen/arch/x86/lib/cpu-policy/policy.c diff --git a/xen/lib/x86/private.h b/xen/arch/x86/lib/cpu-policy/private.h similarity index 100% rename from xen/lib/x86/private.h rename to xen/arch/x86/lib/cpu-policy/private.h diff --git a/xen/lib/Makefile b/xen/lib/Makefile index efca830d924c..850efeb4c570 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -1,5 +1,3 @@ -obj-$(CONFIG_X86) += x86/ - lib-y += bsearch.o lib-y += ctors.o lib-y += ctype.o diff --git a/xen/lib/x86/Makefile b/xen/lib/x86/Makefile deleted file mode 100644 index 780ea05db158..000000000000 --- a/xen/lib/x86/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += cpuid.o -obj-y += msr.o -obj-y += policy.o

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.