Commit 03de06dd authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20141222.0' into staging 



VFIO updates:
- Conversion to tracepoints (Eric Auger)
- Fix memory listener address space (Frank Blaschka)
- Move to hw/vfio/ and split common vs pci (Eric Auger & Kim Phillips)
- Trivial error_report() fixes (Alex Williamson)

In addition to enabling S390 with the address space fix and updating
to use tracepoints rather than compile time debug, this set of patches
moves hw/misc/vfio.c to hw/vfio/ and paves the way for vfio-platform
support by splitting common functionality from PCI specific code.

# gpg: Signature made Mon 22 Dec 2014 20:19:43 GMT 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-20141222.0:
  vfio: Cleanup error_report()s
  hw/vfio: create common module
  hw/vfio/pci: use name field in format strings
  hw/vfio/pci: rename group_list into vfio_group_list
  hw/vfio/pci: split vfio_get_device
  hw/vfio/pci: Introduce VFIORegion
  hw/vfio/pci: handle reset at VFIODevice
  hw/vfio/pci: add type, name and group fields in VFIODevice
  hw/vfio/pci: introduce minimalist VFIODevice with fd
  hw/vfio/pci: generalize mask/unmask to any IRQ index
  hw/vfio/pci: Rename VFIODevice into VFIOPCIDevice
  vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio
  vfio: fix adding memory listener to the right address space
  vfio: migration to trace points

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7e58e2ac dcbfc5ce

LICENSE

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ option) any later version. 


As of July 2013, contributions under version 2 of the GNU General Public

License (and no later version) are only accepted for the following files

or directories: bsd-user/, linux-user/, hw/misc/vfio.c, hw/xen/xen_pt*.

or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.



3) The Tiny Code Generator (TCG) is released under the BSD license

   (see license headers in files).

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ F: hw/usb/dev-serial.c 
VFIO

M: Alex Williamson <alex.williamson@redhat.com>

S: Supported

F: hw/misc/vfio.c

F: hw/vfio/*



vhost

M: Michael S. Tsirkin <mst@redhat.com>

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ 
devices-dirs-$(CONFIG_SOFTMMU) += timer/

devices-dirs-$(CONFIG_TPM) += tpm/

devices-dirs-$(CONFIG_SOFTMMU) += usb/

devices-dirs-$(CONFIG_SOFTMMU) += vfio/

devices-dirs-$(CONFIG_VIRTIO) += virtio/

devices-dirs-$(CONFIG_SOFTMMU) += watchdog/

devices-dirs-$(CONFIG_SOFTMMU) += xen/

hw/misc/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ common-obj-$(CONFIG_MACIO) += macio/ 


ifeq ($(CONFIG_PCI), y)

obj-$(CONFIG_KVM) += ivshmem.o

obj-$(CONFIG_LINUX) += vfio.o

endif



obj-$(CONFIG_REALVIEW) += arm_sysctl.o

hw/ppc/spapr_pci_vfio.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "hw/ppc/spapr.h"

#include "hw/pci-host/spapr.h"

#include "linux/vfio.h"

#include "hw/misc/vfio.h"

#include "hw/vfio/vfio.h"



static Property spapr_phb_vfio_properties[] = {

    DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1),