thr3ads.net - Xen devel - [PATCH] move declarations of some required per-arch functions into common headers [Jan 2012]

If this information is useful, please help other people find it:
Share via:

Jan Beulich

2012-Jan-12 12:32 UTC

[PATCH] move declarations of some required per-arch functions into common headers

... since it is pointless to have each arch declare them on their own
(and now and the - see ia64 - forget to do so).

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- 2012-01-12.orig/xen/arch/ia64/xen/dom0_ops.c	2011-11-16 12:40:48.000000000
+0100
+++ 2012-01-12/xen/arch/ia64/xen/dom0_ops.c	2012-01-12 11:47:51.000000000 +0100
@@ -19,6 +19,7 @@
 #include <xen/console.h>
 #include <xen/grant_table.h>
 #include <xen/guest_access.h>
+#include <xen/hypercall.h>
 #include <xen/pci.h>
 #include <asm/vmx.h>
 #include <asm/dom_fw.h>
--- 2012-01-12.orig/xen/arch/ia64/xen/domain.c	2011-11-16 12:40:48.000000000
+0100
+++ 2012-01-12/xen/arch/ia64/xen/domain.c	2012-01-12 11:45:30.000000000 +0100
@@ -31,6 +31,7 @@
 #include <asm/processor.h>
 #include <xen/event.h>
 #include <xen/console.h>
+#include <xen/hypercall.h>
 #include <xen/version.h>
 #include <xen/libelf.h>
 #include <asm/pgalloc.h>
--- 2012-01-12.orig/xen/arch/ia64/xen/xensetup.c	2011-11-02 09:22:59.000000000
+0100
+++ 2012-01-12/xen/arch/ia64/xen/xensetup.c	2012-01-12 11:52:35.000000000 +0100
@@ -10,7 +10,7 @@
 #include <xen/multiboot.h>
 #include <xen/sched.h>
 #include <xen/mm.h>
-#include <public/version.h>
+#include <xen/hypercall.h>
 #include <xen/gdbstub.h>
 #include <xen/version.h>
 #include <xen/console.h>
--- 2012-01-12.orig/xen/arch/x86/domain.c	2011-11-11 10:11:23.000000000 +0100
+++ 2012-01-12/xen/arch/x86/domain.c	2012-01-12 11:45:59.000000000 +0100
@@ -23,6 +23,7 @@
 #include <xen/grant_table.h>
 #include <xen/iocap.h>
 #include <xen/kernel.h>
+#include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/irq.h>
 #include <xen/event.h>
@@ -46,7 +47,6 @@
 #include <asm/xstate.h>
 #include <asm/mpspec.h>
 #include <asm/ldt.h>
-#include <asm/hypercall.h>
 #include <asm/fixmap.h>
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/support.h>
--- 2012-01-12.orig/xen/arch/x86/x86_64/domain.c	2009-08-19 17:01:49.000000000
+0200
+++ 2012-01-12/xen/arch/x86/x86_64/domain.c	2012-01-12 11:46:27.000000000 +0100
@@ -6,7 +6,7 @@
 #include <xen/config.h>
 #include <xen/types.h>
 #include <xen/guest_access.h>
-#include <asm/hypercall.h>
+#include <xen/hypercall.h>
 #include <compat/vcpu.h>
 
 #define xen_vcpu_info vcpu_info
--- 2012-01-12.orig/xen/common/kernel.c	2011-08-08 08:29:50.000000000 +0200
+++ 2012-01-12/xen/common/kernel.c	2012-01-12 11:51:52.000000000 +0100
@@ -13,13 +13,10 @@
 #include <xen/paging.h>
 #include <xen/nmi.h>
 #include <xen/guest_access.h>
+#include <xen/hypercall.h>
 #include <asm/current.h>
 #include <public/nmi.h>
 #include <public/version.h>
-#ifdef CONFIG_X86
-#include <asm/shared.h>
-#include <asm/setup.h>
-#endif
 
 #ifndef COMPAT
 
--- 2012-01-12.orig/xen/include/asm-ia64/hypercall.h	2007-03-26
16:26:13.000000000 +0200
+++ 2012-01-12/xen/include/asm-ia64/hypercall.h	2012-01-12 11:42:06.000000000
+0100
@@ -22,7 +22,4 @@ vmx_do_mmu_update(
     u64 *pdone,
     u64 foreigndom);
 
-extern long
-arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
-
 #endif /* __ASM_IA64_HYPERCALL_H__ */
--- 2012-01-12.orig/xen/include/asm-x86/hypercall.h	2011-11-16
12:40:48.000000000 +0100
+++ 2012-01-12/xen/include/asm-x86/hypercall.h	2012-01-12 11:43:21.000000000
+0100
@@ -90,16 +90,6 @@ extern unsigned long
 do_iret(
     void);
 
