ia64/xen-unstable

changeset 9971:ada6dba78b6e

[IA64] xen: hypercall no clean up

use __HYERCALL_arch_0 for dom0vp hypercall.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Tue May 09 11:33:29 2006 -0600 (2006-05-09)
parents 32db03c64a12
children 8ac86f96879f
files xen/arch/ia64/xen/hypercall.c xen/include/public/arch-ia64.h
line diff
     1.1 --- a/xen/arch/ia64/xen/hypercall.c	Tue May 09 11:32:08 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/hypercall.c	Tue May 09 11:33:29 2006 -0600
     1.3 @@ -71,7 +71,33 @@ hypercall_t ia64_hypercall_table[] =
     1.4  	(hypercall_t)do_ni_hypercall,		/*  */				/* 30 */
     1.5  	(hypercall_t)do_ni_hypercall,		/*  */
     1.6  	(hypercall_t)do_event_channel_op,
     1.7 -	(hypercall_t)do_physdev_op
     1.8 +	(hypercall_t)do_physdev_op,
     1.9 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.10 +	(hypercall_t)do_ni_hypercall,		/*  */                  /* 35 */
    1.11 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.12 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.13 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.14 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.15 +	(hypercall_t)do_ni_hypercall,		/*  */                  /* 40 */
    1.16 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.17 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.18 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.19 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.20 +	(hypercall_t)do_ni_hypercall,		/*  */                  /* 45 */
    1.21 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.22 +	(hypercall_t)do_ni_hypercall,		/*  */
    1.23 +#ifdef CONFIG_XEN_IA64_DOM0_VP
    1.24 +	(hypercall_t)do_dom0vp_op,			/* dom0vp_op */
    1.25 +#else
    1.26 +	(hypercall_t)do_ni_hypercall,		/* arch_0 */
    1.27 +#endif
    1.28 +	(hypercall_t)do_ni_hypercall,		/* arch_1 */
    1.29 +	(hypercall_t)do_ni_hypercall,		/* arch_2 */            /* 50 */
    1.30 +	(hypercall_t)do_ni_hypercall,		/* arch_3 */
    1.31 +	(hypercall_t)do_ni_hypercall,		/* arch_4 */
    1.32 +	(hypercall_t)do_ni_hypercall,		/* arch_5 */
    1.33 +	(hypercall_t)do_ni_hypercall,		/* arch_6 */
    1.34 +	(hypercall_t)do_ni_hypercall		/* arch_7 */            /* 55 */
    1.35  	};
    1.36  
    1.37  uint32_t nr_hypercalls =
    1.38 @@ -91,12 +117,6 @@ xen_hypercall (struct pt_regs *regs)
    1.39  			regs->r18,
    1.40  			regs->r19);
    1.41  	else
    1.42 -#ifdef CONFIG_XEN_IA64_DOM0_VP
    1.43 -	if (cmd ==  __HYPERVISOR_ia64_dom0vp_op) 
    1.44 -		regs->r8 = do_dom0vp_op(regs->r14, regs->r15, regs->r16,
    1.45 -		                        regs->r17, regs->r18);
    1.46 -	else
    1.47 -#endif
    1.48  		regs->r8 = -ENOSYS;
    1.49  
    1.50  	return 1;
     2.1 --- a/xen/include/public/arch-ia64.h	Tue May 09 11:32:08 2006 -0600
     2.2 +++ b/xen/include/public/arch-ia64.h	Tue May 09 11:33:29 2006 -0600
     2.3 @@ -329,10 +329,7 @@ typedef struct vcpu_guest_context {
     2.4  DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
     2.5  
     2.6  // dom0 vp op
     2.7 -#define __HYPERVISOR_ia64_dom0vp_op     256 // XXX sufficient large
     2.8 -                                            // TODO
     2.9 -                                            // arch specific hypercall
    2.10 -                                            // number conversion
    2.11 +#define __HYPERVISOR_ia64_dom0vp_op     __HYPERVISOR_arch_0
    2.12  #define IA64_DOM0VP_ioremap             0       // map io space in machine
    2.13                                                  // address to dom0 physical
    2.14                                                  // address space.