# HG changeset patch
# User Derek Murray <Derek.Murray@xxxxxxxxxxxx>
# Node ID 937624af9cede4ef73196985727d360be9dbc1d5
# Parent  469478194aef6e987f9281efbc0756749be6eb80
Made the definition of the HYPERVISOR_dom0_op function and the inclusion
of <xen/dom0_ops.h> conditional on __XEN_INTERFACE_VERSION__ being less
than or equal to 0x00030203. This is necessary in order to increment
__XEN_INTERFACE_VERSION__ to 0x00030204, which has been done in the Makefile.

Signed-off-by: Derek Murray <Derek.Murray@xxxxxxxxxxxx>

diff -r 469478194aef -r 937624af9ced extras/mini-os/Makefile
--- a/extras/mini-os/Makefile	Mon Dec 18 00:14:40 2006 +0000
+++ b/extras/mini-os/Makefile	Mon Dec 18 14:57:57 2006 +0000
@@ -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 -r 469478194aef -r 937624af9ced extras/mini-os/include/hypervisor.h
--- a/extras/mini-os/include/hypervisor.h	Mon Dec 18 00:14:40 2006 +0000
+++ b/extras/mini-os/include/hypervisor.h	Mon Dec 18 14:57:57 2006 +0000
@@ -15,7 +15,9 @@
 
 #include <types.h>
 #include <xen/xen.h>
+#if __XEN_INTERFACE_VERSION__ <= 0x00030203
 #include <xen/dom0_ops.h>
+#endif
 #if defined(__i386__)
 #include <hypercall-x86_32.h>
 #elif defined(__x86_64__)
diff -r 469478194aef -r 937624af9ced extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
--- a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h	Mon Dec 18 00:14:40 2006 +0000
+++ b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h	Mon Dec 18 14:57:57 2006 +0000
@@ -181,6 +181,7 @@ HYPERVISOR_set_timer_op(
 	return _hypercall2(long, set_timer_op, timeout_lo, timeout_hi);
 }
 
+#if __XEN_INTERFACE_VERSION__ <= 0x00030203
 static inline int
 HYPERVISOR_dom0_op(
 	dom0_op_t *dom0_op)
@@ -188,6 +189,7 @@ HYPERVISOR_dom0_op(
 	dom0_op->interface_version = DOM0_INTERFACE_VERSION;
 	return _hypercall1(int, dom0_op, dom0_op);
 }
+#endif
 
 static inline int
 HYPERVISOR_set_debugreg(
diff -r 469478194aef -r 937624af9ced extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
--- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h	Mon Dec 18 00:14:40 2006 +0000
+++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h	Mon Dec 18 14:57:57 2006 +0000
@@ -183,6 +183,7 @@ HYPERVISOR_set_timer_op(
 	return _hypercall1(long, set_timer_op, timeout);
 }
 
+#if __XEN_INTERFACE_VERSION__ <= 0x00030203
 static inline int
 HYPERVISOR_dom0_op(
 	dom0_op_t *dom0_op)
@@ -190,6 +191,7 @@ HYPERVISOR_dom0_op(
 	dom0_op->interface_version = DOM0_INTERFACE_VERSION;
 	return _hypercall1(int, dom0_op, dom0_op);
 }
+#endif
 
 static inline int
 HYPERVISOR_set_debugreg(