[PATCH v3 7/7] system/physmem: Memory settings applied on remap notification

[“William Roche <william.roche@xxxxxxxxxx>]

From: William Roche <william.roche@xxxxxxxxxx>

Merging and dump settings are handled by the remap notification
in addition to memory policy and preallocation.
If preallocation is set on a memory block, qemu_prealloc_mem()
call is needed also after a ram_block_discard_range() use for
this block.

Signed-off-by: William Roche <william.roche@xxxxxxxxxx>
---
 system/physmem.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/physmem.c b/system/physmem.c
index 6b948c0a88..f37c280db2 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -2243,8 +2243,6 @@ void qemu_ram_remap(ram_addr_t addr)
                         exit(1);
                     }
                     qemu_ram_remap_mmap(block, vaddr, page_size, offset);
-                    memory_try_enable_merging(vaddr, page_size);
-                    qemu_ram_setup_dump(vaddr, page_size);
                 }
                 ram_block_notify_remap(block->host, offset, page_size);
             }
-- 
2.43.5