diff options
| author | Thanos Makatos <thanos.makatos@nutanix.com> | 2020-12-02 06:37:31 -0500 |
|---|---|---|
| committer | Thanos <tmakatos@gmail.com> | 2020-12-02 11:42:36 +0000 |
| commit | 96716ea7e47aedb769336730f2eee0adb99e5b85 (patch) | |
| tree | 97aba2c6276e2fedbab3b5fadd42dba098bf0ce7 /lib | |
| parent | 3f39bdd3928f3bb219d72d40125940b0653e9267 (diff) | |
| download | libvfio-user-96716ea7e47aedb769336730f2eee0adb99e5b85.zip libvfio-user-96716ea7e47aedb769336730f2eee0adb99e5b85.tar.gz libvfio-user-96716ea7e47aedb769336730f2eee0adb99e5b85.tar.bz2 | |
replace struct vfu_mmap_area with struct iovec
Signed-off-by: Thanos Makatos <thanos.makatos@nutanix.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libvfio-user.c | 10 | ||||
| -rw-r--r-- | lib/private.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libvfio-user.c b/lib/libvfio-user.c index a3f2af7..eb390e6 100644 --- a/lib/libvfio-user.c +++ b/lib/libvfio-user.c @@ -147,8 +147,8 @@ dev_get_caps(vfu_ctx_t *vfu_ctx, vfu_reg_info_t *vfu_reg, bool is_migr_reg, mmap_areas = vfu_reg->mmap_areas; for (i = 0; i < nr_mmap_areas; i++) { - sparse->areas[i].offset = mmap_areas->areas[i].start; - sparse->areas[i].size = mmap_areas->areas[i].size; + sparse->areas[i].offset = (__u64)mmap_areas->areas[i].iov_base; + sparse->areas[i].size = mmap_areas->areas[i].iov_len; vfu_log(vfu_ctx, LOG_DEBUG, "%s: area %d %#llx-%#llx", __func__, i, sparse->areas[i].offset, sparse->areas[i].offset + sparse->areas[i].size); @@ -1450,7 +1450,7 @@ vfu_pci_setup_caps(vfu_ctx_t *vfu_ctx, vfu_cap_t **caps, int nr_caps) static int copy_sparse_mmap_areas(vfu_reg_info_t *reg_info, - struct vfu_mmap_area *mmap_areas, uint32_t nr_mmap_areas) + struct iovec *mmap_areas, uint32_t nr_mmap_areas) { struct vfu_sparse_mmap_areas *smmap_areas; size_t areas_sz; @@ -1459,7 +1459,7 @@ copy_sparse_mmap_areas(vfu_reg_info_t *reg_info, return 0; } - areas_sz = nr_mmap_areas * sizeof(struct vfu_mmap_area); + areas_sz = nr_mmap_areas * sizeof(struct iovec); smmap_areas = calloc(1, sizeof(struct vfu_sparse_mmap_areas) + areas_sz); if (smmap_areas == NULL) { @@ -1476,7 +1476,7 @@ copy_sparse_mmap_areas(vfu_reg_info_t *reg_info, int vfu_setup_region(vfu_ctx_t *vfu_ctx, int region_idx, size_t size, vfu_region_access_cb_t *region_access, int flags, - struct vfu_mmap_area *mmap_areas, uint32_t nr_mmap_areas, + struct iovec *mmap_areas, uint32_t nr_mmap_areas, vfu_map_region_cb_t *map) { int ret; diff --git a/lib/private.h b/lib/private.h index 0c4878c..9768730 100644 --- a/lib/private.h +++ b/lib/private.h @@ -69,7 +69,7 @@ struct migration; struct vfu_sparse_mmap_areas { int nr_mmap_areas; - struct vfu_mmap_area areas[]; + struct iovec areas[]; }; typedef struct { |