Skip to content

vhm: fix 'no previous prototype' error #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lifeix wants to merge 1 commit into
base: 4.19/android_s
Choose a base branch
from
Open

vhm: fix 'no previous prototype' error #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/char/vhm/vhm_dev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/vbs/vq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions drivers/vhm/vhm_ioeventfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions drivers/vhm/vhm_irqfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions drivers/vhm/vhm_msi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions include/linux/vhm/vhm_eventfd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down