Merge remote-tracking branch 'mjt/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 28 Jun 2013 20:48:35 +0000 (15:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 28 Jun 2013 20:48:35 +0000 (15:48 -0500)
commitffeec223b55ea696567ed544016824199cd7c7bc
treed297f4d7406ae809c94d6d1ff357be08f5a247fb
parent2ea3e2c1e85097c45a882dbc1fbba4a7fdb3ff1c
parenta8ad4159ed7d8a442a9c049a6fd0d47aa330c2aa
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>
qemu-char.c