diff options
| author | Peter Maydell | 2018-11-02 11:53:00 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-02 11:53:00 +0100 |
| commit | 2959fb7fe50c3c22aabaaabf198a1b87d10e51f6 (patch) | |
| tree | 0771c1978dd635404ba72498a14599435b695794 /hw/arm/microbit.c | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181031a'... (diff) | |
| parent | editorconfig: set emacs mode (diff) | |
| download | qemu-2959fb7fe50c3c22aabaaabf198a1b87d10e51f6.tar.gz qemu-2959fb7fe50c3c22aabaaabf198a1b87d10e51f6.tar.xz qemu-2959fb7fe50c3c22aabaaabf198a1b87d10e51f6.zip | |
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>
Diffstat (limited to 'hw/arm/microbit.c')
0 files changed, 0 insertions, 0 deletions