On 12.12.2025 05:01, Penny Zheng wrote: > --- a/tools/fuzz/cpu-policy/Makefile > +++ b/tools/fuzz/cpu-policy/Makefile > @@ -22,7 +22,9 @@ CFLAGS += $(APPEND_CFLAGS) -Og > > vpath %.c ../../../xen/lib/x86 > > -afl-policy-fuzzer: afl-policy-fuzzer.o msr.o cpuid.o > +CPUID_OBJS := cpuid.o cpuid-cp2buf.o cpuid-cpfrbuf.o cpupolicy-clr.o
While I agree all three are needed here, ... > --- a/tools/fuzz/x86_instruction_emulator/Makefile > +++ b/tools/fuzz/x86_instruction_emulator/Makefile > @@ -25,7 +25,8 @@ x86_emulate/%.h: x86_emulate ; > ln -nsf $< $@ > > CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -iquote . > -cpuid.o: CFLAGS += -iquote $(XEN_ROOT)/xen/lib/x86 > +CPUID_OBJS := cpuid.o cpuid-cp2buf.o cpuid-cpfrbuf.o cpupolicy-clr.o ... none of them look to be needed e.g. here, and ... > --- a/tools/libs/guest/Makefile.common > +++ b/tools/libs/guest/Makefile.common > @@ -35,7 +35,9 @@ OBJS-y += $(LIBELF_OBJS) > ifeq ($(CONFIG_X86),y) # Add libx86 to the build > vpath %.c ../../../xen/lib/x86 > > -OBJS-y += cpuid.o msr.o policy.o > +CPUID_OBJS := cpuid.o cpuid-cp2buf.o cpuid-cpfrbuf.o cpupolicy-clr.o ... only two of them look to be needed e.g. here. Reason I was looking here again is that while talking of the split with the other x86 maintainers, we also discussed the option of moving what is being split out underneath xen/arch/x86/lib/. The way that may want doing, to some degree, depends on whether all "interested" parties want all the functions, which clearly isn't the case. Jan
