exec: Clean up fall back when -mem-path allocation fails
With -mem-path, qemu_ram_alloc_from_ptr() first tries to allocate
accordingly, but when it fails, it falls back to normal allocation.
The fall back allocation code used to be effectively identical to the
"-mem-path not given" code, until it started to diverge in commit
432d268
. I believe the code still works, but clean it up anyway: drop
the special fall back allocation code, and fall back to the ordinary
"-mem-path not given" code instead.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Message-id: 1375276272-15988-3-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
This commit is contained in:
parent
dfeaf2abc7
commit
0628c18267
7
exec.c
7
exec.c
|
@ -1117,15 +1117,12 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
|
||||||
if (mem_path) {
|
if (mem_path) {
|
||||||
#if defined (__linux__) && !defined(TARGET_S390X)
|
#if defined (__linux__) && !defined(TARGET_S390X)
|
||||||
new_block->host = file_ram_alloc(new_block, size, mem_path);
|
new_block->host = file_ram_alloc(new_block, size, mem_path);
|
||||||
if (!new_block->host) {
|
|
||||||
new_block->host = qemu_anon_ram_alloc(size);
|
|
||||||
memory_try_enable_merging(new_block->host, size);
|
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
fprintf(stderr, "-mem-path option unsupported\n");
|
fprintf(stderr, "-mem-path option unsupported\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
#endif
|
#endif
|
||||||
} else {
|
}
|
||||||
|
if (!new_block->host) {
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
/* some s390/kvm configurations have special constraints */
|
/* some s390/kvm configurations have special constraints */
|
||||||
new_block->host = kvm_ram_alloc(size);
|
new_block->host = kvm_ram_alloc(size);
|
||||||
|
|
Loading…
Reference in a new issue