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

migration/multifd: fix build error when qpl compression is enabled 

The page_size member has been removed from the MultiFDSendParams
and MultiFDRecvParams. The function multifd_ram_page_size is used to
provide the page size in the multifd compressor.

Fixes: 90fa121c6c ("migration/multifd: Inline page_size and page_count")
Signed-off-by: Yuan Liu <yuan1.liu@intel.com>
Link: https://lore.kernel.org/r/20241008104527.3516755-1-yuan1.liu@intel.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Yuan Liu 2024-10-08 18:45:27 +08:00 committed by Peter Xu
parent 255db3ba80
commit 2e49d6a20b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration/multifd-qpl.c
View File

@ -389,7 +389,7 @@ static void multifd_qpl_compress_pages_slow_path(MultiFDSendParams *p)
{ {
QplData *qpl = p->compress_data; QplData *qpl = p->compress_data;
MultiFDPages_t *pages = &p->data->u.ram; MultiFDPages_t *pages = &p->data->u.ram;
uint32_t size = p->page_size; uint32_t size = multifd_ram_page_size();
qpl_job *job = qpl->sw_job; qpl_job *job = qpl->sw_job;
uint8_t *zbuf = qpl->zbuf; uint8_t *zbuf = qpl->zbuf;
uint8_t *buf; uint8_t *buf;
@ -420,7 +420,7 @@ static void multifd_qpl_compress_pages(MultiFDSendParams *p)
{ {
QplData *qpl = p->compress_data; QplData *qpl = p->compress_data;
MultiFDPages_t *pages = &p->data->u.ram; MultiFDPages_t *pages = &p->data->u.ram;
uint32_t size = p->page_size; uint32_t size = multifd_ram_page_size();
QplHwJob *hw_job; QplHwJob *hw_job;
uint8_t *buf; uint8_t *buf;
uint8_t *zbuf; uint8_t *zbuf;
@ -560,7 +560,7 @@ static int multifd_qpl_decompress_pages_slow_path(MultiFDRecvParams *p,
Error **errp) Error **errp)
{ {
QplData *qpl = p->compress_data; QplData *qpl = p->compress_data;
uint32_t size = p->page_size; uint32_t size = multifd_ram_page_size();
qpl_job *job = qpl->sw_job; qpl_job *job = qpl->sw_job;
uint8_t *zbuf = qpl->zbuf; uint8_t *zbuf = qpl->zbuf;
uint8_t *addr; uint8_t *addr;
@ -598,7 +598,7 @@ static int multifd_qpl_decompress_pages_slow_path(MultiFDRecvParams *p,
static int multifd_qpl_decompress_pages(MultiFDRecvParams *p, Error **errp) static int multifd_qpl_decompress_pages(MultiFDRecvParams *p, Error **errp)
{ {
QplData *qpl = p->compress_data; QplData *qpl = p->compress_data;
uint32_t size = p->page_size; uint32_t size = multifd_ram_page_size();
uint8_t *zbuf = qpl->zbuf; uint8_t *zbuf = qpl->zbuf;
uint8_t *addr; uint8_t *addr;
uint32_t len; uint32_t len;
@ -677,7 +677,7 @@ static int multifd_qpl_recv(MultiFDRecvParams *p, Error **errp)
} }
for (int i = 0; i < p->normal_num; i++) { for (int i = 0; i < p->normal_num; i++) {
qpl->zlen[i] = be32_to_cpu(qpl->zlen[i]); qpl->zlen[i] = be32_to_cpu(qpl->zlen[i]);
assert(qpl->zlen[i] <= p->page_size); assert(qpl->zlen[i] <= multifd_ram_page_size());
zbuf_len += qpl->zlen[i]; zbuf_len += qpl->zlen[i];
} }