# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID 94bb302ee8d15ff55b45262a0db62eabd5c570dc
# Parent  f9260e6a64bf881b9d569a9bbd1e6efc67a2c045
use __HYERCALL_arch_0 for dom0vp hypercall.
PATCHNAME: hypercall_dom0vp_op_as_arch_0

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r f9260e6a64bf -r 94bb302ee8d1 xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c	Tue May  9 10:51:28 2006 +0900
+++ b/xen/arch/ia64/xen/hypercall.c	Tue May  9 10:56:01 2006 +0900
@@ -71,7 +71,33 @@ hypercall_t ia64_hypercall_table[] =
 	(hypercall_t)do_ni_hypercall,		/*  */				/* 30 */
 	(hypercall_t)do_ni_hypercall,		/*  */
 	(hypercall_t)do_event_channel_op,
-	(hypercall_t)do_physdev_op
+	(hypercall_t)do_physdev_op,
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */                  /* 35 */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */                  /* 40 */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */                  /* 45 */
+	(hypercall_t)do_ni_hypercall,		/*  */
+	(hypercall_t)do_ni_hypercall,		/*  */
+#ifdef CONFIG_XEN_IA64_DOM0_VP
+	(hypercall_t)do_dom0vp_op,			/* dom0vp_op */
+#else
+	(hypercall_t)do_ni_hypercall,		/* arch_0 */
+#endif
+	(hypercall_t)do_ni_hypercall,		/* arch_1 */
+	(hypercall_t)do_ni_hypercall,		/* arch_2 */            /* 50 */
+	(hypercall_t)do_ni_hypercall,		/* arch_3 */
+	(hypercall_t)do_ni_hypercall,		/* arch_4 */
+	(hypercall_t)do_ni_hypercall,		/* arch_5 */
+	(hypercall_t)do_ni_hypercall,		/* arch_6 */
+	(hypercall_t)do_ni_hypercall		/* arch_7 */            /* 55 */
 	};
 
 uint32_t nr_hypercalls =
@@ -91,12 +117,6 @@ xen_hypercall (struct pt_regs *regs)
 			regs->r18,
 			regs->r19);
 	else
-#ifdef CONFIG_XEN_IA64_DOM0_VP
-	if (cmd ==  __HYPERVISOR_ia64_dom0vp_op) 
-		regs->r8 = do_dom0vp_op(regs->r14, regs->r15, regs->r16,
-		                        regs->r17, regs->r18);
-	else
-#endif
 		regs->r8 = -ENOSYS;
 
 	return 1;
diff -r f9260e6a64bf -r 94bb302ee8d1 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h	Tue May  9 10:51:28 2006 +0900
+++ b/xen/include/public/arch-ia64.h	Tue May  9 10:56:01 2006 +0900
@@ -329,10 +329,7 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_guest_conte
 DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
 
 // dom0 vp op
-#define __HYPERVISOR_ia64_dom0vp_op     256 // XXX sufficient large
-                                            // TODO
-                                            // arch specific hypercall
-                                            // number conversion
+#define __HYPERVISOR_ia64_dom0vp_op     __HYPERVISOR_arch_0
 #define IA64_DOM0VP_ioremap             0       // map io space in machine
                                                 // address to dom0 physical
                                                 // address space.