From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L494h-0004dR-Ae
	for qemu-devel@nongnu.org; Sun, 23 Nov 2008 02:08:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L494g-0004cV-H9
	for qemu-devel@nongnu.org; Sun, 23 Nov 2008 02:08:06 -0500
Received: from [199.232.76.173] (port=53892 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L494g-0004cM-AW
	for qemu-devel@nongnu.org; Sun, 23 Nov 2008 02:08:06 -0500
Received: from sajino.sajinet.com.pe ([76.74.239.193]:46150)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <carenas@sajinet.com.pe>) id 1L494g-0004dK-1e
	for qemu-devel@nongnu.org; Sun, 23 Nov 2008 02:08:06 -0500
Date: Sun, 23 Nov 2008 07:08:04 +0000
From: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Message-ID: <20081123070804.GA373@sajinet.com.pe>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="82I3+IH0IqGh5yIs"
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] consolidate definition for tap script and smb
	support
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


--82I3+IH0IqGh5yIs
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

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

---

--82I3+IH0IqGh5yIs
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="qemu-consolidate-net-define.patch"

Index: vl.c
===================================================================
--- vl.c	(revision 5781)
+++ vl.c	(working copy)
@@ -147,14 +147,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 5781)
+++ 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 5781)
+++ 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

--82I3+IH0IqGh5yIs--