[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing |
Date: |
Fri, 18 Jul 2014 02:41:06 +0300 |
From: Nikolay Nikolaev <address@hidden>
qemu_get_ram_fd doesn't accept a guest physical address. ram_addr_t are
opaque values that are assigned in qemu_ram_alloc.
Find the ram_addr_t corresponding to the userspace_addr using
qemu_ram_addr_from_host,
and then call qemu_get_ram_fd on it.
Thanks to Paolo Bonzini <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/virtio/vhost-user.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 38e5806..3d23218 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -216,7 +216,9 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned
long int request,
case VHOST_SET_MEM_TABLE:
for (i = 0; i < dev->mem->nregions; ++i) {
struct vhost_memory_region *reg = dev->mem->regions + i;
- fd = qemu_get_ram_fd(reg->guest_phys_addr);
+ ram_addr_t ram_addr;
+ qemu_ram_addr_from_host((void *)reg->userspace_addr, &ram_addr);
+ fd = qemu_get_ram_fd(ram_addr);
if (fd > 0) {
msg.memory.regions[fd_num].userspace_addr =
reg->userspace_addr;
msg.memory.regions[fd_num].memory_size = reg->memory_size;
--
MST
- [Qemu-devel] [PULL 0/7] pc,vhost,virtio fixes, test, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 4/7] qtest: fix vhost-user-test compilation with old GLib, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 1/7] pc: fix qemu exiting with error when -m X < 128 with old machines types, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 2/7] pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123], Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 3/7] fix typo: apci -> acpi, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 6/7] qtest: Adapt vhost-user-test to latest vhost-user changes, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 7/7] vhost-user: minor cleanups, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing,
Michael S. Tsirkin <=