From: Nikolay Nikolaev Date: Sat, 12 Jul 2014 01:42:35 +0000 (+0300) Subject: vhost-user: Fix VHOST_SET_MEM_TABLE processing X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f69a28051f856e906bd9c2f9f27b3106a47e18f6;p=qemu.git vhost-user: Fix VHOST_SET_MEM_TABLE processing 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 Signed-off-by: Nikolay Nikolaev Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini --- diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 38e580642f..3d2321865b 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;