From c8decae2e135d2331268619aa07701c31595b6c9 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 28 May 2009 16:39:54 +0100 Subject: [PATCH] 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 --- net.c | 12 ++++++------ 1 file 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); -- 2.11.4.GIT