mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chardev: ensure qemu_chr_parse_compat reports missing driver error

Browse Source 
If no valid char driver was identified the qemu_chr_parse_compat method
was silent, leaving callers no clue what failed.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190211182442.8542-8-berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-02-11 18:24:33 +00:00 committed by Marc-André Lureau
parent 5981c3a232
commit 0bf62dc89e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chardev/char.c
View File

@ -490,6 +490,8 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename,
return opts; return opts;
} }
error_report("'%s' is not a valid char driver", filename);
fail: fail:
qemu_opts_del(opts); qemu_opts_del(opts);
return NULL; return NULL;

3
tests/test-char.c
View File

@ -932,9 +932,10 @@ static void char_null_test(void)
static void char_invalid_test(void) static void char_invalid_test(void)
{ {
Chardev *chr; Chardev *chr;
g_setenv("QTEST_SILENT_ERRORS", "1", 1);
chr = qemu_chr_new("label-invalid", "invalid"); chr = qemu_chr_new("label-invalid", "invalid");
g_assert_null(chr); g_assert_null(chr);
g_unsetenv("QTEST_SILENT_ERRORS");
} }
static int chardev_change(void *opaque) static int chardev_change(void *opaque)