From d4c89152a1707a3ac5adcb120eb4a72dfdd6b033 Mon Sep 17 00:00:00 2001
From: Fei Li <fei1.li@intel.com>
Date: Tue, 6 Feb 2024 11:11:45 +0800
Subject: [PATCH] vhm: fix 'no previous prototype' error

Fix no previous prototype for function 'foo' [-Werror,-Wmissing-prototypes]
for ACRN VHM.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Fei Li <fei1.li@intel.com>
---
 drivers/char/vhm/vhm_dev.c      | 2 +-
 drivers/vbs/vq.c                | 2 +-
 drivers/vhm/vhm_ioeventfd.c     | 1 +
 drivers/vhm/vhm_irqfd.c         | 1 +
 drivers/vhm/vhm_msi.c           | 1 +
 include/linux/vhm/vhm_eventfd.h | 6 +++---
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/char/vhm/vhm_dev.c b/drivers/char/vhm/vhm_dev.c
index a2217949ec743..e9e5b099b97fe 100644
--- a/drivers/char/vhm/vhm_dev.c
+++ b/drivers/char/vhm/vhm_dev.c
@@ -212,7 +212,7 @@ static long vhm_dev_ioctl(struct file *filep,
 
 		ret = hcall_create_vm(virt_to_phys(&created_vm));
 		if ((ret < 0) ||
-			(created_vm.vmid == ACRN_INVALID_VMID)) {
+			(created_vm.vmid == (uint16_t)ACRN_INVALID_VMID)) {
 			pr_err("vhm: failed to create VM from Hypervisor !\n");
 			return -EFAULT;
 		}
diff --git a/drivers/vbs/vq.c b/drivers/vbs/vq.c
index 4ea44c47b871f..6eafa145414db 100644
--- a/drivers/vbs/vq.c
+++ b/drivers/vbs/vq.c
@@ -66,7 +66,7 @@
 #include <linux/vhm/acrn_vhm_mm.h>
 
 /* helper function for remote memory map */
-void * paddr_guest2host(struct ctx *ctx, uintptr_t gaddr, size_t len)
+static void * paddr_guest2host(struct ctx *ctx, uintptr_t gaddr, size_t len)
 {
 	return map_guest_phys(ctx->vmid, gaddr, len);
 }
diff --git a/drivers/vhm/vhm_ioeventfd.c b/drivers/vhm/vhm_ioeventfd.c
index d5efb1a88dfa4..27182357c9c45 100644
--- a/drivers/vhm/vhm_ioeventfd.c
+++ b/drivers/vhm/vhm_ioeventfd.c
@@ -59,6 +59,7 @@
 #include <linux/slab.h>
 
 #include <linux/vhm/acrn_common.h>
+#include <linux/vhm/vhm_eventfd.h>
 #include <linux/vhm/acrn_vhm_ioreq.h>
 #include <linux/vhm/vhm_ioctl_defs.h>
 #include <linux/vhm/vhm_hypercall.h>
diff --git a/drivers/vhm/vhm_irqfd.c b/drivers/vhm/vhm_irqfd.c
index b8c122d5ea1f6..67077a471b2fb 100644
--- a/drivers/vhm/vhm_irqfd.c
+++ b/drivers/vhm/vhm_irqfd.c
@@ -59,6 +59,7 @@
 #include <linux/async.h>
 #include <linux/slab.h>
 
+#include <linux/vhm/vhm_eventfd.h>
 #include <linux/vhm/acrn_common.h>
 #include <linux/vhm/acrn_vhm_ioreq.h>
 #include <linux/vhm/vhm_vm_mngt.h>
diff --git a/drivers/vhm/vhm_msi.c b/drivers/vhm/vhm_msi.c
index 73affd60fc46c..5f10a0ebb1e41 100644
--- a/drivers/vhm/vhm_msi.c
+++ b/drivers/vhm/vhm_msi.c
@@ -53,6 +53,7 @@
 
 #include <linux/msi.h>
 #include <linux/pci.h>
+#include <linux/vhm/vhm_msi.h>
 #include <linux/vhm/acrn_hv_defs.h>
 #include <linux/vhm/vhm_hypercall.h>
 
diff --git a/include/linux/vhm/vhm_eventfd.h b/include/linux/vhm/vhm_eventfd.h
index 7ee5843eca0e2..7046c7a0208db 100644
--- a/include/linux/vhm/vhm_eventfd.h
+++ b/include/linux/vhm/vhm_eventfd.h
@@ -3,9 +3,9 @@
 
 /* ioeventfd APIs */
 struct acrn_ioeventfd;
-int acrn_ioeventfd_init(int vmid);
-int acrn_ioeventfd(int vmid, struct acrn_ioeventfd *args);
-void acrn_ioeventfd_deinit(int vmid);
+int acrn_ioeventfd_init(uint16_t vmid);
+int acrn_ioeventfd(uint16_t vmid, struct acrn_ioeventfd *args);
+void acrn_ioeventfd_deinit(uint16_t vmid);
 
 /* irqfd APIs */
 struct acrn_irqfd;