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.

Interestingly more recent gcc takes issue with three static const arrays
which are unused when HVM=n (noticeable in particular 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.

Requested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Teddy Astie <teddy.astie@vates.tech>
This commit is contained in:
Jan Beulich committed 2026-07-16 09:17:23 +02:00
1 parent bab8391805
commit c5b4ba49a3
5 files changed
+61 -66

No files matched your search

-21
View File
@@ -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;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.