From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vJs-000647-HS for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7vJn-0000Zg-Ir for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vJn-0000ZZ-9B for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:31 -0400 Date: Fri, 18 Jul 2014 02:44:47 +0300 From: "Michael S. Tsirkin" Message-ID: <1405640614-9252-6-git-send-email-mst@redhat.com> References: <1405640614-9252-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1405640614-9252-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Nikolay Nikolaev , Anthony Liguori , Paolo Bonzini From: Nikolay Nikolaev 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 --- 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