From: Peter Maydell Date: Thu, 22 May 2014 17:14:01 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-chardev-2' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~831 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6054d883d6138bfc92c73a7c090c824b64086fd2;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-chardev-2' into staging purge error_is_set() # gpg: Signature made Wed 21 May 2014 11:43:44 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-chardev-2: error: error_is_set() is finally unused; remove char: Explain qmp_chardev_add()'s unusual error handling char: Clean up fragile use of error_is_set() char: Use return values instead of error_is_set(errp) qemu-socket: Clean up inet_connect_opts() Signed-off-by: Peter Maydell --- 6054d883d6138bfc92c73a7c090c824b64086fd2