diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-16 15:20:05 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-16 15:20:05 -0600 |
| commit | 47f4dac3fde809e3da4e60d9eb699f1d4b378249 (patch) | |
| tree | 0b466b044d1ef9180cdf7ae50ccf730b2e6f8dbb /vl.c | |
| parent | af381ebeacdefcec0d2b44bdbb9d6e01e35f691f (diff) | |
| parent | 0a1a7fabda7f0fa05ef09051be29e92e81f929ad (diff) | |
| download | focaccia-qemu-47f4dac3fde809e3da4e60d9eb699f1d4b378249.tar.gz focaccia-qemu-47f4dac3fde809e3da4e60d9eb699f1d4b378249.zip | |
Merge remote-tracking branch 'kraxel/chardev.1' into staging
# By Gerd Hoffmann # Via Gerd Hoffmann * kraxel/chardev.1: chardev: add pty chardev support to chardev-add (qmp) chardev: add socket chardev support to chardev-add (qmp) chardev: add parallel chardev support to chardev-add (qmp) chardev: add serial chardev support to chardev-add (qmp) chardev: add file chardev support to chardev-add (qmp) chardev: add hmp hotplug commands chardev: add qmp hotplug commands, with null chardev support chardev: reduce chardev ifdef mess a bit chardev: fix QemuOpts lifecycle chardev: add error reporting for qemu_chr_new_from_opts
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vl.c b/vl.c index 15e0280daa..8ce2b10541 100644 --- a/vl.c +++ b/vl.c @@ -2238,11 +2238,14 @@ static int device_init_func(QemuOpts *opts, void *opaque) static int chardev_init_func(QemuOpts *opts, void *opaque) { - CharDriverState *chr; + Error *local_err = NULL; - chr = qemu_chr_new_from_opts(opts, NULL); - if (!chr) + qemu_chr_new_from_opts(opts, NULL, &local_err); + if (error_is_set(&local_err)) { + fprintf(stderr, "%s\n", error_get_pretty(local_err)); + error_free(local_err); return -1; + } return 0; } |