diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-14 14:54:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-14 14:54:37 -0500 |
| commit | 139a4b63e3dd002de79d8c0a7c04fcc5bbeb1307 (patch) | |
| tree | b41eac7e4698f68cc7e2431304b4b782f41933e8 /qga/channel-win32.c | |
| parent | 3d34a4110c58bba120bc3d7c96c4b9571994c2a8 (diff) | |
| parent | 344bf1e935163d8a4c3cce3ec4c636e1ebd035ce (diff) | |
Merge remote-tracking branch 'kraxel/chardev.5' into staging
* kraxel/chardev.5:
spice-qemu-char: Remove dead debugging code
spice-qemu-char: Fix name parameter issues after qapi-ifying
qemu-char.c: fix waiting for telnet connection message
Revert "hmp: Disable chardev-add and chardev-remove"
chardev: add udp support to qapi
chardev: add memory (ringbuf) support to qapi
chardev: add vc support to qapi
chardev: add spice support to qapi
chardev: add pipe support to qapi
chardev: add console support to qapi
chardev: switch pty init to qapi
chardev: switch parallel init to qapi
chardev: switch serial/tty init to qapi
chardev: add stdio support to qapi
chardev: switch file init to qapi
chardev: add braille support to qapi
chardev: add msmouse support to qapi
chardev: switch null init to qapi
chardev: add mux chardev support to qapi
chardev: add support for qapi-based chardev initialization
Conflicts:
ui/console.c
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qga/channel-win32.c')
0 files changed, 0 insertions, 0 deletions