[Qemu-devel] [6093] consolidate definition for tap script and smb support

[Aurelien Jarno]

Revision: 6093
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6093
Author:   aurel32
Date:     2008-12-18 22:43:48 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
consolidate definition for tap script and smb support

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 Marcelo Arenas Belon)

Modified Paths:
--------------
    trunk/net.c
    trunk/net.h
    trunk/vl.c

Modified: trunk/net.c
===================================================================
--- trunk/net.c 2008-12-18 22:43:40 UTC (rev 6092)
+++ trunk/net.c 2008-12-18 22:43:48 UTC (rev 6093)
@@ -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;
 
 /***********************************************************/

Modified: trunk/net.h
===================================================================
--- trunk/net.h 2008-12-18 22:43:40 UTC (rev 6092)
+++ trunk/net.h 2008-12-18 22:43:48 UTC (rev 6093)
@@ -85,4 +85,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

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-12-18 22:43:40 UTC (rev 6092)
+++ trunk/vl.c  2008-12-18 22:43:48 UTC (rev 6093)
@@ -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