[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 34/48] qtest: Don't segfault with invalid -qtest opti
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 34/48] qtest: Don't segfault with invalid -qtest option |
Date: |
Mon, 10 Feb 2014 19:36:51 +0100 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
include/sysemu/qtest.h | 3 ++-
qtest.c | 8 +++++++-
vl.c | 8 +++++++-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index 6aca8e4..28f4875 100644
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -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)
{
diff --git a/qtest.c b/qtest.c
index a738afc..ae941d6 100644
--- a/qtest.c
+++ b/qtest.c
@@ -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);
diff --git a/vl.c b/vl.c
index a7b00cd..0f7d31f 100644
--- a/vl.c
+++ b/vl.c
@@ -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();
--
1.8.4.5
- [Qemu-devel] [PULL 29/48] ipack: Convert to QOM realize, (continued)
- [Qemu-devel] [PULL 29/48] ipack: Convert to QOM realize, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 23/48] tests: Add pcnet qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 24/48] tests: Add eepro100 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 26/48] tests: Add virtio-net qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 32/48] ipoctal232: QOM parent field cleanup, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 31/48] ipack: QOM parent field cleanup for IPackDevice, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 34/48] qtest: Don't segfault with invalid -qtest option,
Andreas Färber <=
- [Qemu-devel] [PULL 35/48] qapi: Add size parser to StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 39/48] qdev: Legacy properties are just strings, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 36/48] qdev: Sizes are now parsed by StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 37/48] qdev: Remove legacy parsers for hex8/32/64, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 46/48] qdev: Add enum property types to QAPI schema, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 43/48] qdev: Remove most legacy printers, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 42/48] qdev: Use human mode in "info qtree", Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 48/48] qapi: Refine human printing of sizes, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 41/48] qapi: Add human mode to StringOutputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 45/48] block: Handle "rechs" and "large" translation options, Andreas Färber, 2014/02/10