Merge

diff --cc xen/arch/x86/hvm/hvm.c
Simple merge

diff --cc xen/arch/x86/hvm/svm/svm.c
Simple merge

diff --cc xen/arch/x86/hvm/vmx/vmx.c
Simple merge

diff --cc xen/include/asm-x86/domain.h
Simple merge