Skip to contentSkip to conversation

x86: adjustments to building of the insn emulator

PATCH In review Jan Beulich 3 participants 9 messages Jul 9 – Jul 16

lore
Share & tools
lore
#0 lore raw

cover x86: adjustments to building of the insn emulator

1: x86emul: drop wrapper C file
2: x86: put x86_emulate/ early in $(obj-y)

Possibly the latter patch could also be folded into the former one.

Jan

#1 lore raw

PATCH 1/2 x86emul: drop wrapper C file

Move the little bit that's still left in x86/x86_emulate.c into a __XEN__ conditional in x86/x86_emulate/x86_emulate.c. Move what are roughly the test/fuzzing harness counterparts from there into the corresponding #else.

tools/tests/x86_emulator/x86-emulate.c +0 -21
@@ -3,27 +3,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-/* See gcc bug 100680, but here don't bother making this version dependent. */
-#define gcc11_wrap(x) ({                  \
-    unsigned long x_;                     \
-    __asm__ ( "" : "=g" (x_) : "0" (x) ); \
-    (typeof(x))x_;                        \
-})
-
-#define cpu_has_amd_erratum(nr) 0
-#define cpu_has_mpx false
-#define read_bndcfgu() 0
-#define xstate_set_init(what)
-
-/* For generic assembly code: use macros to define operation/operand sizes. */
-#ifdef __i386__
-# define __OS          "l"  /* Operation Suffix */
-# define __OP          "e"  /* Operand Prefix */
-#else
-# define __OS          "q"  /* Operation Suffix */
-# define __OP          "r"  /* Operand Prefix */
-#endif
-
 uint32_t mxcsr_mask = 0x0000ffbf;
 struct cpu_policy cpu_policy;
 
xen/arch/x86/Makefile +0 -8
@@ -69,7 +69,6 @@ obj-y += traps-setup.o
 obj-y += traps.o
 obj-$(CONFIG_INTEL) += tsx.o
 obj-$(CONFIG_VM_EVENT) += vm_event.o
-obj-y += x86_emulate.o
 obj-y += xstate.o
 
 ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
@@ -86,13 +85,6 @@ hostprogs-y += efi/mkreloc
 
 $(obj)/efi/mkreloc: HOSTCFLAGS += -I$(srctree)/include
 
-ifneq ($(CONFIG_HVM),y)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
-endif
-ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
-endif
-
 efi-y := $(shell if [ ! -r $(objtree)/include/xen/compile.h -o \
                       -O $(objtree)/include/xen/compile.h ]; then \
                          echo '$(TARGET).efi'; fi) \
xen/arch/x86/x86_emulate.c deleted +0 -37
@@ -1,37 +0,0 @@
-/******************************************************************************
- * x86_emulate.c
- * 
- * Wrapper for generic x86 instruction decoder and emulator.
- * 
- * Copyright (c) 2008, Citrix Systems, Inc.
- * 
- * Authors:
- *    Keir Fraser <[email protected]>
- */
-
-#include <xen/event.h>
-
-#include <asm/x86_emulate.h>
-#include <asm/processor.h> /* current_cpu_info */
-#include <asm/xstate.h>
-#include <asm/amd.h> /* cpu_has_amd_erratum() */
-
-/* Avoid namespace pollution. */
-#undef cmpxchg
-#undef cpuid
-#undef wbinvd
-
-#define cpu_has_amd_erratum(nr) \
-        cpu_has_amd_erratum(&current_cpu_data, AMD_ERRATUM_##nr)
-
-#include "x86_emulate/x86_emulate.c"
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
xen/arch/x86/x86_emulate/Makefile +11 -0
@@ -1,3 +1,14 @@
+# Put this ahead of the sorted list below, as it takes long to build and hence
+# we'd like parallel make to schedule its building early.
+obj-y += x86_emulate.o
+
+ifneq ($(CONFIG_HVM),y)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
+endif
+ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
+endif
+
 obj-y += 0f01.o
 obj-y += 0fae.o
 obj-y += 0fc7.o
xen/arch/x86/x86_emulate/x86_emulate.c +42 -0

48 lines not on this page · raw message

#2 lore raw

PATCH 1/2 x86emul: drop wrapper C file

In reply to Jan Beulich

Move the little bit that's still left in x86/x86_emulate.c into a __XEN__ conditional in x86/x86_emulate/x86_emulate.c. Move what are roughly the test/fuzzing harness counterparts from there into the corresponding #else.

Interestingly more recent gcc takes issue with three static const arrays which are unused when HVM=n (noticeable in particule in the shim build). Apparently such are diagnosed only when present in the top-level file, but not when living in an #include-d one.

---
v1.1: Address HVM=n build issues. See

      https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2674985992.
tools/tests/x86_emulator/x86-emulate.c +0 -21
@@ -3,27 +3,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-/* See gcc bug 100680, but here don't bother making this version dependent. */
-#define gcc11_wrap(x) ({                  \
-    unsigned long x_;                     \
-    __asm__ ( "" : "=g" (x_) : "0" (x) ); \
-    (typeof(x))x_;                        \
-})
-
-#define cpu_has_amd_erratum(nr) 0
-#define cpu_has_mpx false
-#define read_bndcfgu() 0
-#define xstate_set_init(what)
-
-/* For generic assembly code: use macros to define operation/operand sizes. */
-#ifdef __i386__
-# define __OS          "l"  /* Operation Suffix */
-# define __OP          "e"  /* Operand Prefix */
-#else
-# define __OS          "q"  /* Operation Suffix */
-# define __OP          "r"  /* Operand Prefix */
-#endif
-
 uint32_t mxcsr_mask = 0x0000ffbf;
 struct cpu_policy cpu_policy;
 
