64-bit VFS_VMCALL_OFFSET

Change-Id: I29725365a199f850420cd0e4e3902cf70dffe9ad
This commit is contained in:
Ben Gras 2014-02-24 17:14:07 +01:00 committed by Lionel Sambuc
parent 188a5fde1f
commit ed9076ccb4
3 changed files with 3 additions and 6 deletions

View file

@ -871,8 +871,7 @@
# define VFS_VMCALL_FD m10_i2 # define VFS_VMCALL_FD m10_i2
# define VFS_VMCALL_REQID m10_i3 # define VFS_VMCALL_REQID m10_i3
# define VFS_VMCALL_ENDPOINT m10_i4 # define VFS_VMCALL_ENDPOINT m10_i4
# define VFS_VMCALL_OFFSET_LO m10_l1 # define VFS_VMCALL_OFFSET m10_ull1
# define VFS_VMCALL_OFFSET_HI m10_l2
# define VFS_VMCALL_LENGTH m10_l3 # define VFS_VMCALL_LENGTH m10_l3
/* Request codes to from VM to VFS */ /* Request codes to from VM to VFS */

View file

@ -349,8 +349,7 @@ int do_vm_call(void)
int req_fd = job_m_in.VFS_VMCALL_FD; int req_fd = job_m_in.VFS_VMCALL_FD;
u32_t req_id = job_m_in.VFS_VMCALL_REQID; u32_t req_id = job_m_in.VFS_VMCALL_REQID;
endpoint_t ep = job_m_in.VFS_VMCALL_ENDPOINT; endpoint_t ep = job_m_in.VFS_VMCALL_ENDPOINT;
u64_t offset = make64(job_m_in.VFS_VMCALL_OFFSET_LO, u64_t offset = job_m_in.VFS_VMCALL_OFFSET;
job_m_in.VFS_VMCALL_OFFSET_HI);
u32_t length = job_m_in.VFS_VMCALL_LENGTH; u32_t length = job_m_in.VFS_VMCALL_LENGTH;
int result = OK; int result = OK;
int slot; int slot;

View file

@ -86,8 +86,7 @@ int vfs_request(int reqno, int fd, struct vmproc *vmp, u64_t offset, u32_t len,
m->VFS_VMCALL_FD = fd; m->VFS_VMCALL_FD = fd;
m->VFS_VMCALL_REQID = reqid; m->VFS_VMCALL_REQID = reqid;
m->VFS_VMCALL_ENDPOINT = vmp->vm_endpoint; m->VFS_VMCALL_ENDPOINT = vmp->vm_endpoint;
m->VFS_VMCALL_OFFSET_LO = ex64lo(offset); m->VFS_VMCALL_OFFSET = offset;
m->VFS_VMCALL_OFFSET_HI = ex64hi(offset);
m->VFS_VMCALL_LENGTH = len; m->VFS_VMCALL_LENGTH = len;
reqnode->who = vmp->vm_endpoint; reqnode->who = vmp->vm_endpoint;