Merge branch 'master' into xen

diff --cc vl.c
index 17f501b07ab9181efe7ccf8a53d796a472971c27,28f6fe0e1fb1a4140de3e7f9f2a984e282cea1ba..f740ac3d047cd3a9719465a9344e536605375b09
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -4918,12 -4861,8 +4925,12 @@@ static int net_client_init(const char *
  #else
      if (!strcmp(device, "tap")) {
          char ifname[64];
-         char setup_script[1024], down_script[1024];
+         char setup_script[1024], down_script[1024], script_arg[1024];
          int fd;
 +
 +      memset(ifname, 0, sizeof(ifname));
 +      memset(setup_script, 0, sizeof(setup_script));
 +
          vlan->nb_host_devs++;
          if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
              fd = strtol(buf, NULL, 0);