[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [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.
---

I'm waiting for an ACK before pushing this, but it sure seems
pretty trivial.  I don't know why the xen 4.0.1 headers of rawhide
are different from the xen 3.4.3 headers of Fedora 13 (translation:
something used to implicitly include xen/xen.h in the older headers,
but no longer does in the newer xen, but I didn't bother to figure
out where the inclusion chain differs).

Tested on F13 and rawhide; fixes the MAX_VIRT_CPUS undeclared issue
that was occurring on rawhide.

 src/xen/xen_driver.h  |    2 ++
 src/xen/xs_internal.c |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index 16d22f1..6af6132 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 a9817b1..eba1b95 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>

-- 
1.7.2.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]