|
@@ -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);
|