-struct vcpu;
-extern long
-arch_do_vcpu_op(
-    int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
-
-extern long
-arch_do_sysctl(
-    struct xen_sysctl *op, 
-    XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
-
 extern int
 do_kexec(
     unsigned long op, unsigned arg1, XEN_GUEST_HANDLE(void) uarg);
--- 2012-01-12.orig/xen/include/asm-x86/setup.h	2011-12-23 08:54:33.000000000
+0100
+++ 2012-01-12/xen/include/asm-x86/setup.h	2012-01-12 11:49:09.000000000 +0100
@@ -2,7 +2,6 @@
 #define __X86_SETUP_H_
 
 #include <xen/multiboot.h>
-#include <public/version.h>
 
 extern bool_t early_boot;
 extern unsigned long xenheap_initial_phys_start;
@@ -40,7 +39,6 @@ unsigned long initial_images_nrpages(voi
 void discard_initial_images(void);
 
 int xen_in_range(unsigned long mfn);
-void arch_get_xen_caps(xen_capabilities_info_t *info);
 
 void microcode_grab_module(
     unsigned long *, const multiboot_info_t *, void *(*)(const module_t *));
--- 2012-01-12.orig/xen/include/xen/hypercall.h	2011-11-16 12:40:48.000000000
+0100
+++ 2012-01-12/xen/include/xen/hypercall.h	2012-01-12 11:50:17.000000000 +0100
@@ -14,6 +14,7 @@
 #include <public/platform.h>
 #include <public/event_channel.h>
 #include <public/tmem.h>
+#include <public/version.h>
 #include <asm/hypercall.h>
 #include <xsm/xsm.h>
 
@@ -45,6 +46,11 @@ do_sysctl(
     XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
 
 extern long
+arch_do_sysctl(
+    struct xen_sysctl *sysctl,
+    XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
+
+extern long
 do_platform_op(
     XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op);
 
@@ -102,6 +108,12 @@ do_vcpu_op(
     int vcpuid,
     XEN_GUEST_HANDLE(void) arg);
 
+struct vcpu;
+extern long
+arch_do_vcpu_op(int cmd,
+    struct vcpu *v,
+    XEN_GUEST_HANDLE(void) arg);
+
 extern long
 do_nmi_op(
     unsigned int cmd,
@@ -167,4 +179,6 @@ compat_set_timer_op(
 
 #endif
 
+void arch_get_xen_caps(xen_capabilities_info_t *info);
+
 #endif /* __XEN_HYPERCALL_H__ */




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Keir Fraser

2012-Jan-12 12:36 UTC

head link

Re: [PATCH] move declarations of some required per-arch functions into common headers

On 12/01/2012 12:32, "Jan Beulich" <JBeulich@suse.com> wrote:
> ... since it is pointless to have each arch declare them on their own
> (and now and the - see ia64 - forget to do so).
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
> --- 2012-01-12.orig/xen/arch/ia64/xen/dom0_ops.c 2011-11-16
12:40:48.000000000
> +0100
> +++ 2012-01-12/xen/arch/ia64/xen/dom0_ops.c 2012-01-12 11:47:51.000000000
> +0100
> @@ -19,6 +19,7 @@
>  #include <xen/console.h>
>  #include <xen/grant_table.h>
>  #include <xen/guest_access.h>
> +#include <xen/hypercall.h>
>  #include <xen/pci.h>
>  #include <asm/vmx.h>
>  #include <asm/dom_fw.h>
> --- 2012-01-12.orig/xen/arch/ia64/xen/domain.c 2011-11-16
12:40:48.000000000
> +0100
> +++ 2012-01-12/xen/arch/ia64/xen/domain.c 2012-01-12 11:45:30.000000000
+0100
> @@ -31,6 +31,7 @@
>  #include <asm/processor.h>
>  #include <xen/event.h>
>  #include <xen/console.h>
> +#include <xen/hypercall.h>
>  #include <xen/version.h>
>  #include <xen/libelf.h>
>  #include <asm/pgalloc.h>
> --- 2012-01-12.orig/xen/arch/ia64/xen/xensetup.c 2011-11-02
09:22:59.000000000
> +0100
> +++ 2012-01-12/xen/arch/ia64/xen/xensetup.c 2012-01-12 11:52:35.000000000
> +0100
> @@ -10,7 +10,7 @@
>  #include <xen/multiboot.h>
>  #include <xen/sched.h>
>  #include <xen/mm.h>
> -#include <public/version.h>
> +#include <xen/hypercall.h>
>  #include <xen/gdbstub.h>
>  #include <xen/version.h>
>  #include <xen/console.h>
> --- 2012-01-12.orig/xen/arch/x86/domain.c 2011-11-11 10:11:23.000000000
+0100
> +++ 2012-01-12/xen/arch/x86/domain.c 2012-01-12 11:45:59.000000000 +0100
> @@ -23,6 +23,7 @@
>  #include <xen/grant_table.h>
>  #include <xen/iocap.h>
>  #include <xen/kernel.h>
> +#include <xen/hypercall.h>
>  #include <xen/multicall.h>
>  #include <xen/irq.h>
>  #include <xen/event.h>
> @@ -46,7 +47,6 @@
>  #include <asm/xstate.h>
>  #include <asm/mpspec.h>
>  #include <asm/ldt.h>
> -#include <asm/hypercall.h>
>  #include <asm/fixmap.h>
>  #include <asm/hvm/hvm.h>
>  #include <asm/hvm/support.h>
> --- 2012-01-12.orig/xen/arch/x86/x86_64/domain.c 2009-08-19
17:01:49.000000000
> +0200
> +++ 2012-01-12/xen/arch/x86/x86_64/domain.c 2012-01-12 11:46:27.000000000
> +0100
> @@ -6,7 +6,7 @@
>  #include <xen/config.h>
>  #include <xen/types.h>
>  #include <xen/guest_access.h>
> -#include <asm/hypercall.h>
> +#include <xen/hypercall.h>
>  #include <compat/vcpu.h>
>  
>  #define xen_vcpu_info vcpu_info
> --- 2012-01-12.orig/xen/common/kernel.c 2011-08-08 08:29:50.000000000 +0200
> +++ 2012-01-12/xen/common/kernel.c 2012-01-12 11:51:52.000000000 +0100
> @@ -13,13 +13,10 @@
>  #include <xen/paging.h>
>  #include <xen/nmi.h>
>  #include <xen/guest_access.h>
> +#include <xen/hypercall.h>
>  #include <asm/current.h>
>  #include <public/nmi.h>
>  #include <public/version.h>
> -#ifdef CONFIG_X86
> -#include <asm/shared.h>
> -#include <asm/setup.h>
> -#endif
>  
>  #ifndef COMPAT
>  
> --- 2012-01-12.orig/xen/include/asm-ia64/hypercall.h 2007-03-26
> 16:26:13.000000000 +0200
> +++ 2012-01-12/xen/include/asm-ia64/hypercall.h 2012-01-12
11:42:06.000000000
> +0100
> @@ -22,7 +22,4 @@ vmx_do_mmu_update(
>      u64 *pdone,
>      u64 foreigndom);
>  
> -extern long
> -arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
> -
>  #endif /* __ASM_IA64_HYPERCALL_H__ */
> --- 2012-01-12.orig/xen/include/asm-x86/hypercall.h 2011-11-16
> 12:40:48.000000000 +0100
> +++ 2012-01-12/xen/include/asm-x86/hypercall.h 2012-01-12
11:43:21.000000000
> +0100
> @@ -90,16 +90,6 @@ extern unsigned long
>  do_iret(
>      void);
>  
> -struct vcpu;
> -extern long
> -arch_do_vcpu_op(
> -    int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
> -
> -extern long
> -arch_do_sysctl(
> -    struct xen_sysctl *op,
> -    XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
> -
>  extern int
>  do_kexec(
>      unsigned long op, unsigned arg1, XEN_GUEST_HANDLE(void) uarg);
> --- 2012-01-12.orig/xen/include/asm-x86/setup.h 2011-12-23
08:54:33.000000000
> +0100
> +++ 2012-01-12/xen/include/asm-x86/setup.h 2012-01-12 11:49:09.000000000
+0100
> @@ -2,7 +2,6 @@
>  #define __X86_SETUP_H_
>  
>  #include <xen/multiboot.h>
> -#include <public/version.h>
>  
>  extern bool_t early_boot;
>  extern unsigned long xenheap_initial_phys_start;
> @@ -40,7 +39,6 @@ unsigned long initial_images_nrpages(voi
>  void discard_initial_images(void);
>  
>  int xen_in_range(unsigned long mfn);
> -void arch_get_xen_caps(xen_capabilities_info_t *info);
>  
>  void microcode_grab_module(
>      unsigned long *, const multiboot_info_t *, void *(*)(const module_t
*));
> --- 2012-01-12.orig/xen/include/xen/hypercall.h 2011-11-16
12:40:48.000000000
> +0100
> +++ 2012-01-12/xen/include/xen/hypercall.h 2012-01-12 11:50:17.000000000
+0100
> @@ -14,6 +14,7 @@
>  #include <public/platform.h>
>  #include <public/event_channel.h>
>  #include <public/tmem.h>
> +#include <public/version.h>
>  #include <asm/hypercall.h>
>  #include <xsm/xsm.h>
>  
> @@ -45,6 +46,11 @@ do_sysctl(
>      XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
>  
>  extern long
> +arch_do_sysctl(
> +    struct xen_sysctl *sysctl,
> +    XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);
> +
> +extern long
>  do_platform_op(
>      XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op);
>  
> @@ -102,6 +108,12 @@ do_vcpu_op(
>      int vcpuid,
>      XEN_GUEST_HANDLE(void) arg);
>  
> +struct vcpu;
> +extern long
> +arch_do_vcpu_op(int cmd,
> +    struct vcpu *v,
> +    XEN_GUEST_HANDLE(void) arg);
> +
>  extern long
>  do_nmi_op(
>      unsigned int cmd,
> @@ -167,4 +179,6 @@ compat_set_timer_op(
>  
>  #endif
>  
> +void arch_get_xen_caps(xen_capabilities_info_t *info);
> +
>  #endif /* __XEN_HYPERCALL_H__ */
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel

Xen devel - Jan 2012 - [PATCH] move declarations of some required per-arch functions into common headers

[PATCH] move declarations of some required per-arch functions into common headers

Re: [PATCH] move declarations of some required per-arch functions into common headers