Move new HVM-op definitions outside the tools-only #ifdef Signed-off-by: Tim Deegan diff -r 32c9a19ac98b xen/include/public/hvm/hvm_op.h --- a/xen/include/public/hvm/hvm_op.h Mon Aug 30 14:59:12 2010 +0100 +++ b/xen/include/public/hvm/hvm_op.h Tue Aug 31 11:36:31 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__ */