b239b0b2d5
- sw_64: Added sw64 architecture related updates - virtio-crypto: verify src&dst buffer length for sym request - vhost-vdpa: do not cleanup the vdpa/vhost-net structures if peer nic is present - qga: Fix suspend on Linux guests without systemd - tests: vhost-user-test: release mutex on protocol violation - qapi: support updating expected test output via make - block: Fix misleading hexadecimal format - block/rbd: fix write zeroes with growing images - block/nbd.c: Fixed IO request coroutine not being wakeup when kill NBD server - block/nfs: Fix 32-bit Windows build - qapi/qdev: Tidy up device_add documentation - hw/xen/xen_pt: fix uninitialized variable - migration/ram: Fix error handling in ram_write_tracking_start() - docs/about/build-platforms: Refine the distro support policy - xen-block: Avoid leaks on new error path - QGA VSS: Add wrapper to send log to debugger and stderr - chardev/char-socket: set s->listener = NULL in char_socket_finalize - qapi/block: Tidy up block-latency-histogram-set documentation - disas/riscv Fix ctzw disassemble - vfio: Fix vfio_get_dev_region() trace event - migration/ram: Fix populate_read_range() - Check and report for incomplete 'global' option format Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 069ad2e6d5ce48c96519ff55ace2ca2bcdac94d5 Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 27 Jul 2023 13:26:21 +0800
|
|
Subject: [PATCH] migration/ram: Fix populate_read_range()
|
|
|
|
cheery-pick from 5f19a4491941fdc5c5b50ce4ade6ffffe0f591b4
|
|
|
|
Unfortunately, commit f7b9dcfbcf44 broke populate_read_range(): the loop
|
|
end condition is very wrong, resulting in that function not populating the
|
|
full range. Lets' fix that.
|
|
|
|
Fixes: f7b9dcfbcf44 ("migration/ram: Factor out populating pages readable in ram_block_populate_pages()")
|
|
Cc: qemu-stable@nongnu.org
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
migration/ram.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
|
index 12b8c653d8..444b6a7aa2 100644
|
|
--- a/migration/ram.c
|
|
+++ b/migration/ram.c
|
|
@@ -2020,13 +2020,15 @@ out:
|
|
static inline void populate_read_range(RAMBlock *block, ram_addr_t offset,
|
|
ram_addr_t size)
|
|
{
|
|
+ const ram_addr_t end = offset + size;
|
|
+
|
|
/*
|
|
* We read one byte of each page; this will preallocate page tables if
|
|
* required and populate the shared zeropage on MAP_PRIVATE anonymous memory
|
|
* where no page was populated yet. This might require adaption when
|
|
* supporting other mappings, like shmem.
|
|
*/
|
|
- for (; offset < size; offset += block->page_size) {
|
|
+ for (; offset < end; offset += block->page_size) {
|
|
char tmp = *((char *)block->host + offset);
|
|
|
|
/* Don't optimize the read out */
|
|
--
|
|
2.41.0.windows.1
|
|
|