Commit dfabb8b9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

numa: introduce memory_region_allocate_system_memory 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

MST: resolve conflicts
parent d1169464

hw/i386/pc.c

+1 −2
Original line number Diff line number Diff line
@@ -1215,8 +1215,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, 
     * with older qemus that used qemu_ram_alloc().

     */

    ram = g_malloc(sizeof(*ram));

    memory_region_init_ram(ram, NULL, "pc.ram", ram_size);

    vmstate_register_ram_global(ram);

    memory_region_allocate_system_memory(ram, NULL, "pc.ram", ram_size);

    *ram_memory = ram;

    ram_below_4g = g_malloc(sizeof(*ram_below_4g));

    memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram,

include/hw/boards.h

+5 −1
Original line number Diff line number Diff line
@@ -43,9 +43,13 @@ struct QEMUMachine { 
    const char *hw_version;

};



#define TYPE_MACHINE_SUFFIX "-machine"

void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,

                                          const char *name,

                                          uint64_t ram_size);



int qemu_register_machine(QEMUMachine *m);



#define TYPE_MACHINE_SUFFIX "-machine"

#define TYPE_MACHINE "machine"

#undef MACHINE  /* BSD defines it and QEMU does not use it */

#define MACHINE(obj) \

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "qemu/notify.h"

#include "qemu/main-loop.h"

#include "qemu/bitmap.h"

#include "qom/object.h"



/* vl.c */

numa.c

+9 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "qapi/opts-visitor.h"

#include "qapi/dealloc-visitor.h"

#include "qapi/qmp/qerror.h"

#include "hw/boards.h"



QemuOptsList qemu_numa_opts = {

    .name = "numa",
@@ -193,3 +194,11 @@ void set_numa_modes(void) 
        }

    }

}



void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,

                                          const char *name,

                                          uint64_t ram_size)

{

    memory_region_init_ram(mr, owner, name, ram_size);

    vmstate_register_ram_global(mr);

}