diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 09:22:40 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 09:22:40 +0100 |
| commit | 1452673888f6d7f0454276d049846c9bec659233 (patch) | |
| tree | 0d1f2d4ec8b3fc3d4ceb51580c383c27ba614164 /slirp | |
| parent | f6e3035f75e5c6a73485335765ae070304c7a110 (diff) | |
| parent | 43302969966bc3a95470bfc300289a83068ef5d9 (diff) | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150706.0' into staging
VFIO updates for 2.4-rc0
- "real" host page size API (Peter Crosthwaite)
- platform device irqfd support (Eric Auger)
- spapr container disconnect fix (Alexey Kardashevskiy)
- quirk for broken Chelsio hardware (Gabriel Laupre)
- coverity fix (Paolo Bonzini)
# gpg: Signature made Mon Jul 6 19:23:49 2015 BST using RSA key ID 3BB08B22
# 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>"
* remotes/awilliam/tags/vfio-update-20150706.0:
vfio/pci : Add pba_offset PCI quirk for Chelsio T5 devices
vfio: Unregister IOMMU notifiers when container is destroyed
hw/vfio/platform: add irqfd support
kvm: some fixes to kvm_resamplefds_allowed
sysbus: add irq_routing_notifier
intc: arm_gic_kvm: set the qemu_irq/gsi mapping
kvm-all.c: add qemu_irq/gsi hash table and utility routines
kvm: rename kvm_irqchip_[add,remove]_irqfd_notifier with gsi suffix
vfio: cpu: Use "real" page size API
cpu-all: complete "real" host page size API
vfio: fix return type of pread
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Conflicts:
kvm-all.c
Diffstat (limited to 'slirp')
0 files changed, 0 insertions, 0 deletions