Revision 0628c182
b/exec.c | ||
---|---|---|
1117 | 1117 |
if (mem_path) { |
1118 | 1118 |
#if defined (__linux__) && !defined(TARGET_S390X) |
1119 | 1119 |
new_block->host = file_ram_alloc(new_block, size, mem_path); |
1120 |
if (!new_block->host) { |
|
1121 |
new_block->host = qemu_anon_ram_alloc(size); |
|
1122 |
memory_try_enable_merging(new_block->host, size); |
|
1123 |
} |
|
1124 | 1120 |
#else |
1125 | 1121 |
fprintf(stderr, "-mem-path option unsupported\n"); |
1126 | 1122 |
exit(1); |
1127 | 1123 |
#endif |
1128 |
} else { |
|
1124 |
} |
|
1125 |
if (!new_block->host) { |
|
1129 | 1126 |
if (kvm_enabled()) { |
1130 | 1127 |
/* some s390/kvm configurations have special constraints */ |
1131 | 1128 |
new_block->host = kvm_ram_alloc(size); |
Also available in: Unified diff