... in preparation to remove the svm/ directory entirely. intr.c doesn't need to include svm.h at all.
No functional change. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> --- xen/arch/x86/cpu-policy.c | 2 +- xen/arch/x86/domain.c | 2 +- xen/arch/x86/hvm/svm/asid.c | 2 +- xen/arch/x86/hvm/svm/emulate.c | 2 +- xen/arch/x86/hvm/svm/intr.c | 1 - xen/arch/x86/hvm/svm/nestedsvm.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/svm/vmcb.c | 2 +- xen/arch/x86/include/asm/hvm/{svm => }/svm.h | 0 xen/arch/x86/spec_ctrl.c | 2 +- 10 files changed, 8 insertions(+), 9 deletions(-) rename xen/arch/x86/include/asm/hvm/{svm => }/svm.h (100%) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 0a7ef15f7210..372d11f2ff20 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -9,7 +9,7 @@ #include <asm/amd.h> #include <asm/cpu-policy.h> #include <asm/hvm/nestedhvm.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/intel-family.h> #include <asm/msr-index.h> #include <asm/paging.h> diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b15120180993..7632d5e2d62d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -48,7 +48,7 @@ #include <asm/guest-msr.h> #include <asm/hvm/hvm.h> #include <asm/hvm/nestedhvm.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/hvm/viridian.h> #include <asm/i387.h> #include <asm/idt.h> diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 0e115243a3af..53aa5d05125f 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -6,7 +6,7 @@ #include <asm/amd.h> #include <asm/hvm/nestedhvm.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include "svm.h" #include "vmcb.h" diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c index d8aa45590885..be3a710fa53d 100644 --- a/xen/arch/x86/hvm/svm/emulate.c +++ b/xen/arch/x86/hvm/svm/emulate.c @@ -11,7 +11,7 @@ #include <asm/msr.h> #include <asm/hvm/emulate.h> #include <asm/hvm/hvm.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/hvm/svm/vmcb.h> #include "svm.h" diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index 931973a9fad4..702c071e8962 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -17,7 +17,6 @@ #include <asm/hvm/hvm.h> #include <asm/hvm/io.h> #include <asm/hvm/vlapic.h> -#include <asm/hvm/svm/svm.h> #include <asm/hvm/nestedhvm.h> /* for nestedhvm_vcpu_in_guestmode */ #include <asm/vm_event.h> #include <xen/event.h> diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 63ed6c86b775..5718ca7f7f0f 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -6,7 +6,7 @@ */ #include <asm/hvm/support.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/hvm/svm/vmcb.h> #include <asm/hvm/nestedhvm.h> #include <asm/paging.h> /* paging_mode_hap */ diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 15d45cbb57c5..86a030b02c27 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -26,7 +26,7 @@ #include <asm/hvm/monitor.h> #include <asm/hvm/nestedhvm.h> #include <asm/hvm/support.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/hvm/svm/vmcb.h> #include <asm/i387.h> #include <asm/idt.h> diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 7bde6e98ce03..463e527a7d98 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -15,7 +15,7 @@ #include <xen/softirq.h> #include <asm/guest-msr.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/hvm/svm/vmcb.h> #include <asm/msr-index.h> #include <asm/p2m.h> diff --git a/xen/arch/x86/include/asm/hvm/svm/svm.h b/xen/arch/x86/include/asm/hvm/svm.h similarity index 100% rename from xen/arch/x86/include/asm/hvm/svm/svm.h rename to xen/arch/x86/include/asm/hvm/svm.h diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index e71f62c60186..dd0413e1fc13 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -11,7 +11,7 @@ #include <xen/warning.h> #include <asm/amd.h> -#include <asm/hvm/svm/svm.h> +#include <asm/hvm/svm.h> #include <asm/intel-family.h> #include <asm/microcode.h> #include <asm/msr.h> -- 2.39.5
