]> xenbits.xensource.com Git - qemu-xen-4.6-testing.git/commitdiff
Do not redefine DEFAULT_NETWORK_{,DOWN_}SCRIPT if already defined eg by some config.h
authorIan Jackson <iwj@mariner.uk.xensource.com>
Thu, 12 Jun 2008 15:25:35 +0000 (16:25 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 12 Jun 2008 15:25:35 +0000 (16:25 +0100)
vl.c

diff --git a/vl.c b/vl.c
index ea933dd74c931d5d89c3bb9c6f01522bcd684943..17f501b07ab9181efe7ccf8a53d796a472971c27 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -133,8 +133,10 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #include "exec-all.h"
 
+#ifndef DEFAULT_NETWORK_SCRIPT
 #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
+#endif
 #ifdef __sun__
 #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
 #else