tree 0b466b044d1ef9180cdf7ae50ccf730b2e6f8dbb
parent af381ebeacdefcec0d2b44bdbb9d6e01e35f691f
parent 0a1a7fabda7f0fa05ef09051be29e92e81f929ad
author Anthony Liguori <aliguori@us.ibm.com> 1358371205 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1358371205 -0600

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