« Previous | Next » 

Revision 139a4b63

ID139a4b63e3dd002de79d8c0a7c04fcc5bbeb1307

Added by Anthony Liguori over 11 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted