| Message ID | 20140712014215.10636.60876.stgit@3820 |
|---|---|
| State | New |
| Headers | show |
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 <pbonzini@redhat.com> > > Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com> > --- > 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 <pbonzini@redhat.com>
On Sat, Jul 12, 2014 at 4:42 AM, Nikolay Nikolaev <n.nikolaev@virtualopensystems.com> 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 <pbonzini@redhat.com> > > Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com> > --- > 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; >
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;
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 <pbonzini@redhat.com> Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com> --- hw/virtio/vhost-user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)