aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Fehlig <jfehlig@novell.com>2009-11-15 09:40:36 +0100
committerDaniel Veillard <veillard@redhat.com>2009-11-15 09:40:36 +0100
commit8d567fbcd34cdf755e1b84b2ae9e0dc2ce4e217e (patch)
treee4f36423bda1bf01e13b32bc561a0caa5fd08338
parentFix probing for libpciaccess (diff)
downloadlibvirt-8d567fbcd34cdf755e1b84b2ae9e0dc2ce4e217e.tar.gz
libvirt-8d567fbcd34cdf755e1b84b2ae9e0dc2ce4e217e.tar.bz2
libvirt-8d567fbcd34cdf755e1b84b2ae9e0dc2ce4e217e.zip
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.
-rw-r--r--src/xen/xen_hypervisor.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 6d8bfdd51..843102a72 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;