This turned out to be a little easier than I was expecting.

https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2212088192

Andrew Cooper (5):
  x86/svm: Move asm/hvm/svm/svm.h up one directory
  x86/svm: Move svm_intercept_msr() into svm.h
  x86/svm: Introduce svm-types.h
  x86/svm: Merge nestedsvm.h into svm-types.h
  x86/svm: Merge vmcb.h into svm-types.h

 xen/arch/x86/cpu-policy.c                     |  2 +-
 xen/arch/x86/cpu/vpmu_amd.c                   |  5 +-
 xen/arch/x86/domain.c                         |  2 +-
 xen/arch/x86/hvm/svm/asid.c                   |  2 +-
 xen/arch/x86/hvm/svm/emulate.c                |  3 +-
 xen/arch/x86/hvm/svm/intr.c                   |  1 -
 xen/arch/x86/hvm/svm/nestedsvm.c              |  3 +-
 xen/arch/x86/hvm/svm/svm.c                    |  3 +-
 xen/arch/x86/hvm/svm/vmcb.c                   |  3 +-
 xen/arch/x86/include/asm/hvm/domain.h         |  2 +-
 .../asm/hvm/{svm/nestedsvm.h => svm-types.h}  | 76 +++++++++++++------
 xen/arch/x86/include/asm/hvm/{svm => }/svm.h  |  8 ++
 xen/arch/x86/include/asm/hvm/svm/vmcb.h       | 63 ---------------
 xen/arch/x86/include/asm/hvm/vcpu.h           |  3 +-
 xen/arch/x86/spec_ctrl.c                      |  2 +-
 15 files changed, 73 insertions(+), 105 deletions(-)
 rename xen/arch/x86/include/asm/hvm/{svm/nestedsvm.h => svm-types.h} (52%)
 rename xen/arch/x86/include/asm/hvm/{svm => }/svm.h (86%)
 delete mode 100644 xen/arch/x86/include/asm/hvm/svm/vmcb.h


base-commit: e6836f213f0f9d3aeaf7c89ce1e20716795b37bd
-- 
2.39.5