32-on-64 sched ops
RFC PATCH 15/17 32-on-64 sched ops
xen/arch/x86/x86_64/compat/entry.S +7 -2
@@ -276,13 +276,18 @@ CFIX14: .quad CFLT14,CFIX14 .previous +compat_arch_sched_op: + # Ensure we return success even if we return via schedule_tail() + xorl %eax,%eax + GET_GUEST_REGS(%r10) + movl %eax,UREGS_rax(%r10) + jmp compat_sched_op + .section .rodata, "a", @progbits #define compat_platform_op domain_crash_synchronous -#define compat_set_timer_op domain_crash_synchronous #define compat_grant_table_op domain_crash_synchronous #define compat_acm_op domain_crash_synchronous -#define compat_arch_sched_op domain_crash_synchronous #define compat_xenoprof_op domain_crash_synchronous #define compat_sysctl domain_crash_synchronous #define compat_domctl domain_crash_synchronous
xen/common/Makefile +5 -0
@@ -34,3 +34,8 @@ subdir-$(CONFIG_COMPAT) += compat # Object file contains changeset and compiler information. version.o: $(BASEDIR)/include/xen/compile.h + +ifeq ($(CONFIG_COMPAT),y) +# extra dependencies +schedule.o: compat/schedule.c +endif
xen/common/compat/schedule.c new file +51 -0
51 lines not on this page · raw message
xen/common/schedule.c +15 -2
@@ -13,6 +13,7 @@* */ +#ifndef COMPAT #include <xen/config.h> #include <xen/init.h> #include <xen/lib.h>
@@ -366,9 +367,13 @@ long do_sched_op_compat(int cmd, unsigne return ret; } -long do_sched_op (int cmd,XEN_GUEST_HANDLE (void ) arg) +typedef long ret_t ; + +#endif /* !COMPAT */ + +ret_t do_sched_op (int cmd,XEN_GUEST_HANDLE (void ) arg) { -long ret =0 ; +ret_t ret =0 ;switch ( cmd ) {
@@ -445,6 +450,8 @@ long do_sched_op(int cmd, XEN_GUEST_HANDreturn ret; } +#ifndef COMPAT +/* Per-domain one-shot-timer hypercall. */ long do_set_timer_op (s_time_t timeout) {
@@ -735,6 +742,12 @@ void dump_runq(unsigned char key) local_irq_restore(flags); } +#ifdef CONFIG_COMPAT +#include "compat/schedule.c" +#endif + +#endif /* !COMPAT */ +/* * Local variables: * mode: C
xen/include/xlat.lst +3 -0
@@ -25,4 +25,7 @@ ! memory_map memory.h ! memory_reservation memory.h ! translate_gpfn_list memory.h +! sched_poll sched.h +? sched_remote_shutdown sched.h +? sched_shutdown sched.h ! vcpu_runstate_info vcpu.h