Message ID | 5cc2afc4-4c01-5457-e655-dfda59bc5291@suse.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | x86: reduce include dependencies | expand |
> From: Jan Beulich <jbeulich@suse.com> > Sent: Tuesday, March 10, 2020 11:51 PM > > Drop #include-s not needed by the header itself as well as one include > of the header which isn't needed. Put the one needed into the file > actually requiring it. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com>
--- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -19,12 +19,8 @@ #ifndef __ASM_X86_HVM_IO_H__ #define __ASM_X86_HVM_IO_H__ -#include <xen/mm.h> #include <xen/pci.h> -#include <asm/hvm/vpic.h> -#include <asm/hvm/vioapic.h> #include <public/hvm/ioreq.h> -#include <public/event_channel.h> #define NR_IO_HANDLERS 32 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -26,6 +26,7 @@ #include <asm/hvm/svm/vmcb.h> #include <asm/hvm/svm/nestedsvm.h> #include <asm/mtrr.h> +#include <public/hvm/ioreq.h> enum hvm_io_completion { HVMIO_no_completion, --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -18,8 +18,6 @@ #ifndef __ASM_X86_HVM_VMX_VMCS_H__ #define __ASM_X86_HVM_VMX_VMCS_H__ -#include <asm/hvm/io.h> - extern void vmcs_dump_vcpu(struct vcpu *v); extern void setup_vmcs_dump(void); extern int vmx_cpu_up_prepare(unsigned int cpu);
Drop #include-s not needed by the header itself as well as one include of the header which isn't needed. Put the one needed into the file actually requiring it. Signed-off-by: Jan Beulich <jbeulich@suse.com>