From patchwork Mon Mar 16 18:49:47 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: 11441205 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 6C4671668 for ; Mon, 16 Mar 2020 19:19:38 +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 4029D20674 for ; Mon, 16 Mar 2020 19:19:38 +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="GjSL3PLr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4029D20674 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]:47428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvGz-0000aB-E4 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 Mar 2020 15:19:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45793) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuu7-0002As-Sd for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:56:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuu6-0005W3-Jt for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:55:59 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:45194) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuu6-0005Ta-FU for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:55:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384958; 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=DAKyL7Tqa+fBdxrFOnKvFsx39GH2EjqIV6ZKoapzE/Q=; b=GjSL3PLrj9fAmuW+nx2MGrmE32jaQgDv9dojpDR6vLOlBAJ0U3Td7LSNDDhdNm0lDO4Uly SOjbXuZTmFJO6DIWEE/PSclvyECOHxGxA1zhd0Zuh3neICxUW2Q0QKTn+TCBWQDLmIMM8h pnCy3RvsakUeU7pADFCLa1cE5bUCpOE= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-_6iVTF7mM-KFfMqd3opASg-1; Mon, 16 Mar 2020 14:55:56 -0400 X-MC-Unique: _6iVTF7mM-KFfMqd3opASg-1 Received: by mail-wm1-f71.google.com with SMTP id n25so4985680wmi.5 for ; Mon, 16 Mar 2020 11:55:56 -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=kHrh7HRUxq+j6HbASfjSpjwX0NBi+3mUfkSXhbTFwJw=; b=KUCXkNWhFFloUjiSw7rNJGnd7VsGA5iBBFFUfqCPxZyfuwS4m6M4yaElMKSILtPnY0 kkwThhSB2VqQuLnt+paDadf8EDJwnJLhGc1ij9AkfeFaqPOh9QEkqqYk5RTrhzFePP5b LqXOQuSqGnEfNzmHhlgfypRYCVPG2t0f9rIehQdUiKRyQcUw3DZsozpv4qxwA5dRxd1k lSg1mepNpVnp3v9U4rsgE67GCZPsWwG+PrkgBWuZ/XHe26z+zKMKwLvJf4+dUW4D0U7Q DiBzqrA18HQr6i7jbw0egI9rUNAzzcZzPmabwi9OZd2O2wC3Vj8P+L62qN7ShfOuxRpu hN/g== X-Gm-Message-State: ANhLgQ1VPRLuWNtwZLoni4PF0VfWIPwA0uiuySDJJQwfBtMkRphRjCwm P0S68sJ3koh05abTMQttbBOgI2hNvvnY3oqhYM02zNqJljICmL0gshgsd8E5da+5mz4HJ9bADzx heWl8mJkPZ42DRco= X-Received: by 2002:a5d:5090:: with SMTP id a16mr771486wrt.191.1584384639541; Mon, 16 Mar 2020 11:50:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsnjqSjZ0/ioyXpDCNFGMeNZtB/AcCe7pOm2OH3Lx5oF5X62lXQNhyzJTltZ/cUHzDv3+1buw== X-Received: by 2002:a5d:5090:: with SMTP id a16mr771474wrt.191.1584384639375; Mon, 16 Mar 2020 11:50:39 -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 b10sm1100611wrm.30.2020.03.16.11.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 06/25] hw/display: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:47 +0100 Message-Id: <20200316185006.576-7-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] [fuzzy] X-Received-From: 216.205.24.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: Peter Maydell , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daudé --- hw/display/cg3.c | 5 ++--- hw/display/tcx.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 4fb67c6b1c..a1ede10394 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -287,9 +287,8 @@ static void cg3_initfn(Object *obj) SysBusDevice *sbd = SYS_BUS_DEVICE(obj); CG3State *s = CG3(obj); - memory_region_init_ram_nomigrate(&s->rom, obj, "cg3.prom", FCODE_MAX_ROM_SIZE, - &error_fatal); - memory_region_set_readonly(&s->rom, true); + memory_region_init_rom_nomigrate(&s->rom, obj, "cg3.prom", + FCODE_MAX_ROM_SIZE, &error_fatal); sysbus_init_mmio(sbd, &s->rom); memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg", diff --git a/hw/display/tcx.c b/hw/display/tcx.c index ca458f94fe..76de16e8ea 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -755,9 +755,8 @@ static void tcx_initfn(Object *obj) SysBusDevice *sbd = SYS_BUS_DEVICE(obj); TCXState *s = TCX(obj); - memory_region_init_ram_nomigrate(&s->rom, obj, "tcx.prom", FCODE_MAX_ROM_SIZE, - &error_fatal); - memory_region_set_readonly(&s->rom, true); + memory_region_init_rom_nomigrate(&s->rom, obj, "tcx.prom", + FCODE_MAX_ROM_SIZE, &error_fatal); sysbus_init_mmio(sbd, &s->rom); /* 2/STIP : Stippler */