github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-16 22:39:29 +00:00
Code Issues Projects Releases Wiki Activity

dm: Use new memory management ioctls

Browse Source 
struct vm_memmap	->	struct acrn_vm_memmap
VM_MEMMAP_SYSMEM	->	ACRN_MEMMAP_RAM
VM_MMIO			->	ACRN_MEMMAP_MMIO
PROT_ALL		->	ACRN_MEM_ACCESS_RWX

Tracked-On: #6282
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Shuo A Liu
2021-07-07 16:06:42 +08:00
committed by wenlingz
parent 9c910bae44
commit 7e01d90b87
3 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
devicemodel/core/vmmapi.c
View File

@@ -362,16 +362,15 @@ int
vm_map_memseg_vma(struct vmctx *ctx, size_t len, vm_paddr_t gpa,
uint64_t vma, int prot)
{
struct vm_memmap memmap;
struct acrn_vm_memmap memmap;
bzero(&memmap, sizeof(struct vm_memmap));
memmap.type = VM_MEMMAP_SYSMEM;
memmap.using_vma = 1;
bzero(&memmap, sizeof(struct acrn_vm_memmap));
memmap.type = ACRN_MEMMAP_RAM;
memmap.vma_base = vma;
memmap.len = len;
memmap.gpa = gpa;
memmap.prot = prot;
return ioctl(ctx->fd, IC_SET_MEMSEG, &memmap);
memmap.user_vm_pa = gpa;
memmap.attr = prot;
return ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap);
}
int
@@ -568,32 +567,32 @@ int
vm_map_ptdev_mmio(struct vmctx *ctx, int bus, int slot, int func,
vm_paddr_t gpa, size_t len, vm_paddr_t hpa)
{
struct vm_memmap memmap;
struct acrn_vm_memmap memmap;
bzero(&memmap, sizeof(struct vm_memmap));
memmap.type = VM_MMIO;
bzero(&memmap, sizeof(struct acrn_vm_memmap));
memmap.type = ACRN_MEMMAP_MMIO;
memmap.len = len;
memmap.gpa = gpa;
memmap.hpa = hpa;
memmap.prot = PROT_ALL;
memmap.user_vm_pa = gpa;
memmap.service_vm_pa = hpa;
memmap.attr = ACRN_MEM_ACCESS_RWX;
return ioctl(ctx->fd, IC_SET_MEMSEG, &memmap);
return ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap);
}
int
vm_unmap_ptdev_mmio(struct vmctx *ctx, int bus, int slot, int func,
vm_paddr_t gpa, size_t len, vm_paddr_t hpa)
{
struct vm_memmap memmap;
struct acrn_vm_memmap memmap;
bzero(&memmap, sizeof(struct vm_memmap));
memmap.type = VM_MMIO;
bzero(&memmap, sizeof(struct acrn_vm_memmap));
memmap.type = ACRN_MEMMAP_MMIO;
memmap.len = len;
memmap.gpa = gpa;
memmap.hpa = hpa;
memmap.prot = PROT_ALL;
memmap.user_vm_pa = gpa;
memmap.service_vm_pa = hpa;
memmap.attr = ACRN_MEM_ACCESS_RWX;
return ioctl(ctx->fd, IC_UNSET_MEMSEG, &memmap);
return ioctl(ctx->fd, ACRN_IOCTL_UNSET_MEMSEG, &memmap);
}
int