From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14304CA9EAF for ; Mon, 21 Oct 2019 11:02:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C26562084C for ; Mon, 21 Oct 2019 11:02:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HuSF0plP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C26562084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVSd-0004ZK-Io for qemu-devel@archiver.kernel.org; Mon, 21 Oct 2019 07:02:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46031) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVMT-0007Wt-9f for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:56:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVMR-0002u2-H3 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 06:56:29 -0400 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:34485) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMVMR-0002tm-BM; Mon, 21 Oct 2019 06:56:27 -0400 Received: by mail-ot1-x342.google.com with SMTP id m19so10615714otp.1; Mon, 21 Oct 2019 03:56:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=8cU9YpjqfjKJljNOjUTYsuZb+8CzeCdO/XDvHbV0w3I=; b=HuSF0plPP7zfJ9Gmt/Eqnd7zSY4ec+1/axKNeO53EgIoV6xziFwx9RXvYGgnVU2Z18 a1WUU4C+ejeqYVlJ1qLX+b6KPBYW4AGG4Jx1b0+cW3SYRYFna/WBtfrze1V+aOOQa3Ll SEehHaNEqVSEnMP4CQF7Y8PWh5xNVNT/s+/eU4FAdFEHO9NYWZSG46MdowphGkT6/J/p 4m5z59RgN0v4lm/iW61Z6PKYdyBTHf1BJ36qKAmhfHGMKAVkdsjtzknbtFWmvuE6VwyN Tn40orTA5Cl7qBt5rYWqZ+bZk4MGO6tqgxvkEAkHfSg4/yhL3ZYNu1R0UKjk++E1qrua crDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=8cU9YpjqfjKJljNOjUTYsuZb+8CzeCdO/XDvHbV0w3I=; b=A3+5PPX2vIOQfdEIuWZRGwoWdBJQNrv1mwteoTbx56PQ4LekAaPR2HE2KmkES8z3Ck iqlOeA8Q0HYocIRKU6X3wqHkXdLZEcYsh7nkQYndQ4RJkFVNVmXLeeeMcCDdcWRDvb6U wCshKoPOVv+wm2+i9JuuhSlF4hC6En71T6cow+yr53uaLB/hTxyQgSk/DtXR4d4M2DBy u+H03nt3b7VvFxdD0TqjDKPpjsvGQMkm7nQ2lgBNSMf0jaQEZPqHklZn8hRfT6dmharg Ac7P5S0PRrWlplKxf/EKiAEdGEOT7VUqatInLQoveWcMQii49K94eJ7G1b6HmWrzUmx2 TiVQ== X-Gm-Message-State: APjAAAVhEF2VEOemcELLUkco1AuAkmiIj+YWT9qKcDSCe1nxh/hyt6+k nNsiViCguk4YHsXYJNy1D2fZ2+zX7bdjbp26znA= X-Google-Smtp-Source: APXvYqyARZa0iKZLmlQBVb8Sukng792nvhpZPLoA4ZkwZ+4FZ76fkEQRvvm0RGcHKWavJB/5gKwNP32Sv3hsyXlmQ4c= X-Received: by 2002:a9d:4f0f:: with SMTP id d15mr17344164otl.64.1571655386293; Mon, 21 Oct 2019 03:56:26 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a9d:340a:0:0:0:0:0 with HTTP; Mon, 21 Oct 2019 03:56:25 -0700 (PDT) In-Reply-To: <698bde03-02a9-be5e-2aff-4e8d50508222@redhat.com> References: <20191020225650.3671-1-philmd@redhat.com> <20191020225650.3671-19-philmd@redhat.com> <698bde03-02a9-be5e-2aff-4e8d50508222@redhat.com> From: Aleksandar Markovic Date: Mon, 21 Oct 2019 12:56:25 +0200 Message-ID: Subject: Re: [PATCH 18/21] hw/mips: Let the machine be the owner of the system memory To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: multipart/alternative; boundary="000000000000026c35059569896e" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Burton , Jan Kiszka , Peter Maydell , Mark Cave-Ayland , "qemu-devel@nongnu.org" , KONRAD Frederic , "Edgar E. Iglesias" , Rob Herring , Andrey Smirnov , Helge Deller , "Michael S. Tsirkin" , Markus Armbruster , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Antony Pavlov , Aleksandar Rikalo , David Gibson , Artyom Tarasenko , Joel Stanley , Eduardo Habkost , Alistair Francis , Leif Lindholm , Beniamino Galvani , "qemu-arm@nongnu.org" , Peter Chubb , Fabien Chouteau , Paolo Bonzini , Richard Henderson , Radoslaw Biernacki , Thomas Huth , Andrew Baumann , Jean-Christophe Dubois , Andrew Jeffery , Michael Walle , "qemu-ppc@nongnu.org" , Aleksandar Markovic , Igor Mammedov , Aurelien Jarno , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000026c35059569896e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Monday, October 21, 2019, Philippe Mathieu-Daud=C3=A9 wrote: > Hi Aleksandar, > > On 10/21/19 8:25 AM, Aleksandar Markovic wrote: > >> >> >> On Monday, October 21, 2019, Philippe Mathieu-Daud=C3=A9 > > wrote: >> >> Signed-off-by: Philippe Mathieu-Daud=C3=A9 > > >> --- >> hw/mips/boston.c | 2 +- >> hw/mips/mips_fulong2e.c | 3 ++- >> hw/mips/mips_jazz.c | 2 +- >> hw/mips/mips_malta.c | 2 +- >> hw/mips/mips_mipssim.c | 2 +- >> hw/mips/mips_r4k.c | 3 ++- >> 6 files changed, 8 insertions(+), 6 deletions(-) >> >> >> Philippe, can this patch be applied independently (on other patches of >> this series)? >> > > Unfortunately not because patch #9 changed the prototype of > memory_region_allocate_system_memory() so this patch alone > won't build. > > I rather expect this series goes as a whole via the machine-next > tree. > > Do you mind giving your Acked-by tag to this patch? > > I can't, sorry, for MIPS target, we don't accept patches with empty commit messages. A. > Thanks, > > Phil. > > >> >> diff --git a/hw/mips/boston.c b/hw/mips/boston.c >> index ca7d813a52..8445fee0f1 100644 >> --- a/hw/mips/boston.c >> +++ b/hw/mips/boston.c >> @@ -474,7 +474,7 @@ static void boston_mach_init(MachineState >> *machine) >> memory_region_add_subregion_overlap(sys_mem, 0x18000000, >> flash, 0); >> >> ddr =3D g_new(MemoryRegion, 1); >> - memory_region_allocate_system_memory(ddr, NULL, "boston.ddr", >> + memory_region_allocate_system_memory(ddr, machine, "boston.ddr"= , >> machine->ram_size); >> memory_region_add_subregion_overlap(sys_mem, 0x80000000, ddr, >> 0); >> >> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c >> index cf537dd7e6..d5a5cef619 100644 >> --- a/hw/mips/mips_fulong2e.c >> +++ b/hw/mips/mips_fulong2e.c >> @@ -318,7 +318,8 @@ static void mips_fulong2e_init(MachineState >> *machine) >> ram_size =3D 256 * MiB; >> >> /* allocate RAM */ >> - memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", >> ram_size); >> + memory_region_allocate_system_memory(ram, machine, >> + "fulong2e.ram", ram_size); >> memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE, >> &error_fatal); >> memory_region_set_readonly(bios, true); >> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c >> index 8d010a0b6e..88b125855f 100644 >> --- a/hw/mips/mips_jazz.c >> +++ b/hw/mips/mips_jazz.c >> @@ -188,7 +188,7 @@ static void mips_jazz_init(MachineState *machine= , >> cc->do_transaction_failed =3D mips_jazz_do_transaction_failed; >> >> /* allocate RAM */ >> - memory_region_allocate_system_memory(ram, NULL, "mips_jazz.ram"= , >> + memory_region_allocate_system_memory(ram, machine, >> "mips_jazz.ram", >> machine->ram_size); >> memory_region_add_subregion(address_space, 0, ram); >> >> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c >> index 4d9c64b36a..af56a29ccb 100644 >> --- a/hw/mips/mips_malta.c >> +++ b/hw/mips/mips_malta.c >> @@ -1267,7 +1267,7 @@ void mips_malta_init(MachineState *machine) >> } >> >> /* register RAM at high address where it is undisturbed by IO = */ >> - memory_region_allocate_system_memory(ram_high, NULL, >> "mips_malta.ram", >> + memory_region_allocate_system_memory(ram_high, machine, >> "mips_malta.ram", >> ram_size); >> memory_region_add_subregion(system_memory, 0x80000000, >> ram_high); >> >> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c >> index 282bbecb24..c1933231e2 100644 >> --- a/hw/mips/mips_mipssim.c >> +++ b/hw/mips/mips_mipssim.c >> @@ -166,7 +166,7 @@ mips_mipssim_init(MachineState *machine) >> qemu_register_reset(main_cpu_reset, reset_info); >> >> /* Allocate RAM. */ >> - memory_region_allocate_system_memory(ram, NULL, >> "mips_mipssim.ram", >> + memory_region_allocate_system_memory(ram, machine, >> "mips_mipssim.ram", >> ram_size); >> memory_region_init_ram(bios, NULL, "mips_mipssim.bios", >> BIOS_SIZE, >> &error_fatal); >> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c >> index bc0be26544..59f8cacfb6 100644 >> --- a/hw/mips/mips_r4k.c >> +++ b/hw/mips/mips_r4k.c >> @@ -203,7 +203,8 @@ void mips_r4k_init(MachineState *machine) >> " maximum 256MB", ram_size / MiB); >> exit(1); >> } >> - memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", >> ram_size); >> + memory_region_allocate_system_memory(ram, machine, >> "mips_r4k.ram", >> + ram_size); >> >> memory_region_add_subregion(address_space_mem, 0, ram); >> >> -- 2.21.0 >> >> >> --000000000000026c35059569896e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Monday, October 21, 2019, Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com> wrote:
Hi Aleksandar,

