From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9hxy-0005zM-Sm for qemu-devel@nongnu.org; Thu, 28 May 2009 11:56:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9hxu-0005wd-4f for qemu-devel@nongnu.org; Thu, 28 May 2009 11:56:26 -0400 Received: from [199.232.76.173] (port=44894 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9hxt-0005wS-UZ for qemu-devel@nongnu.org; Thu, 28 May 2009 11:56:22 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:16440) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M9hxt-0001M8-7E for qemu-devel@nongnu.org; Thu, 28 May 2009 11:56:21 -0400 Message-ID: <4A1EB422.6070309@siemens.com> Date: Thu, 28 May 2009 17:56:18 +0200 From: Jan Kiszka MIME-Version: 1.0 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> <1243523211.4046.194.camel@blaa> In-Reply-To: <1243523211.4046.194.camel@blaa> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 3/3] net: fix error reporting for some net parameter checks List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark McLoughlin Cc: qemu-devel@nongnu.org Mark McLoughlin wrote: > 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); Ack for all three. (My dear. I promise to never touch these param checks again.) Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux