xen: work with xen 4.0.1 headers

* src/xen/xen_driver.h (includes): Include main xen headers
here...
* src/xen/xs_internal.c (includes): ...rather than in just one of
the sub-drivers.

diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index 16d22f19805bc92dca4e9ef516344b622d3afc3b..6af613236f07f3215e3aa96346b1fee7d3f16730 100644 (file)
--- a/src/xen/xen_driver.h
+++ b/src/xen/xen_driver.h
@@ -29,6 +29,8 @@
 #  include <winsock2.h>
 # endif
 
+# include <xen/xen.h>
+
 /* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
  * headers.  Its semantic was retained with XEN_LEGACY_MAX_VCPUS.
  * Ensure MAX_VIRT_CPUS is defined accordingly.

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index a9817b10ea3c1f68042e9af661558e3a56db2c8d..eba1b958084b825c4b4b57362ffef629c7d3cf5e 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -22,7 +22,6 @@
 
 #include <xen/dom0_ops.h>
 #include <xen/version.h>
-#include <xen/xen.h>
 
 #include <xs.h>