From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Thu, 12 Jun 2008 17:41:11 +0000 (+0100)
Subject: Allow bridge=... as synonym for scriptarg=...
X-Git-Tag: xen-3.3.0-rc1~72
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fabff03b69d8fda8ccb598cf7ff8d8fdc24327f1;p=qemu-xen-3.3-testing.git

Allow bridge=... as synonym for scriptarg=...
---

diff --git a/vl.c b/vl.c
index f740ac3d..ef41cb0c 100644
--- a/vl.c
+++ b/vl.c
@@ -4948,7 +4948,8 @@ static int net_client_init(const char *str)
             if (get_param_value(down_script, sizeof(down_script), "downscript", p) == 0) {
                 pstrcpy(down_script, sizeof(down_script), DEFAULT_NETWORK_DOWN_SCRIPT);
             }
-            if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0) {
+            if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 &&
+                get_param_value(script_arg, sizeof(script_arg), "bridge", p) == 0) { /* deprecated; for xend compatibility */
                 pstrcpy(script_arg, sizeof(script_arg), "");
             }
             ret = net_tap_init(vlan, ifname, setup_script, down_script, script_arg);