From patchwork Mon Mar 16 18:50:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11441199 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A0C41668 for ; Mon, 16 Mar 2020 19:18:08 +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 5F57220674 for ; Mon, 16 Mar 2020 19:18:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q78H+IVF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F57220674 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvFX-00060t-IH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 Mar 2020 15:18:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41016) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuqd-0002jb-88 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuqc-0004BO-1J for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:23 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:43807) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuqb-000444-To for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384740; 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=HttrlD9lCEsMBP0W9znyLPVsPA+6bjyfUNmOA7cXo6c=; b=Q78H+IVF2mCNPMkTrl3vuTI5CYCP5uC2hxC7pIOuZSO4ak4rfwjdKhTlHLSE7uHwD51Z2u qly62kz0u0syEYb27H6leR/EpqWBOTyK1Jkp1sJCw5gw9uUy1WKiw8QPZ+I11qdMho1GSl f/3v+JXd5NNfW4sRBiPMv0vm98hAOe4= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-HXE6KNYnOdm_5w6uVGxVxA-1; Mon, 16 Mar 2020 14:52:08 -0400 X-MC-Unique: HXE6KNYnOdm_5w6uVGxVxA-1 Received: by mail-wr1-f72.google.com with SMTP id g4so1811197wrv.12 for ; Mon, 16 Mar 2020 11:52:08 -0700 (PDT) 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=tYfa1Hf7U/2ml3JMTg2AwntL/E669AKHYCa9fz5AtEA=; b=o9CPhKS4AHUuSmwR7SMttRbhYn4HmTvOZQWbHBdV0g5vkBcGavVJJrBaewhzNc9Hq+ xUu9YKrCIB3CM68HLotqfmgrqEPbwsiUQTt9sdLnJDIIzpMczwZl2sFPXQwj+tPL4RLd mi+LCYuJCjDBlbuwK/eNAyrVsDwWGROFC8xSWAz9fv7ajnQZhUYtyzr5nCL+xh1NHZ8d 2nBIljGKdYXvhpRo0/jbwCcrkTNkW49t1QvQvCZ27Y9j2YkE82Ti1bITeBlmTCc4b7Ic 5brt07Ryoj1lmL+3MKR5Naifjug46a67f/H91tIbp0Ry+5r4Yelrz3sB6DFAp/WukHB7 L90g== X-Gm-Message-State: ANhLgQ3EFIdf7riy3UgWzFw6AVo00u7PdgwGKrJpGNBqweqfm1Evo/e4 2LNqtfd+dnMXcjEziEprT7fK/cIsWDXfUgV/rJNauy+6TiSHrTKgZQVPGe44nG0WKFRBy97kHko FWE2kiu2mUjNuCyA= X-Received: by 2002:a7b:c5d9:: with SMTP id n25mr535852wmk.160.1584384727478; Mon, 16 Mar 2020 11:52:07 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvoJUVwD0BxKlnO6sB3V8r22Mhun1i+av8ikletTQazuOpWsoxjcRElP92FIznS3RwH5tSC3g== X-Received: by 2002:a7b:c5d9:: with SMTP id n25mr535833wmk.160.1584384727293; Mon, 16 Mar 2020 11:52:07 -0700 (PDT) Received: from localhost.localdomain (96.red-83-59-163.dynamicip.rima-tde.net. [83.59.163.96]) by smtp.gmail.com with ESMTPSA id v8sm1166744wrw.2.2020.03.16.11.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:52:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 23/25] hw/ppc/ppc405: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:50:04 +0100 Message-Id: <20200316185006.576-24-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200316185006.576-1-philmd@redhat.com> References: <20200316185006.576-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: "open list:ppc4xx" , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The scripts/coccinelle/memory-region-housekeeping.cocci reported: * TODO [[view:./hw/ppc/ppc405_boards.c::face=ovl-face1::linb=195::colb=8::cole=30][potential use of memory_region_init_rom*() in ./hw/ppc/ppc405_boards.c::195]] * TODO [[view:./hw/ppc/ppc405_boards.c::face=ovl-face1::linb=464::colb=8::cole=30][potential use of memory_region_init_rom*() in ./hw/ppc/ppc405_boards.c::464]] We can indeed replace the memory_region_init_ram() and memory_region_set_readonly() calls by memory_region_init_rom(). Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/ppc405_boards.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index de93c40f1a..e6bffb9e1a 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -199,7 +199,7 @@ static void ref405ep_init(MachineState *machine) #endif { bios = g_new(MemoryRegion, 1); - memory_region_init_ram(bios, NULL, "ef405ep.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "ef405ep.bios", BIOS_SIZE, &error_fatal); if (bios_name == NULL) @@ -223,7 +223,6 @@ static void ref405ep_init(MachineState *machine) /* Avoid an uninitialized variable warning */ bios_size = -1; } - memory_region_set_readonly(bios, true); } /* Register FPGA */ ref405ep_fpga_init(sysmem, 0xF0300000); @@ -471,7 +470,7 @@ static void taihu_405ep_init(MachineState *machine) if (bios_name == NULL) bios_name = BIOS_FILENAME; bios = g_new(MemoryRegion, 1); - memory_region_init_ram(bios, NULL, "taihu_405ep.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "taihu_405ep.bios", BIOS_SIZE, &error_fatal); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { @@ -489,7 +488,6 @@ static void taihu_405ep_init(MachineState *machine) error_report("Could not load PowerPC BIOS '%s'", bios_name); exit(1); } - memory_region_set_readonly(bios, true); } /* Register Linux flash */ dinfo = drive_get(IF_PFLASH, 0, fl_idx);