[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/5] spice-qemu-char: fix parameter checks for qe
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [PATCH v2 3/5] spice-qemu-char: fix parameter checks for qemu_chr_parse_* functions |
Date: |
Mon, 3 Nov 2014 17:44:30 +0800 |
For functions qemu_chr_parse_spice_vmc and qemu_chr_parse_spice_port,
we should also check the length of parameter name, and it will help findind
the wrong configure, such as
'qemu-system-x86_64 -chardev spiceport(or spiceport),id=id,name='
Also remove the superfluous parameter checks in qemu_chr_open_spice_*
Signed-off-by: zhanghailiang <address@hidden>
---
spice-qemu-char.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 8106e06..48ee37f 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -290,11 +290,6 @@ CharDriverState *qemu_chr_open_spice_vmc(const char *type)
{
const char **psubtype = spice_server_char_device_recognized_subtypes();
- if (type == NULL) {
- fprintf(stderr, "spice-qemu-char: missing name parameter\n");
- print_allowed_subtypes();
- return NULL;
- }
for (; *psubtype != NULL; ++psubtype) {
if (strcmp(type, *psubtype) == 0) {
break;
@@ -315,11 +310,6 @@ CharDriverState *qemu_chr_open_spice_port(const char *name)
CharDriverState *chr;
SpiceCharDriver *s;
- if (name == NULL) {
- fprintf(stderr, "spice-qemu-char: missing name parameter\n");
- return NULL;
- }
-
chr = chr_open("port", spice_port_set_fe_open);
s = chr->opaque;
s->sin.portname = g_strdup(name);
@@ -345,8 +335,9 @@ static void qemu_chr_parse_spice_vmc(QemuOpts *opts,
ChardevBackend *backend,
{
const char *name = qemu_opt_get(opts, "name");
- if (name == NULL) {
+ if (name == NULL || strlen(name) == 0) {
error_setg(errp, "chardev: spice channel: no name given");
+ print_allowed_subtypes();
return;
}
backend->spicevmc = g_new0(ChardevSpiceChannel, 1);
@@ -358,7 +349,7 @@ static void qemu_chr_parse_spice_port(QemuOpts *opts,
ChardevBackend *backend,
{
const char *name = qemu_opt_get(opts, "name");
- if (name == NULL) {
+ if (name == NULL || strlen(name) == 0) {
error_setg(errp, "chardev: spice port: no name given");
return;
}
--
1.7.12.4
- [Qemu-devel] [PATCH v2 0/5] Trivial patch about qemu-char, zhanghailiang, 2014/11/03
- [Qemu-devel] [PATCH v2 3/5] spice-qemu-char: fix parameter checks for qemu_chr_parse_* functions,
zhanghailiang <=
- [Qemu-devel] [PATCH v2 4/5] qemu-char: convert some open functions to use Error API, zhanghailiang, 2014/11/03
- [Qemu-devel] [PATCH v2 2/5] qemu-char: remove unnecessary in-parameter check for qemu_chr_parse_pipe, zhanghailiang, 2014/11/03
- [Qemu-devel] [PATCH v2 5/5] spice-qemu-char: convert qemu_chr_open_spice_vmc to use Error API, zhanghailiang, 2014/11/03
- [Qemu-devel] [PATCH v2 1/5] qemu-char: fix parameter check for some qemu_chr_parse_* functions, zhanghailiang, 2014/11/03
- Re: [Qemu-devel] [PATCH v2 0/5] Trivial patch about qemu-char, Michael Tokarev, 2014/11/03