On 10/21/19 8:25 AM, Aleksandar Markovic wrote:


On Monday, October 21, 2019, Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com <mailto:<= a href=3D"mailto:philmd@redhat.com" target=3D"_blank">philmd@redhat.com= >> wrote:

=C2=A0 =C2=A0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com
=C2=A0 =C2=A0 <mailto:philmd@redhat.com>>
=C2=A0 =C2=A0 ---
=C2=A0 =C2=A0 =C2=A0=C2=A0hw/mips/boston.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 += -
=C2=A0 =C2=A0 =C2=A0=C2=A0hw/mips/mips_fulong2e.c | 3 ++-
=C2=A0 =C2=A0 =C2=A0=C2=A0hw/mips/mips_jazz.c=C2=A0 =C2=A0 =C2=A0| 2 +-
=C2=A0 =C2=A0 =C2=A0=C2=A0hw/mips/mips_malta.c=C2=A0 =C2=A0 | 2 +-
=C2=A0 =C2=A0 =C2=A0=C2=A0hw/mips/mips_mipssim.c=C2=A0 | 2 +-
=C2=A0 =C2=A0 =C2=A0=C2=A0hw/mips/mips_r4k.c=C2=A0 =C2=A0 =C2=A0 | 3 ++- =C2=A0 =C2=A0 =C2=A0=C2=A06 files changed, 8 insertions(+), 6 deletions(-)<= br>

