Skip to content
  • Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150706.0' into staging · 14526738
    Peter Maydell authored
    
    
    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: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    Conflicts:
    	kvm-all.c
    14526738