[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3.1 11/31] numa: introduce memory_region_allocate_s
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v3.1 11/31] numa: introduce memory_region_allocate_system_memory |
Date: |
Tue, 6 May 2014 17:27:32 +0800 |
From: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
---
hw/i386/pc.c | 4 +---
include/hw/boards.h | 6 +++++-
include/sysemu/sysemu.h | 1 +
numa.c | 9 +++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d5fb884..571dc72 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1181,9 +1181,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_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,
diff --git a/include/hw/boards.h b/include/hw/boards.h
index dd2c70d..1ea52c0 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -50,9 +50,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) \
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 423d49e..caf88dd 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -10,6 +10,7 @@
#include "qemu/notify.h"
#include "qemu/main-loop.h"
#include "qemu/bitmap.h"
+#include "qom/object.h"
/* vl.c */
diff --git a/numa.c b/numa.c
index 439df87..bcd7b04 100644
--- a/numa.c
+++ b/numa.c
@@ -33,6 +33,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",
@@ -194,3 +195,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);
+}
--
1.8.5.2.229.g4448466
- [Qemu-devel] [PATCH v3.1 00/31] NUMA series, and hostmem improvements, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 02/31] NUMA: check if the total numa memory size is equal to ram_size, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 03/31] NUMA: Add numa_info structure to contain numa nodes info, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 09/31] qmp: improve error reporting for -object and object-add, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 12/31] add memdev backend infrastructure, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 11/31] numa: introduce memory_region_allocate_system_memory,
Hu Tao <=
- [Qemu-devel] [PATCH v3.1 15/31] memory: move mem_path handling to memory_region_allocate_system_memory, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 08/31] qmp: allow object-add completion handler to get canonical path, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 01/31] NUMA: move numa related code to new file numa.c, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 05/31] NUMA: expand MAX_NODES from 64 to 128, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 13/31] numa: add -numa node, memdev= option, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 07/31] vl: redo -object parsing, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 04/31] NUMA: convert -numa option to use OptsVisitor, Hu Tao, 2014/05/06
- [Qemu-devel] [PATCH v3.1 06/31] man: improve -numa doc, Hu Tao, 2014/05/06