From: Mark McLoughlin <markmc@redhat.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 1/3] Revert "Fix output of uninitialized strings"
Date: Thu, 28 May 2009 16:05:30 +0100 [thread overview]
Message-ID: <1243523130.4046.189.camel@blaa> (raw)
In-Reply-To: <1243523072.4046.185.camel@blaa>
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 <markmc@redhat.com>
---
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
next prev parent reply other threads:[~2009-05-28 15:05 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-08 10:34 [Qemu-devel] [PATCH 00/11] Networking fixes and slirp enhancements Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 03/11] slirp: Avoid zombie processes after fork_exec Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 04/11] net: Real fix for check_params users Jan Kiszka
2009-05-19 7:57 ` Mark McLoughlin
2009-05-19 9:34 ` Jan Kiszka
2009-05-19 9:57 ` Mark McLoughlin
2009-05-28 15:04 ` Mark McLoughlin
2009-05-28 15:05 ` Mark McLoughlin [this message]
2009-05-28 15:06 ` [Qemu-devel] [PATCH 2/3] " Mark McLoughlin
2009-05-28 15:06 ` [Qemu-devel] [PATCH 3/3] net: fix error reporting for some net parameter checks Mark McLoughlin
2009-05-28 15:56 ` [Qemu-devel] " Jan Kiszka
2009-05-28 15:22 ` [Qemu-devel] [PATCH 04/11] net: Real fix for check_params users Kevin Wolf
2009-05-08 10:34 ` [Qemu-devel] [PATCH 01/11] net: Don't deliver to disabled interfaces in qemu_sendv_packet Jan Kiszka
2009-05-08 15:20 ` Mark McLoughlin
2009-05-08 22:27 ` [Qemu-devel] "FLOSS bounty" ( FB )for running QEMU on SheevaPlug AGSCalabrese
2009-05-08 22:47 ` Marek Vasut
2009-05-08 22:58 ` Paul Brook
2009-05-08 10:34 ` [Qemu-devel] [PATCH 02/11] net: Fix and improved ordered packet delivery Jan Kiszka
2009-05-08 15:24 ` Mark McLoughlin
2009-05-08 10:34 ` [Qemu-devel] [PATCH 07/11] Introduce get_next_param_value Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 10/11] slirp: Rework external configuration interface Jan Kiszka
2009-05-28 15:07 ` Mark McLoughlin
2009-05-28 15:55 ` Jan Kiszka
2009-05-28 17:23 ` Mark McLoughlin
2009-05-28 20:41 ` Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 05/11] net: Improve parameter error reporting Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 06/11] slirp: Reorder initialization Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 08/11] slirp: Move smb, redir, tftp and bootp parameters and -net channel Jan Kiszka
2009-05-28 15:07 ` Mark McLoughlin
2009-05-28 15:52 ` Jan Kiszka
2009-05-29 11:42 ` Paul Brook
2009-05-29 14:19 ` Jan Kiszka
2009-05-29 15:36 ` Paul Brook
2009-05-08 10:34 ` [Qemu-devel] [PATCH 09/11] slirp: Rework internal configuration Jan Kiszka
2009-05-08 10:34 ` [Qemu-devel] [PATCH 11/11] slirp: Bind support for host forwarding rules Jan Kiszka
2009-05-08 16:25 ` [Qemu-devel] [PATCH 00/11] Networking fixes and slirp enhancements Anthony Liguori
2009-05-08 17:01 ` Jan Kiszka
2009-05-09 7:41 ` [Qemu-devel] [PATCH 08/11 v2] slirp: Move smb, redir, tftp and bootp parameters and -net channel Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1243523130.4046.189.camel@blaa \
--to=markmc@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).