# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID ada6dba78b6efd06a2e4923df0fdc816688436ee
# Parent 32db03c64a12e6e50f80755b061e079ad4fc8718
[IA64] xen: hypercall no clean up
use __HYERCALL_arch_0 for dom0vp hypercall.
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
xen/arch/ia64/xen/hypercall.c | 34 +++++++++++++++++++++++++++-------
xen/include/public/arch-ia64.h | 5 +----
2 files changed, 28 insertions(+), 11 deletions(-)
diff -r 32db03c64a12 -r ada6dba78b6e xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c Tue May 09 11:32:08 2006 -0600
+++ b/xen/arch/ia64/xen/hypercall.c Tue May 09 11:33:29 2006 -0600
@@ -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 32db03c64a12 -r ada6dba78b6e xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h Tue May 09 11:32:08 2006 -0600
+++ b/xen/include/public/arch-ia64.h Tue May 09 11:33:29 2006 -0600
@@ -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.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home