[libvirt] [PATCH] Fix compilation of libvirt against xen-unstable

[Daniel Veillard]

On Fri, Nov 13, 2009 at 03:04:01PM -0700, Jim Fehlig wrote:
> libvirt fails to compile against current xen-unstable.  This patch fixes it.
> 
> Regards,
> Jim
> 

> commit d08067f04248c7f1bd797f4401308ea9a8971f1b
> Author: Jim Fehlig <jfehlig at novell.com>
> Date:   Fri Nov 13 14:44:56 2009 -0700
> 
>     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 6d8bfdd..843102a 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;


  Okay, thanks for fixing this !

   applied and pushed,

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/