xen/arch/x86/Makefile +0 -8
@@ -69,7 +69,6 @@ obj-y += traps-setup.o
 obj-y += traps.o
 obj-$(CONFIG_INTEL) += tsx.o
 obj-$(CONFIG_VM_EVENT) += vm_event.o
-obj-y += x86_emulate.o
 obj-y += xstate.o
 
 ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
@@ -86,13 +85,6 @@ hostprogs-y += efi/mkreloc
 
 $(obj)/efi/mkreloc: HOSTCFLAGS += -I$(srctree)/include
 
-ifneq ($(CONFIG_HVM),y)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
-endif
-ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
-endif
-
 efi-y := $(shell if [ ! -r $(objtree)/include/xen/compile.h -o \
                       -O $(objtree)/include/xen/compile.h ]; then \
                          echo '$(TARGET).efi'; fi) \
xen/arch/x86/x86_emulate.c deleted +0 -37
@@ -1,37 +0,0 @@
-/******************************************************************************
- * x86_emulate.c
- * 
- * Wrapper for generic x86 instruction decoder and emulator.
- * 
- * Copyright (c) 2008, Citrix Systems, Inc.
- * 
- * Authors:
- *    Keir Fraser <[email protected]>
- */
-
-#include <xen/event.h>
-
-#include <asm/x86_emulate.h>
-#include <asm/processor.h> /* current_cpu_info */
-#include <asm/xstate.h>
-#include <asm/amd.h> /* cpu_has_amd_erratum() */
-
-/* Avoid namespace pollution. */
-#undef cmpxchg
-#undef cpuid
-#undef wbinvd
-
-#define cpu_has_amd_erratum(nr) \
-        cpu_has_amd_erratum(&current_cpu_data, AMD_ERRATUM_##nr)
-
-#include "x86_emulate/x86_emulate.c"
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
xen/arch/x86/x86_emulate/Makefile +11 -0
@@ -1,3 +1,14 @@
+# Put this ahead of the sorted list below, as it takes long to build and hence
+# we'd like parallel make to schedule its building early.
+obj-y += x86_emulate.o
+
+ifneq ($(CONFIG_HVM),y)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
+endif
+ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
+endif
+
 obj-y += 0f01.o
 obj-y += 0fae.o
 obj-y += 0fc7.o
xen/arch/x86/x86_emulate/x86_emulate.c +50 -0

67 lines not on this page · raw message

Reviewed-by on v1 1/2
#3 lore raw

Re: [PATCH v1.1 1/2] x86emul: drop wrapper C file

Le 14/07/2026 à 16:00, Jan Beulich a écrit :

Quoted 189 lines

Move the little bit that's still left in x86/x86_emulate.c into a __XEN__ conditional in x86/x86_emulate/x86_emulate.c. Move what are roughly the test/fuzzing harness counterparts from there into the corresponding #else.

Interestingly more recent gcc takes issue with three static const arrays which are unused when HVM=n (noticeable in particule in the shim build). Apparently such are diagnosed only when present in the top-level file, but not when living in an #include-d one.

---
v1.1: Address HVM=n build issues. See

       https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2674985992.
tools/tests/x86_emulator/x86-emulate.c +0 -21
@@ -3,27 +3,6 @@
  #include <errno.h>
  #include <sys/mman.h>
 
-/* See gcc bug 100680, but here don't bother making this version dependent. */
-#define gcc11_wrap(x) ({                  \
-    unsigned long x_;                     \
-    __asm__ ( "" : "=g" (x_) : "0" (x) ); \
-    (typeof(x))x_;                        \
-})
-
-#define cpu_has_amd_erratum(nr) 0
-#define cpu_has_mpx false
-#define read_bndcfgu() 0
-#define xstate_set_init(what)
-
-/* For generic assembly code: use macros to define operation/operand sizes. */
-#ifdef __i386__
-# define __OS          "l"  /* Operation Suffix */
-# define __OP          "e"  /* Operand Prefix */
-#else
-# define __OS          "q"  /* Operation Suffix */
-# define __OP          "r"  /* Operand Prefix */
-#endif
-
  uint32_t mxcsr_mask = 0x0000ffbf;
  struct cpu_policy cpu_policy;
 
