From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 16 Jan 2013 21:20:05 +0000 (-0600)
Subject: Merge remote-tracking branch 'kraxel/chardev.1' into staging
X-Git-Tag: v1.4.0-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47f4dac3fde809e3da4e60d9eb699f1d4b378249;p=thirdparty%2Fqemu.git

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

47f4dac3fde809e3da4e60d9eb699f1d4b378249