Properly store it in the flags of the ram block instead (and the flag even already exists and is used).
E.g., qemu_ram_is_shared() now properly succeeds on all ram blocks that are actually shared. Reviewed-by: Igor Kotrasinski <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Reviewed-by: Peter Xu <[email protected]> Signed-off-by: David Hildenbrand <[email protected]> --- softmmu/physmem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 243c3097d3..6b6c3be605 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1938,7 +1938,7 @@ static void dirty_memory_extend(ram_addr_t old_ram_size, } } -static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) +static void ram_block_add(RAMBlock *new_block, Error **errp) { RAMBlock *block; RAMBlock *last_block = NULL; @@ -1961,7 +1961,8 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) } } else { new_block->host = phys_mem_alloc(new_block->max_length, - &new_block->mr->align, shared); + &new_block->mr->align, + qemu_ram_is_shared(new_block)); if (!new_block->host) { error_setg_errno(errp, errno, "cannot set up guest memory '%s'", @@ -2085,7 +2086,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, return NULL; } - ram_block_add(new_block, &local_err, ram_flags & RAM_SHARED); + ram_block_add(new_block, &local_err); if (local_err) { g_free(new_block); error_propagate(errp, local_err); @@ -2148,10 +2149,13 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, if (host) { new_block->flags |= RAM_PREALLOC; } + if (share) { + new_block->flags |= RAM_SHARED; + } if (resizeable) { new_block->flags |= RAM_RESIZEABLE; } - ram_block_add(new_block, &local_err, share); + ram_block_add(new_block, &local_err); if (local_err) { g_free(new_block); error_propagate(errp, local_err); -- 2.29.2
