Commit 3435f395 authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

exec: Reduce ifdeffery around -mem-path 



Instead of spreading its ifdeffery everywhere, confine it to
qemu_ram_alloc_from_ptr().  Everywhere else, simply test block->fd,
which is non-negative exactly when block uses -mem-path.

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-4-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parent 0628c182

exec.c

+10 −27
Original line number Diff line number Diff line
@@ -1099,6 +1099,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, 


    size = TARGET_PAGE_ALIGN(size);

    new_block = g_malloc0(sizeof(*new_block));

    new_block->fd = -1;



    /* This assumes the iothread lock is taken here too.  */

    qemu_mutex_lock_ramlist();
@@ -1203,20 +1204,12 @@ void qemu_ram_free(ram_addr_t addr) 
                ;

            } else if (xen_enabled()) {

                xen_invalidate_map_cache_entry(block->host);

            } else if (mem_path) {

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

                if (block->fd) {

            } else if (block->fd >= 0) {

                munmap(block->host, block->length);

                close(block->fd);

            } else {

                qemu_anon_ram_free(block->host, block->length);

            }

#else

                abort();

#endif

            } else {

                qemu_anon_ram_free(block->host, block->length);

            }

            g_free(block);

            break;

        }
@@ -1244,9 +1237,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) 
            } else {

                flags = MAP_FIXED;

                munmap(vaddr, length);

                if (mem_path) {

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

                    if (block->fd) {

                if (block->fd >= 0) {

#ifdef MAP_POPULATE

                    flags |= mem_prealloc ? MAP_POPULATE | MAP_SHARED :

                        MAP_PRIVATE;
@@ -1256,14 +1247,6 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) 
                    area = mmap(vaddr, length, PROT_READ | PROT_WRITE,

                                flags, block->fd, offset);

                } else {

                        flags |= MAP_PRIVATE | MAP_ANONYMOUS;

                        area = mmap(vaddr, length, PROT_READ | PROT_WRITE,

                                    flags, -1, 0);

                    }

#else

                    abort();

#endif

                } else {

#if defined(TARGET_S390X) && defined(CONFIG_KVM)

                    flags |= MAP_SHARED | MAP_ANONYMOUS;

                    area = mmap(vaddr, length, PROT_EXEC|PROT_READ|PROT_WRITE,

include/exec/cpu-all.h

+0 −2
Original line number Diff line number Diff line
@@ -453,9 +453,7 @@ typedef struct RAMBlock { 
     * Writes must take both locks.

     */

    QTAILQ_ENTRY(RAMBlock) next;

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

    int fd;

#endif

} RAMBlock;



typedef struct RAMList {