[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 1/9] softmmu/physmem: drop "shared" parameter from ram_block_a
From: |
David Hildenbrand |
Subject: |
[PATCH v1 1/9] softmmu/physmem: drop "shared" parameter from ram_block_add() |
Date: |
Tue, 9 Feb 2021 14:49:31 +0100 |
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 <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>
---
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
- [PATCH v1 0/9] RAM_NORESERVE, MAP_NORESERVE and hostmem "reserve" property, David Hildenbrand, 2021/02/09
- [PATCH v1 1/9] softmmu/physmem: drop "shared" parameter from ram_block_add(),
David Hildenbrand <=
- [PATCH v1 2/9] util/mmap-alloc: factor out calculation of the pagesize for the guard page, David Hildenbrand, 2021/02/09
- [PATCH v1 3/9] util/mmap-alloc: factor out reserving of a memory region to mmap_reserve(), David Hildenbrand, 2021/02/09
- [PATCH v1 4/9] util/mmap-alloc: factor out activating of memory to mmap_activate(), David Hildenbrand, 2021/02/09
- [PATCH v1 5/9] softmmu/memory: pass ram_flags into qemu_ram_alloc_from_fd(), David Hildenbrand, 2021/02/09
- [PATCH v1 6/9] softmmu/memory: pass ram_flags into memory_region_init_ram_shared_nomigrate(), David Hildenbrand, 2021/02/09
- [PATCH v1 8/9] util/mmap-alloc: support RAM_NORESERVE via MAP_NORESERVE, David Hildenbrand, 2021/02/09
- [PATCH v1 7/9] memory: introduce RAM_NORESERVE and wire it up in qemu_ram_mmap(), David Hildenbrand, 2021/02/09
- [PATCH v1 9/9] hostmem: wire up RAM_NORESERVE via "reserve" property, David Hildenbrand, 2021/02/09