From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LC7CH-0005PE-O4 for qemu-devel@nongnu.org; Mon, 15 Dec 2008 01:44:53 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LC7CG-0005OQ-5q for qemu-devel@nongnu.org; Mon, 15 Dec 2008 01:44:53 -0500 Received: from [199.232.76.173] (port=51162 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LC7CF-0005ON-UG for qemu-devel@nongnu.org; Mon, 15 Dec 2008 01:44:51 -0500 Received: from sajino.sajinet.com.pe ([76.74.239.193]:56527) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LC7CF-0003uP-Ex for qemu-devel@nongnu.org; Mon, 15 Dec 2008 01:44:51 -0500 Date: Mon, 15 Dec 2008 06:44:49 +0000 From: Carlo Marcelo Arenas Belon Message-ID: <20081215064449.GA11206@sajinet.com.pe> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="2B/JsCI69OhZNC5r" Content-Disposition: inline Subject: [Qemu-devel] [RESEND][PATCH] consolidate definition for tap script and smb support 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 Cc: aliguori@us.ibm.com --2B/JsCI69OhZNC5r Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 Carlo --- --2B/JsCI69OhZNC5r Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="qemu-consolidate-net-define.patch" 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 --2B/JsCI69OhZNC5r--