diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-09 16:25:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-09 16:25:39 +0100 |
| commit | a84e937649f09d372e677b3978a933f1207513a2 (patch) | |
| tree | 7a5b5dfc0e152d736ae3d443b4013330d5cc6f03 /ui/x_keymap.c | |
| parent | 9005774b27b6aa5e1c99d80bd59d5d048c2f7077 (diff) | |
| parent | d434e5ac5d70e9da7d20e50246af9251a125bdad (diff) | |
| download | focaccia-qemu-a84e937649f09d372e677b3978a933f1207513a2.tar.gz focaccia-qemu-a84e937649f09d372e677b3978a933f1207513a2.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,vhost: fixes Add a feature flag for new protocol messages. Misc fixes. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Mon 09 Apr 2018 15:37:29 BST # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: virtio-serial: fix heap-over-flow vhost: Allow adjoining regions contrib/libvhost-user: add the protocol feature used for SET/GET message vhost-user: back SET/GET_CONFIG requests with a protocol feature vhost-user-blk: set config ops before vhost-user init Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/x_keymap.c')
0 files changed, 0 insertions, 0 deletions