xen/arch/x86/Makefile +0 -8
@@ -69,7 +69,6 @@ obj-y += traps-setup.o
  obj-y += traps.o
  obj-$(CONFIG_INTEL) += tsx.o
  obj-$(CONFIG_VM_EVENT) += vm_event.o
-obj-y += x86_emulate.o
  obj-y += xstate.o
 
  ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
@@ -86,13 +85,6 @@ hostprogs-y += efi/mkreloc
 
  $(obj)/efi/mkreloc: HOSTCFLAGS += -I$(srctree)/include
 
-ifneq ($(CONFIG_HVM),y)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
-endif
-ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
-endif
-
  efi-y := $(shell if [ ! -r $(objtree)/include/xen/compile.h -o \
                        -O $(objtree)/include/xen/compile.h ]; then \
                           echo '$(TARGET).efi'; fi) \
xen/arch/x86/x86_emulate.c deleted +0 -37
@@ -1,37 +0,0 @@
-/******************************************************************************
- * x86_emulate.c
- *
- * Wrapper for generic x86 instruction decoder and emulator.
- *
- * Copyright (c) 2008, Citrix Systems, Inc.
- *
- * Authors:
- *    Keir Fraser <[email protected]>
- */
-
-#include <xen/event.h>
-
-#include <asm/x86_emulate.h>
-#include <asm/processor.h> /* current_cpu_info */
-#include <asm/xstate.h>
-#include <asm/amd.h> /* cpu_has_amd_erratum() */
-
-/* Avoid namespace pollution. */
-#undef cmpxchg
-#undef cpuid
-#undef wbinvd
-
-#define cpu_has_amd_erratum(nr) \
-        cpu_has_amd_erratum(&current_cpu_data, AMD_ERRATUM_##nr)
-
-#include "x86_emulate/x86_emulate.c"
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
xen/arch/x86/x86_emulate/Makefile +11 -0
@@ -1,3 +1,14 @@
+# Put this ahead of the sorted list below, as it takes long to build and hence
+# we'd like parallel make to schedule its building early.
+obj-y += x86_emulate.o
+
+ifneq ($(CONFIG_HVM),y)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
+endif
+ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
+endif
+
  obj-y += 0f01.o
  obj-y += 0fae.o
  obj-y += 0fc7.o
xen/arch/x86/x86_emulate/x86_emulate.c +46 -0
@@ -8,8 +8,52 @@
   * Copyright (c) 2005-2007 XenSource Inc.
   */
 
+#ifdef __XEN__
+
+# include <xen/event.h>
+
+# include <asm/amd.h> /* cpu_has_amd_erratum() */
+# include <asm/processor.h> /* current_cpu_info */
+# include <asm/x86_emulate.h>
+# include <asm/xstate.h>
+
+/* Avoid namespace pollution. */
+# undef cmpxchg
+# undef cpuid
+# undef wbinvd
+
+# define cpu_has_amd_erratum(nr) \
+         cpu_has_amd_erratum(&current_cpu_data, AMD_ERRATUM_##nr)
+
+#else /* !__XEN__ */
+
+/* See gcc bug 100680, but here don't bother making this version dependent. */
+# define gcc11_wrap(x) ({                  \
+     unsigned long x_;                     \
+     __asm__ ( "" : "=g" (x_) : "0" (x) ); \
+     (typeof(x))x_;                        \
+})
+
+# define cpu_has_amd_erratum(nr) 0
+# define cpu_has_mpx false
+# define read_bndcfgu() 0
+# define xstate_set_init(what)
+
+/* For generic assembly code: use macros to define operation/operand sizes. */
+# ifdef __i386__
+#  define __OS          "l"  /* Operation Suffix */
+#  define __OP          "e"  /* Operand Prefix */
+# else
+#  define __OS          "q"  /* Operation Suffix */
+#  define __OP          "r"  /* Operand Prefix */
+# endif
+
+#endif /* __XEN__ */
+
  #include "private.h"
 