Philippe, can this patch be applied independently (on other patches of this= series)?

Unfortunately not because patch #9 changed the prototype of
memory_region_allocate_system_memory() so this patch alone
won't build.

I rather expect this series goes as a whole via the machine-next
tree.

Do you mind giving your Acked-by tag to this patch?


I can't, sorry, for MIPS target, w= e don't accept patches with empty commit messages.

=
A.


=C2=A0
Thanks,

Phil.



=C2=A0 =C2=A0 diff --git a/hw/mips/boston.c b/hw/mips/boston.c
=C2=A0 =C2=A0 index ca7d813a52..8445fee0f1 100644
=C2=A0 =C2=A0 --- a/hw/mips/boston.c
=C2=A0 =C2=A0 +++ b/hw/mips/boston.c
=C2=A0 =C2=A0 @@ -474,7 +474,7 @@ static void boston_mach_init(MachineState= *machine)
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_add_subregion_ov= erlap(sys_mem, 0x18000000,
=C2=A0 =C2=A0 flash, 0);

=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0ddr =3D g_new(MemoryRegion, 1);
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 memory_region_allocate_system_memory(ddr,= NULL, "boston.ddr",
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 memory_region_allocate_system_memory(ddr,= machine, "boston.ddr",
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 machine->ram_size);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_add_subregion_ov= erlap(sys_mem, 0x80000000, ddr, 0);

=C2=A0 =C2=A0 diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.= c
=C2=A0 =C2=A0 index cf537dd7e6..d5a5cef619 100644
=C2=A0 =C2=A0 --- a/hw/mips/mips_fulong2e.c
=C2=A0 =C2=A0 +++ b/hw/mips/mips_fulong2e.c
=C2=A0 =C2=A0 @@ -318,7 +318,8 @@ static void mips_fulong2e_init(MachineSta= te
=C2=A0 =C2=A0 *machine)
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0ram_size =3D 256 * MiB;

=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0/* allocate RAM */
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= NULL, "fulong2e.ram",
=C2=A0 =C2=A0 ram_size);
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= machine,
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0"fulong2e.ram", ram_size);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_init_ram(bios, NULL, = "fulong2e.bios", BIOS_SIZE,
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &error_fatal);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_set_readonly(bio= s, true);
=C2=A0 =C2=A0 diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
=C2=A0 =C2=A0 index 8d010a0b6e..88b125855f 100644
=C2=A0 =C2=A0 --- a/hw/mips/mips_jazz.c
=C2=A0 =C2=A0 +++ b/hw/mips/mips_jazz.c
=C2=A0 =C2=A0 @@ -188,7 +188,7 @@ static void mips_jazz_init(MachineState *= machine,
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0cc->do_transaction_failed =3D mi= ps_jazz_do_transaction_failed;

=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0/* allocate RAM */
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= NULL, "mips_jazz.ram",
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= machine, "mips_jazz.ram",
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 machine->ram_size);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_add_subregion(ad= dress_space, 0, ram);

