From: Keir Fraser Date: Sat, 30 Apr 2011 08:48:16 +0000 (+0100) Subject: x86: Remove TRAP_INSTR from the public headers. X-Git-Tag: 4.2.0-rc1~2299 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c95aea868025733eccd73f2272e9ca87efc9efe9;p=xen.git x86: Remove TRAP_INSTR from the public headers. Direct hypercall traps (rather than using the hypercall transfer page) was long obsolete even when TRAP_INSTR was deprecated in the API headers. No current guest will be, or should be, using TRAP_INSTR. Signed-off-by: Keir Fraser --- diff --git a/xen/include/public/arch-x86/xen-x86_32.h b/xen/include/public/arch-x86/xen-x86_32.h index 82a7f5b776..de584ea8af 100644 --- a/xen/include/public/arch-x86/xen-x86_32.h +++ b/xen/include/public/arch-x86/xen-x86_32.h @@ -36,15 +36,6 @@ * Clobbered: Argument registers (e.g., 2-arg hypercall clobbers %ebx,%ecx) */ -#if __XEN_INTERFACE_VERSION__ < 0x00030203 -/* - * Legacy hypercall interface: - * As above, except the entry sequence to the hypervisor is: - * mov $hypercall-number*32,%eax ; int $0x82 - */ -#define TRAP_INSTR "int $0x82" -#endif - /* * These flat segments are in the Xen-private section of every GDT. Since these * are also present in the initial GDT, many OSes will be able to avoid diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h index 1e54cf92a7..0bdd86825d 100644 --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -36,16 +36,6 @@ * Clobbered: argument registers (e.g., 2-arg hypercall clobbers %rdi,%rsi) */ -#if __XEN_INTERFACE_VERSION__ < 0x00030203 -/* - * Legacy hypercall interface: - * As above, except the entry sequence to the hypervisor is: - * mov $hypercall-number*32,%eax ; syscall - * Clobbered: %rcx, %r11, argument registers (as above) - */ -#define TRAP_INSTR "syscall" -#endif - /* * 64-bit segment selectors * These flat segments are in the Xen-private section of every GDT. Since these