diff options
| author | Peter Maydell | 2018-10-12 13:40:04 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-12 13:40:04 +0200 |
| commit | 69ac8c4cb93f2685839ff7b857cef306b388ff3c (patch) | |
| tree | 227eab213d6478690170695325be3d38c43bbbb5 /linux-headers/linux/vhost.h | |
| parent | Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging (diff) | |
| parent | hw/s390x: Include the tod-qemu also for builds with --disable-tcg (diff) | |
| download | qemu-69ac8c4cb93f2685839ff7b857cef306b388ff3c.tar.gz qemu-69ac8c4cb93f2685839ff7b857cef306b388ff3c.tar.xz qemu-69ac8c4cb93f2685839ff7b857cef306b388ff3c.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181012' into staging
More s390x updates:
- introduce support for vfio-ap (s390 crypto devices), including a
Linux headers update to get the new interfaces
- the usual fixing + cleanup
# gpg: Signature made Fri 12 Oct 2018 10:54:38 BST
# gpg: using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20181012:
hw/s390x: Include the tod-qemu also for builds with --disable-tcg
s390: doc: detailed specifications for AP virtualization
s390x/vfio: ap: Introduce VFIO AP device
s390x/ap: base Adjunct Processor (AP) object model
s390x/kvm: enable AP instruction interpretation for guest
s390x/cpumodel: Set up CPU model for AP device support
linux-headers: update
target/s390x/excp_helper: Remove DPRINTF() macro
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/linux/vhost.h')
| -rw-r--r-- | linux-headers/linux/vhost.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h index 94726cb2c5..c8a8fbeb81 100644 --- a/linux-headers/linux/vhost.h +++ b/linux-headers/linux/vhost.h @@ -176,7 +176,7 @@ struct vhost_memory { #define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 #define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64) -#define VHOST_GET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x26, __u64) +#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64) /* VHOST_NET specific defines */ |