Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j6Ket-0001NY-Gf for mharc-qemu-riscv@gnu.org; Mon, 24 Feb 2020 15:48:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48865) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Keq-0001Ed-AE for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Keo-0006Bj-VQ for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:52 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:27393 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Keo-0006Av-QU for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582577330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EimZBb/wTLnnIdXn4hxLBCiwdZq9+sATqGkFdsLXgrs=; b=iKjfM+xsYVSHJ+KOmWnOJcrt+WZEkfRyn4NslG1OL3qRrDrE7uL08vSZ3qsmgJeMcYRjUD tFjXQ1sU5Jr/cSIEv0xM/XaBXNueKzXpNMJMCwYniAsW4injf8+TAlf2NPtch5mtRbsY8t 7zL1ju7mBFVjY237I/0n249Nfbg0HMc= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-6kZON8TtNSyYbtdSZdne4A-1; Mon, 24 Feb 2020 15:48:48 -0500 X-MC-Unique: 6kZON8TtNSyYbtdSZdne4A-1 Received: by mail-wr1-f71.google.com with SMTP id t6so6182649wru.3 for ; Mon, 24 Feb 2020 12:48:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ByVIxDLRiagI4jpWyJ3PwuXt8g8+yTOCqOLmRfAD0zk=; b=G8Q70Q275p4vHxvoomYZEtFtPaiPGRY6QO4N6zzSDnmIDkVoMkNxfgjqFaYIWAcmD8 QtzGmFgIbeYivkRjtGVz/aqixpcfstri58HJ+sVMTDXaGUqQ91iF6WU7MosIfhZZ8RjX yOSiTGR2ZRjto2umzvIwMv9VWr28hO/aWGKNFEEX3IaLBDXUv5TGJTEMF8tB+CvKI9kL XllRgD+lVF0zjVv81bsNn3HCJujwFeQIPSJMTtvEpvP9u4MhMYjva5g9ZxAmiMARzEaI 54MtHpBkoFEkRAYe5shpSTYWt4dgSViQyac6wip+AYfsYn4Cg3VF5viX3y1sS8xd6BrT Kong== X-Gm-Message-State: APjAAAWRq9cC4Q7VKPD+hwFhTLUE5QzxeTyW9E1St4x5P+tBs3xb1k8C KeLzC9DB6nlpAtPsjxH52GZ294JXIPTLcn7sMbn045MJqtDyIJNx4HVCeye/i7Rmt1NgCx26is2 E8odXdFhK8oJneRo= X-Received: by 2002:adf:f606:: with SMTP id t6mr68482924wrp.304.1582577327198; Mon, 24 Feb 2020 12:48:47 -0800 (PST) X-Google-Smtp-Source: APXvYqxgsmEWqTG1GUpTzj1fBJMF8iV76DYHlRh2PrTAfSOWCB3BA2V2zsC6BlmKJaMzFLzwtZmTEQ== X-Received: by 2002:adf:f606:: with SMTP id t6mr68482882wrp.304.1582577327002; Mon, 24 Feb 2020 12:48:47 -0800 (PST) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id t81sm863436wmg.6.2020.02.24.12.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 12:48:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org Cc: Joel Stanley , Laurent Vivier , Aleksandar Markovic , Richard Henderson , Andrzej Zaborowski , KONRAD Frederic , Peter Chubb , Palmer Dabbelt , Michael Walle , Max Reitz , "Edgar E. Iglesias" , Marcel Apfelbaum , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, Magnus Damm , Subbaraya Sundeep , David Gibson , Eduardo Habkost , Jean-Christophe Dubois , Sagar Karandikar , Igor Mitsyanko , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, Mark Cave-Ayland , Aurelien Jarno , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Bastian Koppelmann , Fabien Chouteau , Alistair Francis , Kevin Wolf , Aleksandar Rikalo , qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , Artyom Tarasenko Subject: [PATCH v2 07/32] hw/mips: Use memory_region_init_rom() with read-only regions Date: Mon, 24 Feb 2020 21:48:03 +0100 Message-Id: <20200224204828.23167-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200224204828.23167-1-philmd@redhat.com> References: <20200224204828.23167-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 20:48:54 -0000 This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/mips_fulong2e.c | 3 +-- hw/mips/mips_jazz.c | 6 ++---- hw/mips/mips_mipssim.c | 3 +-- hw/mips/mips_r4k.c | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 2e043cbb98..547a7d3a45 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -319,9 +319,8 @@ static void mips_fulong2e_init(MachineState *machine) =20 /* allocate RAM */ memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_si= ze); - memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, &error_fatal); - memory_region_set_readonly(bios, true); =20 memory_region_add_subregion(address_space_mem, 0, ram); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 66fd4d867d..cf47335ea5 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -195,9 +195,8 @@ static void mips_jazz_init(MachineState *machine, machine->ram_size); memory_region_add_subregion(address_space, 0, ram); =20 - memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE, + memory_region_init_rom(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE, &error_fatal); - memory_region_set_readonly(bios, true); memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios, 0, MAGNUM_BIOS_SIZE); memory_region_add_subregion(address_space, 0x1fc00000LL, bios); @@ -263,9 +262,8 @@ static void mips_jazz_init(MachineState *machine, { /* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =3D g_new(MemoryRegion, 1); - memory_region_init_ram(rom_mr, NULL, "g364fb.rom", 0x80000, + memory_region_init_rom(rom_mr, NULL, "g364fb.rom", 0x80000, &error_fatal); - memory_region_set_readonly(rom_mr, true); uint8_t *rom =3D memory_region_get_ram_ptr(rom_mr); memory_region_add_subregion(address_space, 0x60000000, rom_mr)= ; rom[0] =3D 0x10; /* Mips G364 */ diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index b934ca9d51..3fdbb21680 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -169,9 +169,8 @@ mips_mipssim_init(MachineState *machine) /* Allocate RAM. */ memory_region_allocate_system_memory(ram, NULL, "mips_mipssim.ram", ram_size); - memory_region_init_ram(bios, NULL, "mips_mipssim.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "mips_mipssim.bios", BIOS_SIZE, &error_fatal); - memory_region_set_readonly(bios, true); =20 memory_region_add_subregion(address_space_mem, 0, ram); =20 diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index b2aec434c3..54b286ceee 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -241,9 +241,8 @@ void mips_r4k_init(MachineState *machine) dinfo =3D drive_get(IF_PFLASH, 0, 0); if ((bios_size > 0) && (bios_size <=3D BIOS_SIZE)) { bios =3D g_new(MemoryRegion, 1); - memory_region_init_ram(bios, NULL, "mips_r4k.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "mips_r4k.bios", BIOS_SIZE, &error_fatal); - memory_region_set_readonly(bios, true); memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios)= ; =20 load_image_targphys(filename, 0x1fc00000, BIOS_SIZE); --=20 2.21.1