qtest: Don't segfault with invalid -qtest option

This prints an error message, instead of core dump, when "-qtest"
option value is invalid, e.g.:

    $ ./x86_64-softmmu/qemu-system-x86_64 -qtest unknown
        qemu-system-x86_64: Failed to initialize device for qtest:
        "unknown"

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
master
Fam Zheng 2014-02-10 09:28:02 +08:00 committed by Andreas Färber
parent 1f9c4cfda4
commit 23802b4fe0
3 changed files with 16 additions and 3 deletions

View File

@ -15,6 +15,7 @@
#define QTEST_H
#include "qemu-common.h"
#include "qapi/error.h"
extern bool qtest_allowed;
@ -26,7 +27,7 @@ static inline bool qtest_enabled(void)
bool qtest_driver(void);
int qtest_init_accel(void);
void qtest_init(const char *qtest_chrdev, const char *qtest_log);
void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp);
static inline int qtest_available(void)
{

View File

@ -507,12 +507,18 @@ int qtest_init_accel(void)
return 0;
}
void qtest_init(const char *qtest_chrdev, const char *qtest_log)
void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp)
{
CharDriverState *chr;
chr = qemu_chr_new("qtest", qtest_chrdev, NULL);
if (chr == NULL) {
error_setg(errp, "Failed to initialize device for qtest: \"%s\"",
qtest_chrdev);
return;
}
qemu_chr_add_handlers(chr, qtest_can_read, qtest_read, qtest_event, chr);
qemu_chr_fe_set_echo(chr, true);

8
vl.c
View File

@ -4078,7 +4078,13 @@ int main(int argc, char **argv, char **envp)
configure_accelerator();
if (qtest_chrdev) {
qtest_init(qtest_chrdev, qtest_log);
Error *local_err = NULL;
qtest_init(qtest_chrdev, qtest_log, &local_err);
if (local_err) {
error_report("%s", error_get_pretty(local_err));
error_free(local_err);
exit(1);
}
}
machine_opts = qemu_get_machine_opts();