From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LDRjR-0003vX-AL for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:52:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LDRjQ-0003v9-Ro for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:52:37 -0500 Received: from [199.232.76.173] (port=41232 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LDRjQ-0003v2-NC for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:52:36 -0500 Received: from hall.aurel32.net ([88.191.82.174]:58095) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LDRjQ-0000OK-43 for qemu-devel@nongnu.org; Thu, 18 Dec 2008 17:52:36 -0500 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1LDRjO-00083J-OV for qemu-devel@nongnu.org; Thu, 18 Dec 2008 23:52:34 +0100 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1LDRjO-000422-5h for qemu-devel@nongnu.org; Thu, 18 Dec 2008 23:52:34 +0100 Date: Thu, 18 Dec 2008 23:52:34 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [RESEND][PATCH] consolidate definition for tap script and smb support Message-ID: <20081218225234.GD12048@volta.aurel32.net> References: <20081215064449.GA11206@sajinet.com.pe> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20081215064449.GA11206@sajinet.com.pe> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net