ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

multifd: Use qemu_target_page_size() 

We will make it cpu independent.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2020-01-22 17:46:30 +01:00
parent 99f2c6fb46
commit a6703e4d33
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
migration/ram.c
View File

@ -882,14 +882,14 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
for (i = 0; i < p->pages->used; i++) { for (i = 0; i < p->pages->used; i++) {
uint64_t offset = be64_to_cpu(packet->offset[i]); uint64_t offset = be64_to_cpu(packet->offset[i]);
if (offset > (block->used_length - TARGET_PAGE_SIZE)) { if (offset > (block->used_length - qemu_target_page_size())) {
error_setg(errp, "multifd: offset too long %" PRIu64 error_setg(errp, "multifd: offset too long %" PRIu64
" (max " RAM_ADDR_FMT ")", " (max " RAM_ADDR_FMT ")",
offset, block->max_length); offset, block->max_length);
return -1; return -1;
} }
p->pages->iov[i].iov_base = block->host + offset; p->pages->iov[i].iov_base = block->host + offset;
p->pages->iov[i].iov_len = TARGET_PAGE_SIZE; p->pages->iov[i].iov_len = qemu_target_page_size();
} }
return 0; return 0;
@ -964,7 +964,8 @@ static int multifd_send_pages(QEMUFile *f)
p->packet_num = multifd_send_state->packet_num++; p->packet_num = multifd_send_state->packet_num++;
multifd_send_state->pages = p->pages; multifd_send_state->pages = p->pages;
p->pages = pages; p->pages = pages;
transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packet_len; transferred = ((uint64_t) pages->used) * qemu_target_page_size()
+ p->packet_len;
qemu_file_update_transfer(f, transferred); qemu_file_update_transfer(f, transferred);
ram_counters.multifd_bytes += transferred; ram_counters.multifd_bytes += transferred;
ram_counters.transferred += transferred;; ram_counters.transferred += transferred;;
@ -985,7 +986,7 @@ static int multifd_queue_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset)
if (pages->block == block) { if (pages->block == block) {
pages->offset[pages->used] = offset; pages->offset[pages->used] = offset;
pages->iov[pages->used].iov_base = block->host + offset; pages->iov[pages->used].iov_base = block->host + offset;
pages->iov[pages->used].iov_len = TARGET_PAGE_SIZE; pages->iov[pages->used].iov_len = qemu_target_page_size();
pages->used++; pages->used++;
if (pages->used < pages->allocated) { if (pages->used < pages->allocated) {