aboutsummaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-05-28 14:07:31 +0100
committerMark McLoughlin <markmc@redhat.com>2009-06-09 11:38:49 +0100
commitcda94b27821726df74eead0701d8401c1acda6ec (patch)
tree580fa6fd870c6fee6af381a142ff798a835e151a /net.c
parent7c3370d4fe3fa6cda8655f109e4659afc8ca4269 (diff)
downloadqemu-cda94b27821726df74eead0701d8401c1acda6ec.zip
qemu-cda94b27821726df74eead0701d8401c1acda6ec.tar.gz
qemu-cda94b27821726df74eead0701d8401c1acda6ec.tar.bz2
Revert "Fix output of uninitialized strings"
This reverts commit 8cf07dcbe7691dbe4f47563058659dba6ef66b05. This is a sorry saga. This commit: 8e4416af45 net: Add parameter checks for VLAN clients broken '-net socket' and this commit: ffad4116b9 net: Fix -net socket parameter checks fixed the problem but introduced another problem which this commit: 8cf07dcbe7 Fix output of uninitialized strings fixed that final problem, but causing us to lose some error reporting information in the process. Meanwhile Jan posted a patch to mostly re-do ffad4116b9 in a way that fixes the original issue, but without losing the error reporting information. So, let's revert 8cf07dcbe7 and apply Jan's patch. Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c30
1 files changed, 20 insertions, 10 deletions
diff --git a/net.c b/net.c
index 97e1ac5..390d6a6 100644
--- a/net.c
+++ b/net.c
@@ -1912,7 +1912,8 @@ int net_client_init(const char *device, const char *p)
int idx = nic_get_free_idx();
if (check_params(nic_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
if (idx == -1 || nb_nics >= MAX_NICS) {
@@ -1962,7 +1963,8 @@ int net_client_init(const char *device, const char *p)
"vlan", "name", "hostname", "restrict", "ip", NULL
};
if (check_params(slirp_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
if (get_param_value(buf, sizeof(buf), "hostname", p)) {
@@ -2012,7 +2014,8 @@ int net_client_init(const char *device, const char *p)
char ifname[64];
if (check_params(tap_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
@@ -2032,7 +2035,8 @@ int net_client_init(const char *device, const char *p)
vlan->nb_host_devs++;
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
if (check_params(fd_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
fd = strtol(buf, NULL, 0);
@@ -2044,7 +2048,8 @@ int net_client_init(const char *device, const char *p)
"vlan", "name", "ifname", "script", "downscript", NULL
};
if (check_params(tap_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
@@ -2064,7 +2069,8 @@ int net_client_init(const char *device, const char *p)
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
int fd;
if (check_params(fd_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
fd = strtol(buf, NULL, 0);
@@ -2076,7 +2082,8 @@ int net_client_init(const char *device, const char *p)
"vlan", "name", "listen", NULL
};
if (check_params(listen_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
ret = net_socket_listen_init(vlan, device, name, buf);
@@ -2085,7 +2092,8 @@ int net_client_init(const char *device, const char *p)
"vlan", "name", "connect", NULL
};
if (check_params(connect_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
ret = net_socket_connect_init(vlan, device, name, buf);
@@ -2094,7 +2102,8 @@ int net_client_init(const char *device, const char *p)
"vlan", "name", "mcast", NULL
};
if (check_params(mcast_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
ret = net_socket_mcast_init(vlan, device, name, buf);
@@ -2114,7 +2123,8 @@ int net_client_init(const char *device, const char *p)
int vde_port, vde_mode;
if (check_params(vde_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
+ fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
+ buf, p);
return -1;
}
vlan->nb_host_devs++;