diff options
author | Christoph Egger <Christoph.Egger@amd.com> | 2011-05-20 15:39:07 +0100 |
---|---|---|
committer | Christoph Egger <Christoph.Egger@amd.com> | 2011-05-20 15:39:07 +0100 |
commit | 8b7d4efbc3f9393ff73c4c2aa14bde59a199d3b6 (patch) | |
tree | 5867df529c218d0dc0cc050458ed4e37e332e6f1 /xen/include | |
parent | e982084c7604a4386b84655664ea029aba25770a (diff) | |
download | xen-8b7d4efbc3f9393ff73c4c2aa14bde59a199d3b6.tar.gz xen-8b7d4efbc3f9393ff73c4c2aa14bde59a199d3b6.tar.bz2 xen-8b7d4efbc3f9393ff73c4c2aa14bde59a199d3b6.zip |
xen: Include headers that are actually needed, drop everything else.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'xen/include')
-rw-r--r-- | xen/include/asm-x86/fixmap.h | 6 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/support.h | 4 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/svm/asid.h | 8 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/svm/emulate.h | 2 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/svm/svm.h | 9 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/svm/vmcb.h | 5 | ||||
-rw-r--r-- | xen/include/asm-x86/msi.h | 2 | ||||
-rw-r--r-- | xen/include/public/hvm/save.h | 1 | ||||
-rw-r--r-- | xen/include/xen/console.h | 3 | ||||
-rw-r--r-- | xen/include/xen/hvm/save.h | 2 | ||||
-rw-r--r-- | xen/include/xen/sched.h | 17 | ||||
-rw-r--r-- | xen/include/xen/serial.h | 2 | ||||
-rw-r--r-- | xen/include/xen/tasklet.h | 1 | ||||
-rw-r--r-- | xen/include/xen/vga.h | 1 | ||||
-rw-r--r-- | xen/include/xen/xenoprof.h | 1 | ||||
-rw-r--r-- | xen/include/xen/xmalloc.h | 3 |
16 files changed, 32 insertions, 35 deletions
diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 0614291b9d..695e8d95f8 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -13,12 +13,12 @@ #define _ASM_FIXMAP_H #include <xen/config.h> -#include <asm/apicdef.h> -#include <asm/acpi.h> -#include <asm/page.h> #include <xen/pfn.h> #include <xen/kexec.h> #include <xen/iommu.h> +#include <asm/apicdef.h> +#include <asm/acpi.h> +#include <asm/page.h> #include <asm/amd-iommu.h> #include <asm/msi.h> #include <acpi/apei.h> diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index d9a4e3cdca..f9b102f2a7 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -21,10 +21,10 @@ #ifndef __ASM_X86_HVM_SUPPORT_H__ #define __ASM_X86_HVM_SUPPORT_H__ +#include <xen/types.h> +#include <public/hvm/ioreq.h> #include <xen/sched.h> #include <xen/hvm/save.h> -#include <asm/types.h> -#include <asm/regs.h> #include <asm/processor.h> static inline ioreq_t *get_ioreq(struct vcpu *v) diff --git a/xen/include/asm-x86/hvm/svm/asid.h b/xen/include/asm-x86/hvm/svm/asid.h index 356a1cd023..d9a0618f26 100644 --- a/xen/include/asm-x86/hvm/svm/asid.h +++ b/xen/include/asm-x86/hvm/svm/asid.h @@ -20,13 +20,9 @@ #define __ASM_X86_HVM_SVM_ASID_H__ #include <xen/config.h> -#include <asm/types.h> -#include <asm/hvm/hvm.h> +#include <xen/types.h> #include <asm/hvm/asid.h> -#include <asm/hvm/support.h> -#include <asm/hvm/svm/svm.h> -#include <asm/hvm/svm/vmcb.h> -#include <asm/percpu.h> +#include <asm/processor.h> void svm_asid_init(struct cpuinfo_x86 *c); diff --git a/xen/include/asm-x86/hvm/svm/emulate.h b/xen/include/asm-x86/hvm/svm/emulate.h index 7d2677fa07..8779b82f81 100644 --- a/xen/include/asm-x86/hvm/svm/emulate.h +++ b/xen/include/asm-x86/hvm/svm/emulate.h @@ -42,6 +42,8 @@ enum instruction_index { INSTR_MAX_COUNT /* Must be last - Number of instructions supported */ }; +struct vcpu; + int __get_instruction_length_from_list( struct vcpu *v, enum instruction_index *list, unsigned int list_count); diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 59dbf39e4e..53f6ed5188 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -21,13 +21,8 @@ #ifndef __ASM_X86_HVM_SVM_H__ #define __ASM_X86_HVM_SVM_H__ -#include <xen/sched.h> -#include <asm/types.h> -#include <asm/regs.h> -#include <asm/processor.h> -#include <asm/hvm/svm/vmcb.h> -#include <asm/i387.h> -#include <asm/hvm/vpmu.h> +#include <xen/types.h> +#include <xen/bitmap.h> #define SVM_REG_EAX (0) #define SVM_REG_ECX (1) diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index 9337ebaf36..7e6ddad437 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -20,8 +20,9 @@ #ifndef __ASM_X86_HVM_SVM_VMCB_H__ #define __ASM_X86_HVM_SVM_VMCB_H__ -#include <asm/config.h> -#include <asm/hvm/hvm.h> +#include <xen/config.h> +#include <xen/types.h> +#include <asm/hvm/emulate.h> /* general 1 intercepts */ diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h index 0848616b29..760315e923 100644 --- a/xen/include/asm-x86/msi.h +++ b/xen/include/asm-x86/msi.h @@ -2,6 +2,8 @@ #define __ASM_MSI_H #include <xen/cpumask.h> +#include <xen/pci.h> + /* * Constants for Intel APIC based MSI messages. */ diff --git a/xen/include/public/hvm/save.h b/xen/include/public/hvm/save.h index 8a4c53815a..d0f2661477 100644 --- a/xen/include/public/hvm/save.h +++ b/xen/include/public/hvm/save.h @@ -67,6 +67,7 @@ struct hvm_save_descriptor { struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[2];}; \ struct __HVM_SAVE_TYPE_COMPAT_##_x { _ctype t; } +# include <xen/lib.h> /* BUG() */ # define DECLARE_HVM_SAVE_TYPE(_x, _code, _type) \ static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h) { BUG(); return -1; } \ struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[1];}; \ diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index 553d425bae..cfb07a23e0 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -7,8 +7,7 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ -#include <xen/spinlock.h> -#include <xen/guest_access.h> +#include <xen/inttypes.h> #include <public/xen.h> struct xen_sysctl_readconsole; diff --git a/xen/include/xen/hvm/save.h b/xen/include/xen/hvm/save.h index 43adfcf39c..f1eeaf068e 100644 --- a/xen/include/xen/hvm/save.h +++ b/xen/include/xen/hvm/save.h @@ -18,9 +18,9 @@ #ifndef __XEN_HVM_SAVE_H__ #define __XEN_HVM_SAVE_H__ +#include <xen/types.h> #include <public/xen.h> #include <public/hvm/save.h> -#include <asm/types.h> /* Marshalling and unmarshalling uses a buffer with size and cursor. */ typedef struct hvm_domain_context { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 17fac57dfd..7b546d77b9 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -5,26 +5,19 @@ #include <xen/config.h> #include <xen/types.h> #include <xen/spinlock.h> -#include <xen/smp.h> #include <xen/shared.h> -#include <public/xen.h> -#include <public/domctl.h> -#include <public/sysctl.h> -#include <public/vcpu.h> -#include <xen/time.h> #include <xen/timer.h> -#include <xen/grant_table.h> #include <xen/rangeset.h> #include <xen/domain.h> -#include <xen/xenoprof.h> #include <xen/rcupdate.h> -#include <xen/irq.h> -#include <xen/mm.h> -#include <xen/tasklet.h> -#include <public/mem_event.h> #include <xen/cpumask.h> #include <xen/nodemask.h> #include <xen/multicall.h> +#include <public/xen.h> +#include <public/domctl.h> +#include <public/sysctl.h> +#include <public/vcpu.h> +#include <public/mem_event.h> #ifdef CONFIG_COMPAT #include <compat/vcpu.h> diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 15f7f12275..c5719ec5c5 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -9,6 +9,8 @@ #ifndef __XEN_SERIAL_H__ #define __XEN_SERIAL_H__ +#include <xen/spinlock.h> + struct cpu_user_regs; /* Register a character-receive hook on the specified COM port. */ diff --git a/xen/include/xen/tasklet.h b/xen/include/xen/tasklet.h index e8d6e96b0f..2f65da2c4a 100644 --- a/xen/include/xen/tasklet.h +++ b/xen/include/xen/tasklet.h @@ -10,6 +10,7 @@ #include <xen/types.h> #include <xen/list.h> +#include <xen/percpu.h> struct tasklet { diff --git a/xen/include/xen/vga.h b/xen/include/xen/vga.h index f96776d2f8..04100778e1 100644 --- a/xen/include/xen/vga.h +++ b/xen/include/xen/vga.h @@ -10,6 +10,7 @@ #define _XEN_VGA_H #include <xen/config.h> +#include <public/xen.h> #ifdef CONFIG_VGA extern struct xen_vga_console_info vga_console_info; diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index 5b38e614da..df4c842bbf 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -11,6 +11,7 @@ #define __XEN_XENOPROF_H__ #include <xen/config.h> +#include <xen/inttypes.h> #include <public/xenoprof.h> #include <asm/xenoprof.h> diff --git a/xen/include/xen/xmalloc.h b/xen/include/xen/xmalloc.h index a5188e8629..d9df7dc50e 100644 --- a/xen/include/xen/xmalloc.h +++ b/xen/include/xen/xmalloc.h @@ -2,6 +2,9 @@ #ifndef __XMALLOC_H__ #define __XMALLOC_H__ +#include <xen/types.h> +#include <xen/cache.h> + /* * Xen malloc/free-style interface. */ |