=C2=A0 =C2=A0 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
=C2=A0 =C2=A0 index 4d9c64b36a..af56a29ccb 100644
=C2=A0 =C2=A0 --- a/hw/mips/mips_malta.c
=C2=A0 =C2=A0 +++ b/hw/mips/mips_malta.c
=C2=A0 =C2=A0 @@ -1267,7 +1267,7 @@ void mips_malta_init(MachineState *mach= ine)
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0/* register RAM at high address whe= re it is undisturbed by IO */
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram_= high, NULL,
=C2=A0 =C2=A0 "mips_malta.ram",
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram_= high, machine,
=C2=A0 =C2=A0 "mips_malta.ram",
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 ram_size);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_add_subregion(sy= stem_memory, 0x80000000, ram_high);

=C2=A0 =C2=A0 diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c<= br> =C2=A0 =C2=A0 index 282bbecb24..c1933231e2 100644
=C2=A0 =C2=A0 --- a/hw/mips/mips_mipssim.c
=C2=A0 =C2=A0 +++ b/hw/mips/mips_mipssim.c
=C2=A0 =C2=A0 @@ -166,7 +166,7 @@ mips_mipssim_init(MachineState *machine)<= br> =C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0qemu_register_reset(main_cpu_r= eset, reset_info);

=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0/* Allocate RAM. */
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= NULL, "mips_mipssim.ram",
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= machine,
=C2=A0 =C2=A0 "mips_mipssim.ram",
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 ram_size);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_init_ram(bios, NULL, = "mips_mipssim.bios", BIOS_SIZE,
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &error_fatal);
=C2=A0 =C2=A0 diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
=C2=A0 =C2=A0 index bc0be26544..59f8cacfb6 100644
=C2=A0 =C2=A0 --- a/hw/mips/mips_r4k.c
=C2=A0 =C2=A0 +++ b/hw/mips/mips_r4k.c
=C2=A0 =C2=A0 @@ -203,7 +203,8 @@ void mips_r4k_init(MachineState *machine)=
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 " maximum 256MB", ram_size / MiB);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exit(1);
=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= NULL, "mips_r4k.ram",
=C2=A0 =C2=A0 ram_size);
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 memory_region_allocate_system_memory(ram,= machine, "mips_r4k.ram",
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0ram_size);

=C2=A0 =C2=A0 =C2=A0=C2=A0 =C2=A0 =C2=A0memory_region_add_subregion(ad= dress_space_mem, 0, ram);

=C2=A0 =C2=A0 --=C2=A0 =C2=A0 =C2=A02.21.0


--000000000000026c35059569896e--