Failed in applying to current master (
apply log)
docs/man/xl.cfg.5.pod.in | 56 +++++++
tools/libxl/libxl.c | 2 +
tools/libxl/libxl.h | 23 +++
tools/libxl/libxl_create.c | 9 ++
tools/libxl/libxl_mem.c | 6 +-
tools/libxl/libxl_types.idl | 9 ++
tools/libxl/libxl_utils.c | 15 ++
tools/libxl/libxl_utils.h | 1 +
tools/ocaml/libs/xc/xenctrl.ml | 6 +
tools/ocaml/libs/xc/xenctrl.mli | 6 +
tools/ocaml/libs/xc/xenctrl_stubs.c | 16 +-
tools/xl/xl_info.c | 5 +-
tools/xl/xl_parse.c | 172 ++++++++++++++------
xen/arch/arm/Kconfig | 1 +
xen/arch/arm/domain.c | 17 +-
xen/arch/arm/p2m.c | 4 +-
xen/arch/arm/setup.c | 3 +
xen/arch/arm/sysctl.c | 3 +
xen/arch/x86/dom0_build.c | 4 +-
xen/arch/x86/domain.c | 2 +-
xen/arch/x86/domctl.c | 4 +-
xen/arch/x86/hvm/hvm.c | 6 +-
xen/arch/x86/hvm/mtrr.c | 5 +-
xen/arch/x86/hvm/vioapic.c | 2 +-
xen/arch/x86/hvm/vmx/vmcs.c | 2 +-
xen/arch/x86/hvm/vmx/vmx.c | 2 +-
xen/arch/x86/mm/mem_sharing.c | 2 +-
xen/arch/x86/mm/p2m-ept.c | 4 +-
xen/arch/x86/mm/p2m.c | 4 +-
xen/arch/x86/mm/paging.c | 2 +-
xen/arch/x86/setup.c | 3 +
xen/arch/x86/sysctl.c | 5 +
xen/arch/x86/x86_64/mm.c | 2 +-
xen/common/domain.c | 16 +-
xen/common/memory.c | 4 +-
xen/common/vm_event.c | 2 +-
xen/drivers/passthrough/Kconfig | 3 +
xen/drivers/passthrough/amd/iommu_guest.c | 2 +-
xen/drivers/passthrough/device_tree.c | 18 +--
xen/drivers/passthrough/io.c | 8 +-
xen/drivers/passthrough/iommu.c | 188 +++++++---------------
xen/drivers/passthrough/pci.c | 28 +---
xen/drivers/passthrough/vtd/iommu.c | 12 +-
xen/drivers/passthrough/vtd/x86/hvm.c | 2 +-
xen/drivers/passthrough/x86/iommu.c | 99 +-----------
xen/include/asm-arm/iommu.h | 3 -
xen/include/asm-x86/iommu.h | 15 +-
xen/include/public/domctl.h | 15 +-
xen/include/public/sysctl.h | 6 +-
xen/include/xen/iommu.h | 44 ++---
xen/include/xen/sched.h | 13 +-
xen/xsm/flask/hooks.c | 18 +--
52 files changed, 489 insertions(+), 410 deletions(-)