From 8dd22be93e6418686a236815985a650a048caddc Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 1 Nov 2010 14:02:55 -0600
Subject: [PATCH] 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.
---
 src/xen/xen_driver.h  | 2 ++
 src/xen/xs_internal.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index 16d22f1980..6af613236f 100644
--- 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 a9817b10ea..eba1b95808 100644
--- 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>