mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

softmmu/physmem: Mark shared anonymous memory RAM_SHARED

Browse Source 
Let's drop the "shared" parameter from ram_block_add() and properly
store it in the flags of the ram block instead, such that
qemu_ram_is_shared() properly succeeds on all ram blocks that were mapped
MAP_SHARED.

We'll use this information next to fix some cases with shared anonymous
memory.

Reviewed-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210406080126.24010-2-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
David Hildenbrand 2021-04-06 10:01:24 +02:00 committed by Paolo Bonzini
parent 4eb8606560
commit 7ce18ca025
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
softmmu/physmem.c
View File

@ -1946,8 +1946,9 @@ 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)
{ {
const bool shared = qemu_ram_is_shared(new_block);
RAMBlock *block; RAMBlock *block;
RAMBlock *last_block = NULL; RAMBlock *last_block = NULL;
ram_addr_t old_ram_size, new_ram_size; ram_addr_t old_ram_size, new_ram_size;
@ -2084,7 +2085,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
return NULL; return NULL;
} }
ram_block_add(new_block, &local_err, ram_flags & RAM_SHARED); ram_block_add(new_block, &local_err);
if (local_err) { if (local_err) {
g_free(new_block); g_free(new_block);
error_propagate(errp, local_err); error_propagate(errp, local_err);
@ -2147,10 +2148,13 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
if (host) { if (host) {
new_block->flags |= RAM_PREALLOC; new_block->flags |= RAM_PREALLOC;
} }
if (share) {
new_block->flags |= RAM_SHARED;
}
if (resizeable) { if (resizeable) {
new_block->flags |= RAM_RESIZEABLE; new_block->flags |= RAM_RESIZEABLE;
} }
ram_block_add(new_block, &local_err, share); ram_block_add(new_block, &local_err);
if (local_err) { if (local_err) {
g_free(new_block); g_free(new_block);
error_propagate(errp, local_err); error_propagate(errp, local_err);