[Xen-ia64-devel] [PATCH 2/2] fix pv-on-hvm: xcom_hcall.c

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1189593314 -32400
# Node ID 069fe21b4f904869ca8082720f02bc6eed1f82f9
# Parent  d650f254d544b16c31f025c3ab40c357153346e1
Minor fix of xcom_hcall.c for pv-on-hvm.
- compilation fix.
  hypercall.h shouldn't included directly. intead include hypervisor.h
- In RHEL4U4, insmod xen-platform-pci.ko failed with these patches.
  xen_platform_pci: Unknown symbol xencomm_arch_hypercall_suspend
  comment out xencomm_hypercall_suspend() because suspend hypercall isn't
  necessary for VTi domain.
PATCHNAME: fix_xcom_hcall_for_pv_on_hvm

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

diff -r d650f254d544 -r 069fe21b4f90 arch/ia64/xen/xcom_hcall.c
--- a/arch/ia64/xen/xcom_hcall.c        Tue Sep 11 15:15:22 2007 -0600
+++ b/arch/ia64/xen/xcom_hcall.c        Wed Sep 12 19:35:14 2007 +0900
@@ -39,7 +39,7 @@
 #include <xen/interface/hvm/params.h>
 #include <xen/interface/xenoprof.h>
 #include <xen/interface/vcpu.h>
-#include <asm/hypercall.h>
+#include <asm/hypervisor.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <asm/xen/xencomm.h>
@@ -483,6 +483,7 @@ xencomm_hypercall_hvm_op(int cmd, void *
 }
 EXPORT_SYMBOL_GPL(xencomm_hypercall_hvm_op);
 
+#ifndef CONFIG_VMX_GUEST
 int
 xencomm_hypercall_suspend(unsigned long srec)
 {
@@ -493,6 +494,7 @@ xencomm_hypercall_suspend(unsigned long 
        return xencomm_arch_hypercall_suspend(
                xencomm_map_no_alloc(&arg, sizeof(arg)));
 }
+#endif
 
 int
 xencomm_hypercall_xenoprof_op(int op, void *arg)


-- 
yamahata

Attachment: 210_069fe21b4f90_fix_xcom_hcall_for_pv_on_hvm.patch
Description: Text Data

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel