Migration code assumes that each RAM block is a multiple of target page size. We can fix this in a variety of ways, for 1.6 the simplest way is possibly exporting the required page size so callers can make regions large enough.
Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- arch_init.c | 3 +++ include/exec/memory.h | 1 + 2 files changed, 4 insertions(+) diff --git a/arch_init.c b/arch_init.c index 68a7ab7..61937e2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -150,6 +150,9 @@ int qemu_read_default_config_files(bool userconfig) return 0; } +/* Smallest page size for migrated RAM. */ +uint64_t qemu_migration_page_size = TARGET_PAGE_SIZE; + static inline bool is_zero_page(uint8_t *p) { return buffer_find_nonzero_offset(p, TARGET_PAGE_SIZE) == diff --git a/include/exec/memory.h b/include/exec/memory.h index ebe0d24..42450fe 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1055,6 +1055,7 @@ void *address_space_map(AddressSpace *as, hwaddr addr, void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, int is_write, hwaddr access_len); +extern uint64_t qemu_migration_page_size; #endif -- MST