+#ifndef X86EMUL_NO_MMX
+
  /*
   * The next two tables are indexed by high opcode extension byte (the one
   * that's encoded like an immediate) nibble, with each table element then
@@ -45,9 +89,15 @@ static const uint16_t _3dnow_ext_table[1
      [0xb] = (1 << 0xb) /* pswapd */,
  };
 
+#endif /* !X86EMUL_NO_MMX */
+

xen/arch/x86/x86_emulate/x86_emulate.c static const uint16_t _3dnow_ext_table[1 · line 103

Quoted 10 lines
xen/arch/x86/x86_emulate/x86_emulate.c +4 -0
+#ifndef X86EMUL_NO_SIMD
+
  /* Shift values between src and dst sizes of pmov{s,z}x{b,w,d}{w,d,q}. */
  static const uint8_t pmov_convert_delta[] = { 1, 2, 3, 1, 2, 1 };
 
+#endif /* !X86EMUL_NO_SIMD */
+
  static const uint8_t sse_prefix[] = { 0x66, 0xf3, 0xf2 };
 
  #ifdef __x86_64__
#4 lore raw

Re: [PATCH v1.1 1/2] x86emul: drop wrapper C file

Quoted 194 lines · Teddy Astie

Le 14/07/2026 à 16:00, Jan Beulich a écrit :

Quoted 193 lines

Move the little bit that's still left in x86/x86_emulate.c into a __XEN__ conditional in x86/x86_emulate/x86_emulate.c. Move what are roughly the test/fuzzing harness counterparts from there into the corresponding #else.

Interestingly more recent gcc takes issue with three static const arrays which are unused when HVM=n (noticeable in particule in the shim build). Apparently such are diagnosed only when present in the top-level file, but not when living in an #include-d one.

---
v1.1: Address HVM=n build issues. See

       https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2674985992.
tools/tests/x86_emulator/x86-emulate.c +0 -21
@@ -3,27 +3,6 @@
  #include <errno.h>
  #include <sys/mman.h>
 
-/* See gcc bug 100680, but here don't bother making this version dependent. */
-#define gcc11_wrap(x) ({                  \
-    unsigned long x_;                     \
-    __asm__ ( "" : "=g" (x_) : "0" (x) ); \
-    (typeof(x))x_;                        \
-})
-
-#define cpu_has_amd_erratum(nr) 0
-#define cpu_has_mpx false
-#define read_bndcfgu() 0
-#define xstate_set_init(what)
-
-/* For generic assembly code: use macros to define operation/operand sizes. */
-#ifdef __i386__
-# define __OS          "l"  /* Operation Suffix */
-# define __OP          "e"  /* Operand Prefix */
-#else
-# define __OS          "q"  /* Operation Suffix */
-# define __OP          "r"  /* Operand Prefix */
-#endif
-
  uint32_t mxcsr_mask = 0x0000ffbf;
  struct cpu_policy cpu_policy;
 
xen/arch/x86/Makefile +0 -8
@@ -69,7 +69,6 @@ obj-y += traps-setup.o
  obj-y += traps.o
  obj-$(CONFIG_INTEL) += tsx.o
  obj-$(CONFIG_VM_EVENT) += vm_event.o
-obj-y += x86_emulate.o
  obj-y += xstate.o
 
  ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
@@ -86,13 +85,6 @@ hostprogs-y += efi/mkreloc
 
  $(obj)/efi/mkreloc: HOSTCFLAGS += -I$(srctree)/include
 
