aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-03-20 08:40:18 +0000
committerKeir Fraser <keir.fraser@citrix.com>2009-03-20 08:40:18 +0000
commit15ab9b2d3f36bdf3f64454dd8f0d3c2d224c8c1f (patch)
tree75ed745e230bc01e6c4633cc69a8d763d5e31793
parentf13bb77a496cf646c8f7ae87f74ff201450d3d21 (diff)
downloadxen-15ab9b2d3f36bdf3f64454dd8f0d3c2d224c8c1f.tar.gz
xen-15ab9b2d3f36bdf3f64454dd8f0d3c2d224c8c1f.tar.bz2
xen-15ab9b2d3f36bdf3f64454dd8f0d3c2d224c8c1f.zip
tmem: Placeholder hypercall.
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r--xen/arch/x86/x86_32/entry.S2
-rw-r--r--xen/arch/x86/x86_64/compat/entry.S2
-rw-r--r--xen/arch/x86/x86_64/entry.S2
-rw-r--r--xen/common/memory.c11
4 files changed, 17 insertions, 0 deletions
diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index 8a08617981..764d3290e1 100644
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -703,6 +703,7 @@ ENTRY(hypercall_table)
.long do_sysctl /* 35 */
.long do_domctl
.long do_kexec_op
+ .long do_tmem_op
.rept __HYPERVISOR_arch_0-((.-hypercall_table)/4)
.long do_ni_hypercall
.endr
@@ -750,6 +751,7 @@ ENTRY(hypercall_args_table)
.byte 1 /* do_sysctl */ /* 35 */
.byte 1 /* do_domctl */
.byte 2 /* do_kexec_op */
+ .byte 1 /* do_tmem_op */
.rept __HYPERVISOR_arch_0-(.-hypercall_args_table)
.byte 0 /* do_ni_hypercall */
.endr
diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index f08c180fd9..7efedc903f 100644
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -408,6 +408,7 @@ ENTRY(compat_hypercall_table)
.quad do_sysctl /* 35 */
.quad do_domctl
.quad compat_kexec_op
+ .quad do_tmem_op
.rept __HYPERVISOR_arch_0-((.-compat_hypercall_table)/8)
.quad compat_ni_hypercall
.endr
@@ -455,6 +456,7 @@ ENTRY(compat_hypercall_args_table)
.byte 1 /* do_sysctl */ /* 35 */
.byte 1 /* do_domctl */
.byte 2 /* compat_kexec_op */
+ .byte 1 /* do_tmem_op */
.rept __HYPERVISOR_arch_0-(.-compat_hypercall_args_table)
.byte 0 /* compat_ni_hypercall */
.endr
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 96431ad099..dce286ef3f 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -692,6 +692,7 @@ ENTRY(hypercall_table)
.quad do_sysctl /* 35 */
.quad do_domctl
.quad do_kexec_op
+ .quad do_tmem_op
.rept __HYPERVISOR_arch_0-((.-hypercall_table)/8)
.quad do_ni_hypercall
.endr
@@ -739,6 +740,7 @@ ENTRY(hypercall_args_table)
.byte 1 /* do_sysctl */ /* 35 */
.byte 1 /* do_domctl */
.byte 2 /* do_kexec */
+ .byte 1 /* do_tmem_op */
.rept __HYPERVISOR_arch_0-(.-hypercall_args_table)
.byte 0 /* do_ni_hypercall */
.endr
diff --git a/xen/common/memory.c b/xen/common/memory.c
index 0dd2b9282f..55e2d8a046 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -560,6 +560,17 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg)
return rc;
}
+/* Temporary placeholder. */
+int do_tmem_op(void *tmem_op)
+{
+ static bool_t warned;
+
+ if ( !test_and_set_bool(warned) )
+ printk("tmem: not implemented\n");
+
+ return -ENOSYS;
+}
+
/*
* Local variables:
* mode: C