| Message ID | 20211208155606.20029-5-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xen: drop hypercall function tables | expand |
On 08.12.2021 16:55, Juergen Gross wrote: > The definition of compat_platform_op_t is in compat/platform.h > already, so include that file from hypercall.h instead of repeating > the typedef. > > This allows to remove the related include statement from > arch/x86/x86_64/platform_hypercall.c. > > Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Jan Beulich <jbeulich@suse.com> > --- > V3: > - new patch I was actually puzzled by the cover letter stating two already applied patches when my record said three, yet total patch count having gone down by just two. Then I came to spot this new patch ... Jan
diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index f84252bac6..7631058cce 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -6,7 +6,6 @@ EMIT_FILE; #include <xen/hypercall.h> #include <xen/lib.h> -#include <compat/platform.h> #define xen_platform_op compat_platform_op #define xen_platform_op_t compat_platform_op_t diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 9266bc86e9..459172f6a5 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -15,6 +15,9 @@ #include <public/version.h> #include <public/pmu.h> #include <public/hvm/dm_op.h> +#ifdef CONFIG_COMPAT +#include <compat/platform.h> +#endif #include <asm/hypercall.h> #include <xsm/xsm.h> @@ -207,7 +210,6 @@ extern int compat_multicall( int compat_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); -typedef struct compat_platform_op compat_platform_op_t; DEFINE_XEN_GUEST_HANDLE(compat_platform_op_t); int compat_platform_op(XEN_GUEST_HANDLE_PARAM(compat_platform_op_t) u_xenpf_op);
The definition of compat_platform_op_t is in compat/platform.h already, so include that file from hypercall.h instead of repeating the typedef. This allows to remove the related include statement from arch/x86/x86_64/platform_hypercall.c. Signed-off-by: Juergen Gross <jgross@suse.com> --- V3: - new patch --- xen/arch/x86/x86_64/platform_hypercall.c | 1 - xen/include/xen/hypercall.h | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-)