migration/multifd: Reduce access to p->pages
I'm about to replace the p->pages pointer with an opaque pointer, so do a cleanup now to reduce direct accesses to p->page, which makes the next diffs cleaner. Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
@@ -174,19 +174,20 @@ static int multifd_uadk_send_prepare(MultiFDSendParams *p, Error **errp)
|
||||
uint32_t hdr_size;
|
||||
uint8_t *buf = uadk_data->buf;
|
||||
int ret = 0;
|
||||
MultiFDPages_t *pages = p->pages;
|
||||
|
||||
if (!multifd_send_prepare_common(p)) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
hdr_size = p->pages->normal_num * sizeof(uint32_t);
|
||||
hdr_size = pages->normal_num * sizeof(uint32_t);
|
||||
/* prepare the header that stores the lengths of all compressed data */
|
||||
prepare_next_iov(p, uadk_data->buf_hdr, hdr_size);
|
||||
|
||||
for (int i = 0; i < p->pages->normal_num; i++) {
|
||||
for (int i = 0; i < pages->normal_num; i++) {
|
||||
struct wd_comp_req creq = {
|
||||
.op_type = WD_DIR_COMPRESS,
|
||||
.src = p->pages->block->host + p->pages->offset[i],
|
||||
.src = pages->block->host + pages->offset[i],
|
||||
.src_len = p->page_size,
|
||||
.dst = buf,
|
||||
/* Set dst_len to double the src in case compressed out >= page_size */
|
||||
@@ -214,7 +215,7 @@ static int multifd_uadk_send_prepare(MultiFDSendParams *p, Error **errp)
|
||||
*/
|
||||
if (!uadk_data->handle || creq.dst_len >= p->page_size) {
|
||||
uadk_data->buf_hdr[i] = cpu_to_be32(p->page_size);
|
||||
prepare_next_iov(p, p->pages->block->host + p->pages->offset[i],
|
||||
prepare_next_iov(p, pages->block->host + pages->offset[i],
|
||||
p->page_size);
|
||||
buf += p->page_size;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user