diff options
| author | Peter Maydell | 2017-01-20 15:05:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-20 15:05:44 +0100 |
| commit | 4383fa7c8019193676e76de466375babc3a89c83 (patch) | |
| tree | 1b26b6e89d2219fc88363c027566a701847de841 /linux-headers | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-01-19' into... (diff) | |
| parent | virtio: force VIRTIO_F_IOMMU_PLATFORM (diff) | |
| download | qemu-4383fa7c8019193676e76de466375babc3a89c83.tar.gz qemu-4383fa7c8019193676e76de466375babc3a89c83.tar.xz qemu-4383fa7c8019193676e76de466375babc3a89c83.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, vhost, pc: fixes, features
writeable fw cfg blobs which will be used for guest to host
communication
fixes and cleanups all over the place
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 19 Jan 2017 21:08:04 GMT
# 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:
virtio: force VIRTIO_F_IOMMU_PLATFORM
virtio: fix up max size checks
vhost: drop VHOST_F_DEVICE_IOTLB
update-linux-headers.sh: support __bitwise
virtio_crypto: header update
pci_regs: update to latest linux
virtio-mmio: switch to linux headers
virtio_mmio: add standard header file
virtio: drop an obsolete comment
fw-cfg: bump "x-file-slots" to 0x20 for 2.9+ machine types
pc: Add 2.9 machine-types
fw-cfg: turn FW_CFG_FILE_SLOTS into a device property
fw-cfg: support writeable blobs
vhost_net: device IOTLB support
virtio: disable notifications again after poll succeeded
Revert "virtio: turn vq->notification into a nested counter"
virtio-net: enable ioeventfd even if vhost=off
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers')
| -rw-r--r-- | linux-headers/linux/vhost.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h index ac7a1f136a..1e86a3dd0d 100644 --- a/linux-headers/linux/vhost.h +++ b/linux-headers/linux/vhost.h @@ -172,8 +172,6 @@ struct vhost_memory { #define VHOST_F_LOG_ALL 26 /* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */ #define VHOST_NET_F_VIRTIO_NET_HDR 27 -/* Vhost have device IOTLB */ -#define VHOST_F_DEVICE_IOTLB 63 /* VHOST_SCSI specific definitions */ |