[Qemu-devel] [PATCH 1/3] vhost-user: rename VhostUserMemory userspace_addr field to user_addr

[Maxime Coquelin]

The Vhost-user specification does not specify the user address should
be a valid address within master process address space.

Let's name it user_addr to comply with the specification.

Cc: Stefan Hajnoczi <stefa...@redhat.com>
Cc: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coque...@redhat.com>
---
 hw/virtio/vhost-user.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 093675ed98..43b342a65b 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -77,7 +77,7 @@ typedef enum VhostUserSlaveRequest {
 typedef struct VhostUserMemoryRegion {
     uint64_t guest_phys_addr;
     uint64_t memory_size;
-    uint64_t userspace_addr;
+    uint64_t user_addr;
     uint64_t mmap_offset;
 } VhostUserMemoryRegion;
 
@@ -317,7 +317,7 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev,
                                      &offset);
         fd = memory_region_get_fd(mr);
         if (fd > 0) {
-            msg.payload.memory.regions[fd_num].userspace_addr = 
reg->userspace_addr;
+            msg.payload.memory.regions[fd_num].user_addr = reg->userspace_addr;
             msg.payload.memory.regions[fd_num].memory_size  = reg->memory_size;
             msg.payload.memory.regions[fd_num].guest_phys_addr = 
reg->guest_phys_addr;
             msg.payload.memory.regions[fd_num].mmap_offset = offset;
-- 
2.14.3