summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Mammedov2020-02-19 17:08:35 +0100
committerPatchew Importer2020-02-19 17:49:53 +0100
commit68a86dc15ccdf0f1242dc71b3d8da18a3ee6b8be (patch)
treea70a0466cf93a766e8a4b00ba90ee0b2dd2a03c2
parentMerge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2020-02-15-v2'... (diff)
downloadqemu-68a86dc15ccdf0f1242dc71b3d8da18a3ee6b8be.tar.gz
qemu-68a86dc15ccdf0f1242dc71b3d8da18a3ee6b8be.tar.xz
qemu-68a86dc15ccdf0f1242dc71b3d8da18a3ee6b8be.zip
numa: remove deprecated -mem-path fallback to anonymous RAM
it has been deprecated since 4.0 by commit cb79224b7 (deprecate -mem-path fallback to anonymous RAM) Deprecation period ran out and it's time to remove it so it won't get in a way of switching to using hostmem backend for RAM. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200219160953.13771-2-imammedo@redhat.com>
-rw-r--r--hw/core/numa.c18
-rw-r--r--qemu-deprecated.texi9
2 files changed, 1 insertions, 26 deletions
diff --git a/hw/core/numa.c b/hw/core/numa.c
index 0d1b4be76a..840e68581f 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -784,24 +784,8 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,
{
if (mem_path) {
#ifdef __linux__
- Error *err = NULL;
memory_region_init_ram_from_file(mr, owner, name, ram_size, 0, 0,
- mem_path, &err);
- if (err) {
- error_report_err(err);
- if (mem_prealloc) {
- exit(1);
- }
- warn_report("falling back to regular RAM allocation");
- error_printf("This is deprecated. Make sure that -mem-path "
- " specified path has sufficient resources to allocate"
- " -m specified RAM amount\n");
- /* Legacy behavior: if allocation failed, fall back to
- * regular RAM allocation.
- */
- mem_path = NULL;
- memory_region_init_ram_nomigrate(mr, owner, name, ram_size, &error_fatal);
- }
+ mem_path, &error_fatal);
#else
fprintf(stderr, "-mem-path not supported on this host\n");
exit(1);
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 0671c26c80..66eca3a1de 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -113,15 +113,6 @@ QEMU using implicit generic or board specific splitting rule.
Use @option{memdev} with @var{memory-backend-ram} backend or @option{mem} (if
it's supported by used machine type) to define mapping explictly instead.
-@subsection -mem-path fallback to RAM (since 4.1)
-Currently if guest RAM allocation from file pointed by @option{mem-path}
-fails, QEMU falls back to allocating from RAM, which might result
-in unpredictable behavior since the backing file specified by the user
-is ignored. In the future, users will be responsible for making sure
-the backing storage specified with @option{-mem-path} can actually provide
-the guest RAM configured with @option{-m} and QEMU will fail to start up if
-RAM allocation is unsuccessful.
-
@subsection RISC-V -bios (since 4.1)
QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the