From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqimI-0004d4-Ht for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vqim9-0007Tb-EH for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:34 -0500 Received: from mail-qa0-x236.google.com ([2607:f8b0:400d:c00::236]:57387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vqim9-0007TP-AK for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:25 -0500 Received: by mail-qa0-f54.google.com with SMTP id f11so508234qae.20 for ; Wed, 11 Dec 2013 04:20:25 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 11 Dec 2013 13:19:19 +0100 Message-Id: <1386764361-15260-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> References: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 12/14] numa: introduce memory_region_allocate_system_memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, gaowanlong@cn.fujitsu.com, stefanha@redhat.com Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 4 +--- include/sysemu/sysemu.h | 5 +++++ numa.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 76c47a9..61df5d4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1168,9 +1168,7 @@ FWCfgState *pc_memory_init(QEMUMachineInitArgs *args, * with older qemus that used qemu_ram_alloc(). */ ram = g_malloc(sizeof(*ram)); - memory_region_init_ram(ram, NULL, "pc.ram", - below_4g_mem_size + above_4g_mem_size); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "pc.ram", args); *ram_memory = ram; ram_below_4g = g_malloc(sizeof(*ram_below_4g)); memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram, diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 4c94cf5..e9da760 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -10,6 +10,8 @@ #include "qemu/notify.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" +#include "qom/object.h" +#include "hw/boards.h" /* vl.c */ @@ -144,6 +146,9 @@ void set_numa_nodes(void); void set_numa_modes(void); extern QemuOptsList qemu_numa_opts; int numa_init_func(QemuOpts *opts, void *opaque); +void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, + const char *name, + QEMUMachineInitArgs *args); #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/numa.c b/numa.c index c4fa665..f903b9e 100644 --- a/numa.c +++ b/numa.c @@ -187,3 +187,13 @@ void set_numa_modes(void) } } } + +void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, + const char *name, + QEMUMachineInitArgs *args) +{ + uint64_t ram_size = args->ram_size; + + memory_region_init_ram(mr, owner, name, ram_size); + vmstate_register_ram_global(mr); +} -- 1.8.4.2