diff options
| author | David Hildenbrand | 2021-11-02 17:43:15 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2022-01-18 10:45:35 +0100 |
| commit | eef3a7abff8a5eab840868fffd6195d8a2a555d0 (patch) | |
| tree | 3a0c992aa08c0863fb05019583330ad24a7e39d9 /hw/core | |
| parent | memory: Have 'info mtree' remove duplicated Address Space information (diff) | |
| download | qemu-eef3a7abff8a5eab840868fffd6195d8a2a555d0.tar.gz qemu-eef3a7abff8a5eab840868fffd6195d8a2a555d0.tar.xz qemu-eef3a7abff8a5eab840868fffd6195d8a2a555d0.zip | |
machine: Use host_memory_backend_is_mapped() in machine_consume_memdev()
memory_region_is_mapped() is the wrong check, we actually want to check
whether the backend is already marked mapped.
For example, memory regions mapped via an alias, such as NVDIMMs,
currently don't make memory_region_is_mapped() return "true". As the
machine is initialized before any memory devices (and thereby before
NVDIMMs are initialized), this isn't a fix but merely a cleanup.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20211102164317.45658-2-david@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index debcdc0e70..d856485cb4 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1091,7 +1091,7 @@ MemoryRegion *machine_consume_memdev(MachineState *machine, { MemoryRegion *ret = host_memory_backend_get_memory(backend); - if (memory_region_is_mapped(ret)) { + if (host_memory_backend_is_mapped(backend)) { error_report("memory backend %s can't be used multiple times.", object_get_canonical_path_component(OBJECT(backend))); exit(EXIT_FAILURE); |