diff options
| author | Juan Quintela <quintela@redhat.com> | 2020-01-14 12:24:09 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2020-01-20 09:17:07 +0100 |
| commit | ddac5cb2d95774cd019bfaf93c54ffd921095fea (patch) | |
| tree | 921d6fe8b18c6b2021ea5f8f27af52c46f3e240f /migration/ram.c | |
| parent | 4746dbf8a98d560e20dbd22d0e8405b38478b409 (diff) | |
| download | qemu-ddac5cb2d95774cd019bfaf93c54ffd921095fea.zip qemu-ddac5cb2d95774cd019bfaf93c54ffd921095fea.tar.gz qemu-ddac5cb2d95774cd019bfaf93c54ffd921095fea.tar.bz2 | |
multifd: Be consistent about using uint64_t
We transmit ram_addr_t always as uint64_t. Be consistent in its
use (on 64bit system, it is always uint64_t problem is 32bits).
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/ram.c')
| -rw-r--r-- | migration/ram.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/migration/ram.c b/migration/ram.c index d094038..d2208b5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -803,7 +803,10 @@ static void multifd_send_fill_packet(MultiFDSendParams *p) } for (i = 0; i < p->pages->used; i++) { - packet->offset[i] = cpu_to_be64(p->pages->offset[i]); + /* there are architectures where ram_addr_t is 32 bit */ + uint64_t temp = p->pages->offset[i]; + + packet->offset[i] = cpu_to_be64(temp); } } @@ -877,10 +880,10 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) } for (i = 0; i < p->pages->used; i++) { - ram_addr_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)) { - error_setg(errp, "multifd: offset too long " RAM_ADDR_FMT + error_setg(errp, "multifd: offset too long %" PRIu64 " (max " RAM_ADDR_FMT ")", offset, block->max_length); return -1; @@ -1267,7 +1270,7 @@ int multifd_save_setup(void) p->id = i; p->pages = multifd_pages_init(page_count); p->packet_len = sizeof(MultiFDPacket_t) - + sizeof(ram_addr_t) * page_count; + + sizeof(uint64_t) * page_count; p->packet = g_malloc0(p->packet_len); p->packet->magic = cpu_to_be32(MULTIFD_MAGIC); p->packet->version = cpu_to_be32(MULTIFD_VERSION); @@ -1484,7 +1487,7 @@ int multifd_load_setup(void) p->id = i; p->pages = multifd_pages_init(page_count); p->packet_len = sizeof(MultiFDPacket_t) - + sizeof(ram_addr_t) * page_count; + + sizeof(uint64_t) * page_count; p->packet = g_malloc0(p->packet_len); p->name = g_strdup_printf("multifdrecv_%d", i); } |