[MINIOS] Update __XEN_INTERFACE_VERSION__

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 01176a625f396e3c51e597eb6919139058f5942d..f042d1a18fb7c0a3a186a3d038f319e691bc6563 100644 (file)
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -7,7 +7,7 @@ include $(XEN_ROOT)/Config.mk
 # Set TARGET_ARCH
 override TARGET_ARCH     := $(XEN_TARGET_ARCH)
 
-XEN_INTERFACE_VERSION := 0x00030203
+XEN_INTERFACE_VERSION := 0x00030204
 
 # NB. '-Wcast-qual' is nasty, so I omitted it.
 CFLAGS := -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format

diff --git a/extras/mini-os/include/hypervisor.h b/extras/mini-os/include/hypervisor.h
index e3f149e35f650339a0e3b46b2c55340320ed18b8..1b7ea72ac3402823649c3f202e02d7e8e0e198fa 100644 (file)
--- a/extras/mini-os/include/hypervisor.h
+++ b/extras/mini-os/include/hypervisor.h
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <xen/xen.h>
-#include <xen/dom0_ops.h>
 #if defined(__i386__)
 #include <hypercall-x86_32.h>
 #elif defined(__x86_64__)

diff --git a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
index 5f8b51f872847d22698cd51e8b031ad1fe09f345..9c41c946b2513f4b41738bfa3cf90a77d55c9a35 100644 (file)
--- a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
+++ b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
@@ -181,14 +181,6 @@ HYPERVISOR_set_timer_op(
        return _hypercall2(long, set_timer_op, timeout_lo, timeout_hi);
 }
 
-static inline int
-HYPERVISOR_dom0_op(
-       dom0_op_t *dom0_op)
-{
-       dom0_op->interface_version = DOM0_INTERFACE_VERSION;
-       return _hypercall1(int, dom0_op, dom0_op);
-}
-
 static inline int
 HYPERVISOR_set_debugreg(
        int reg, unsigned long value)

diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
index 2d2904a218cbc8b16b1c93f6be5c8dc880a93939..3a4aa049e80285750a65713ec7582805ad6902a1 100644 (file)
--- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
+++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
@@ -183,14 +183,6 @@ HYPERVISOR_set_timer_op(
        return _hypercall1(long, set_timer_op, timeout);
 }
 
-static inline int
-HYPERVISOR_dom0_op(
-       dom0_op_t *dom0_op)
-{
-       dom0_op->interface_version = DOM0_INTERFACE_VERSION;
-       return _hypercall1(int, dom0_op, dom0_op);
-}
-
 static inline int
 HYPERVISOR_set_debugreg(
        int reg, unsigned long value)