i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_disk: Round the length to the proper offset for partial reads.

Browse Source 
Following this commit, Haiku boots successfully in VMware from a
NVMe device!
This commit is contained in:
Augustin Cavalier
2019-04-14 21:21:26 -04:00
parent 0c26c6f155
commit fa84c61a81
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+2 -2
View File
@@ -288,8 +288,8 @@ nvme_disk_read(void* cookie, off_t pos, void* buffer, size_t* length)
// libnvme does transfers in units of device sectors, so if we have to // libnvme does transfers in units of device sectors, so if we have to
// round either the position or the length, we will need a bounce buffer. // round either the position or the length, we will need a bounce buffer.
off_t rounded_pos = ROUNDDOWN(pos, block_size); const off_t rounded_pos = ROUNDDOWN(pos, block_size);
size_t rounded_len = ROUNDUP(*length, block_size); size_t rounded_len = ROUNDUP((*length) + (pos - rounded_pos), block_size);
if (rounded_pos != pos || rounded_len != *length if (rounded_pos != pos || rounded_len != *length
|| IS_USER_ADDRESS(buffer)) { || IS_USER_ADDRESS(buffer)) {
void* bounceBuffer = malloc(rounded_len); void* bounceBuffer = malloc(rounded_len);