32-on-64 platform ops
RFC PATCH 17/17 32-on-64 platform ops
xen/arch/x86/platform_hypercall.c +16 -3
@@ -23,11 +23,17 @@#include <asm/mtrr.h> #include "cpu/mtrr/mtrr.h" -long do_platform_op (XEN_GUEST_HANDLE (xen_platform_op_t) u_xenpf_op) +#ifndef COMPAT +typedef long ret_t ; +DEFINE_SPINLOCK (xenpf_lock); +#else +extern spinlock_t xenpf_lock; +#endif + +ret_t do_platform_op (XEN_GUEST_HANDLE (xen_platform_op_t) u_xenpf_op) { -long ret =0 ; +ret_t ret =0 ;struct xen_platform_op curop, *op = &curop; -static DEFINE_SPINLOCK (xenpf_lock);if ( !IS_PRIV (current->domain) )return -EPERM ;
@@ -112,8 +118,15 @@ long do_platform_op(XEN_GUEST_HANDLE(xencase XENPF_microcode_update: {extern int microcode_update (XEN_GUEST_HANDLE (void ),unsigned long len); +#ifndef COMPAT ret =microcode_update (op->u.microcode.data, op->u.microcode.length); +#else +XEN_GUEST_HANDLE (void ) data; + +guest_from_compat_handle (data, op->u.microcode.data); + ret =microcode_update (data, op->u.microcode.length); +#endif }break ;
xen/arch/x86/x86_64/Makefile +2 -0
@@ -6,6 +6,7 @@ obj-y += traps.o obj-$(CONFIG_COMPAT) += compat.o obj-$(CONFIG_COMPAT) += domain.o obj-$(CONFIG_COMPAT) += physdev.o +obj-$(CONFIG_COMPAT) += platform_hypercall.o ifeq ($(CONFIG_COMPAT),y) # extra dependencies
@@ -13,5 +14,6 @@ compat.o: ../compat.c entry.o: compat/entry.S mm.o: compat/mm.c physdev.o: ../physdev.c +platform_hypercall.o: ../platform_hypercall.c traps.o: compat/traps.c endif
xen/arch/x86/x86_64/compat/entry.S +0 -1
@@ -285,7 +285,6 @@ compat_arch_sched_op: .section .rodata, "a", @progbits -#define compat_platform_op domain_crash_synchronous #define compat_acm_op domain_crash_synchronous #define compat_xenoprof_op domain_crash_synchronous #define compat_sysctl domain_crash_synchronous
xen/arch/x86/x86_64/platform_hypercall.c new file +29 -0
@@ -0,0 +1,29 @@ +/****************************************************************************** +* platform_hypercall.c +* +*/ + +#include <xen/config.h> +#include <xen/types.h> +#include <compat/platform.h> + +DEFINE_XEN_GUEST_HANDLE (compat_platform_op_t); +#define xen_platform_op compat_platform_op +#define xen_platform_op_t compat_platform_op_t +#define do_platform_op (x) compat_platform_op(_##x) + +#define COMPAT +#define _XEN_GUEST_HANDLE (t) XEN_GUEST_HANDLE(t) +typedef int ret_t ; + +#include "../platform_hypercall.c" + +/* +* Local variables: +* mode: C +* c-set-style: "BSD" +* c-basic-offset: 4 +* tab-width: 4 +* indent-tabs-mode: nil +* End: +*/