Skip to contentSkip to conversation

consolidate definition for tap script and smb support

PATCH RESEND Applied Carlo Marcelo Arenas Belon 2 participants 2 messages Dec 15, 2008 – Dec 18, 2008

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 consolidate definition for tap script and smb support

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
---

vl.c +0 -8
Index: vl.c
===================================================================
@@ -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
net.c +0 -8
Index: net.c
===================================================================
@@ -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;
 
 /***********************************************************/
net.h +8 -0
Index: net.h
===================================================================
@@ -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
#1 lore raw
Quoted 11 lines · Carlo Marcelo Arenas Belon

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.

Quoted 55 lines

Index: vl.c
===================================================================

vl.c +0 -8
@@ -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 +0 -8
@@ -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 +8 -0
@@ -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
Signature · 4 lines
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   [email protected]         | [email protected]
   `-    people.debian.org/~aurel32 | www.aurel32.net