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

exec: Fix Xen RAM allocation with unusual options 



Issues:

* We try to obey -mem-path even though it can't work with Xen.

* To implement -machine mem-merge, we call
  memory_try_enable_merging(new_block->host, size).  But with Xen,
  new_block->host remains null.  Oops.

Fix by separating Xen allocation from normal allocation.

Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Acked-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-id: 1375276272-15988-2-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parent 2d1fe187

exec.c

+12 −8
Original line number Diff line number Diff line
@@ -1107,6 +1107,12 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, 
    if (host) {

        new_block->host = host;

        new_block->flags |= RAM_PREALLOC_MASK;

    } else if (xen_enabled()) {

        if (mem_path) {

            fprintf(stderr, "-mem-path not supported with Xen\n");

            exit(1);

        }

        xen_ram_alloc(new_block->offset, size, mr);

    } else {

        if (mem_path) {

#if defined (__linux__) && !defined(TARGET_S390X)
@@ -1120,9 +1126,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, 
            exit(1);

#endif

        } else {

            if (xen_enabled()) {

                xen_ram_alloc(new_block->offset, size, mr);

            } else if (kvm_enabled()) {

            if (kvm_enabled()) {

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

                new_block->host = kvm_ram_alloc(size);

            } else {
@@ -1200,6 +1204,8 @@ void qemu_ram_free(ram_addr_t addr) 
            ram_list.version++;

            if (block->flags & RAM_PREALLOC_MASK) {

                ;

            } else if (xen_enabled()) {

                xen_invalidate_map_cache_entry(block->host);

            } else if (mem_path) {

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

                if (block->fd) {
@@ -1211,13 +1217,9 @@ void qemu_ram_free(ram_addr_t addr) 
#else

                abort();

#endif

            } else {

                if (xen_enabled()) {

                    xen_invalidate_map_cache_entry(block->host);

            } else {

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

            }

            }

            g_free(block);

            break;

        }
@@ -1240,6 +1242,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) 
            vaddr = block->host + offset;

            if (block->flags & RAM_PREALLOC_MASK) {

                ;

            } else if (xen_enabled()) {

                abort();

            } else {

                flags = MAP_FIXED;

                munmap(vaddr, length);