[PULL,v3,0/8] VFIO updates 2016-03-11

Pull-request

git://github.com/awilliam/qemu-vfio.git tags/vfio-update-20160311.0

Commit Message

Alex Williamson March 11, 2016, 4 p.m. UTC

The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging (2016-03-10 02:51:14 +0000)

are available in the git repository at:


  git://github.com/awilliam/qemu-vfio.git tags/vfio-update-20160311.0

for you to fetch changes up to 99b88c6d1fc81c9757bb6e116e0adf20b2906629:

  MAINTAINERS: Add entry for the include/hw/vfio/ folder (2016-03-10 20:50:44 -0700)

----------------------------------------------------------------
VFIO updates 2016-03-11

 - Allow devices to be specified via sysfs path (Alex Williamson)
 - vfio region helpers and generalization for future device specific regions
   (Alex Williamson)
 - Automatic ROM device ID and checksum fixup (Alex Williamson)
 - Split VGA setup to allow enabling VGA from quirks (Alex Williamson)
 - Remove fixed string limit for ROM MemoryRegion name (Neo Jia)
 - MAINTAINERS update (Thomas Huth)

----------------------------------------------------------------
Alex Williamson (6):
      vfio: Add sysfsdev property for pci & platform
      vfio: Wrap VFIO_DEVICE_GET_REGION_INFO
      vfio: Generalize region support
      vfio/pci: Convert all MemoryRegion to dynamic alloc and consistent functions
      vfio/pci: Fixup PCI option ROMs
      vfio/pci: Split out VGA setup

Neo Jia (1):
      vfio/pci: replace fixed string limit by g_strdup_printf

Thomas Huth (1):
      MAINTAINERS: Add entry for the include/hw/vfio/ folder

 MAINTAINERS                   |   1 +
 hw/arm/sysbus-fdt.c           |   4 +-
 hw/vfio/common.c              | 190 ++++++++++++---
 hw/vfio/pci-quirks.c          |  62 ++---
 hw/vfio/pci.c                 | 528 +++++++++++++++++++++---------------------
 hw/vfio/pci.h                 |  12 +-
 hw/vfio/platform.c            | 126 ++++------
 include/hw/vfio/vfio-common.h |  31 ++-
 trace-events                  |  10 +-
 9 files changed, 549 insertions(+), 415 deletions(-)

Diff from previous pull request:

Comments

Peter Maydell March 14, 2016, 3:57 p.m. UTC | #1

On 11 March 2016 at 16:00, Alex Williamson <[e-mail]> wrote:
> The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging (2016-03-10 02:51:14 +0000)
>
> are available in the git repository at:
>
>
>   git://github.com/awilliam/qemu-vfio.git tags/vfio-update-20160311.0
>
> for you to fetch changes up to 99b88c6d1fc81c9757bb6e116e0adf20b2906629:
>
>   MAINTAINERS: Add entry for the include/hw/vfio/ folder (2016-03-10 20:50:44 -0700)
>
> ----------------------------------------------------------------
> VFIO updates 2016-03-11
>
>  - Allow devices to be specified via sysfs path (Alex Williamson)
>  - vfio region helpers and generalization for future device specific regions
>    (Alex Williamson)
>  - Automatic ROM device ID and checksum fixup (Alex Williamson)
>  - Split VGA setup to allow enabling VGA from quirks (Alex Williamson)
>  - Remove fixed string limit for ROM MemoryRegion name (Neo Jia)
>  - MAINTAINERS update (Thomas Huth)

Applied, thanks.

-- PMM

Patch

diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 594905a..eb0e1b0 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -25,7 +25,9 @@ 
 #include "exec/memory.h"
 #include "qemu/queue.h"
 #include "qemu/notify.h"
+#ifdef CONFIG_LINUX
 #include <linux/vfio.h>
+#endif
 
 /*#define DEBUG_VFIO*/
 #ifdef DEBUG_VFIO
@@ -144,11 +146,13 @@  VFIOGroup *vfio_get_group(int groupid, AddressSpace *as);
 void vfio_put_group(VFIOGroup *group);
 int vfio_get_device(VFIOGroup *group, const char *name,
                     VFIODevice *vbasedev);
-int vfio_get_region_info(VFIODevice *vbasedev, int index,
-                         struct vfio_region_info **info);
 
 extern const MemoryRegionOps vfio_region_ops;
 extern QLIST_HEAD(vfio_group_head, VFIOGroup) vfio_group_list;
 extern QLIST_HEAD(vfio_as_head, VFIOAddressSpace) vfio_address_spaces;
 
+#ifdef CONFIG_LINUX
+int vfio_get_region_info(VFIODevice *vbasedev, int index,
+                         struct vfio_region_info **info);
+#endif
 #endif /* !HW_VFIO_VFIO_COMMON_H */
diff --git a/trace-events b/trace-events
index c285a6f..bf07a8f 100644
--- a/trace-events
+++ b/trace-events
@@ -1652,7 +1652,7 @@  vfio_msix_enable(const char *name) " (%s)"
 vfio_msix_pba_disable(const char *name) " (%s)"
 vfio_msix_pba_enable(const char *name) " (%s)"
 vfio_msix_disable(const char *name) " (%s)"
-vfio_msix_fixup(const char *name, int bar, off_t start, off_t end) " (%s) MSI-X region %d mmap fixup [0x%"PRIx64" - 0x%"PRIx64"]"
+vfio_msix_fixup(const char *name, int bar, uint64_t start, uint64_t end) " (%s) MSI-X region %d mmap fixup [0x%"PRIx64" - 0x%"PRIx64"]"
 vfio_msi_enable(const char *name, int nr_vectors) " (%s) Enabled %d MSI vectors"
 vfio_msi_disable(const char *name) " (%s)"
 vfio_pci_load_rom(const char *name, unsigned long size, unsigned long offset, unsigned long flags) "Device %s ROM:\n  size: 0x%lx, offset: 0x%lx, flags: 0x%lx"