Failed in applying to current master (
apply log)
hw/s390x/s390-pci-bus.h | 2 +-
include/exec/memory.h | 64 ++++++++++++++++++------
include/hw/i386/intel_iommu.h | 2 +-
include/hw/ppc/spapr.h | 4 +-
include/hw/vfio/vfio-common.h | 4 +-
include/qemu/typedefs.h | 1 +
target/ppc/kvm_ppc.h | 6 +++
exec.c | 16 +++---
hw/dma/sun4m_iommu.c | 2 +-
hw/i386/amd_iommu.c | 11 ++--
hw/i386/intel_iommu.c | 14 +++---
hw/ppc/spapr_iommu.c | 29 ++++++++---
hw/s390x/s390-pci-bus.c | 6 +--
hw/s390x/s390-pci-inst.c | 8 +--
hw/vfio/common.c | 41 ++++++++++-----
hw/vfio/spapr.c | 34 ++++++++++++-
memory.c | 114 +++++++++++++++++++++++++++++-------------
target/ppc/kvm.c | 7 ++-
hw/vfio/trace-events | 1 +
19 files changed, 265 insertions(+), 101 deletions(-)