[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/10] Add helper to populate vhost-user message regions
From: |
Raphael Norwitz |
Subject: |
[PATCH v3 01/10] Add helper to populate vhost-user message regions |
Date: |
Tue, 19 May 2020 12:25:24 +0000 (UTC) |
When setting vhost-user memory tables, memory region descriptors must be
copied from the vhost_dev struct to the vhost-user message. To avoid
duplicating code in setting the memory tables, we should use a helper to
populate this field. This change adds this helper.
Signed-off-by: Raphael Norwitz <address@hidden>
---
hw/virtio/vhost-user.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index ec21e8f..ee6d1ed 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -407,6 +407,15 @@ static int vhost_user_set_log_base(struct vhost_dev *dev,
uint64_t base,
return 0;
}
+static void vhost_user_fill_msg_region(VhostUserMemoryRegion *dst,
+ struct vhost_memory_region *src)
+{
+ assert(src != NULL && dst != NULL);
+ dst->userspace_addr = src->userspace_addr;
+ dst->memory_size = src->memory_size;
+ dst->guest_phys_addr = src->guest_phys_addr;
+}
+
static int vhost_user_fill_set_mem_table_msg(struct vhost_user *u,
struct vhost_dev *dev,
VhostUserMsg *msg,
@@ -441,12 +450,8 @@ static int vhost_user_fill_set_mem_table_msg(struct
vhost_user *u,
error_report("Failed preparing vhost-user memory table msg");
return -1;
}
- msg->payload.memory.regions[*fd_num].userspace_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;
+ vhost_user_fill_msg_region(&msg->payload.memory.regions[*fd_num],
+ reg);
msg->payload.memory.regions[*fd_num].mmap_offset = offset;
fds[(*fd_num)++] = fd;
} else if (track_ramblocks) {
--
1.8.3.1
- [PATCH v3 00/10] vhost-user: Lift Max Ram Slots Limitation, Raphael Norwitz, 2020/05/19
- [PATCH v3 01/10] Add helper to populate vhost-user message regions,
Raphael Norwitz <=
- [PATCH v3 02/10] Add vhost-user helper to get MemoryRegion data, Raphael Norwitz, 2020/05/19
- [PATCH v3 03/10] Add VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS, Raphael Norwitz, 2020/05/19
- [PATCH v3 05/10] Lift max memory slots limit imposed by vhost-user, Raphael Norwitz, 2020/05/19
- [PATCH v3 04/10] Transmit vhost-user memory regions individually, Raphael Norwitz, 2020/05/19
- [PATCH v3 06/10] Refactor out libvhost-user fault generation logic, Raphael Norwitz, 2020/05/19
- [PATCH v3 07/10] Support ram slot configuration in libvhost-user, Raphael Norwitz, 2020/05/19
- [PATCH v3 08/10] Support adding individual regions in libvhost-user, Raphael Norwitz, 2020/05/19
- [PATCH v3 09/10] Support individual region unmap in libvhost-user, Raphael Norwitz, 2020/05/19
- [PATCH v3 10/10] Lift max ram slots limit in libvhost-user, Raphael Norwitz, 2020/05/19
- Re: [PATCH v3 00/10] vhost-user: Lift Max Ram Slots Limitation, no-reply, 2020/05/19