svn commit: r188683 - in user/dfr/xenhvm/7/sys/xen/interface: arch-x86 hvm

[Doug Rabson]

Author: dfr
Date: Mon Feb 16 17:13:00 2009
New Revision: 188683
URL: http://svn.freebsd.org/changeset/base/188683

Log:
  Diff reduction with user/dfr/xenhvm/6

Modified:
  user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h
  user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h

Modified: user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h	Mon Feb 16 17:11:34 2009	(r188682)
+++ user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h	Mon Feb 16 17:13:00 2009	(r188683)
@@ -32,7 +32,8 @@
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef struct { type *p; } __guest_handle_ ## name
 #else
-#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
+#error "using old handle"
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type)  \
     typedef type * __guest_handle_ ## name
 #endif
 
@@ -50,7 +51,7 @@
 #if defined(__i386__)
 #include <xen/interface/arch-x86/xen-x86_32.h>
 #elif defined(__x86_64__)
-#include "xen-x86_64.h"
+#include <xen/interface/arch-x86/xen-x86_64.h>
 #endif
 
 #ifndef __ASSEMBLY__

Modified: user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h	Mon Feb 16 17:11:34 2009	(r188682)
+++ user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h	Mon Feb 16 17:13:00 2009	(r188683)
@@ -21,7 +21,7 @@
 #ifndef __XEN_PUBLIC_HVM_PARAMS_H__
 #define __XEN_PUBLIC_HVM_PARAMS_H__
 
-#include "hvm_op.h"
+#include <xen/interface/hvm/hvm_op.h>
 
 /*
  * Parameter space for HVMOP_{set,get}_param.