From: Jim Fehlig <jfehlig@novell.com>
Date: Sun, 15 Nov 2009 08:40:36 +0000 (+0100)
Subject: Fix compilation of libvirt against xen-unstable
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8d567fbcd34cdf755e1b84b2ae9e0dc2ce4e217e;p=libvirt.git

Fix compilation of libvirt against xen-unstable

* src/xen/xen_hypervisor.c: xen-unstable changeset 19788 removed
  MAX_VIRT_CPUS from public headers, breaking compilation of libvirt
  on -unstable.  Its semanitc was retained with XEN_LEGACY_MAX_VCPUS.
  Ensure MAX_VIRT_CPUS is defined accordingly.
---

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 6d8bfdd517..843102a723 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -109,6 +109,14 @@ typedef privcmd_hypercall_t hypercall_t;
 #define SYS_IFACE_MIN_VERS_NUMA 4
 #endif
 
+/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
+ * headers.  Its semanitc was retained with XEN_LEGACY_MAX_VCPUS.
+ * Ensure MAX_VIRT_CPUS is defined accordingly.
+ */
+#if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS)
+#define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS
+#endif
+
 static int xen_ioctl_hypercall_cmd = 0;
 static int initialized = 0;
 static int in_init = 0;