Commit 0628c182 authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

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
432d268c.  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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Acked-by: default avatarLaszlo Ersek <lersek@redhat.com>
Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Message-id: 1375276272-15988-3-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parent dfeaf2ab

exec.c

+2 −5
Original line number Diff line number Diff line
@@ -1117,15 +1117,12 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, 
        if (mem_path) {

#if defined (__linux__) && !defined(TARGET_S390X)

            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

            fprintf(stderr, "-mem-path option unsupported\n");

            exit(1);

#endif

        } else {

        }

        if (!new_block->host) {

            if (kvm_enabled()) {

                /* some s390/kvm configurations have special constraints */

                new_block->host = kvm_ram_alloc(size);