Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160526.1' into...

VFIO updates 2016-05-26

 - Infrastructure and quirks to support IGD assignment (Alex Williamson)
 - Fixes to 128bit handling, IOMMU replay, IOMMU translation sanity
   checking (Alexey Kardashevskiy)

# gpg: Signature made Thu 26 May 2016 18:50:29 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-20160526.1:
  vfio: Check that IOMMU MR translates to system address space
  memory: Fix IOMMU replay base address
  vfio: Fix 128 bit handling when deleting region
  vfio/pci: Add IGD documentation
  vfio/pci: Add a separate option for IGD OpRegion support
  vfio/pci: Intel graphics legacy mode assignment
  vfio/pci: Setup BAR quirks after capabilities probing
  vfio/pci: Consolidate VGA setup
  vfio/pci: Fix return of vfio_populate_vga()
  vfio: Create device specific region info helper
  vfio: Enable sparse mmap capability

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined trace-events
index 767fd0459596773a8e874298682578e9bc61e095,018d75f0a87a9fd7361dae45043a12ef6bd6425b..1211c20ed11344b41a837dee84ac5a46ee50e157
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -1483,7 -1483,7 +1483,7 @@@ await_return_path_close_on_source_close
  await_return_path_close_on_source_joining(void) ""
  migrate_set_state(int new_state) "new state %d"
  migrate_fd_cleanup(void) ""
 -migrate_fd_error(void) ""
 +migrate_fd_error(const char *error_desc) "error=%s"
  migrate_fd_cancel(void) ""
  migrate_handle_rp_req_pages(const char *rbname, size_t start, size_t len) "in %s at %zx len %zx"
  migrate_pending(uint64_t size, uint64_t max, uint64_t post, uint64_t nonpost) "pending size %" PRIu64 " max %" PRIu64 " (post=%" PRIu64 " nonpost=%" PRIu64 ")"
@@@ -1513,8 -1513,6 +1513,8 @@@ migrate_state_too_big(void) "
  migrate_transferred(uint64_t tranferred, uint64_t time_spent, double bandwidth, uint64_t size) "transferred %" PRIu64 " time_spent %" PRIu64 " bandwidth %g max_size %" PRId64
  process_incoming_migration_co_end(int ret, int ps) "ret=%d postcopy-state=%d"
  process_incoming_migration_co_postcopy_end_main(void) ""
 +migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
 +migration_set_outgoing_channel(void *ioc, const char *ioctype, const char *hostname)  "ioc=%p ioctype=%s hostname=%s"
  
  # migration/rdma.c
  qemu_rdma_accept_incoming_migration(void) ""
@@@ -1599,27 -1597,6 +1599,27 @@@ postcopy_ram_incoming_cleanup_entry(voi
  postcopy_ram_incoming_cleanup_exit(void) ""
  postcopy_ram_incoming_cleanup_join(void) ""
  
 +# migration/exec.c
 +migration_exec_outgoing(const char *cmd) "cmd=%s"
 +migration_exec_incoming(const char *cmd) "cmd=%s"
 +
 +# migration/fd.c
 +migration_fd_outgoing(int fd) "fd=%d"
 +migration_fd_incoming(int fd) "fd=%d"
 +
 +# migration/socket.c
 +migration_socket_incoming_accepted(void) ""
 +migration_socket_outgoing_connected(const char *hostname) "hostname=%s"
 +migration_socket_outgoing_error(const char *err) "error=%s"
 +
 +# migration/tls.c
 +migration_tls_outgoing_handshake_start(const char *hostname) "hostname=%s"
 +migration_tls_outgoing_handshake_error(const char *err) "err=%s"
 +migration_tls_outgoing_handshake_complete(void) ""
 +migration_tls_incoming_handshake_start(void) ""
 +migration_tls_incoming_handshake_error(const char *err) "err=%s"
 +migration_tls_incoming_handshake_complete(void) ""
 +
  # kvm-all.c
  kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"
  kvm_vm_ioctl(int type, void *arg) "type 0x%x, arg %p"
@@@ -1736,9 -1713,13 +1736,13 @@@ vfio_quirk_ati_bonaire_reset_no_smc(con
  vfio_quirk_ati_bonaire_reset_timeout(const char *name) "%s"
  vfio_quirk_ati_bonaire_reset_done(const char *name) "%s"
  vfio_quirk_ati_bonaire_reset(const char *name) "%s"
+ vfio_pci_igd_bar4_write(const char *name, uint32_t index, uint32_t data, uint32_t base) "%s [%03x] %08x -> %08x"
+ vfio_pci_igd_bdsm_enabled(const char *name, int size) "%s %dMB"
+ vfio_pci_igd_opregion_enabled(const char *name) "%s"
+ vfio_pci_igd_host_bridge_enabled(const char *name) "%s"
+ vfio_pci_igd_lpc_bridge_enabled(const char *name) "%s"
  
- 
- # hw/vfio/vfio-common.c
+ # hw/vfio/common.c
  vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)"
  vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint64_t data) " (%s:region%d+0x%"PRIx64", %d) = 0x%"PRIx64
  vfio_iommu_map_notify(uint64_t iova_start, uint64_t iova_end) "iommu map @ %"PRIx64" - %"PRIx64
@@@ -1757,6 -1738,9 +1761,9 @@@ vfio_region_mmap(const char *name, unsi
  vfio_region_exit(const char *name, int index) "Device %s, region %d"
  vfio_region_finalize(const char *name, int index) "Device %s, region %d"
  vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps enabled: %d"
+ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Device %s region %d: %d sparse mmap entries"
+ vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]"
+ vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8"
  
  # hw/vfio/platform.c
  vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d"