Re: [Qemu-devel] [RESEND][PATCH] consolidate definition for tap script and smb support

[Aurelien Jarno]

On Mon, Dec 15, 2008 at 06:44:49AM +0000, Carlo Marcelo Arenas Belon wrote:
> This is an updated patch to consolidate the handling of the location of
> the "net" scripts to easy patching (as used in kvm) and which was
> originally presented in :
> 
>   http://lists.gnu.org/archive/html/qemu-devel/2008-11/msg01218.html
> 
> since the introduction of net.c in r5581 there had been 2 places where
> the location of the TAP helper scripts and SMB daemon are defined.
> 
> the following patch move those definitions to net.h so they are accessible
> for net.c and vl.c but defined only once

Thanks, applied.

> Index: vl.c
> ===================================================================
> --- vl.c      (revision 6041)
> +++ vl.c      (working copy)
> @@ -149,14 +149,6 @@
>  
>  #include "exec-all.h"
>  
> -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
> -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
> -#ifdef __sun__
> -#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
> -#else
> -#define SMBD_COMMAND "/usr/sbin/smbd"
> -#endif
> -
>  //#define DEBUG_UNUSED_IOPORT
>  //#define DEBUG_IOPORT
>  //#define DEBUG_NET
> Index: net.c
> ===================================================================
> --- net.c     (revision 6041)
> +++ net.c     (working copy)
> @@ -120,14 +120,6 @@
>  #define memalign(align, size) malloc(size)
>  #endif
>  
> -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
> -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
> -#ifdef __sun__
> -#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
> -#else
> -#define SMBD_COMMAND "/usr/sbin/smbd"
> -#endif
> -
>  static VLANState *first_vlan;
>  
>  /***********************************************************/
> Index: net.h
> ===================================================================
> --- net.h     (revision 6041)
> +++ net.h     (working copy)
> @@ -78,4 +78,12 @@
>  int slirp_is_inited(void);
>  void net_client_check(void);
>  
> +#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
> +#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
> +#ifdef __sun__
> +#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
> +#else
> +#define SMBD_COMMAND "/usr/sbin/smbd"
>  #endif
> +
> +#endif


-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   address@hidden         | address@hidden
   `-    people.debian.org/~aurel32 | www.aurel32.net