summaryrefslogtreecommitdiffstats
path: root/bsd-user/main.c
diff options
context:
space:
mode:
authorPeter Maydell2016-08-10 18:14:35 +0200
committerPeter Maydell2016-08-10 18:14:35 +0200
commitd08306dc42ea599ffcf8aad056fa9c23acfbe230 (patch)
tree485f28174714509d48d0a928a3b65871b4e13569 /bsd-user/main.c
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
parentvhost-user: Attempt to fix a race with set_mem_table. (diff)
downloadqemu-d08306dc42ea599ffcf8aad056fa9c23acfbe230.tar.gz
qemu-d08306dc42ea599ffcf8aad056fa9c23acfbe230.tar.xz
qemu-d08306dc42ea599ffcf8aad056fa9c23acfbe230.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio/vhost: fixes some bugfixes for virtio/vhost Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Wed 10 Aug 2016 16:16:22 BST # gpg: using RSA key 0x281F0DB8D28D5469 # 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: vhost-user: Attempt to fix a race with set_mem_table. vhost-user: Introduce a new protocol feature REPLY_ACK. vhost: check for vhost_ops before using. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'bsd-user/main.c')
0 files changed, 0 insertions, 0 deletions