-ifneq ($(CONFIG_HVM),y)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
-endif
-ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
-$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
-endif
-
  efi-y := $(shell if [ ! -r $(objtree)/include/xen/compile.h -o \
                        -O $(objtree)/include/xen/compile.h ]; then \
                           echo '$(TARGET).efi'; fi) \
xen/arch/x86/x86_emulate.c deleted +0 -37
@@ -1,37 +0,0 @@
-/******************************************************************************
- * x86_emulate.c
- *
- * Wrapper for generic x86 instruction decoder and emulator.
- *
- * Copyright (c) 2008, Citrix Systems, Inc.
- *
- * Authors:
- *    Keir Fraser <[email protected]>
- */
-
-#include <xen/event.h>
-
-#include <asm/x86_emulate.h>
-#include <asm/processor.h> /* current_cpu_info */
-#include <asm/xstate.h>
-#include <asm/amd.h> /* cpu_has_amd_erratum() */
-
-/* Avoid namespace pollution. */
-#undef cmpxchg
-#undef cpuid
-#undef wbinvd
-
-#define cpu_has_amd_erratum(nr) \
-        cpu_has_amd_erratum(&current_cpu_data, AMD_ERRATUM_##nr)
-
-#include "x86_emulate/x86_emulate.c"
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
xen/arch/x86/x86_emulate/Makefile +11 -0
@@ -1,3 +1,14 @@
+# Put this ahead of the sorted list below, as it takes long to build and hence
+# we'd like parallel make to schedule its building early.
+obj-y += x86_emulate.o
+
+ifneq ($(CONFIG_HVM),y)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-unused-label
+endif
+ifeq ($(CONFIG_CONDITION_COVERAGE)$(CONFIG_CC_IS_GCC),yy)
+$(obj)/x86_emulate.o: CFLAGS-y += -Wno-error=coverage-too-many-conditions
+endif
+
  obj-y += 0f01.o
  obj-y += 0fae.o
  obj-y += 0fc7.o
xen/arch/x86/x86_emulate/x86_emulate.c +48 -0
@@ -8,8 +8,52 @@
   * Copyright (c) 2005-2007 XenSource Inc.
   */
 
+#ifdef __XEN__
+
+# include <xen/event.h>
+
+# include <asm/amd.h> /* cpu_has_amd_erratum() */
+# include <asm/processor.h> /* current_cpu_info */
+# include <asm/x86_emulate.h>
+# include <asm/xstate.h>
+
+/* Avoid namespace pollution. */
+# undef cmpxchg
+# undef cpuid
+# undef wbinvd
+
+# define cpu_has_amd_erratum(nr) \
+         cpu_has_amd_erratum(&current_cpu_data, AMD_ERRATUM_##nr)
+
+#else /* !__XEN__ */
+
+/* See gcc bug 100680, but here don't bother making this version dependent. */
+# define gcc11_wrap(x) ({                  \
+     unsigned long x_;                     \
+     __asm__ ( "" : "=g" (x_) : "0" (x) ); \
+     (typeof(x))x_;                        \
+})
+
+# define cpu_has_amd_erratum(nr) 0
+# define cpu_has_mpx false
+# define read_bndcfgu() 0
+# define xstate_set_init(what)
+
+/* For generic assembly code: use macros to define operation/operand sizes. */
+# ifdef __i386__
+#  define __OS          "l"  /* Operation Suffix */
+#  define __OP          "e"  /* Operand Prefix */
+# else
+#  define __OS          "q"  /* Operation Suffix */
+#  define __OP          "r"  /* Operand Prefix */
+# endif
+
+#endif /* __XEN__ */
+
  #include "private.h"
 
+#ifndef X86EMUL_NO_MMX
+
  /*
   * The next two tables are indexed by high opcode extension byte (the one
   * that's encoded like an immediate) nibble, with each table element then
@@ -45,9 +89,15 @@ static const uint16_t _3dnow_ext_table[1
      [0xb] = (1 << 0xb) /* pswapd */,
  };
 
+#endif /* !X86EMUL_NO_MMX */
+
+#ifndef X86EMUL_NO_SIMD
+
  /* Shift values between src and dst sizes of pmov{s,z}x{b,w,d}{w,d,q}. */
  static const uint8_t pmov_convert_delta[] = { 1, 2, 3, 1, 2, 1 };
 
Quoted 8 lines

