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 /include | |
| 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 'include')
| -rw-r--r-- | include/char/char.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/char/char.h b/include/char/char.h index baa5d035fd..c91ce3c98a 100644 --- a/include/char/char.h +++ b/include/char/char.h @@ -75,6 +75,7 @@ struct CharDriverState { char *filename; int opened; int avail_connections; + QemuOpts *opts; QTAILQ_ENTRY(CharDriverState) next; }; @@ -89,7 +90,8 @@ struct CharDriverState { * Returns: a new character backend */ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, - void (*init)(struct CharDriverState *s)); + void (*init)(struct CharDriverState *s), + Error **errp); /** * @qemu_chr_new: |