[Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging

[patchbot@xxxxxxx]

commit 19b17e240c5f31eb1ff744946ce75afa729bfe91
Merge: 9072240954fc8a7c74ae04d2eb51c98bc0cb3356 
9875f6d6693a87864f6ab949aedb092f65d15e3a
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri Jul 24 14:13:21 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Jul 24 14:13:21 2015 +0100

    Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into 
staging

 docs/man/xl.cfg.pod.5                        |   12 +
 docs/misc/xen-command-line.markdown          |    7 +
 tools/flask/policy/policy/modules/xen/xen.if |    4 +-
 tools/libxc/Makefile                         |    1 +
 tools/libxc/include/xenctrl.h                |   22 +
 tools/libxc/xc_altp2m.c                      |  248 +++++++++++
 tools/libxl/libxl.h                          |    6 +
 tools/libxl/libxl_create.c                   |    1 +
 tools/libxl/libxl_dom.c                      |    2 +
 tools/libxl/libxl_types.idl                  |    1 +
 tools/libxl/xl_cmdimpl.c                     |   10 +
 tools/tests/xen-access/xen-access.c          |  173 +++++++-
 xen/arch/x86/hvm/emulate.c                   |   18 +-
 xen/arch/x86/hvm/hvm.c                       |  252 +++++++++++-
 xen/arch/x86/hvm/vmx/vmcs.c                  |   42 ++-
 xen/arch/x86/hvm/vmx/vmx.c                   |  176 ++++++++
 xen/arch/x86/mm/Makefile                     |    1 +
 xen/arch/x86/mm/altp2m.c                     |   77 ++++
 xen/arch/x86/mm/hap/hap.c                    |   40 ++-
 xen/arch/x86/mm/mem_sharing.c                |    4 +-
 xen/arch/x86/mm/mm-locks.h                   |   46 ++-
 xen/arch/x86/mm/p2m-ept.c                    |   35 ++-
 xen/arch/x86/mm/p2m-pod.c                    |   12 +-
 xen/arch/x86/mm/p2m-pt.c                     |   10 +-
 xen/arch/x86/mm/p2m.c                        |  608 ++++++++++++++++++++++++--
 xen/arch/x86/x86_emulate/x86_emulate.c       |   19 +-
 xen/arch/x86/x86_emulate/x86_emulate.h       |    4 +
 xen/common/domain.c                          |   28 ++
 xen/common/vm_event.c                        |    4 +
 xen/include/asm-arm/p2m.h                    |    6 +
 xen/include/asm-x86/altp2m.h                 |   38 ++
 xen/include/asm-x86/domain.h                 |   10 +
 xen/include/asm-x86/hvm/hvm.h                |   25 +
 xen/include/asm-x86/hvm/vcpu.h               |    9 +
 xen/include/asm-x86/hvm/vmx/vmcs.h           |   14 +-
 xen/include/asm-x86/hvm/vmx/vmx.h            |   13 +-
 xen/include/asm-x86/msr-index.h              |    1 +
 xen/include/asm-x86/p2m.h                    |  100 ++++-
 xen/include/public/hvm/hvm_op.h              |   89 ++++
 xen/include/public/hvm/params.h              |    5 +-
 xen/include/public/vm_event.h                |   12 +
 xen/include/xen/sched.h                      |    5 +
 xen/include/xsm/dummy.h                      |   12 +
 xen/include/xsm/xsm.h                        |   12 +
 xen/xsm/dummy.c                              |    2 +
 xen/xsm/flask/hooks.c                        |   12 +
 xen/xsm/flask/policy/access_vectors          |    7 +
 47 files changed, 2131 insertions(+), 104 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog