diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-28 15:48:35 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-28 15:48:35 -0500 |
| commit | ffeec223b55ea696567ed544016824199cd7c7bc (patch) | |
| tree | d297f4d7406ae809c94d6d1ff357be08f5a247fb /include/sysemu | |
| parent | 2ea3e2c1e85097c45a882dbc1fbba4a7fdb3ff1c (diff) | |
| parent | a8ad4159ed7d8a442a9c049a6fd0d47aa330c2aa (diff) | |
| download | qemu-ffeec223b55ea696567ed544016824199cd7c7bc.zip qemu-ffeec223b55ea696567ed544016824199cd7c7bc.tar.gz qemu-ffeec223b55ea696567ed544016824199cd7c7bc.tar.bz2 | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Gerd Hoffmann (13) and Michael Tokarev (1)
# Via Michael Tokarev
* mjt/trivial-patches:
doc: we use seabios, not bochs bios
qemu-socket: don't leak opts on error
qemu-char: report udp backend errors
qemu-char: add -chardev mux support
qemu-char: minor mux chardev fixes
qemu-char: use ChardevBackendKind in CharDriver
qemu-char: don't leak opts on error
qemu-char: fix documentation for telnet+wait socket flags
qemu-char: print notification to stderr
qemu-char: use more specific error_setg_* variants
qemu-char: check optional fields using has_*
qemu-socket: catch monitor_get_fd failures
qemu-socket: drop pointless allocation
qemu-socket: zero-initialize SocketAddress
Message-id: 1372443465-22384-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/sysemu')
| -rw-r--r-- | include/sysemu/char.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 066c216..e65e4a4 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -281,7 +281,7 @@ CharDriverState *qemu_chr_find(const char *name); QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename); void register_char_driver(const char *name, CharDriverState *(*open)(QemuOpts *)); -void register_char_driver_qapi(const char *name, int kind, +void register_char_driver_qapi(const char *name, ChardevBackendKind kind, void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp)); /* add an eventfd to the qemu devices that are polled */ |