From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wta3B-0002Oc-Q4 for qemu-devel@nongnu.org; Sun, 08 Jun 2014 06:10:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wta37-00079n-6E for qemu-devel@nongnu.org; Sun, 08 Jun 2014 06:10:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wta36-00079c-P1 for qemu-devel@nongnu.org; Sun, 08 Jun 2014 06:10:01 -0400 Date: Sun, 8 Jun 2014 13:10:25 +0300 From: "Michael S. Tsirkin" Message-ID: <20140608101025.GD21677@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v3.2 11/31] numa: introduce memory_region_allocate_system_memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao Cc: Paolo Bonzini , qemu-devel@nongnu.org, Igor Mammedov On Wed, May 14, 2014 at 05:43:15PM +0800, Hu Tao wrote: > From: Paolo Bonzini > > Signed-off-by: Paolo Bonzini > Signed-off-by: Hu Tao > --- > 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 3673da8..3778d41 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1210,9 +1210,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, Better keep below_4g_mem_size + above_4g_mem_size around, this way this can be a stand-alone patch. > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 4345bd0..3f1c17d 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 >