From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Thu, 12 Jun 2008 17:28:24 +0000 (+0100)
Subject: Merge branch 'master' into xen
X-Git-Tag: xen-3.3.0-rc1~73
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cbbb135b2c2637f7acc408d11ce2af91f245fa8d;p=qemu-xen-3.3-testing.git

Merge branch 'master' into xen
---

cbbb135b2c2637f7acc408d11ce2af91f245fa8d
diff --cc vl.c
index 17f501b0,28f6fe0e..f740ac3d
--- a/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);