diff options
| author | Peter Maydell | 2018-08-20 18:41:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-08-20 18:41:18 +0200 |
| commit | d0092d90eb546a8bbe9e9120426c189474123797 (patch) | |
| tree | 4eb27ac9db3ebc7ce01425e0605f8d7682639a88 /include/standard-headers/linux/virtio_config.h | |
| parent | tests/vm: Clean out old working directories on build (diff) | |
| parent | s390x: Enable KVM huge page backing support (diff) | |
| download | qemu-d0092d90eb546a8bbe9e9120426c189474123797.tar.gz qemu-d0092d90eb546a8bbe9e9120426c189474123797.tar.xz qemu-d0092d90eb546a8bbe9e9120426c189474123797.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180820' into staging
First round of s390x patches for 3.1:
- add compat machine for 3.1
- remove deprecated 's390-squash-mcss' option
- cpu models: add "max" cpu model, enhance feature group code
- kvm: add support for etoken facility and huge page backing
# gpg: Signature made Mon 20 Aug 2018 13:47: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-20180820:
s390x: Enable KVM huge page backing support
s390x/kvm: add etoken facility
linux-headers: update
s390x/cpumodel: Add "-cpu max" support
s390x: remove 's390-squash-mcss' option
s390x/cpumodel: enum type S390FeatGroup now gets generated
s390x: introduce 3.1 compat machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/standard-headers/linux/virtio_config.h')
| -rw-r--r-- | include/standard-headers/linux/virtio_config.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/standard-headers/linux/virtio_config.h b/include/standard-headers/linux/virtio_config.h index b777069699..0b194365a0 100644 --- a/include/standard-headers/linux/virtio_config.h +++ b/include/standard-headers/linux/virtio_config.h @@ -45,11 +45,14 @@ /* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80 -/* Some virtio feature bits (currently bits 28 through 32) are reserved for the - * transport being used (eg. virtio_ring), the rest are per-device feature - * bits. */ +/* + * Virtio feature bits VIRTIO_TRANSPORT_F_START through + * VIRTIO_TRANSPORT_F_END are reserved for the transport + * being used (e.g. virtio_ring, virtio_pci etc.), the + * rest are per-device feature bits. + */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 34 +#define VIRTIO_TRANSPORT_F_END 38 #ifndef VIRTIO_CONFIG_NO_LEGACY /* Do we get callbacks when the ring is completely used, even if we've @@ -71,4 +74,9 @@ * this is for compatibility with legacy systems. */ #define VIRTIO_F_IOMMU_PLATFORM 33 + +/* + * Does the device support Single Root I/O Virtualization? + */ +#define VIRTIO_F_SR_IOV 37 #endif /* _LINUX_VIRTIO_CONFIG_H */ |