diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-26 19:18:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-26 19:18:08 +0100 |
| commit | 84cfc756d158a061bd462473d42b0a9f072218de (patch) | |
| tree | 90762acdf3e5f44ba48a88f178479af0a1de912b /trace-events | |
| parent | aef11b8d33ff9018b20ae29d87b1d674ed23dab9 (diff) | |
| parent | f1f9365019bb257af087b454972c396bb0d53b26 (diff) | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160526.1' into staging
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>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/trace-events b/trace-events index 767fd04595..1211c20ed1 100644 --- a/trace-events +++ b/trace-events @@ -1736,9 +1736,13 @@ vfio_quirk_ati_bonaire_reset_no_smc(const char *name) "%s" 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 +1761,9 @@ vfio_region_mmap(const char *name, unsigned long offset, unsigned long end) "Reg 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" |