OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix output of uninitialized strings 

Commit ffad4116b9 removed the "scratch buffer"
from check_params, but didn't care for the error messages which actually
included this string to tell the user which option was wrong. Now this string
is uninitialized, so this patch removes it from the message.

This means that the user is only told the whole parameter string and has to
pick the wrong option by himself as the callers of check_params can't know this
value any more. An alternative approach would be to revert that commit and do
whatever is needed to fix the original problem without changing check_params.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Kevin Wolf 2009-05-19 18:51:34 +02:00 committed by Anthony Liguori
parent 7696d1ecd0
commit 8cf07dcbe7
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net.c
View File

@ -1792,8 +1792,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (idx == -1 || nb_nics >= MAX_NICS) {
@ -1843,8 +1842,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (get_param_value(buf, sizeof(buf), "hostname", p)) {
@ -1894,8 +1892,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
@ -1915,8 +1912,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
fd = strtol(buf, NULL, 0);
@ -1928,8 +1924,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
@ -1949,8 +1944,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
fd = strtol(buf, NULL, 0);
@ -1962,8 +1956,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
ret = net_socket_listen_init(vlan, device, name, buf);
@ -1972,8 +1965,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
ret = net_socket_connect_init(vlan, device, name, buf);
@ -1982,8 +1974,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
ret = net_socket_mcast_init(vlan, device, name, buf);
@ -2003,8 +1994,7 @@ 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 '%s' in '%s'\n",
buf, p);
fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
vlan->nb_host_devs++;

3
vl.c
View File

@ -2227,8 +2227,7 @@ int drive_init(struct drive_opt *arg, int snapshot, void *opaque)
NULL };
if (check_params(params, str) < 0) {
fprintf(stderr, "qemu: unknown parameter '%s' in '%s'\n",
buf, str);
fprintf(stderr, "qemu: unknown parameter in '%s'\n", str);
return -1;
}