| Message ID | 20220310073420.15622-2-jgross@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen: drop hypercall function tables | expand |
Hi Juergen, On 10/03/2022 07:34, Juergen Gross wrote: > do_physdev_op() prototypes on Arm and x86 differ in their return type, > so rename the Arm one in order to prepare using a common generated > header file. > > Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Julien Grall <jgrall@amazon.com> Cheers,
diff --git a/xen/arch/arm/include/asm/hypercall.h b/xen/arch/arm/include/asm/hypercall.h index a0c5a31a2f..39d2e7889d 100644 --- a/xen/arch/arm/include/asm/hypercall.h +++ b/xen/arch/arm/include/asm/hypercall.h @@ -2,7 +2,7 @@ #define __ASM_ARM_HYPERCALL_H__ #include <public/domctl.h> /* for arch_do_domctl */ -int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); +int do_arm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); long do_arm_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg); diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c index f9aa274dda..95a8cdc0ee 100644 --- a/xen/arch/arm/physdev.c +++ b/xen/arch/arm/physdev.c @@ -11,7 +11,7 @@ #include <xen/hypercall.h> -int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) +int do_arm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { #ifdef CONFIG_HAS_PCI return pci_physdev_op(cmd, arg); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7a1b679b8c..f8c3ef0ca2 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1371,7 +1371,7 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL(xsm_op, 1), HYPERCALL(event_channel_op, 2), HYPERCALL_DEPRECATED(event_channel_op_compat, 1), - HYPERCALL(physdev_op, 2), + HYPERCALL_ARM(physdev_op, 2), HYPERCALL_DEPRECATED(physdev_op_compat, 1), HYPERCALL(sysctl, 2), HYPERCALL(hvm_op, 2),
do_physdev_op() prototypes on Arm and x86 differ in their return type, so rename the Arm one in order to prepare using a common generated header file. Signed-off-by: Juergen Gross <jgross@suse.com> --- V4: - new patch --- xen/arch/arm/include/asm/hypercall.h | 2 +- xen/arch/arm/physdev.c | 2 +- xen/arch/arm/traps.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)