Change hv_vp_index to use uint32_t because that is what is defined in TLFS.
Add "_addr" suffix to hv_do_rep_hypercall's parameters. Signed-off-by: Wei Liu <li...@microsoft.com> --- xen/arch/x86/guest/hyperv/hyperv.c | 2 +- xen/arch/x86/guest/hyperv/private.h | 2 +- xen/include/asm-x86/guest/hyperv-hcall.h | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 70f4cd5ae0..b7044f7193 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -31,7 +31,7 @@ struct ms_hyperv_info __read_mostly ms_hyperv; DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); -DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +DEFINE_PER_CPU_READ_MOSTLY(uint32_t, hv_vp_index); static uint64_t generate_guest_id(void) { diff --git a/xen/arch/x86/guest/hyperv/private.h b/xen/arch/x86/guest/hyperv/private.h index 956eff831f..eb14ea43e5 100644 --- a/xen/arch/x86/guest/hyperv/private.h +++ b/xen/arch/x86/guest/hyperv/private.h @@ -26,6 +26,6 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); -DECLARE_PER_CPU(unsigned int, hv_vp_index); +DECLARE_PER_CPU(uint32_t, hv_vp_index); #endif /* __XEN_HYPERV_PRIVIATE_H__ */ diff --git a/xen/include/asm-x86/guest/hyperv-hcall.h b/xen/include/asm-x86/guest/hyperv-hcall.h index 4d3b131b3a..3396caccdd 100644 --- a/xen/include/asm-x86/guest/hyperv-hcall.h +++ b/xen/include/asm-x86/guest/hyperv-hcall.h @@ -61,7 +61,8 @@ static inline uint64_t hv_do_fast_hypercall(uint16_t code, static inline uint64_t hv_do_rep_hypercall(uint16_t code, uint16_t rep_count, uint16_t varhead_size, - paddr_t input, paddr_t output) + paddr_t input_addr, + paddr_t output_addr) { uint64_t control = code; uint64_t status; @@ -71,7 +72,7 @@ static inline uint64_t hv_do_rep_hypercall(uint16_t code, uint16_t rep_count, control |= (uint64_t)rep_count << HV_HYPERCALL_REP_COMP_OFFSET; do { - status = hv_do_hypercall(control, input, output); + status = hv_do_hypercall(control, input_addr, output_addr); if ( (status & HV_HYPERCALL_RESULT_MASK) != HV_STATUS_SUCCESS ) break; -- 2.20.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel