From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avLd5-0007F9-6X for qemu-devel@nongnu.org; Wed, 27 Apr 2016 05:19:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avLd0-0007CL-Kr for qemu-devel@nongnu.org; Wed, 27 Apr 2016 05:19:31 -0400 References: <1461119601-4936-1-git-send-email-david@gibson.dropbear.id.au> <1461119601-4936-8-git-send-email-david@gibson.dropbear.id.au> From: Thomas Huth Message-ID: <57208419.5030206@redhat.com> Date: Wed, 27 Apr 2016 11:19:21 +0200 MIME-Version: 1.0 In-Reply-To: <1461119601-4936-8-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC for-2.7 07/11] pseries: Move adding of fdt reserve map entries List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , agraf@suse.de, crosthwaite.peter@gmail.com Cc: aik@ozlabs.ru, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 20.04.2016 04:33, David Gibson wrote: > The flattened device tree passed to pseries guests contains a list of > reserved memory areas. Currently we construct this list early in > spapr_build_fdt() as we sequentially write out the fdt. > > This will be inconvenient for upcoming cleanups, so this patch moves > the reserve map changes to the end of fdt construction. This changes > fdt_add_reservemap_entry() calls - which work when writing the fdt > sequentially to fdt_add_mem_rsv() calls used when altering the fdt in > random access mode. > > Signed-off-by: David Gibson > --- > hw/ppc/spapr.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 5356f4d..aef44a2 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -733,14 +733,6 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, > fdt = g_malloc0(FDT_MAX_SIZE); > _FDT((fdt_create(fdt, FDT_MAX_SIZE))); > > - if (spapr->kernel_size) { > - _FDT((fdt_add_reservemap_entry(fdt, KERNEL_LOAD_ADDR, > - spapr->kernel_size))); > - } > - if (spapr->initrd_size) { > - _FDT((fdt_add_reservemap_entry(fdt, spapr->initrd_base, > - spapr->initrd_size))); > - } > _FDT((fdt_finish_reservemap(fdt))); > > /* Root node */ > @@ -976,6 +968,15 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, > } > > g_free(bootlist); > + > + /* Build memory reserve map */ > + if (spapr->kernel_size) { > + _FDT((fdt_add_mem_rsv(fdt, KERNEL_LOAD_ADDR, spapr->kernel_size))); > + } > + if (spapr->initrd_size) { > + _FDT((fdt_add_mem_rsv(fdt, spapr->initrd_base, spapr->initrd_size))); > + } > + > return fdt; > } Reviewed-by: Thomas Huth