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

Re: [libvirt] [PATCH] Add a define for NFS_SUPER_MAGIC



On Wed, Mar 03, 2010 at 11:44:51AM -0500, Chris Lalancette wrote:
> Commit 3c12a67b766cce51b47861ccde2be41de369f832 added
> a dependency on the NFS_SUPER_MAGIC macro, which is
> defined in linux/magic.h.  Unfortunately linux/magic.h
> is not available in RHEL-5, and causes a compile error.
> Just define it locally, since this is something that
> can't change.
> 
> Signed-off-by: Chris Lalancette <clalance redhat com>
> ---
>  src/qemu/qemu_driver.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index ccb9ef9..efc3be1 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -49,8 +49,10 @@
>  
>  #ifdef __linux__
>  #include <sys/vfs.h>
> -#include <linux/magic.h>
> -#endif
> +#ifndef NFS_SUPER_MAGIC
> +#define NFS_SUPER_MAGIC 0x6969
> +#endif /* NFS_SUPER_MAGIC */
> +#endif /* __linux__ */
>  
>  #include "virterror_internal.h"
>  #include "logging.h"

ACK,

Daniel

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


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