xen: remove struct domain and vcpu declarations from types.h

They don't belong there. Removing them causes build errors in several
places. Add the forward declarations in those places.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>

diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h
index 855ded1b071221ff6c69ad92c82dc48cff15eb5b..ab5225fa6c6be1709056cdab0bd3c7785879d1cb 100644 (file)
--- a/xen/include/asm-arm/processor.h
+++ b/xen/include/asm-arm/processor.h
@@ -699,6 +699,7 @@ void show_registers(struct cpu_user_regs *regs);
 
 void noreturn do_unexpected_trap(const char *msg, struct cpu_user_regs *regs);
 
+struct vcpu;
 void vcpu_regs_hyp_to_user(const struct vcpu *vcpu,
                            struct vcpu_guest_core_regs *regs);
 void vcpu_regs_user_to_hyp(struct vcpu *vcpu,

diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h
index 3a1b001edb89d841ca632ee21097ee06e8515c13..eeac9f2ca1fbb5f9d28528b3cd5c10f7a7e400b3 100644 (file)
--- a/xen/include/asm-x86/xenoprof.h
+++ b/xen/include/asm-x86/xenoprof.h
@@ -22,6 +22,8 @@
 #ifndef __ASM_X86_XENOPROF_H__
 #define __ASM_X86_XENOPROF_H__
 
+struct vcpu;
+
 #ifdef CONFIG_XENOPROF
 
 int nmi_reserve_counters(void);
@@ -45,7 +47,6 @@ int xenoprof_arch_counter(XEN_GUEST_HANDLE_PARAM(void) arg);
 int compat_oprof_arch_counter(XEN_GUEST_HANDLE_PARAM(void) arg);
 int xenoprof_arch_ibs_counter(XEN_GUEST_HANDLE_PARAM(void) arg);
 
-struct vcpu;
 struct cpu_user_regs;
 
 /* AMD IBS support */

diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h
index ce6245c10feb7c6617e57a9e9404b368ddfe2745..895e2ff68d134f99f0b25a49ff651d50f49547dc 100644 (file)
--- a/xen/include/xen/compat.h
+++ b/xen/include/xen/compat.h
@@ -227,6 +227,7 @@ void xlat_start_info(struct start_info *, enum XLAT_start_info_console);
 struct vcpu_runstate_info;
 void xlat_vcpu_runstate_info(struct vcpu_runstate_info *);
 
+struct domain;
 int switch_compat(struct domain *);
 
 #else

diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h
index 170e993558a37c8855ff7c0936857673fcfd33f4..b1dbb8720adb43a570b95d377eece7ba69e85979 100644 (file)
--- a/xen/include/xen/types.h
+++ b/xen/include/xen/types.h
@@ -42,9 +42,6 @@ typedef         __s32           int32_t;
 typedef         __u64           uint64_t;
 typedef         __s64           int64_t;
 
-struct domain;
-struct vcpu;
-
 typedef __u16 __le16;
 typedef __u16 __be16;
 typedef __u32 __le32;