xen/arch/x86/x86_emulate/x86_emulate.c static const uint16_t _3dnow_ext_table[1 · line 103

Quoted 6 lines
xen/arch/x86/x86_emulate/x86_emulate.c +2 -0
+#endif /* !X86EMUL_NO_SIMD */
+
  static const uint8_t sse_prefix[] = { 0x66, 0xf3, 0xf2 };
 
  #ifdef __x86_64__

Thanks. May I ask, though, that you reduce reply context in such cases? Every reader needs to scroll through the entire original mail just to find the single line at the bottom. See how others do this, e.g.
https://lists.xen.org/archives/html/xen-devel/2026-07/msg00139.html
https://lists.xen.org/archives/html/xen-devel/2026-06/msg01595.html
https://lists.xen.org/archives/html/xen-devel/2026-06/msg01493.html

Thanks, Jan

#5 lore raw

Re: [PATCH v1.1 1/2] x86emul: drop wrapper C file

Le 16/07/2026 à 09:16, Jan Beulich a écrit :

Quoted 18 lines · Teddy Astie
Quoted 17 lines

Le 14/07/2026 à 16:00, Jan Beulich a écrit :

Quoted 16 lines

Move the little bit that's still left in x86/x86_emulate.c into a __XEN__ conditional in x86/x86_emulate/x86_emulate.c. Move what are roughly the test/fuzzing harness counterparts from there into the corresponding #else.

Interestingly more recent gcc takes issue with three static const arrays which are unused when HVM=n (noticeable in particule in the shim build). Apparently such are diagnosed only when present in the top-level file, but not when living in an #include-d one.

---
v1.1: Address HVM=n build issues. See

        https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2674985992.

...

Quoted 4 lines
Quoted 3 lines
Quoted 1 line
Quoted 9 lines

Thanks. May I ask, though, that you reduce reply context in such cases? Every reader needs to scroll through the entire original mail just to find the single line at the bottom. See how others do this, e.g.
https://lists.xen.org/archives/html/xen-devel/2026-07/msg00139.html
https://lists.xen.org/archives/html/xen-devel/2026-06/msg01595.html
https://lists.xen.org/archives/html/xen-devel/2026-06/msg01493.html

Thanks, Jan

Ok, will do.

Teddy

#6 lore raw
In reply to Jan Beulich
Quoted 4 lines · Jan Beulich

1: x86emul: drop wrapper C file
2: x86: put x86_emulate/ early in $(obj-y)

Possibly the latter patch could also be folded into the former one.

They're better split IMO.

Both Acked-by: Andrew Cooper <[email protected]>

#7 lore raw

PATCH 2/2 x86: put x86_emulate/ early in $(obj-y)

In reply to Jan Beulich

... such that in parallel builds make would schedule it early.

xen/arch/x86/Makefile +4 -1
@@ -1,3 +1,7 @@
+# Put this ahead of the sorted list below, as it takes long to build and hence
+# we'd like parallel make to schedule its building early.
+obj-y += x86_emulate/
+
 obj-y += acpi/
 obj-y += boot/
 obj-y += cpu/
@@ -9,7 +13,6 @@ obj-y += lib/
 obj-y += mm/
 obj-$(CONFIG_PV) += pv/
 obj-y += x86_64/
-obj-y += x86_emulate/
 
 obj-y += alternative.o
 obj-y += apic.o
Reviewed-by on v1 2/2
#8 lore raw

Re: [PATCH 2/2] x86: put x86_emulate/ early in $(obj-y)

Le 09/07/2026 à 14:00, Jan Beulich a écrit :

Quoted 17 lines

... such that in parallel builds make would schedule it early.

xen/arch/x86/Makefile +4 -0
@@ -1,3 +1,7 @@
+# Put this ahead of the sorted list below, as it takes long to build and hence
+# we'd like parallel make to schedule its building early.
+obj-y += x86_emulate/
+
  obj-y += acpi/
  obj-y += boot/
  obj-y += cpu/

xen/arch/x86/Makefile obj-y += lib/ · line 18

Quoted 7 lines
xen/arch/x86/Makefile +0 -1
@@ -9,7 +13,6 @@ obj-y += lib/
  obj-y += mm/
  obj-$(CONFIG_PV) += pv/
  obj-y += x86_64/
-obj-y += x86_emulate/
 
  obj-y += alternative.o
  obj-y += apic.o