From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 2 Nov 2018 10:53:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/elmarco/tags/chrdev-pull-request' into staging
X-Git-Tag: v3.1.0-rc0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2959fb7fe50c3c22aabaaabf198a1b87d10e51f6;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/elmarco/tags/chrdev-pull-request' into staging

- add websocket support
- socket: make 'fd' incompatible with 'reconnect'
- fix a websocket leak
- unrelated editorconfig patch that missed -trivial (included for
  convenience)
- v2: fix commit author field

# gpg: Signature made Thu 01 Nov 2018 08:23:39 GMT
# gpg:                using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/chrdev-pull-request:
  editorconfig: set emacs mode
  tests/test-char: Check websocket chardev functionality
  chardev: Add websocket support
  chardev/char-socket: Function headers refactoring
  char-socket: make 'fd' incompatible with 'reconnect'
  char-socket: correctly set has_reconnect when parsing QemuOpts
  websock: fix handshake leak

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

2959fb7fe50c3c22aabaaabf198a1b87d10e51f6