[RESEND Patch V2 2/4] xen: synchronize include/xen/interface/xen.h with xen

2015-01-20 Thread Juergen Gross
The header include/xen/interface/xen.h doesn't contain all definitions
from Xen's version of that header. Update it accordingly.

Signed-off-by: Juergen Gross 
Reviewed-by: David Vrabel 
---
 arch/x86/xen/trace.c| 2 +-
 include/xen/interface/xen.h | 6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/x86/xen/trace.c b/arch/x86/xen/trace.c
index 520022d..8296cdf 100644
--- a/arch/x86/xen/trace.c
+++ b/arch/x86/xen/trace.c
@@ -29,7 +29,7 @@ static const char *xen_hypercall_names[] = {
N(vcpu_op),
N(set_segment_base),
N(mmuext_op),
-   N(acm_op),
+   N(xsm_op),
N(nmi_op),
N(sched_op),
N(callback_op),
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index f68719f..a483789 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -67,7 +67,7 @@
 #define __HYPERVISOR_vcpu_op  24
 #define __HYPERVISOR_set_segment_base 25 /* x86/64 only */
 #define __HYPERVISOR_mmuext_op26
-#define __HYPERVISOR_acm_op   27
+#define __HYPERVISOR_xsm_op   27
 #define __HYPERVISOR_nmi_op   28
 #define __HYPERVISOR_sched_op 29
 #define __HYPERVISOR_callback_op  30
@@ -75,7 +75,11 @@
 #define __HYPERVISOR_event_channel_op 32
 #define __HYPERVISOR_physdev_op   33
 #define __HYPERVISOR_hvm_op   34
+#define __HYPERVISOR_sysctl   35
+#define __HYPERVISOR_domctl   36
+#define __HYPERVISOR_kexec_op 37
 #define __HYPERVISOR_tmem_op  38
+#define __HYPERVISOR_xc_reserved_op   39 /* reserved for XenClient */
 
 /* Architecture-specific hypercall definitions. */
 #define __HYPERVISOR_arch_0   48
-- 
2.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[RESEND Patch V2 2/4] xen: synchronize include/xen/interface/xen.h with xen

2015-01-20 Thread Juergen Gross
The header include/xen/interface/xen.h doesn't contain all definitions
from Xen's version of that header. Update it accordingly.

Signed-off-by: Juergen Gross jgr...@suse.com
Reviewed-by: David Vrabel david.vra...@citrix.com
---
 arch/x86/xen/trace.c| 2 +-
 include/xen/interface/xen.h | 6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/x86/xen/trace.c b/arch/x86/xen/trace.c
index 520022d..8296cdf 100644
--- a/arch/x86/xen/trace.c
+++ b/arch/x86/xen/trace.c
@@ -29,7 +29,7 @@ static const char *xen_hypercall_names[] = {
N(vcpu_op),
N(set_segment_base),
N(mmuext_op),
-   N(acm_op),
+   N(xsm_op),
N(nmi_op),
N(sched_op),
N(callback_op),
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index f68719f..a483789 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -67,7 +67,7 @@
 #define __HYPERVISOR_vcpu_op  24
 #define __HYPERVISOR_set_segment_base 25 /* x86/64 only */
 #define __HYPERVISOR_mmuext_op26
-#define __HYPERVISOR_acm_op   27
+#define __HYPERVISOR_xsm_op   27
 #define __HYPERVISOR_nmi_op   28
 #define __HYPERVISOR_sched_op 29
 #define __HYPERVISOR_callback_op  30
@@ -75,7 +75,11 @@
 #define __HYPERVISOR_event_channel_op 32
 #define __HYPERVISOR_physdev_op   33
 #define __HYPERVISOR_hvm_op   34
+#define __HYPERVISOR_sysctl   35
+#define __HYPERVISOR_domctl   36
+#define __HYPERVISOR_kexec_op 37
 #define __HYPERVISOR_tmem_op  38
+#define __HYPERVISOR_xc_reserved_op   39 /* reserved for XenClient */
 
 /* Architecture-specific hypercall definitions. */
 #define __HYPERVISOR_arch_0   48
-- 
2.1.2

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/