From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9hAq-0002yj-73 for qemu-devel@nongnu.org; Thu, 28 May 2009 11:05:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9hAl-0002w0-0E for qemu-devel@nongnu.org; Thu, 28 May 2009 11:05:39 -0400 Received: from [199.232.76.173] (port=44278 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9hAk-0002vr-QY for qemu-devel@nongnu.org; Thu, 28 May 2009 11:05:34 -0400 Received: from mx2.redhat.com ([66.187.237.31]:48213) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9hAk-0005K3-0r for qemu-devel@nongnu.org; Thu, 28 May 2009 11:05:34 -0400 From: Mark McLoughlin In-Reply-To: <1243523072.4046.185.camel@blaa> References: <20090508103416.6080.44298.stgit@mchn012c.ww002.siemens.net> <20090508103417.6080.2193.stgit@mchn012c.ww002.siemens.net> <1243523072.4046.185.camel@blaa> Content-Type: text/plain Date: Thu, 28 May 2009 16:05:30 +0100 Message-Id: <1243523130.4046.189.camel@blaa> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/3] Revert "Fix output of uninitialized strings" 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 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 --- net.c | 30 ++++++++++++++++++++---------- vl.c | 3 ++- 2 files changed, 22 insertions(+), 11 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++; diff --git a/vl.c b/vl.c index 012b2a3..975e811 100644 --- a/vl.c +++ b/vl.c @@ -2227,7 +2227,8 @@ int drive_init(struct drive_opt *arg, int snapshot, void *opaque) NULL }; if (check_params(params, str) < 0) { - fprintf(stderr, "qemu: unknown parameter in '%s'\n", str); + fprintf(stderr, "qemu: unknown parameter '%s' in '%s'\n", + buf, str); return -1; } -- 1.6.2.2