[Xen-changelog] [xen-unstable] hvm: Fix merging error in hvm_op.h

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1283332649 -3600
# Node ID 0eb89b465e46cbc688bcce5f451e125c1650b353
# Parent  5b03813d8d6ea36e07dbde2b50887341476336ed
hvm: Fix merging error in hvm_op.h

A couple of new hvm_op commands were erroneously ifdef'ed to be
accessible only to the toolstack.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/include/public/hvm/hvm_op.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 5b03813d8d6e -r 0eb89b465e46 xen/include/public/hvm/hvm_op.h
--- a/xen/include/public/hvm/hvm_op.h   Wed Sep 01 10:17:16 2010 +0100
+++ b/xen/include/public/hvm/hvm_op.h   Wed Sep 01 10:17:29 2010 +0100
@@ -128,6 +128,8 @@ typedef struct xen_hvm_set_mem_type xen_
 typedef struct xen_hvm_set_mem_type xen_hvm_set_mem_type_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_mem_type_t);
 
+#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
+
 /* Hint from PV drivers for pagetable destruction. */
 #define HVMOP_pagetable_dying        9
 struct xen_hvm_pagetable_dying {
@@ -155,6 +157,4 @@ typedef struct xen_hvm_xentrace xen_hvm_
 typedef struct xen_hvm_xentrace xen_hvm_xentrace_t;
 DEFINE_XEN_GUEST_HANDLE(xen_hvm_xentrace_t);
 
-#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
-
 #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */

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