From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5pWp-0005b1-3m for qemu-devel@nongnu.org; Sat, 12 Jul 2014 01:07:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5pWj-0004cQ-AP for qemu-devel@nongnu.org; Sat, 12 Jul 2014 01:07:19 -0400 Received: from mail-qc0-x22f.google.com ([2607:f8b0:400d:c01::22f]:43333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5pWj-0004cC-5v for qemu-devel@nongnu.org; Sat, 12 Jul 2014 01:07:13 -0400 Received: by mail-qc0-f175.google.com with SMTP id i8so1760408qcq.6 for ; Fri, 11 Jul 2014 22:07:12 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <53C0C27B.2020006@redhat.com> Date: Sat, 12 Jul 2014 07:07:07 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <20140712014119.10636.81503.stgit@3820> <20140712014215.10636.60876.stgit@3820> In-Reply-To: <20140712014215.10636.60876.stgit@3820> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/2 for-2.1] vhost-user: Fix VHOST_SET_MEM_TABLE processing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Il 12/07/2014 03:42, Nikolay Nikolaev ha scritto: > 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 > --- > 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..d610aa4 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; > Reviewed-by: Paolo Bonzini