Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336081
b: refs/heads/master
c: bd97120
h: refs/heads/master
i:
  336079: 38222ba
v: v3
  • Loading branch information
Michael S. Tsirkin authored and David S. Miller committed Nov 28, 2012
1 parent eeaccfc commit c3b4da4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c3b2c2581988d304127c2aa218430b5fca88ce56
refs/heads/master: bd97120fc3d1a11f3124c7c9ba1d91f51829eb85
2 changes: 1 addition & 1 deletion trunk/drivers/vhost/vhost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len,
}
_iov = iov + ret;
size = reg->memory_size - addr + reg->guest_phys_addr;
_iov->iov_len = min((u64)len, size);
_iov->iov_len = min((u64)len - s, size);
_iov->iov_base = (void __user *)(unsigned long)
(reg->userspace_addr + addr - reg->guest_phys_addr);
s += size;
Expand Down

0 comments on commit c3b4da4

Please sign in to comment.