From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9hC9-0003sT-38 for qemu-devel@nongnu.org; Thu, 28 May 2009 11:07:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9hC4-0003oi-8i for qemu-devel@nongnu.org; Thu, 28 May 2009 11:07:00 -0400 Received: from [199.232.76.173] (port=44304 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9hC4-0003oc-3Q for qemu-devel@nongnu.org; Thu, 28 May 2009 11:06:56 -0400 Received: from mx2.redhat.com ([66.187.237.31]:48260) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9hC2-0005og-Hz for qemu-devel@nongnu.org; Thu, 28 May 2009 11:06:55 -0400 From: Mark McLoughlin In-Reply-To: <1243523171.4046.193.camel@blaa> References: <20090508103416.6080.44298.stgit@mchn012c.ww002.siemens.net> <20090508103417.6080.2193.stgit@mchn012c.ww002.siemens.net> <1243523072.4046.185.camel@blaa> <1243523130.4046.189.camel@blaa> <1243523171.4046.193.camel@blaa> Content-Type: text/plain Date: Thu, 28 May 2009 16:06:51 +0100 Message-Id: <1243523211.4046.194.camel@blaa> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 3/3] net: fix error reporting for some net parameter checks Reply-To: Mark McLoughlin List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: qemu-devel@nongnu.org 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 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net.c b/net.c index 723e934..2594ed7 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); -- 1.6.2.2