summaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-05-28 16:39:54 +0100
committerMark McLoughlin <markmc@redhat.com>2009-06-09 11:38:49 +0100
commitc8decae2e135d2331268619aa07701c31595b6c9 (patch)
tree8ba8ee727e7560f3815fcc644a6598f442cebe44 /net.c
parent0aa7a205c899c516d906673efbe9457f7af0dd3c (diff)
downloadqemu-c8decae2e135d2331268619aa07701c31595b6c9.tar.gz
net: fix error reporting for some net parameter checks
A small bit of confusion between buffers is causing errors like: qemu: invalid parameter '10' in 'script=/etc/qemu-ifup,fd=10' instead of: qemu: invalid parameter 'script' in 'script=/etc/qemu-ifup,fd=10' Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net.c b/net.c
index 723e934224..2594ed73a9 100644
--- a/net.c
+++ b/net.c
@@ -2036,7 +2036,7 @@ int net_client_init(const char *device, const char *p)
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ chkbuf, p);
return -1;
}
fd = strtol(buf, NULL, 0);
@@ -2049,7 +2049,7 @@ int net_client_init(const char *device, const char *p)
};
if (check_params(chkbuf, sizeof(chkbuf), tap_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ chkbuf, p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
@@ -2071,7 +2071,7 @@ int net_client_init(const char *device, const char *p)
int fd;
if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ chkbuf, p);
return -1;
}
fd = strtol(buf, NULL, 0);
@@ -2084,7 +2084,7 @@ int net_client_init(const char *device, const char *p)
};
if (check_params(chkbuf, sizeof(chkbuf), listen_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ chkbuf, p);
return -1;
}
ret = net_socket_listen_init(vlan, device, name, buf);
@@ -2094,7 +2094,7 @@ int net_client_init(const char *device, const char *p)
};
if (check_params(chkbuf, sizeof(chkbuf), connect_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ chkbuf, p);
return -1;
}
ret = net_socket_connect_init(vlan, device, name, buf);
@@ -2104,7 +2104,7 @@ int net_client_init(const char *device, const char *p)
};
if (check_params(chkbuf, sizeof(chkbuf), mcast_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ chkbuf, p);
return -1;
}
ret = net_socket_mcast_init(vlan, device, name, buf);