summaryrefslogtreecommitdiff
path: root/io/channel-websock.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-10-05 13:28:43 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-10-05 13:28:43 +0100
commit90586a78ffaee2e0fc74c16da44e985697fd7472 (patch)
tree816f9dcc290139056e1c12d2d58600b614618f27 /io/channel-websock.c
parent5456c6a4ec9cd8fc314ddc303e88bf85c110975c (diff)
parentdfbee78db8fdf7bc8c151c3d29504bb47438480b (diff)
downloadqemu-90586a78ffaee2e0fc74c16da44e985697fd7472.tar.gz
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20171003.0' into staging
VFIO updates 2017-10-03 - NVIDIA GPUDirect Cliques experimental support (Alex Williamson) # gpg: Signature made Tue 03 Oct 2017 22:28:43 BST # gpg: using RSA key 0x239B9B6E3BB08B22 # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" # gpg: aka "Alex Williamson <alex@shazbot.org>" # gpg: aka "Alex Williamson <alwillia@redhat.com>" # gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>" # Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22 * remotes/awilliam/tags/vfio-updates-20171003.0: vfio/pci: Add NVIDIA GPUDirect Cliques support vfio/pci: Add virtual capabilities quirk infrastructure vfio/pci: Do not unwind on error Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-websock.c')
0 files changed, 0 insertions, 0 deletions