From: Anthony Liguori Date: Fri, 28 Jun 2013 20:48:35 +0000 (-0500) Subject: Merge remote-tracking branch 'mjt/trivial-patches' into staging X-Git-Tag: v1.6.0-rc0~164 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=ffeec223b55ea696567ed544016824199cd7c7bc 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 --- ffeec223b55ea696567ed544016824199cd7c7bc