From 0fc47b5a7c742bc853e522860bde0bc07d2d5862 Mon Sep 17 00:00:00 2001 From: Yin Fengwei Date: Wed, 7 Nov 2018 14:32:51 +0800 Subject: [PATCH] hv: fix release build issue The old doc update commit changed the code by accident and broke release version build. This patch fix the release build issue. Tracked-On: #1595 Signed-off-by: Yin Fengwei Acked-by: Eddie Dong --- hypervisor/common/hypercall.c | 27 --------------------------- hypervisor/include/common/hypercall.h | 2 ++ 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c index ade353982..5f92fa248 100644 --- a/hypervisor/common/hypercall.c +++ b/hypervisor/common/hypercall.c @@ -981,18 +981,6 @@ int32_t hcall_setup_sbuf(struct acrn_vm *vm, uint64_t param) return sbuf_share_setup(ssp.pcpu_id, ssp.sbuf_id, hva); } -#else -/** - * @brief Setup a share buffer for a VM. - * - * @param vm Pointer to VM data structure - * @param param guest physical address. This gpa points to - * struct sbuf_setup_param - * - * @pre Pointer vm shall point to VM0 - * @return 0 on success, non-zero on error. - */ -int32_t hcall_setup_sbuf(__unused struct acrn_vm *vm, __unused uint64_t param) #endif #ifdef HV_DEBUG @@ -1026,21 +1014,6 @@ int32_t hcall_setup_hv_npk_log(struct acrn_vm *vm, uint64_t param) return 0; } -#else -/** - * @brief Setup the hypervisor NPK log. - * - * @param vm Pointer to VM data structure - * @param param guest physical address. This gpa points to - * struct hv_npk_log_param - * - * @pre Pointer vm shall point to VM0 - * @return 0 on success, non-zero on error. - */ -int32_t hcall_setup_hv_npk_log(__unused struct acrn_vm *vm, __unused uint64_t param) -{ - return -ENODEV; -} #endif /** diff --git a/hypervisor/include/common/hypercall.h b/hypervisor/include/common/hypercall.h index 377dfe0bb..05889fd4d 100644 --- a/hypervisor/include/common/hypercall.h +++ b/hypervisor/include/common/hypercall.h @@ -318,6 +318,7 @@ int32_t hcall_set_ptdev_intr_info(struct acrn_vm *vm, uint16_t vmid, uint64_t pa int32_t hcall_reset_ptdev_intr_info(struct acrn_vm *vm, uint16_t vmid, uint64_t param); +#ifdef HV_DEBUG /** * @brief Setup a share buffer for a VM. * @@ -341,6 +342,7 @@ int32_t hcall_setup_sbuf(struct acrn_vm *vm, uint64_t param); * @return 0 on success, non-zero on error. */ int32_t hcall_setup_hv_npk_log(struct acrn_vm *vm, uint64_t param); +#endif /** * @brief Execute profiling operation