From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5tFF-0004vC-6U for qemu-devel@nongnu.org; Sat, 12 Jul 2014 05:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5tF8-0007QJ-UV for qemu-devel@nongnu.org; Sat, 12 Jul 2014 05:05:25 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:41888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5tF8-0007Nr-QS for qemu-devel@nongnu.org; Sat, 12 Jul 2014 05:05:18 -0400 Received: by mail-qc0-f173.google.com with SMTP id c9so1833751qcz.32 for ; Sat, 12 Jul 2014 02:05:18 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20140712014215.10636.60876.stgit@3820> References: <20140712014119.10636.81503.stgit@3820> <20140712014215.10636.60876.stgit@3820> From: Nikolay Nikolaev Date: Sat, 12 Jul 2014 12:04:58 +0300 Message-ID: Content-Type: text/plain; charset=UTF-8 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 , mst Cc: VirtualOpenSystems Technical Team , Nikolay Nikolaev On Sat, Jul 12, 2014 at 4:42 AM, Nikolay Nikolaev wrote: > > 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); Forgot to checkpatch. Should have space after the void - (void *). Michael, should I resend it? > + 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; >