From nobody Tue May 7 12:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386287; cv=none; d=zohomail.com; s=zohoarc; b=bGe/jcOrqpTL9w4rg1A3r1OoajNXVZ8psPEpysKEXWKYykjD8CP7fYMGW+B27328+9JxtttmmD8/tAaHrSMoA1jpk6J60nT88ZWmXGP4cOhFjYPktui8psqriWZI8XClUyxzvN06w9HOlLWDXga/Rj2s9tTTQkwhggM6DGwuaFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386287; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ToHM1bRcSu3o42IHguqQBrZI8fvHPvcqixZhQVzTz6E=; b=c0Vq9hheSqIBAnctmavB7CdTR+txkla1Bh65L3lC/+IavMuSEXX89LYyqPdc7kOiZzx2UDyr1Ev2q+zOLLG/15C3ssWrfyEzCc1Hehi2KhfQ3K/IoTnZ67fxPFZW507vFvBaCrYtfsJnutH6Hz1MZkaB+m/KLqWOYuy0m0HaRyY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386287481924.3008102474537; Mon, 16 Mar 2020 12:18:07 -0700 (PDT) Received: from localhost ([::1]:47390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvFW-0005T7-CX for importer@patchew.org; Mon, 16 Mar 2020 15:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuod-0006jx-BS for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuoc-0005Ld-97 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:19 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:38826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuoc-0005JT-3z for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:18 -0400 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-11-1eibFGHpPlGov-kvsdwdCw-1; Mon, 16 Mar 2020 14:50:15 -0400 Received: by mail-wr1-f72.google.com with SMTP id v7so8264wrp.0 for ; Mon, 16 Mar 2020 11:50:15 -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 v10sm763990wmh.17.2020.03.16.11.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384617; 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=ToHM1bRcSu3o42IHguqQBrZI8fvHPvcqixZhQVzTz6E=; b=dswHuwkp/soGaKzAvCFQs0qfpLSSrFvINcLEV2QgeIePdCV79VzUzSJdFZJEFGPVpwirdP bm0nf2FCv7iqPPfD08swIiY0k6qfE895vQ2vzj+AMpXZxpkp+fVHW66fP0a+/xyG+JynR2 Uy0Mt1fNRhl3CoPlegEZZq5LAyl4+ac= X-MC-Unique: 1eibFGHpPlGov-kvsdwdCw-1 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=dnVDi3pCdMDNavjfPIsCqusO2Yp3WpdN6v4oPIcWzd4=; b=ZVl5RtbGMoUKrD+ozn0yHPDhRr0MPpV3T/BIejJpUnHleevWvnKmeg041po4I0ZA+2 2/riSQu+Q2is7qneVKjzLe2hFH+8RmH2Wl+YwNmgeIqVIxtS9u1ZNyIq7kzeIsVSTcV3 /evKjjhLh1CtcxRIbeMxX0xhC9ONDqHOERRqLf8TvW0rwpONcbDsvevD0TgTutGiuIvK qpt1260rn/2nhV929Vv/of+XXrNp0TEO1J0INwc9wg9ga9OI15hywqd5O7wHxypgkUPs vYJa/Bs0uVJzKcAj+HGsFqmP38cMBPT/2oHimXMWkMG6EpKSZ6KwcjxZoymc05RmBRXK OvLA== X-Gm-Message-State: ANhLgQ29kCD16T+SFE88ghQLYV6w65Se8XQpK8MpOw4uCIXnDxhxIPhz M1tbx/zB94Ke/ZUbof7IsOqtPef9v2+JJm70iI73dqIIW2/wtMGc/X/ek9oA9ik3qDkgnFxofvV v+NqX+NnpJX4Sbm0= X-Received: by 2002:a5d:694e:: with SMTP id r14mr761147wrw.312.1584384614279; Mon, 16 Mar 2020 11:50:14 -0700 (PDT) X-Google-Smtp-Source: ADFU+vumt0/zyQegs7BCttH3meap4BjY3y8njKNdvv230mwaaJmL4cZHHdg7RC6AUxKvB+enCsS0Uw== X-Received: by 2002:a5d:694e:: with SMTP id r14mr761126wrw.312.1584384614058; Mon, 16 Mar 2020 11:50:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 01/25] memory: Correctly return alias region type Date: Mon, 16 Mar 2020 19:49:42 +0100 Message-Id: <20200316185006.576-2-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 Content-Transfer-Encoding: quoted-printable 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Since memory region aliases are neither rom nor ram, they are described as i/o, which is often incorrect. Return instead the type of the original region we are aliasing. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- memory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/memory.c b/memory.c index 09be40edd2..3ea0afada9 100644 --- a/memory.c +++ b/memory.c @@ -2830,6 +2830,9 @@ void address_space_destroy(AddressSpace *as) =20 static const char *memory_region_type(MemoryRegion *mr) { + if (mr->alias) { + return memory_region_type(mr->alias); + } if (memory_region_is_ram_device(mr)) { return "ramd"; } else if (memory_region_is_romd(mr)) { --=20 2.21.1 From nobody Tue May 7 12:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385785; cv=none; d=zohomail.com; s=zohoarc; b=IcJC9IwP1HAuGSMZHexlRWcP0N91SE7kr9aUNsAOUVSSPhi0rnjsw0+du4tbntKszUgDWyiy8XoFu0Uglyi4M+7G7FV0rAIn0IzaqdbPvIan9tyNhZMBVr/nuBBSKvEP/7SxO6VoA+AxmuXYeDTBG4jzUnYED65qWgX6SKq5/Mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385785; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=geXUfxMTgfWENukAzjlYJ+d5da/XKDwLqigN/96zKgk=; b=cgjp3PATqkrdoyefQ3f/VWMKZJ5dIh26r+lJERCtJlbRHV2+dj610c9e6ddSQuhJIwLCNdxyLIM8gVuolWRM9y9yQByRKVLlU5L+REyiVUp/5GYp9gvRmTfGgUnheECQGkGGCFatPL3NZbDXlAK9IExguKgoc6ox/cLQ5uiaVL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385785664352.4812788147376; Mon, 16 Mar 2020 12:09:45 -0700 (PDT) Received: from localhost ([::1]:47192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDv7Q-0008Uo-Lp for importer@patchew.org; Mon, 16 Mar 2020 15:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37304) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuoi-0006v0-Fh for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuoh-0005uQ-Eo for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:24 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:23312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuoh-0005p7-91 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:23 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-B3V4_B-ROp-rAvvvEZNBIQ-1; Mon, 16 Mar 2020 14:50:20 -0400 Received: by mail-wr1-f70.google.com with SMTP id 94so4786023wrr.3 for ; Mon, 16 Mar 2020 11:50:20 -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 k18sm916145wru.94.2020.03.16.11.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384622; 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=geXUfxMTgfWENukAzjlYJ+d5da/XKDwLqigN/96zKgk=; b=MnJJrFU7pQspdxvaBYulKtie3OasaO73uYYZY4OQKnqef735HUaQRSiWEkhQYya/HPYtWv o7QqukLODjsBo78OnMXjB32g9+Sf/wNfbLg8u2zbtFj6W0UyRq3vMeUSHs7yI/yJHEWWOh XEH3mMFqiv842xuIx38VIJFbKX25scM= X-MC-Unique: B3V4_B-ROp-rAvvvEZNBIQ-1 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=c99EwYDmEg45/8wGuL3rbDlH0homjHih1JIeWwXpyVw=; b=s1jQIZvzrYFlbFzCaji+jkOsxy7oG+HOREIb46yw1uVrDwfeVSBrvuy4eRgy77e+uW An/qiEBXA8hefYczIhbqpb0l+fX6yH/Ij/Q+Z3lfq8MdDte3M2y7MNaO0T6++HckW711 KSC8TcimLps88qoGZwDMhqZguM2eKsuEaUKIUtP8BcmXoO9o2d0v5uK6oszk5LmqYv80 xqxbcvkytr1gbIbu1D98AD6aXo2ntiwVmrmD36akjozZrRGZoYKMtus0qTT+N9K0ttWq neaMGMEZh/kzgCxtkxspnpLTI9wtedaH/7dGxeAPARdoZvoaMlT2vNL5eg8gMYXDNjqn aPvQ== X-Gm-Message-State: ANhLgQ0BmiPwA2LYcNrkXSJ1YVGeTr680dGVUk42hWrSnho1nWJzM+/C eq58j++fWTf9oYQHEC4gsAPppSaeRHQ3/wQeckaWg72U/suSfD9eroZBh80z0n02C6qQ2acOEyg rMk2m6B2z6b/anE4= X-Received: by 2002:adf:dd8a:: with SMTP id x10mr859460wrl.38.1584384619223; Mon, 16 Mar 2020 11:50:19 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsY7FkLjuRCRhi7A/6S071MUAhXUay6JJw0H0pT5iS2EtUJy1H4rCdjVpv8QDVXrBfp9uTYfA== X-Received: by 2002:adf:dd8a:: with SMTP id x10mr859443wrl.38.1584384619020; Mon, 16 Mar 2020 11:50:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 02/25] memory: Simplify memory_region_init_rom_nomigrate() to ease review Date: Mon, 16 Mar 2020 19:49:43 +0100 Message-Id: <20200316185006.576-3-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" memory_region_init_rom_nomigrate() has the same content than memory_region_init_ram_shared_nomigrate(), with setting the readonly mode. The code is easier to review as creating a readonly ram/shared/nomigrate region. Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- memory.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/memory.c b/memory.c index 3ea0afada9..0ee43c60bd 100644 --- a/memory.c +++ b/memory.c @@ -1671,19 +1671,8 @@ void memory_region_init_rom_nomigrate(MemoryRegion *= mr, uint64_t size, Error **errp) { - Error *err =3D NULL; - memory_region_init(mr, owner, name, size); - mr->ram =3D true; + memory_region_init_ram_shared_nomigrate(mr, owner, name, size, false, = errp); mr->readonly =3D true; - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, false, mr, &err); - mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - } } =20 void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, --=20 2.21.1 From nobody Tue May 7 12:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386371; cv=none; d=zohomail.com; s=zohoarc; b=H5TuBMpzbX9DZa2htc5FyMSI/a2XPVuxPKYFxqhXRUoys7r3IZlZO7nJqEVO38Z+w7KwGEs+lYtAAovzFd8X3VfiDD9PRVFU+0TQZY2/+8OToHQ55i2OD+NT/A+XGcbbHIn/grgvGEhtsjmiURs3gFjR7HSG/8l2cTkfo13tOy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386371; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aOssGK0wEGA9lwDtDnb83pypbPpNOihgV6a6aZtmUvE=; b=V4R2pc/Cuc2iwPpOGRpim910TUoAPALku7o8fuAvtLOWbZuQhmUtpb342aSW+M4XjtxAo8A2eg1bRoyVoSFNshRzahC1fTA4CZ8tqRnDsqgrHGAkk7HsM+CBTjY85v0v6t2lo4YM7QeUQ30EY8W0xNJcpP2bMVWP/dC19FgNS/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386371204798.9642511084159; Mon, 16 Mar 2020 12:19:31 -0700 (PDT) Received: from localhost ([::1]:47426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvGs-0008E8-6c for importer@patchew.org; Mon, 16 Mar 2020 15:19:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37453) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuom-00072n-QI for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuol-0006Pl-M6 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:28 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:27619) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuol-0006NI-I4 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:27 -0400 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-433-rwAKA0HSMre9RyNpOgamLw-1; Mon, 16 Mar 2020 14:50:25 -0400 Received: by mail-wr1-f71.google.com with SMTP id w11so9464132wrp.20 for ; Mon, 16 Mar 2020 11:50:25 -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 i21sm730035wmb.23.2020.03.16.11.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384627; 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=aOssGK0wEGA9lwDtDnb83pypbPpNOihgV6a6aZtmUvE=; b=QyN+4o0musM+1MnwoqQpqew0EtSsO32tGBKvlHGUdwjLvEx7yXu3n6AZfC/JB+AAlcyEpk DHcGbBAnLud9ZNQspiuDpJZv8IZQspe4OHN7ywkw6tM6PjKxmAI1JMZ1pHanEfZNIwIQyN LR3v+xHmuEGqalK9SKRu5Lkb411rrN4= X-MC-Unique: rwAKA0HSMre9RyNpOgamLw-1 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=6B9O1gJSAeC5+USb9YJATMdkhOfRccXcmwPvQFdVhw4=; b=LEvcfVmS9IhpY2uYyAw86M2c5+H5y8Odh8bbs1/oQvPrxbW812M7R7GjMsaDHspBV+ n5872IDZslD4GCR5+py0gl3e54HvRd55qPSlHl7ap09Xli7RUFsMBMmRQsxXohgS5wVg EnLWEyoG0y01C20oaOXI4FaxYWJo5qt6U/CqEx4XkA5FFlH19h0Qu4HCxKyfhX40Qbey cU/hVIczY4CsQNwBGvg7d/EjMXhvA61QgfJrBqTccDc4FSWSbzE3N/1NyWog0qedHb4c cqPiKXHSxpmLIFQK6Spjoyxh1gXLsJhNPtQmD7KXFxemNr1mpG5TduCxE58E/pwz9us+ ZcQA== X-Gm-Message-State: ANhLgQ2BtZr+GG/88nRkBIWfbqrijlKmBppnL6Bl14/NDi7iQX1b2YtB nbUt6tpcbCAaQgca+AHyaWDTM4PQdCAW7B19mH5YWRZMqRpyCdH1XCwqhh3s4aAgd75bj1OA22B M2Z+3jhqDfSxIR4A= X-Received: by 2002:a1c:e341:: with SMTP id a62mr506373wmh.121.1584384624244; Mon, 16 Mar 2020 11:50:24 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsM3AleS9xV+8VbIyS0A3n+inDidCwOindr1HQys0CBWm0sqQaL2XS+8KRSCBoBeJegDF7H2Q== X-Received: by 2002:a1c:e341:: with SMTP id a62mr506345wmh.121.1584384623970; Mon, 16 Mar 2020 11:50:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 03/25] scripts/cocci: Rename memory-region-{init-ram -> housekeeping} Date: Mon, 16 Mar 2020 19:49:44 +0100 Message-Id: <20200316185006.576-4-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 Content-Transfer-Encoding: quoted-printable 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" As we are going to add various semantic changes related to the memory region API, rename this script to be more generic. Add a 'usage' header, and an entry in MAINTAINERS to avoid checkpatch warning. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- ...t-ram.cocci =3D> memory-region-housekeeping.cocci} | 13 +++++++++++++ MAINTAINERS | 1 + 2 files changed, 14 insertions(+) rename scripts/coccinelle/{memory-region-init-ram.cocci =3D> memory-region= -housekeeping.cocci} (84%) diff --git a/scripts/coccinelle/memory-region-init-ram.cocci b/scripts/cocc= inelle/memory-region-housekeeping.cocci similarity index 84% rename from scripts/coccinelle/memory-region-init-ram.cocci rename to scripts/coccinelle/memory-region-housekeeping.cocci index d290150872..3699c1017e 100644 --- a/scripts/coccinelle/memory-region-init-ram.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -1,3 +1,16 @@ +/* + Usage: + + spatch \ + --macro-file scripts/cocci-macro-file.h \ + --sp-file scripts/coccinelle/memory-region-housekeeping.cocci \ + --keep-comments \ + --in-place \ + --dir . + +*/ + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions. diff --git a/MAINTAINERS b/MAINTAINERS index 32867bc636..e06ef9bb56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2036,6 +2036,7 @@ F: include/exec/ramblock.h F: memory.c F: include/exec/memory-internal.h F: exec.c +F: scripts/coccinelle/memory-region-housekeeping.cocci =20 SPICE M: Gerd Hoffmann --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385652; cv=none; d=zohomail.com; s=zohoarc; b=bceFmOph0C2vxvSbG12xattD2d8VhUh8EoovS8k/KMjH4DrOf0lhta3/IqGLJKAmiP913muoflYzNHoTaUEqcAqTCIUzsh/OjleMk19tpNhfgwze9zkOwBXd6I4sja/lL4Xf4Sai8Prq3iRUy1+93RADJHEBrdy/lMcNkxEIdPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385652; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KKIXWkZQ88WTduFFFkbsC3MYjrqzYmU5aP3tKw4s+ro=; b=b/DqBF9Kyug1CP4GSjP5TnL+I7u0LExpT/Y9SZO2adjHL3WOBCOgbKb1LuaReNr1u5AHpFonb4ZqVNrReCjzqwBXvXdFHPaF1oh8GY6sCm8jtWo2U9xu/ubOCLl1N3BpFKrqtCP9cbnHI4gagSH6NlbTorgQvjqir5nW6G4tQFM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385652311900.1930143150187; Mon, 16 Mar 2020 12:07:32 -0700 (PDT) Received: from localhost ([::1]:47144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDv5G-0004fK-Uj for importer@patchew.org; Mon, 16 Mar 2020 15:07:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuou-0007Fn-8n for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuot-0007nQ-3P for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:36 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:46278) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuos-0007h1-UB for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:35 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-168-XaWtLWjxN6-k15RYNXvfdw-1; Mon, 16 Mar 2020 14:50:30 -0400 Received: by mail-wr1-f69.google.com with SMTP id l16so8749103wrr.6 for ; Mon, 16 Mar 2020 11:50:30 -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 h10sm1079644wrb.24.2020.03.16.11.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384634; 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=KKIXWkZQ88WTduFFFkbsC3MYjrqzYmU5aP3tKw4s+ro=; b=E66aKtU3AjXGs96/bUQH5A5g1RpwU4zb9JoioA0MEJeromP0IK234O6Fu6fA6pI8qaiBe/ ibe34NoCPlL2Kp1XoSoAfeHP7LItf741XFW0IqUhBe8FhzjvNGbIa0JLiImhlg9c/TLbrs QBNTvZ4y/LRZGHv9qDfvIUw6wHalDII= X-MC-Unique: XaWtLWjxN6-k15RYNXvfdw-1 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=pKNOtl8y4WJnqPTmGJ+A9Z44KVpFXaN4HJISuiqMTmo=; b=aAsjxYQmttJ6SMNIVZOqhrlRS+XpDiMFpNf9n8kH49UfGfQwOAc+kt+ZddDeqWImeF vYxy19TzrV87wHkMiFujlwX5NDTr8IL86gwVhebwOU7eqeDekzKRi+TqUQg00Ckf880E uPZaom5kbm9qNO/GEiGWP6r+O1Ya6/PdbDiC7G4+CAHFAUR8zk75HCfMvKIqlxEbdOwW ekn4gc9mTSnIm1AIwTinK9DM7kPgQW5XDy+vkoBougv6MTYZVovV+g6Q2ETwxlBRslKO K/3RQAWeI2LyrV+pxmzijDbXBU+zbAPROnok4KYp3Y+aNaK/H/wabVNzUPhR8CS7ZaJV 2Z8A== X-Gm-Message-State: ANhLgQ3wCVOkgTRiZlVxp3zDN4H3UnifrO3PuuaJvFQXXLGiBweFEUhx y7L4CVVseovHsCHuQdEU6xalyDGK/0FjoHRpxD/C55nfUXvzCV3yi6m+DhBj+uodmYd9i6Iud/G YF3l8nLikhkHnq8c= X-Received: by 2002:a5d:4283:: with SMTP id k3mr772415wrq.304.1584384629244; Mon, 16 Mar 2020 11:50:29 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvLYYS1hcFWDjX+81ipfXjuKriBFgByjOnnLP1rmg7qpolVldr1N15Iz2a7I4cYqnmMXQAUgA== X-Received: by 2002:a5d:4283:: with SMTP id k3mr772390wrq.304.1584384628962; Mon, 16 Mar 2020 11:50:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 04/25] scripts/cocci: Patch to replace memory_region_init_{ram, readonly -> rom} Date: Mon, 16 Mar 2020 19:49:45 +0100 Message-Id: <20200316185006.576-5-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Add a semantic patch to replace memory_region_init_ram(readonly) by memory_region_init_rom(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- .../memory-region-housekeeping.cocci | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/= coccinelle/memory-region-housekeeping.cocci index 3699c1017e..ee3923d369 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -11,6 +11,24 @@ */ =20 =20 +// Replace memory_region_init_ram(readonly) by memory_region_init_rom() +@@ +expression E1, E2, E3, E4, E5; +symbol true; +@@ +( +- memory_region_init_ram(E1, E2, E3, E4, E5); ++ memory_region_init_rom(E1, E2, E3, E4, E5); + ... WHEN !=3D E1 +- memory_region_set_readonly(E1, true); +| +- memory_region_init_ram_nomigrate(E1, E2, E3, E4, E5); ++ memory_region_init_rom_nomigrate(E1, E2, E3, E4, E5); + ... WHEN !=3D E1 +- memory_region_set_readonly(E1, true); +) + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions. --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584384710; cv=none; d=zohomail.com; s=zohoarc; b=istb8zdV9JWRuwqY8uYzwphlAdcp/Iyc6LmO0DnXZ1p6B32oLJmIWgB/RSy5fQV3gFg0XhFQXUNV5F9Q0/EGeR/AfRQ0clyfHA5AZbsBfkq1gS5iZ657xo20IfGGGXsjlQWBb9AMAOdx6F3Itc32xx9YT6oeomO3WZtaIb5Rt8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584384710; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hXIJL668freBf14eTVXascLoIFucgmXgkcGWSAplUNA=; b=WZ3h8/dYIQxyOUqTa9tnTKOHgR7x3OfURXBiUpZOe8fRpEHTiSio44fANP3uN7xU7w5BZNCEY3KG7EZ/xW812pAis4kYucSHJaMU0f129VXeO3Xy9fwT5zLqDHD6gRBQOwHwF08YxEEkcJ06ZS8d5Q/XCwVaXZdLmvsIxniDvLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584384710337724.9467579701649; Mon, 16 Mar 2020 11:51:50 -0700 (PDT) Received: from localhost ([::1]:46662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuq5-00017c-7t for importer@patchew.org; Mon, 16 Mar 2020 14:51:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37744) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuoy-0007N3-5r for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuow-0008V6-Ki for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:40 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:34895) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuow-0008Qt-G7 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:38 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-444-QciJYGRAPWC3ASAcCeZqiQ-1; Mon, 16 Mar 2020 14:50:35 -0400 Received: by mail-wm1-f72.google.com with SMTP id a23so6173765wmm.8 for ; Mon, 16 Mar 2020 11:50:35 -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 b5sm1036436wrw.86.2020.03.16.11.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384638; 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=hXIJL668freBf14eTVXascLoIFucgmXgkcGWSAplUNA=; b=GP7SnVfIflN2MzHSxiiG2dXJDZcbuw+Lvs/1b0GBjE5KbpHnuu8kEPnSL6iXNPk/0706If /hMBsOIoLsxiDOTFA2zM/WxIbO9d/XsMjWOHFlraDTJN41ad0EOsbQsQYnysLVYDFW3FOH M/qO9CQnF+9SbJ62EJvIeowYVej1oaQ= X-MC-Unique: QciJYGRAPWC3ASAcCeZqiQ-1 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=4QL+8S8VSX/i0yA2bSlkIiSqdqBMljhwg+YkcURAAts=; b=Q4mVKFy67csWbqNxS75yF/YOby93w4z2umx3/jGMRA4MGCIheh/dhJ4DjyYB/vUL2A XYjyJ4VrU++cut9+dHHhlv50e2OBsw6PdPMCbWeJXy9B12tfzfIuGxWvGJtdICKzP379 aguYN5BnJgPp4aOcKWNZcDRrZ/ExcZp2q9DLBEzVDwzLToxbtEahoQG1E7kPJbdfxsQK h9aWvWGijayVdeVzR8YL9AeEiNVrcC/XcAbqJRhpJfjqpHbvRB8lkBvBIj2n67gZOQlD 6Iz1IdsGTVEDqeGVAc5LfOWt1ejcIcUgkVnYs/HUXhQTfJbPbAP1/8pbPLYjFLSB9y2G GaEQ== X-Gm-Message-State: ANhLgQ3ebNVnfcaMrUL767aaCGOWUVbmImtSRj4upXWBU51sbGIR4UQr fEbQLxKXKyoBszfL0l8WijsdWsgD4jix6C9YWL80ZglGWgeLheHpzvfIvIcTdM0e4vs2khaRNhD +5WUU64RHdSnxbxA= X-Received: by 2002:a1c:156:: with SMTP id 83mr484821wmb.151.1584384634595; Mon, 16 Mar 2020 11:50:34 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvYSH5bQVhe7l3Eyrisd/fUWufhe9CCEW/brEle1wnTEqiYlpfJLLcCr6DkPXeks+UsP6XzXA== X-Received: by 2002:a1c:156:: with SMTP id 83mr484810wmb.151.1584384634350; Mon, 16 Mar 2020 11:50:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 05/25] hw/arm: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:46 +0100 Message-Id: <20200316185006.576-6-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 Content-Transfer-Encoding: quoted-printable 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: Igor Mitsyanko , Peter Maydell , "open list:Exynos" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/arm/exynos4210.c | 3 +-- hw/arm/mainstone.c | 3 +-- hw/arm/omap_sx1.c | 6 ++---- hw/arm/palm.c | 3 +-- hw/arm/spitz.c | 3 +-- hw/arm/stellaris.c | 3 +-- hw/arm/tosa.c | 3 +-- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 59a27bdd68..3af6502a5e 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -311,9 +311,8 @@ static void exynos4210_realize(DeviceState *socdev, Err= or **errp) &s->chipid_mem); =20 /* Internal ROM */ - memory_region_init_ram(&s->irom_mem, NULL, "exynos4210.irom", + memory_region_init_rom(&s->irom_mem, NULL, "exynos4210.irom", EXYNOS4210_IROM_SIZE, &error_fatal); - memory_region_set_readonly(&s->irom_mem, true); memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR, &s->irom_mem); /* mirror of iROM */ diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index 1042017086..6bc643651b 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -124,9 +124,8 @@ static void mainstone_common_init(MemoryRegion *address= _space_mem, /* Setup CPU & memory */ mpu =3D pxa270_init(address_space_mem, mainstone_binfo.ram_size, machine->cpu_type); - memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM, + memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM, &error_fatal); - memory_region_set_readonly(rom, true); memory_region_add_subregion(address_space_mem, 0, rom); =20 /* There are two 32MiB flash devices on the board */ diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index de5ff447dc..57829b3744 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -131,9 +131,8 @@ static void sx1_init(MachineState *machine, const int v= ersion) mpu =3D omap310_mpu_init(machine->ram, machine->cpu_type); =20 /* External Flash (EMIFS) */ - memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size, + memory_region_init_rom(flash, NULL, "omap_sx1.flash0-0", flash_size, &error_fatal); - memory_region_set_readonly(flash, true); memory_region_add_subregion(address_space, OMAP_CS0_BASE, flash); =20 memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, @@ -167,9 +166,8 @@ static void sx1_init(MachineState *machine, const int v= ersion) if ((version =3D=3D 1) && (dinfo =3D drive_get(IF_PFLASH, 0, fl_idx)) !=3D NULL) { MemoryRegion *flash_1 =3D g_new(MemoryRegion, 1); - memory_region_init_ram(flash_1, NULL, "omap_sx1.flash1-0", + memory_region_init_rom(flash_1, NULL, "omap_sx1.flash1-0", flash1_size, &error_fatal); - memory_region_set_readonly(flash_1, true); memory_region_add_subregion(address_space, OMAP_CS1_BASE, flash_1); =20 memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val, diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 99554bda19..97ca105d29 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -213,9 +213,8 @@ static void palmte_init(MachineState *machine) mpu =3D omap310_mpu_init(machine->ram, machine->cpu_type); =20 /* External Flash (EMIFS) */ - memory_region_init_ram(flash, NULL, "palmte.flash", flash_size, + memory_region_init_rom(flash, NULL, "palmte.flash", flash_size, &error_fatal); - memory_region_set_readonly(flash, true); memory_region_add_subregion(address_space_mem, OMAP_CS0_BASE, flash); =20 memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val, "palmte-cs0", diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index cbfa6934cf..c28d9b5ed7 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -929,8 +929,7 @@ static void spitz_common_init(MachineState *machine, =20 sl_flash_register(mpu, (model =3D=3D spitz) ? FLASH_128M : FLASH_1024M= ); =20 - memory_region_init_ram(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal= ); - memory_region_set_readonly(rom, true); + memory_region_init_rom(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal= ); memory_region_add_subregion(address_space_mem, 0, rom); =20 /* Setup peripherals */ diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 221a78674e..d136ba1a92 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1300,9 +1300,8 @@ static void stellaris_init(MachineState *ms, stellari= s_board_info *board) sram_size =3D ((board->dc0 >> 18) + 1) * 1024; =20 /* Flash programming is done via the SCU, so pretend it is ROM. */ - memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size, + memory_region_init_rom(flash, NULL, "stellaris.flash", flash_size, &error_fatal); - memory_region_set_readonly(flash, true); memory_region_add_subregion(system_memory, 0, flash); =20 memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size, diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 4d95a1f3e2..5dee2d76c6 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -226,8 +226,7 @@ static void tosa_init(MachineState *machine) =20 mpu =3D pxa255_init(address_space_mem, tosa_binfo.ram_size); =20 - memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal); - memory_region_set_readonly(rom, true); + memory_region_init_rom(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal); memory_region_add_subregion(address_space_mem, 0, rom); =20 tmio =3D tc6393xb_init(address_space_mem, 0x10000000, --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386398; cv=none; d=zohomail.com; s=zohoarc; b=KkPO86UHAuzpO3ps3PtwOigWxBonXK4pLTAIlta+zxW5kLILdSrLhCoZs3XGgTWNxdDOqP1HNMONZGGzO10Obv3RU38hT3a2hJObwNC1G6cibqeszFDfwAlxk/JGhGUikp/ItSmyliPL7gDjwWovNj2QkuyNMBBE+a4COgC+bS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386398; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DAKyL7Tqa+fBdxrFOnKvFsx39GH2EjqIV6ZKoapzE/Q=; b=i+IaMkDFXDbqnI4GbaP8Di4QaLI0wEMbAoOD7y4BXH5lr6DLEhC8XKBa0Xl1+BAJFhYC4gfenrVQIFZ7kLwBJL/Em4di3h+Gg6se+9SwxKexK2kn9aYWi5KUiC9DyRE4W1PZKLx3maagm5KrU3/urqZTEOwz5fDyvLJ39WaByLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158438639836812.996422041498136; Mon, 16 Mar 2020 12:19:58 -0700 (PDT) Received: from localhost ([::1]:47428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvHJ-0000aB-9L for importer@patchew.org; Mon, 16 Mar 2020 15:19:57 -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 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 Received: by mail-wm1-f71.google.com with SMTP id n25so4985680wmi.5 for ; Mon, 16 Mar 2020 11:55:56 -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) 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= X-MC-Unique: _6iVTF7mM-KFfMqd3opASg-1 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) From: =?UTF-8?q?Philippe=20Mathieu-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 Content-Transfer-Encoding: quoted-printable 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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- 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 =3D SYS_BUS_DEVICE(obj); CG3State *s =3D CG3(obj); =20 - memory_region_init_ram_nomigrate(&s->rom, obj, "cg3.prom", FCODE_MAX_R= OM_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); =20 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 =3D SYS_BUS_DEVICE(obj); TCXState *s =3D TCX(obj); =20 - memory_region_init_ram_nomigrate(&s->rom, obj, "tcx.prom", FCODE_MAX_R= OM_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); =20 /* 2/STIP : Stippler */ --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385752; cv=none; d=zohomail.com; s=zohoarc; b=IE8od6eTnfCiZ1Xxo8gR8Y5TbmPudW8S6wF7m0ommh2jmntE3ySOKjKZ8PoIu7GiUEIiwyUf4zlknVyREoQBehTx1jxe4lfN9gRczsIPnAicz/3C3O36LwtXJaQNmQNrO+PjoPWY1VDmdnxf54jt9QM7Bo+tM5xIF3YhVIFE0Iw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385752; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QVXGSPxot8hczQz2J5IHTqJPn4YWY3H/+Nf8/tep/GA=; b=BMBN71NHGZQdbZh/ykrp4Ae1dDd7e/rEpZrzYh1qetx3XLWzhXkxW5ab4Eudn2kY75lueCBQjvzwGy6fp5pKzOQ2dmNyWUwv3jYqPKo//OGMFXjAMBINTrwaizwI7boH7PC7dh7tXy/N1aTd620kK52cWwcodPUc28FxxTKCOpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385752293295.78732850166557; Mon, 16 Mar 2020 12:09:12 -0700 (PDT) Received: from localhost ([::1]:47184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDv6t-0007Vv-5h for importer@patchew.org; Mon, 16 Mar 2020 15:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37999) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDup9-0007r7-Ib for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDup8-00027f-J5 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:51 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:46642) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDup8-00023E-E9 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:50 -0400 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-262-NrWvU37BOH21cJSQmtDrxQ-1; Mon, 16 Mar 2020 14:50:46 -0400 Received: by mail-wr1-f71.google.com with SMTP id l16so8749408wrr.6 for ; Mon, 16 Mar 2020 11:50:46 -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 f203sm722111wmf.18.2020.03.16.11.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384650; 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=QVXGSPxot8hczQz2J5IHTqJPn4YWY3H/+Nf8/tep/GA=; b=fsI0I7FYHxuNmYyj16gckFJebc/2pIqOyaWu1BglUyaKiCPt/wbomSwhS0P9eQfuQIbqML JJ/v0WdzH1QX3jkgRvDZk++ABzrpmHKSTlxURVnaATVbYiFfhxYn7AR3C7FRmkctzLen32 f0ANEXBcm1QLzpjy0OT70EyIJRq2hVE= X-MC-Unique: NrWvU37BOH21cJSQmtDrxQ-1 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=n5kS6EiiI2CJmBCx9jFtPHKM4BcDVAnb98D+QFJyFl4=; b=PAhj9IHqkqKt/epC9CF2bes1e6TUjNkVfBDwgal0q0j8ptienCsYTaV7eB9gb6r0pe lJvmiQ3Vw0mMzq28jrfndT51bFApTaFG9Zhjfe3sRxqQ0yjIgf6gfCQ1eDhkq0mHwImi aQyqKXs0MGuefixwMnbkjFNCNHqEmWTGqE6R/UuGER8oNuroEA9/NZxMxdhlzzEjTO0A Yzo4knOzTeumWLWc0RdD55GGOZsOdAYaYRoxG5k9a22WnJDJPlpKTF3UgxVae1pNzIng rWGTXuYyT9Ix1cnNH3G/obzzp7cME6wj21JcBTINUnbUgIaMxjx9Gwgb8izOxkY9xtEh ncgg== X-Gm-Message-State: ANhLgQ3WcQI0Y1HgGZvGqqBD/Kx0vbolUvpevUeQi7HTBJycOgE9lUBx yEyhXLMBGYtlvNYZ1A/WXiR5FSP35SFiJpYuRBOy6QGQh0FOtgPOfUdZLK+QOexeHlquv6jnWfC bqrvLrT7ULO04qF8= X-Received: by 2002:adf:eed2:: with SMTP id a18mr761697wrp.59.1584384644868; Mon, 16 Mar 2020 11:50:44 -0700 (PDT) X-Google-Smtp-Source: ADFU+vujUgKKQsz8YH3FWEJO9HVduH1cIw0ZQ6bqlikQYm/FweiEVy96zoMzg8SD0wXEjW51QSWRSw== X-Received: by 2002:adf:eed2:: with SMTP id a18mr761679wrp.59.1584384644664; Mon, 16 Mar 2020 11:50:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 07/25] hw/m68k: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:48 +0100 Message-Id: <20200316185006.576-8-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/m68k/q800.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index c5699f6f3e..81749e7ec6 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -399,13 +399,12 @@ static void q800_init(MachineState *machine) uint8_t *ptr; /* allocate and load BIOS */ rom =3D g_malloc(sizeof(*rom)); - memory_region_init_ram(rom, NULL, "m68k_mac.rom", MACROM_SIZE, + memory_region_init_rom(rom, NULL, "m68k_mac.rom", MACROM_SIZE, &error_abort); if (bios_name =3D=3D NULL) { bios_name =3D MACROM_FILENAME; } filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - memory_region_set_readonly(rom, true); memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom); =20 /* Load MacROM binary */ --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385852; cv=none; d=zohomail.com; s=zohoarc; b=eNqZqKIDr3cFAmxl1QQX93+FatIgnrw+Z1S+e+7TB56lC9QtTK+dvsren72nRoVZ9agPlTMz6koJJddKTeTuy61OSJtTrr3JeLn2L+stHhjLOGf2FQd1WHZ9B7nZwxdVnI9JsU0SDUY7FkQEk/ObmlTyrSpI2cRP40M5TSxWj6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385852; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FIgThoEePPf90ajNUgSVa3azTjacscrWOhCWVgwnzwo=; b=YdYbbo+ivVzaVfhtzQWCbtTLsjFsX5j2gmM3C6cXu+WZ0TmOs+kSmQE+9kJosSo5sbsRXxfPYcedpNr4L/9N2a1aNv8ysnAftn9j4i98LiCb3yuztdPWt4lcXgYHDr9aL2mkBOPv0y2aXss9fVJ8He2eY6dqgWzpL93Zg9KUHPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385852536631.79263609578; Mon, 16 Mar 2020 12:10:52 -0700 (PDT) Received: from localhost ([::1]:47216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDv8V-0002PL-Cn for importer@patchew.org; Mon, 16 Mar 2020 15:10:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38116) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupD-00082p-3E for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupC-0002b2-2G for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:54 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:54602) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupB-0002Wd-U5 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:53 -0400 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-286-hcCofLS_PIOuwtAQI8Sssg-1; Mon, 16 Mar 2020 14:50:51 -0400 Received: by mail-wr1-f71.google.com with SMTP id t10so3162210wrp.15 for ; Mon, 16 Mar 2020 11:50:51 -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 z6sm1009141wrp.95.2020.03.16.11.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384653; 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=FIgThoEePPf90ajNUgSVa3azTjacscrWOhCWVgwnzwo=; b=Wpgzr3O+xbgQNnF+fvyEp/0piv3c02jycI7VKlH6vEZtFjDPMzQPfbIdI4ASbegDx4yCHn jBzk5daPOyzZNz19YigvOTbMhK8kpgkzHvQoBDFtFk1GJHpJHzK+b/aCbhvX3Bo+0KKB1c hCjHS6itLQ97ttmQc6mLrE/3fq19obc= X-MC-Unique: hcCofLS_PIOuwtAQI8Sssg-1 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=Yr6HrhyKndkeZIUV2fnZDlI2PIM1TMA/l8zKwFVALGs=; b=UzrdCen6IfY7FwFSfuIQPjTlpzVWrwmKZHWULrUHywYpYwy1sGfEDXeN0zDiFoFWgw u4vPyRsL9EDV6x2ogsEizPoU8nn0Bfm1V076sBEEvUKFTFZS8zTU2o87Q5rPVXJvDRTg NEkpFdBmDGn/dyTgHECRGidH6nU8q1HvZRrmpmAOgbtIGdGNLKPT8krqG7vG564rzOA5 2ESdV7011xmfVymT56dF3cB16WT0ncAXSnjP0yfGBQA+gDLrHCmPQIl9MDpsZ4ypfakp tWCHACqGjlo/7ds0nA31ARF4zpXjgNJbuX/D01rDRywXIlkY6NL5oAqcCUgy/1Z4Svf2 CjDA== X-Gm-Message-State: ANhLgQ09J161K2+ZUTo0Uo/uPjHFXvPoGwgS0WoobV7XtKs9OHPPztR4 TXq6hNi8wyNfKmSMy2ShOUvdF55dpAvru+E6EXw8tt1R4fDGHRDn+NROS4jZqryBwhNag6V4RaW q4gXFZGZtEHysegc= X-Received: by 2002:adf:9c8d:: with SMTP id d13mr807040wre.6.1584384649860; Mon, 16 Mar 2020 11:50:49 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvxVw34Y0dvw/cj/D+8i0g4RQcCseUS6Ilb7fPEP6+sNlgRxoS8Homs2uJJt6CsOxg59vbrAw== X-Received: by 2002:adf:9c8d:: with SMTP id d13mr807022wre.6.1584384649697; Mon, 16 Mar 2020 11:50:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 08/25] hw/net: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:49 +0100 Message-Id: <20200316185006.576-9-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/net/dp8393x.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 81fc13ee9f..1563c11b9e 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -986,13 +986,12 @@ static void dp8393x_realize(DeviceState *dev, Error *= *errp) =20 s->watchdog =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s); =20 - memory_region_init_ram(&s->prom, OBJECT(dev), - "dp8393x-prom", SONIC_PROM_SIZE, &local_err); + memory_region_init_rom(&s->prom, OBJECT(dev), "dp8393x-prom", + SONIC_PROM_SIZE, &local_err); if (local_err) { error_propagate(errp, local_err); return; } - memory_region_set_readonly(&s->prom, true); prom =3D memory_region_get_ram_ptr(&s->prom); checksum =3D 0; for (i =3D 0; i < 6; i++) { --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584384812; cv=none; d=zohomail.com; s=zohoarc; b=AqZtrlSuHU8QonvrdoUN8CWijYSBBzl0cawGmqrklU4aS7fnDPT63smT5hAhJ5KHoDX9o7k8GlZN5iraGbyb+MbPG4yl2hrXOgKeB4FDUAwVDnhRDN1Nf7PFjOk/0hR3FA2uaZdQsNZ7nSGoeb4UTeBcb5F2j9BVnv5THLQm/NM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584384812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P91BDDFp6WWBIyOarvZn4paQHej1y4/GWozJGZUVwdw=; b=lJvDxmALgYG+qmlUuKTBgNRxHIrGrUuYz8wppKcj/YbA4OAm28A6A4/k5xD20/wMT7tLPwsY3dUsFMD9bJu//HoYavGhTnu9/TY+uyUCsY/RfV5o+VkDYoYFX59ZWinZYyYQ8wpZkuUBjEmVj4Ve99zx+KQ0+/JM2IWCHBrUe+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158438481217615.239212314172505; Mon, 16 Mar 2020 11:53:32 -0700 (PDT) Received: from localhost ([::1]:46724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDurj-0004Cq-0X for importer@patchew.org; Mon, 16 Mar 2020 14:53:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38259) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupH-0008JN-J9 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupG-00039m-Hu for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:59 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:26215) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupG-00036p-Cx for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:50:58 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-90-IhDE65Z3NKi7bSRHNKosSA-1; Mon, 16 Mar 2020 14:50:56 -0400 Received: by mail-wm1-f72.google.com with SMTP id m4so6183359wmi.5 for ; Mon, 16 Mar 2020 11:50:56 -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 z129sm753554wmb.7.2020.03.16.11.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384658; 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=P91BDDFp6WWBIyOarvZn4paQHej1y4/GWozJGZUVwdw=; b=TFdAL1yGTD6Fwpdm25/PhRbE92mJmUzDMHabt61H2BCw4zJaQ9sVxJI/bHLzfninL+bxQZ ppERyE36hKNj9mHwPM0niFQbKNcwr1jgrUEvHUFPxOOeE0hgHhvTEj7u6GY4C50ft0ex64 J59chdGy0jxrLVccrUsf7eWZWPBmvW4= X-MC-Unique: IhDE65Z3NKi7bSRHNKosSA-1 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=7aNJ2gC8YMKEuodM495PkW/8yrOdqW/HFr1FTk6gVds=; b=da97bD37T6D9FVjY7lx0FmfCLokLRB2d5uJNyl7MKTiYlCinxVDrmEdX/Hqf+s9h4B 8VEKSAGUg/bkU5cj6Gqy1+T/KoesUWnpD/3gzkeN+SDJGZZHdsQac94/vLRJ7N9vA+/F T582TxIthzLnrRd6RO/sHVLnekNQ9bSS/a/JI+j70gLz2DAGt/0ou3JXUCvhR6IwCP26 sJvZwcKUL8rMJknpy3K7npSfB+/xRWoazCFi/xYslJ8NSlSoLlB9HPGqPBbN3usWzW/4 qbh8agmpzuH4HWiMaK68/Xkrn4pk752MZvESsUpWPsBpyMxOVwN+a5uMzFIeg/Ab+Vux 81vQ== X-Gm-Message-State: ANhLgQ3cNkJrmP67FiOcII+++OTkFJ6NvNcMyZ5S1IiI3wXd8j3XzJAk 8rDzAJdKbHFCsDfQxKCYSD5qb0e4jycOCToJH6vQQlRnLZeEinh1GpdCwc09mkb1guLpoPwJf0y yGs94zcLnE0YYTv8= X-Received: by 2002:a1c:ac46:: with SMTP id v67mr457729wme.153.1584384655075; Mon, 16 Mar 2020 11:50:55 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt3KUoeRQGbTh7k2X4hX4P4+QinKDcRd7Pux5fkFOe7V+/ik3+7j4YU/RkdsJEZj6ci19AXJA== X-Received: by 2002:a1c:ac46:: with SMTP id v67mr457718wme.153.1584384654902; Mon, 16 Mar 2020 11:50:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 09/25] hw/pci-host: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:50 +0100 Message-Id: <20200316185006.576-10-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 Content-Transfer-Encoding: quoted-printable 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:PReP" , Peter Maydell , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/pci-host/prep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 1aff72bec6..1a02e9a670 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -325,9 +325,8 @@ static void raven_realize(PCIDevice *d, Error **errp) d->config[0x0D] =3D 0x10; // latency_timer d->config[0x34] =3D 0x00; // capabilities_pointer =20 - memory_region_init_ram_nomigrate(&s->bios, OBJECT(s), "bios", BIOS_SIZ= E, - &error_fatal); - memory_region_set_readonly(&s->bios, true); + memory_region_init_rom_nomigrate(&s->bios, OBJECT(s), "bios", BIOS_SIZ= E, + &error_fatal); memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE= ), &s->bios); if (s->bios_name) { --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385944; cv=none; d=zohomail.com; s=zohoarc; b=fC8gUFstmkfM2C4RiRk09xQLlEAFfWKoZh+NubrKXCmpsB56o+/6/q5+wX5oN3txZuJqG3LTBWIg4V0k3DeLfR/N1PqJ8753ml6U6OHOJ5oNgKXtXk1XpAzb1/kL+w6V1i04oAnUYYEdOdZwTjS8UBAD846xnjnvw3bcJx1f4Tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385944; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pY4c+GmzU3u8g8c7AEnnooJobRsrslPLMh6otl/Aa9k=; b=GW3BA4qlDUuTikb0pVCRoNrJ6ceK6cRymkjUVkFZQDKE8dlrPshQJcqFGu0TGUwgDTv9jULctfOwJPz/V/DE8bxEuDX+UM0vrlL90bVbGZ/ochaj26b8xsluMbrwcVwSnql8bZZza6Qo8qEQLdA7KrGRJIYg5ErZKtKy8gmbMNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385944465480.00773841118666; Mon, 16 Mar 2020 12:12:24 -0700 (PDT) Received: from localhost ([::1]:47266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDv9z-0005BL-FQ for importer@patchew.org; Mon, 16 Mar 2020 15:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38442) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupO-0000DU-8b for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupN-0003zH-2Z for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:06 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:27971) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupM-0003vz-Ti for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:05 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-rPMwwdN1MzKz74HXoSzNVQ-1; Mon, 16 Mar 2020 14:51:01 -0400 Received: by mail-wm1-f72.google.com with SMTP id n25so4986019wmi.5 for ; Mon, 16 Mar 2020 11:51:01 -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 w204sm753789wma.1.2020.03.16.11.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384664; 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=pY4c+GmzU3u8g8c7AEnnooJobRsrslPLMh6otl/Aa9k=; b=KiX1vxH4hMYbKD45IoCCtwuHZ6/1jIKGJkzyFHbPvfr4lqXU7t7PGRVrUyL1bDZ6G1GcR9 OyZ9NVYuEf/BHixbkGpBNIitfFRIz4ZGRNPB6MXJRbI8H1KpUGdcNSNEcsPXutd100FPFi ue8HIczdG0ZQT4yzjcMcyUKZDNsM6sc= X-MC-Unique: rPMwwdN1MzKz74HXoSzNVQ-1 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=5hL9ZjbXwspwyX5zsCIPRGL66Px5twVExOc9y+i/WDs=; b=m6WEqAeYQEJ8oraMcWbcc1H6frOl1SJdLyjIOj0wNNchANSuzf83v1RsvTr04+Wkha p6SP8mX9uKpRXbgVZ9+3erUkZx6N/vwekEchpHx+ScUYrzvJJxeOI3PCGisz43CYzC/5 mCG0sqB0VMu5Ssdg0FhEe7CgM/pPQ+xCyrVDhvIbndwyC8QWBxU6t89ba8bQrgOIddQu bbmfpxIt3heua5PRTcLUKIff60P0xK+6AW3wc8GSkRPvuufT87TuvV6Ayw3UwCKMSpfj hZM0dTPPLKxMGNdiJc9LDauzoB8X5HznkbwJvrlukjRLQXteSKVJcebeRSun6IX6FExa edkA== X-Gm-Message-State: ANhLgQ3UdST7iB1z95GS1jXRspG4PZ1FVi3vrZxpLU6K/bOd/LB6Tu8+ fqzD/VOHJ2nFAqQQZVvAObwSMDVL4XeEB8W6xL1IYSHBKJ+bseZK4g83Yy1TA2uj4qcbE+aUhtn aE28N9+QTZgyGj6Q= X-Received: by 2002:a1c:62c5:: with SMTP id w188mr537632wmb.112.1584384660259; Mon, 16 Mar 2020 11:51:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtYXWLIeUBJzV9zhJPiOLxS+CvAn577zEJ1lyarLKnKVezDA0uvW1XqIFwrYCLed9IjU6Pe2A== X-Received: by 2002:a1c:62c5:: with SMTP id w188mr537609wmb.112.1584384660033; Mon, 16 Mar 2020 11:51:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 10/25] hw/ppc: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:51 +0100 Message-Id: <20200316185006.576-11-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 Content-Transfer-Encoding: quoted-printable 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:New World mac99" , Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/ppc/mac_newworld.c | 3 +-- hw/ppc/mac_oldworld.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index b8189bf7a4..b2ec372958 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -155,13 +155,12 @@ static void ppc_core99_init(MachineState *machine) memory_region_add_subregion(get_system_memory(), 0, machine->ram); =20 /* allocate and load BIOS */ - memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "ppc_core99.bios", BIOS_SIZE, &error_fatal); =20 if (bios_name =3D=3D NULL) bios_name =3D PROM_FILENAME; filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - memory_region_set_readonly(bios, true); memory_region_add_subregion(get_system_memory(), PROM_ADDR, bios); =20 /* Load OpenBIOS (ELF) */ diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 440c406eb4..faaa165f3f 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -129,13 +129,12 @@ static void ppc_heathrow_init(MachineState *machine) memory_region_add_subregion(sysmem, 0, machine->ram); =20 /* allocate and load BIOS */ - memory_region_init_ram(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE, &error_fatal); =20 if (bios_name =3D=3D NULL) bios_name =3D PROM_FILENAME; filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - memory_region_set_readonly(bios, true); memory_region_add_subregion(sysmem, PROM_ADDR, bios); =20 /* Load OpenBIOS (ELF) */ --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386488; cv=none; d=zohomail.com; s=zohoarc; b=Hq/Xnsj9zzPOaEbq2QbNivztYbTlNy16IIp7Ty3m1sSJd8QBmUJMray9L95et6CAARlx+CavqzmdOXEdoe7KBUmh8SXJ1LaB13lQYw8agukDrCz6NOf7uu1S2RbAY/dQyDvPhSiZ7/1cSpKpqge0cRsoJ/E7PkQl+F1Rp/YnhX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386488; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wyRumdv7o8mjHGVNOOLf3anSbfYPjmYQMfiM+qbhAcE=; b=D4SyfOpZ2wJJwZIP/AsKxE8POJEA+y+N1LSCwFGUAgNyIt/avy5Fm2Tw1JAA2a37A4C/JeJ//oIMXYXXJeSIRnUf/53n/ZB9Dt1wwyCaGEhf+Sq5soF/Xd7Q3FNpF3xVPb8qjBCEmxuggzzSYqu8dcbzCwlNYFRBAqkb3eZ24T0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386488103231.69753261996186; Mon, 16 Mar 2020 12:21:28 -0700 (PDT) Received: from localhost ([::1]:47482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvIk-0003PH-0K for importer@patchew.org; Mon, 16 Mar 2020 15:21:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38586) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupS-0000P3-Kx for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupR-0004f2-Gh for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:10 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:31334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupR-0004as-BC for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:09 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-CMjTCkpJOsK_4a6_k2ezUg-1; Mon, 16 Mar 2020 14:51:06 -0400 Received: by mail-wr1-f69.google.com with SMTP id w11so9464888wrp.20 for ; Mon, 16 Mar 2020 11:51:06 -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 g7sm1105206wrq.21.2020.03.16.11.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384669; 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=wyRumdv7o8mjHGVNOOLf3anSbfYPjmYQMfiM+qbhAcE=; b=NnHk+Fa9Z4jR8WwkYFneLpx5iNoJ7dKay4U6R47buw3RPbDHiKEW9EDlOy+YtkZ2B7X6gL /O4VusGGTRha4kn4UoQqc2TMHNcSSXLVO0NbYr5LosFqOi9zrTbAxqsAlosB/751HLhYf/ j/EUpYQdOePYHpkR3lmVZHd+0As18iY= X-MC-Unique: CMjTCkpJOsK_4a6_k2ezUg-1 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=gL3h6ZksVMeXBRgyMt6g9kMfQEpNuOznE3swIyLz84E=; b=kAOoyzgg04qAyIivGbNCnUnuHqRURalNFuAt0BQRVVG4CSuK/ZD/IPytk6l3RlLTzo JPgGkBVfbz4a7YOq6fRcwfU6tw2ve5/EcuEDPJQj/cZXa8umrCblJtmskFx6dqpq0LbN LJjRatuxMtkzA0YwXxOGJgXeTjYkVds2iJv4x8ivOKdlgMaHXOhrWzFhx7JJLyZNEzYe DmV7u3a4gGiBqf/BiuMFP6BiiFw6u6o+1UqBu5uCuKiRq4Tudm481SEIzA80303Oa6PK 9qXclL/TFIV7L78MmrqDAcqFss2mtV8u1n1b6u7ltH+W1JZ0HDo/+FMUqyKMCqvYZvX0 m1vw== X-Gm-Message-State: ANhLgQ2ZnHgtkFhdFnZeAnGAW0glhYh0Bse3d7uI3ITcIz5wdRgcTM6a dzX1NjsF5gjJBT5eQBOimdeQ6ZDJy4qnjbqQgZmVZNWTltibojt0zv60NZ2aD22WmuKEZotEz5x OQubMCgMlmwoD5Dg= X-Received: by 2002:a1c:bcd4:: with SMTP id m203mr481676wmf.35.1584384665784; Mon, 16 Mar 2020 11:51:05 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvNaIHGQ9I8m8ytYUjaU7litKg/SGzMQ6NhVLbSVjMAg5iQYGy3QqbxmPYWBwo64dYck+gg3g== X-Received: by 2002:a1c:bcd4:: with SMTP id m203mr481640wmf.35.1584384665537; Mon, 16 Mar 2020 11:51:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 11/25] hw/riscv: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:52 +0100 Message-Id: <20200316185006.576-12-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , "open list:RISC-V TCG CPUs" , Sagar Karandikar , Bastian Koppelmann , Alistair Francis , Palmer Dabbelt , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/riscv/sifive_e.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index a254cad489..a1974ef7be 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -208,9 +208,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev= , Error **errp) memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size); =20 /* Flash memory */ - memory_region_init_ram(&s->xip_mem, NULL, "riscv.sifive.e.xip", - memmap[SIFIVE_E_XIP].size, &error_fatal); - memory_region_set_readonly(&s->xip_mem, true); + memory_region_init_rom(&s->xip_mem, NULL, "riscv.sifive.e.xip", + memmap[SIFIVE_E_XIP].size, &error_fatal); memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base, &s->xip_mem); } --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386041; cv=none; d=zohomail.com; s=zohoarc; b=NchnVE+qqkoSzExYtsKUF9Ee/azpXAIoPgVCTKyLygYhVhUsYBrQYIo5u5wHL0G98bZlee+kyKBpkWuWsdsX4PnIagDEkLyFgPcLCmt4+72Zq13SZdDBd1dykMp+EEnRnCfIcxuopLrDvfOA5yDpN305114dRJRxXLEkTb9v57M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386041; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sW3gH7UL9MrbkxAJw9PX37bnGNS1gH34ZmW3oFfVoTo=; b=XM3H8rMgmAGJowchNjgbhRKME27ytKxGxFeBpaLIJZpgMBIIx3vniV0QDb4/WzF7qCMShuA/Lh2Yi6nVg7MKNLWFRm3t3Uh0gevD11vP+rGtYAshvWKC8TNFPb4uBOX/hgx791KiyfLqWsoC7gpXisgQCxvQ2mOh99QISMgBc1g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386041618492.947799920031; Mon, 16 Mar 2020 12:14:01 -0700 (PDT) Received: from localhost ([::1]:47298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvBY-000802-G0 for importer@patchew.org; Mon, 16 Mar 2020 15:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38791) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupZ-0000gu-Qo for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupY-00062o-P8 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:17 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:55798) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupY-0005wz-J4 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:16 -0400 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-132-Aa-Jack0PWWNT3eVWz9Ccg-1; Mon, 16 Mar 2020 14:51:12 -0400 Received: by mail-wr1-f72.google.com with SMTP id t10so3162580wrp.15 for ; Mon, 16 Mar 2020 11:51:11 -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 u7sm672496wme.43.2020.03.16.11.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384676; 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=sW3gH7UL9MrbkxAJw9PX37bnGNS1gH34ZmW3oFfVoTo=; b=BZEYh1nq1xocdSZzUUeOWtC2fzID8hXqoFJaWxbXrduX93VVJqVgaBSXhk+xgszkj0RzVu sp91z4Pg0Czlzs1an9e6/91FnPJrMy0cn9N6LC0za+kXd7Xpsecqk5OXVden1AKikGOaxW Jnr/SbBStr+xQAakVNjst9B0xZz/3Pw= X-MC-Unique: Aa-Jack0PWWNT3eVWz9Ccg-1 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=hNWi7LQpKVg6rdUUQBdGPXi6j/9C/ADRCO+rxBA6Etw=; b=sSVHUt3Cu1Ly3e1ducHxlsVL3/tgWF2So9Hz1Cykd4DMUwZUdNRf4TMI2io9RNGP72 h3KFC+n1TJbXnhuW/xm/ZU79RSypxq1SnB9qLSZFvlf09ZByhEeOrRQmikxwoI0R+v1a 6lzZBWUBw9WiLmAhQNG1dD/98UHcfsT0DPJJLbXOSuRYeVC8WlKykkVeze2rdb9TcvBl RnHs1drz7awINo2tOdu1ldT9caTHS0U3asQHLH0F99fUP3HxBfn89Mq+YPmHlpq+uVuO vLhWxf5GeLjqkNqXZqAR6XKF4IMeMp2rRWCZXHtAE6SoCZCClKw9lqb3I/ZfNvma66bi /xPQ== X-Gm-Message-State: ANhLgQ1mLEd860qS5Gt8pXUHCK/GcTlWzWT+8Vd+qaIr+LNEbtXDgiUe 2slBTJ4ElYNmv0e7GT+DGiR30BqWEjeGaBEBpy74S7AANPUqV32An7DaYofzplnjQ6sk8fH2wjP 5WsNsOWB7LGighO8= X-Received: by 2002:a7b:c950:: with SMTP id i16mr471308wml.97.1584384670959; Mon, 16 Mar 2020 11:51:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtM5WSWHcF1VIUqKXaCmF6ES2SzpH9PSOkRMzdXOffYUcUCXu53beeGadWeMQfEbxHh65RI+g== X-Received: by 2002:a7b:c950:: with SMTP id i16mr471294wml.97.1584384670732; Mon, 16 Mar 2020 11:51:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 12/25] hw/sh4: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:53 +0100 Message-Id: <20200316185006.576-13-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/sh4/shix.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 68b14ee5e7..f410c08883 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -53,8 +53,7 @@ static void shix_init(MachineState *machine) cpu =3D SUPERH_CPU(cpu_create(machine->cpu_type)); =20 /* Allocate memory space */ - memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal); - memory_region_set_readonly(rom, true); + memory_region_init_rom(rom, NULL, "shix.rom", 0x4000, &error_fatal); memory_region_add_subregion(sysmem, 0x00000000, rom); memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000, &error_fatal); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386572; cv=none; d=zohomail.com; s=zohoarc; b=MnLR3m3ykrm+zIkNRoYgwSu0nq/Al9rTYp/OOl2Mcdq+EQ3TTKgJxv2mEa+I04Uu2iffoW7vAcf07rklgDIEQm1s2TgF8nRcZ49RKC8e8c6NtPHezb2yeFeaKYsIs3dvDew0DzZ2m3Q2KzL337vUOLGMx2AUcP7Zpbxb2F0qphU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386572; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bTuM1yhPSP5ySruBCJxSW6noud9pHrZGrwBgDgMq278=; b=HtmrkiQXKurrvgbUayG0X4m/PmKIXOZvajcd+jo8vOCJj6BnPRrmWximodkNXJYrWzpRvqbH/JcThTDM086Zg0aFBZu24iikoNqL7FbJUE7FiDsEUp/n1MU9hDD2gkbsRbrtkt3FAjI/a9ObqUI/ExHh6lKJ0/tO7Eo0HlC8/yA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386572347161.0599208637218; Mon, 16 Mar 2020 12:22:52 -0700 (PDT) Received: from localhost ([::1]:47536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvK7-0006Mq-2f for importer@patchew.org; Mon, 16 Mar 2020 15:22:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38934) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuph-0000t0-By for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupg-000754-5C for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:25 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:52157) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupg-0006mS-0o for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:24 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-8RY_omIMNRavhwS1PD0myg-1; Mon, 16 Mar 2020 14:51:17 -0400 Received: by mail-wr1-f69.google.com with SMTP id f13so3265862wro.23 for ; Mon, 16 Mar 2020 11:51:17 -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 g127sm781950wmf.10.2020.03.16.11.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384681; 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=bTuM1yhPSP5ySruBCJxSW6noud9pHrZGrwBgDgMq278=; b=g0X82ww1NkuMK1gwyeWGJvkDulhLayCd/Ya3lfHseNfGSuUEcKW0+goMxKtq/k7H3qJooU cq+j4qBWt9cmSbnoAe1yvQy02Y5dqmWgqxvnde/qsbO+H+JyHdNcCgPfa7QWeMUsv35B+w H05DJAeUsoSw4Rza4FIbtBGvSQgVH4M= X-MC-Unique: 8RY_omIMNRavhwS1PD0myg-1 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=2B/8CWN/FyAeBStmkGrCPLIrt/TAmqFu9+C8I7tRrxA=; b=Y97GA7bZkpAkOi17iHGXKugqkuYY8BkzGfB8ACtlcIPAlBqHV0DuBlFSuKY+Cy+6eh YrgosB7oghaipF1EgTbmhsHu1tp7slT6+cDZs7duafRuIgI4v8P0dM9c+YepuVNWF1K9 kboW4inTBDWyaQJMP4+Tfd11o6LzGBco6kIkiVV1ZID00Q/oPCf2Pm5WiGM+M2OsU4Kd wo8xh7LiNmUO8KTvuXZFXaLxo3zfYJG56LxnK7xY75AFUH1mRt/aDkCQz1gRJet4x5V7 WunCtwr7gFtSaEDlV0Bf+PS6dbQ/FnluXQK/I1TrojW+2ZdsvSuJRetzvSde2L45moGR vpgw== X-Gm-Message-State: ANhLgQ1Ww2vhB2ld1uLfME4iVAqsi44+tFTT7qWmYMBNYCx40336G2TK lDYkoK4IcW22ocw3+d+xlKAAth7nBdEzzmHibfPZStsKJjsECqA29qhlrKyeQO7hRsyiKeYUTEp aV5k1MVbSsrzsgbI= X-Received: by 2002:a5d:6910:: with SMTP id t16mr722548wru.209.1584384676472; Mon, 16 Mar 2020 11:51:16 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvBnXDAus51I8a8xSHRFv5byerQBu4zdjvJtF9Gjgy7GzQkS7v5UpU5DfU2gyAprWpZI+Juwg== X-Received: by 2002:a5d:6910:: with SMTP id t16mr722533wru.209.1584384676298; Mon, 16 Mar 2020 11:51:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 13/25] hw/sparc: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:49:54 +0100 Message-Id: <20200316185006.576-14-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 Content-Transfer-Encoding: quoted-printable 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 , Fabien Chouteau , KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Reviewed-by: KONRAD Frederic Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/sparc/leon3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 5fa58aa55f..8f024dab7b 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -255,8 +255,7 @@ static void leon3_generic_hw_init(MachineState *machine) =20 /* Allocate BIOS */ prom_size =3D 8 * MiB; - memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fat= al); - memory_region_set_readonly(prom, true); + memory_region_init_rom(prom, NULL, "Leon3.bios", prom_size, &error_fat= al); memory_region_add_subregion(address_space_mem, LEON3_PROM_OFFSET, prom= ); =20 /* Load boot prom */ --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385878; cv=none; d=zohomail.com; s=zohoarc; b=UKgzGrv28+3bwv3/6zvbBgrD/9qyeW9Mf3YrCdQuKu+mfbRMK+K4HdtOBTG0FXN4GyNzEVHftaYnb/fY7ivZWZ8KPMnmeU0wb/Zqkgl5v/kRmWkJKBQftS2xAczA+ZZYBLQ5FpXV9k2HDCY9zql+LuKmfJQRGm9ZIUxRBWpLCGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385878; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I6SdkZkbHtZbpGj30/TNvSyK6rwDYnvFekTs4gXk1Gs=; b=ffdb0YStUqA9n4JC/aFXm4j7TskT/qACaA3oVhbd1r/KOqBuKapdhKQybRUiGXWDV88EaLP1QA6IeCX8qvic8QcWz7ntyvU5Pjw07MjUSIuNCAqAErEc70SocLNdVrbVYJ4gg9fexwV7NF8VylKas1EVRLPKomqmhxPPz4CS0EE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385878688203.80266722649537; Mon, 16 Mar 2020 12:11:18 -0700 (PDT) Received: from localhost ([::1]:47242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDv8v-0003PQ-K0 for importer@patchew.org; Mon, 16 Mar 2020 15:11:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38973) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupi-0000us-9F for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuph-0007Je-73 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:26 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:29068) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuph-0007Ck-0k for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:25 -0400 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-144-O4miobZiOuWPSuQhPdPd-Q-1; Mon, 16 Mar 2020 14:51:22 -0400 Received: by mail-wm1-f71.google.com with SMTP id f9so3415411wme.7 for ; Mon, 16 Mar 2020 11:51:22 -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 j39sm1182045wre.11.2020.03.16.11.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384684; 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=I6SdkZkbHtZbpGj30/TNvSyK6rwDYnvFekTs4gXk1Gs=; b=JraAs/eUqpY1HFPGWOQrICWlybKYqtWLt096CLv76JGI6973GCXBKHbPLdVkc5FShG/ODT 8folApAGfX3AQGM4aQ6Sqcq3IlpEcmBsb8XsJ4fkYtaFpFO6M0hd50rblTnyXkzGGPPQW3 vYQBXVlDy5wTRKKVRMtZm3bP5DV39xQ= X-MC-Unique: O4miobZiOuWPSuQhPdPd-Q-1 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=BHfEltHWnJM0z/TMqJwXjvVhbV/f/WiV8vJxO2iwc/M=; b=QAZcWjhZiu/0Ut+/l/I27JkmgBaH8dgeGDnX8iV/03o95jw8oMyPoof3vi5C1JG2tv gpydtj2GwS355kSLWDhpiTYZ8nW3grjYs64YVmdVk5tcNh/SlGcfBZAjgDgNOjvzkejW s42Ibw5m/7KEIMwq9N3C7s8rQsKvuzm6FzUZ9AG+YdmeCsDXlyJOzDcBECnjJeQDXr4c G1mlP6sOolMx4AOu35bfmTCzJ/eHiUx13K3ryKEgMgY1ESSgBS9GYj/ggxZ69aK5pGOA hZTb83QRowXA3U8dqHhq7PyD1RhDjc5wbqhy3ky54z5w90hAvb8RnN3+nOjOGTNEfk3J PQIw== X-Gm-Message-State: ANhLgQ2MrPckuKkCsm+9QF+IOjfQvfjsrEhqLGv5aATHuR7r+IAtfzEP ikY9C+83pkg404SCyHy+tjZAOuyuxCxbdLIVoZO5zV8AZH4fj9VayCGx32ATsEZqN5xne1yIQME 2mUnAJO6NKprbVVI= X-Received: by 2002:adf:9d8f:: with SMTP id p15mr773329wre.160.1584384681597; Mon, 16 Mar 2020 11:51:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuN9lbEtfI9IT2eh6/dMbvu5oUyRVDk6NkP/8fNtteSCQYaXMzoG4LyOqsrwuu5pN54GOde8g== X-Received: by 2002:adf:9d8f:: with SMTP id p15mr773311wre.160.1584384681433; Mon, 16 Mar 2020 11:51:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 14/25] scripts/cocci: Patch to detect potential use of memory_region_init_rom Date: Mon, 16 Mar 2020 19:49:55 +0100 Message-Id: <20200316185006.576-15-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Add a semantic patch to detect potential replacement of memory_region_init_ram(readonly) by memory_region_init_rom(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- .../memory-region-housekeeping.cocci | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/= coccinelle/memory-region-housekeeping.cocci index ee3923d369..9cdde71bb1 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -29,6 +29,25 @@ symbol true; ) =20 =20 +@possible_memory_region_init_rom@ +expression E1, E2, E3, E4, E5; +position p; +@@ +( + memory_region_init_ram@p(E1, E2, E3, E4, E5); + ... + memory_region_set_readonly(E1, true); +| + memory_region_init_ram_nomigrate@p(E1, E2, E3, E4, E5); + ... + memory_region_set_readonly(E1, true); +) +@script:python@ +p << possible_memory_region_init_rom.p; +@@ +cocci.print_main("potential use of memory_region_init_rom*() in ", p) + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions. --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386164; cv=none; d=zohomail.com; s=zohoarc; b=m7kXEUKVtb4v81gIPsXkLaTdlalA6qvW7AqyDhVCdsWEH8mC7aM2BThjVz4yiFsy1yCI9bcsGuAoSnnmbAaLhLrlaN4HNipSbmXpGqAUW3hzgMpT8X7ynJTblXXy1p053rqWpGSKlFqG0H2cN7E2sxEW5p8fgn2sle9d+mmvlKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386164; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MiaNZR/YFUXbUQr2CW30itYe2jJLit5uoKbrlDDb9zo=; b=TWd80a5JRufk0q64+fM/718vW+SRZV9LUenhV/in9wbSnYiicKMJ+1CxMUDsoG5ie0AEmlpyJ/95l1IcmWhpFKmK1/rKAokhfgSW6OSL8lpy5KHoNSWwyFqfS6AeKPFgbA4ZYGDzLvoOMOQOqmF4Hx/C3QES7ddqIQjO0q19z2A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386164280914.4397839813324; Mon, 16 Mar 2020 12:16:04 -0700 (PDT) Received: from localhost ([::1]:47358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvDX-0002Iw-2q for importer@patchew.org; Mon, 16 Mar 2020 15:16:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39142) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupn-00016g-57 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupm-0007xj-5w for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:31 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:51561) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupm-0007vu-25 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:30 -0400 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-397-kan1FIFhP5OOSycRvFGzqg-1; Mon, 16 Mar 2020 14:51:27 -0400 Received: by mail-wr1-f72.google.com with SMTP id p2so6924560wrw.8 for ; Mon, 16 Mar 2020 11:51:27 -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 r28sm1158066wra.16.2020.03.16.11.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384689; 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=MiaNZR/YFUXbUQr2CW30itYe2jJLit5uoKbrlDDb9zo=; b=SQoGRtMsrJ0g7O4DZFLQ0PvxUXlmgKsJ4lx9Rk3hUikQXje0mMKfd6AN7PFkS+eQRDwbQn MPqKFaIrjMDeCAspRCESJPRURhFFfczloRDM3nxOYr5mVApC/A9ufT/rMSLsNeukDMnhah VJMPpZFUP1HFN06ksPe025kFt2JH8Xw= X-MC-Unique: kan1FIFhP5OOSycRvFGzqg-1 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=fr7tR+uE5gurF7jZCvxXMmjEzQ0XGdfWsIrKdvCDUxM=; b=GtYKxgrOgbNqLUYR6cvXPCAUfoi7f37T60SlbngBb22bFZRVHored9gSQt5jC/OT3Z PNFb8Jx91TReS7PkKsLHgxbAxJLciWEhqbDdPRRw9wN9PFfi0VZ+Sn9skKXhhsegM5u9 VA7wKLLHGtlPc0Y7HI+QbKkzOcZcIKkqX/1vooLV4KTGiCsEBCYFe3YGvLgDVaO8ltSB pfZKggjGmT0DzkrK5jaT9yc+nhbGV34q1r6Y5wvreD83exRexofjZppTiupBlQy3ZmhK OHrescqbt9I+qxJjcuiYRX10vFt05+Yoq6oSpr0qzTKnnvgtez6jbqYPkXLcWyEFeEeH p07Q== X-Gm-Message-State: ANhLgQ2OsiiYi3EQqAffUOYmNfHEit/abcvsvhJYLZmPlV9IoDdfgPYE 9SASMb0ugNdm0dB5ko/orxGlKmziGgDL+kZ9PljbemUe1xxfyYo+dJRuGF24YeQj4yy0eoTz0pv GqcuwLwIYTdUsSSY= X-Received: by 2002:adf:82f7:: with SMTP id 110mr709004wrc.373.1584384686655; Mon, 16 Mar 2020 11:51:26 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs//rpAiK+xC5iYw0T7Oh1sadDsQ7K/U2GlCCkhy1nMZWCWbX1KSDGH9bvtWb4oYVJO/F2Vcw== X-Received: by 2002:adf:82f7:: with SMTP id 110mr708995wrc.373.1584384686494; Mon, 16 Mar 2020 11:51:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 15/25] scripts/cocci: Patch to remove unnecessary memory_region_set_readonly() Date: Mon, 16 Mar 2020 19:49:56 +0100 Message-Id: <20200316185006.576-16-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 Content-Transfer-Encoding: quoted-printable 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Add a semantic patch to remove memory_region_set_readonly() calls on ROM memory regions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- .../coccinelle/memory-region-housekeeping.cocci | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/= coccinelle/memory-region-housekeeping.cocci index 9cdde71bb1..5e6b31d8ba 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -48,6 +48,21 @@ p << possible_memory_region_init_rom.p; cocci.print_main("potential use of memory_region_init_rom*() in ", p) =20 =20 +// Do not call memory_region_set_readonly() on ROM alias +@@ +expression ROM, E1, E2, E3, E4; +expression ALIAS, E5, E6, E7, E8; +@@ +( + memory_region_init_rom(ROM, E1, E2, E3, E4); +| + memory_region_init_rom_nomigrate(ROM, E1, E2, E3, E4); +) + ... + memory_region_init_alias(ALIAS, E5, E6, ROM, E7, E8); +- memory_region_set_readonly(ALIAS, true); + + // Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram // code sequences with use of the new memory_region_init_ram function. // Similarly for the _rom and _rom_device functions. --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386272; cv=none; d=zohomail.com; s=zohoarc; b=DE/HG8o69B+fEpI1AlIeUhb2n51zmFQHnCNHu3qqhUzRa+2LGFE0TcfheWaQd3nkn6OEAiuuGNdWN2Bdznrxb5Oy9nHNrRmQy0OrtVFCovu3HrKmal1BNbI2xGysMVb+gxBjhI7UuwddLL0XEx3DY47mK6vx/BG0I3wAFTo6ymY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386272; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PnTiznQbcjSITmlrC8f0MwivspPIOZv0h5wAVkTgkTc=; b=VvY2rhhrLva5dW998i+Mjptg3RMc18aJSq7yT583XyWNyhRXn+AJVAeO/mqoRy9+WmiZTV1Z1dfwcjQrxUt8ndlgfmlnSHsspqeu7oQ0MwBWGkK3J5ZtKJBQo/HDwiMUu61dSao2QweP4BMLI0LO6Clk329uKr5TSgQNCXEzgFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386272959576.8772975526782; Mon, 16 Mar 2020 12:17:52 -0700 (PDT) Received: from localhost ([::1]:47380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvFH-0004uB-Tr for importer@patchew.org; Mon, 16 Mar 2020 15:17:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39355) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDups-0001JF-FT for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupr-0008OJ-9I for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:36 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:39251) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupr-0008Mh-4r for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:35 -0400 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-328-mpECr7nXNgK8D7A29tNcCA-1; Mon, 16 Mar 2020 14:51:33 -0400 Received: by mail-wr1-f72.google.com with SMTP id w11so9465380wrp.20 for ; Mon, 16 Mar 2020 11:51:32 -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 b4sm747590wmj.12.2020.03.16.11.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384694; 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=PnTiznQbcjSITmlrC8f0MwivspPIOZv0h5wAVkTgkTc=; b=Ml3q88mlKS3Df5R1wT1AsPJL+LVBkjN3Ihfdc8dKXk514k7PDhIMJrUmoGcTN/U2FgMXtq 3q1iAQp/AwpWNh0bl+ADLMEo1EwmJXUZyW44A1uUsD8reEpmU/Ml5CR9oOOSA9V1QNnfo1 UFP+xhlR/sUDf1wRNLKl52aDByk2Yiw= X-MC-Unique: mpECr7nXNgK8D7A29tNcCA-1 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=04xeP5EixbpWsJm6lJ8qB4mcyVbq8ONy8Rtl0nbrdFA=; b=eMyw0lYrE+rb87OccotAxpkC2bFhd1PffR3lf4PhDnjjN8aNOd8vkrCPg74/c3kqPZ gZvff+2gPk3YyaWRHfqqmgkJvrrwU+fC9M7ic3ehNhZWACa7xMyIOTmlOFUGQ+d4heOj zWQ+M3+2SNtEXRAFwM5x16Zt4aekG1RZk0oLb3Inw9EGYx+Fkf1tH8Ka0ZFYOooWNVwX x6PTAd6GlKVaDYf04roMkrs3G5gITqgEbeupY8dg+T2RRq+Fzj9F/UMDPiLApxhZdE/l sHeKZ1l9p324tMNbzE4IVq1ogkzNfgTiZ5LmVYesBGUkmMDCuXlzq1D6PQOEZKXpOxTG grLA== X-Gm-Message-State: ANhLgQ2xPFcIhUYNYVEQE7jZdA4R3BvJgoYGZ8H+YV7byb31kpGs7Bty X7KzE6rguU546IKVN0AFw2YF0ryCLXRKL8VKYGsvXEpmsDEhqjABiEFZLkS0oLjtopPiKLLZMij kFLtKAFoZ4EVXuGw= X-Received: by 2002:a1c:4d14:: with SMTP id o20mr525852wmh.17.1584384691714; Mon, 16 Mar 2020 11:51:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs5XMd9dWXI5/5mbyYuh2ZFc0lUCEk7bLwWAUlQSiKmR6i7d0sJHuxSLYEAXyyiuMXUqIb20g== X-Received: by 2002:a1c:4d14:: with SMTP id o20mr525833wmh.17.1584384691447; Mon, 16 Mar 2020 11:51:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 16/25] scripts/cocci: Patch to let devices own their MemoryRegions Date: Mon, 16 Mar 2020 19:49:57 +0100 Message-Id: <20200316185006.576-17-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" When a device creates a MemoryRegion without setting its ownership, the MemoryRegion is added to the machine "/unattached" container in the QOM tree. Example with the Samsung SMDKC210 board: $ arm-softmmu/qemu-system-arm -M smdkc210 -S -monitor stdio (qemu) info qom-tree /machine (smdkc210-machine) /unattached (container) /io[0] (qemu:memory-region) /exynos4210.dram0[0] (qemu:memory-region) /exynos4210.irom[0] (qemu:memory-region) /exynos4210.iram[0] (qemu:memory-region) /exynos4210.chipid[0] (qemu:memory-region) ... /device[26] (exynos4210.uart) /exynos4210.uart[0] (qemu:memory-region) /soc (exynos4210) ^ \__ [*] The irom/iram/chipid regions should go under 'soc' at [*]. Add a semantic patch to let the device own the memory region. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- .../memory-region-housekeeping.cocci | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/= coccinelle/memory-region-housekeeping.cocci index 5e6b31d8ba..c768d8140a 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -101,3 +101,59 @@ expression ERRP; +memory_region_init_rom_device(MR, NULL, OPS, OPAQUE, NAME, SIZE, ERRP); ... -vmstate_register_ram_global(MR); + + +// Device is owner +@@ +typedef DeviceState; +identifier device_fn, dev, obj; +expression E1, E2, E3, E4, E5; +@@ +static void device_fn(DeviceState *dev, ...) +{ + ... + Object *obj =3D OBJECT(dev); + <+... +( +- memory_region_init(E1, NULL, E2, E3); ++ memory_region_init(E1, obj, E2, E3); +| +- memory_region_init_io(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_io(E1, obj, E2, E3, E4, E5); +| +- memory_region_init_alias(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_alias(E1, obj, E2, E3, E4, E5); +| +- memory_region_init_rom(E1, NULL, E2, E3, E4); ++ memory_region_init_rom(E1, obj, E2, E3, E4); +| +- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_ram_shared_nomigrate(E1, obj, E2, E3, E4, E5); +) + ...+> +} +@@ +identifier device_fn, dev; +expression E1, E2, E3, E4, E5; +@@ +static void device_fn(DeviceState *dev, ...) +{ + <+... +( +- memory_region_init(E1, NULL, E2, E3); ++ memory_region_init(E1, OBJECT(dev), E2, E3); +| +- memory_region_init_io(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_io(E1, OBJECT(dev), E2, E3, E4, E5); +| +- memory_region_init_alias(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_alias(E1, OBJECT(dev), E2, E3, E4, E5); +| +- memory_region_init_rom(E1, NULL, E2, E3, E4); ++ memory_region_init_rom(E1, OBJECT(dev), E2, E3, E4); +| +- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_ram_shared_nomigrate(E1, OBJECT(dev), E2, E3, E4, E5); +) + ...+> +} --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386355; cv=none; d=zohomail.com; s=zohoarc; b=NIwcdAQkveQi7hHVzyzEBRNJHtj62BB+kOkOlWsGm6//YMwVajlSjUoQi8crXeTKdoB/t1ItB3BbI2cvfnU2R2lfclOw6a6wRPN3HMLfocnlGMdj6VNnOFdvFry48UWZBZ7dTjf6Y2cANCuzq7uhCy0cfQiYSkWA+b3M6ob+uz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386355; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=d82MUeKk+/4B02rjdl6yI9CuL1FxqpOnif29vr+0CBA=; b=d0zI2i0KK4RsZf0ICAhyZLUGikNRNgevXT++2GEz9uRXYiJoDplHdR0DUnujhVVbp/tNbyVbz3VxJhlz1tskcPpK/twgnWPw3A56P6Ey1+bT6TuPokJMkk+bruKhjs00iMpNb9IGWYbDAF7gfEj8yUBQHvtnVIbnFjv2/8DaqSg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386355269491.08512844515894; Mon, 16 Mar 2020 12:19:15 -0700 (PDT) Received: from localhost ([::1]:47418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvGc-0007eK-66 for importer@patchew.org; Mon, 16 Mar 2020 15:19:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39675) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDupz-0001Z3-Cu for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDupy-0000dL-EP for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:43 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:25984) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDupy-0000bn-Ay for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:42 -0400 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-111-EoRbDIeLM-Gv0q2u8EdyGQ-1; Mon, 16 Mar 2020 14:51:37 -0400 Received: by mail-wr1-f72.google.com with SMTP id p2so6924790wrw.8 for ; Mon, 16 Mar 2020 11:51:37 -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 y11sm1102956wrd.65.2020.03.16.11.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384702; 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=d82MUeKk+/4B02rjdl6yI9CuL1FxqpOnif29vr+0CBA=; b=XmUHB5zhQTc9V88/yje31225NdT/twiLBR37qnx/a/2UyTRSgWPrXp6x7V8lJf1T+EZks6 k1cPgm4PEa4F7tht/vAfY2hq+KmoLYzsN1SrYEsuSa/njR2FKjJ5BSdu30kf0ztUVjWbg6 Rx/DSKawUKcQGZE3QyjK0EtAZB50i8c= X-MC-Unique: EoRbDIeLM-Gv0q2u8EdyGQ-1 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=S/FBDGV/15lXYdA91sXPdJa+d5WfDFcmkJ3uIRUkYtg=; b=WTBng64nSNy12v73yt4+zjosBS0krwp/AJpEE5KF43lRpZqfzzvt5DEQjyg0Wnn72K d3KW+IRUbFjdrp1Vkdxw68VIdx9qOYXPNy7sOCVoU1qPKLv1fOb6y6mu+NxeuWivQv/Y Ubh1VfV49Ea2txadijSBBYzO5yo4W/maCKXsmjBI+dOdrL2Qsj5za9oKHhjFANlj+go7 G8uCQ2eGsXgsnUuzuuG7rzJIWv79C+buFx5eWN+cdbB1JuDjSmbsZ4FnKXpT4iZgbBAe RijX71asGEl8kW/JrblM5YDX5AEJx9V7SZ/S7RUKrN5vromP4cEGEwfKCOVMostLbu6f Baog== X-Gm-Message-State: ANhLgQ3uh00H4kvJzBUPfyo+vPrmN/lujHU5bR7eY/5jC+65KmU5FuvQ 2ZSiADWWlolX3LlRGD5EBoRrwZcFGlZkqyki/Zwklwq9N1JOjs/P5eUq9Xn4GbwTUNEYrAAFaAd HZtAuO3/ceCPr0po= X-Received: by 2002:adf:ec4f:: with SMTP id w15mr819152wrn.106.1584384696511; Mon, 16 Mar 2020 11:51:36 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuMJCY6sWlRrJ/mFfOn5ylCypiBCw1oT6GumW7HgBf2HYpkbKc+2TF6mlV/AlK4WQbxyG8nZA== X-Received: by 2002:adf:ec4f:: with SMTP id w15mr819137wrn.106.1584384696350; Mon, 16 Mar 2020 11:51:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 17/25] hw/core: Let devices own the MemoryRegion they create Date: Mon, 16 Mar 2020 19:49:58 +0100 Message-Id: <20200316185006.576-18-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 Content-Transfer-Encoding: quoted-printable 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Avoid orphan memory regions being added in the /unattached QOM container. This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/core/platform-bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 22c5f76dd0..d494e5cec1 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -187,7 +187,8 @@ static void platform_bus_realize(DeviceState *dev, Erro= r **errp) d =3D SYS_BUS_DEVICE(dev); pbus =3D PLATFORM_BUS_DEVICE(dev); =20 - memory_region_init(&pbus->mmio, NULL, "platform bus", pbus->mmio_size); + memory_region_init(&pbus->mmio, OBJECT(dev), "platform bus", + pbus->mmio_size); sysbus_init_mmio(d, &pbus->mmio); =20 pbus->used_irqs =3D bitmap_new(pbus->num_irqs); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584385967; cv=none; d=zohomail.com; s=zohoarc; b=oFcLpIRO08/UX0jOGLP0mg+v64ZvyVmLYdllwOwRsBoV6jUcGhaBt551KUchMxEJ19ho+bfByLFkYRO+VBz4z/svKP/qzdeJcXHfvtnQ9+7slTRzaFU1r+ym+m38N+OUpL8Lw3N5HS6BcfEGMsS1Hxq954qkM8mkzaImiO79NRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584385967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1VSR9kygTTReaCRIBAeG2Orj1G8eqxnIXlzuyJCEoZ4=; b=hfFVL/btbjkQ9p1F085+enmz24Ajk7aKgDdkDvmd5dcyer5P9G2JVo5nqGcvsgQD0f/TT8b3aFOwPiMMtNFNL3wtqw6PyFxQ0KYMVXfYEH4Fo8/wckcxrxUiFqqJpRG8vNVOF8xr/0svA8L8562PPRb6aqEgkBlNp36elQhsZDo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584385967807818.7106164076637; Mon, 16 Mar 2020 12:12:47 -0700 (PDT) Received: from localhost ([::1]:47272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvAM-0005wQ-Ot for importer@patchew.org; Mon, 16 Mar 2020 15:12:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39804) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuq2-0001ga-DE for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuq1-0000r2-AQ for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:46 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:34983) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuq1-0000oo-65 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:45 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-418-0yDrMbkiPBWBkgIHefu_0w-1; Mon, 16 Mar 2020 14:51:42 -0400 Received: by mail-wr1-f69.google.com with SMTP id w11so9465637wrp.20 for ; Mon, 16 Mar 2020 11:51:42 -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 g3sm1123154wro.93.2020.03.16.11.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384704; 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=1VSR9kygTTReaCRIBAeG2Orj1G8eqxnIXlzuyJCEoZ4=; b=QdMIAVi1ZkDXke0i876+cZQKuvndMkboH5M8tE9FknGSOO7hBfq73Nqj6Umlqt7AnusoYY IfnsUCdK4wfMn9TQTeuKlZ5h55AEql0igUgaVO85vdZpqQbnXnN+4+QiXKUOo9V1Vg7hzA MpjyFOGx4/UmhW2u4rVuyMpHSnpv0y8= X-MC-Unique: 0yDrMbkiPBWBkgIHefu_0w-1 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=t3v5KkPJFqQ5Hvd8PkUF+qQTJk/z0T5Un950kyyDqAQ=; b=psJKQe05f0VII45BM7eUZ9ML8B7sNJrMZiUNpxbVth0yyYeiEWEJDpMzCHCde6YzPH XT7jmdA0JYP3nMqpAby7ieqLgN+0qd8M+TGK6Gx9y45CMNP6mfPIY40ZlHgGiMm1yGQ6 QWM1orbgCwcyuVeW0Y+GpRdflzYy9HF/P6n2VZf6amzpHZGNHp34XTbSE/VF1PYnKUzP x5VGGoEAxqGRKo9bO0qDcvPmxn7ZzaSyoIBY6Ots74PKF0IpqvXmZJHlisByI4QsJdIR w60ysCjX32ZDryvTtSMEKJTuhCRafg1jbUq6eRVlQdj8kGz16LutZYjOyKyaX9R4HhSq XzHQ== X-Gm-Message-State: ANhLgQ2fNSMhrDfsKVnqzIkdEpArb7KjPna5Xychn/iA3bIx+kmcs6Mn KzCpJWOeW4L9Eb4u6S9H2t7x10lZELlSwkB5MqfZshtCF4pPha8rtM7p+L/OMdvh2ID8kQQq/xg YOgWGDQPLxTo3ioQ= X-Received: by 2002:adf:d0c1:: with SMTP id z1mr725330wrh.311.1584384701497; Mon, 16 Mar 2020 11:51:41 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtfD6HXEuELQkAUsgJzstaLWfjF3PFpCHIpTWt5s/PhF+tuPeA0D/I34QmESmCXiL0zDj2Aow== X-Received: by 2002:adf:d0c1:: with SMTP id z1mr725318wrh.311.1584384701328; Mon, 16 Mar 2020 11:51:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 18/25] hw/display: Let devices own the MemoryRegion they create Date: Mon, 16 Mar 2020 19:49:59 +0100 Message-Id: <20200316185006.576-19-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Avoid orphan memory regions being added in the /unattached QOM container. This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/display/g364fb.c | 3 ++- hw/display/macfb.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 55185c95c6..adcba96e34 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -477,7 +477,8 @@ static void g364fb_init(DeviceState *dev, G364State *s) =20 s->con =3D graphic_console_init(dev, 0, &g364fb_ops, s); =20 - memory_region_init_io(&s->mem_ctrl, NULL, &g364fb_ctrl_ops, s, "ctrl",= 0x180000); + memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &g364fb_ctrl_ops, s, + "ctrl", 0x180000); memory_region_init_ram_ptr(&s->mem_vram, NULL, "vram", s->vram_size, s->vram); vmstate_register_ram(&s->mem_vram, dev); diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 8bff16d535..b68faff4bb 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -362,8 +362,8 @@ static void macfb_common_realize(DeviceState *dev, Macf= bState *s, Error **errp) return; } =20 - memory_region_init_io(&s->mem_ctrl, NULL, &macfb_ctrl_ops, s, "macfb-c= trl", - 0x1000); + memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &macfb_ctrl_ops, s, + "macfb-ctrl", 0x1000); =20 memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(s), "macfb-vram", MACFB_VRAM_SIZE, errp); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386656; cv=none; d=zohomail.com; s=zohoarc; b=R9MJSY4Donn/3Jb+gUe1v0KR28tjjPZ/m7+aE3yCENKBviA91zh9QUEMyYGJ/Dv6J7bCCQ2wxsJKoQ0c11WErhgZppNToZCmQ4eQilT3U8u+PwPfcwI+mbf+UdbqjoQXCjFZey4wBLTA+1K9JEJ23WLNNOIEMEwy3+fLTUNogC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386656; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i3ghcWWXfmrp7QvFdK9qXlRLUNNDkXw1/QjRUWIVTOU=; b=jmHr6WtYCisR8AhvujNiIDKSx2wXzD6KvvmAoyatjJHWkAeAyZe7RFQmo5DEfWvTXgIyYuPV0Vp/pZ6TlCKp8nZImb0jnSyD2yp2R/ZKuZi4Q0JDQKfrqQMUzgauU1tNAzknyXNObBST2Q97lSMeAzbZDye81rhBs/9f3LRscvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158438665625158.243301897512765; Mon, 16 Mar 2020 12:24:16 -0700 (PDT) Received: from localhost ([::1]:47570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvLT-0000ut-8a for importer@patchew.org; Mon, 16 Mar 2020 15:24:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39998) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuq7-0001rd-Aj for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuq6-0001Md-5T for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:51 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:35400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuq6-0001LD-0g for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:50 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-PNFviC6cPpyfD68pkftx3g-1; Mon, 16 Mar 2020 14:51:48 -0400 Received: by mail-wr1-f70.google.com with SMTP id v7so10146wrp.0 for ; Mon, 16 Mar 2020 11:51:48 -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 x5sm1027236wrv.67.2020.03.16.11.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384709; 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=i3ghcWWXfmrp7QvFdK9qXlRLUNNDkXw1/QjRUWIVTOU=; b=CzlZQFAz/JQh5e1diW4e2sX7ytkEy9dTzvpO5vy3BOdHZRzL4u4Bjm5HULlrsTB9dYkXT+ f+sqYp1+76EoNP64+AqnwgEhD+4LZdLTEWE/mQ92q7pR39jaovJIWmVbvREBj4rCWw1un2 TTNs5DJuYoPLkCf3nNjVwWc2oUD+eUo= X-MC-Unique: PNFviC6cPpyfD68pkftx3g-1 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=Tg4YT8Vv6s4Pvf6ypAvksHmessU7kCXErgARgCCgCB0=; b=F+EEKFQxwOgtCuvBpEftTtWQ2Y08R3VsJSxbpU2zYt9js4rC5BdeNXYnIlc+CzLUB3 dKqzuWOTPeIV6EVz+6LKjR1b69WnVEe51Li7emdvulZWoKk1WcZMkrUmFp7m12mIFBWA KeiF4IRUyRRaTVr26D1bOFR/QAitIVCPg18cky/dFABGZTzSXsUbjfxFGtawEd2tWgE1 0AebaK6eqrOqOHQaa43XF2ayF3rc8EvYevGg2UZLp2RRnloY9iKpnpkfaldPNTk2Qp6D sTJ+SQRfalcHfGO1ujtDvbytrxc0YTMz/I8tnXd6mbRqJNINfIzx6ph31oVP+7xxkdh6 imyg== X-Gm-Message-State: ANhLgQ1VQmjIM0zpqRWXXomdyWEGMvNrXjVXB7gLBGDVf8vjFxJS+aS9 MSAAnJeqRWlrlO2WzCrsn+oKWwx+LpeU9giPmFs7t4k9bp+mDIzRONi5sd/HU8liHA0tdNF3xEG nL5hIMeCxI/FRDwk= X-Received: by 2002:a05:6000:10d:: with SMTP id o13mr787616wrx.84.1584384706875; Mon, 16 Mar 2020 11:51:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvbAJ8oPKSi+7bUQa0Z5HltaI79+8Zsqm/dSQSSkH8TmcXK0iCza9kQkk+65DqJCDLlRmdwag== X-Received: by 2002:a05:6000:10d:: with SMTP id o13mr787595wrx.84.1584384706714; Mon, 16 Mar 2020 11:51:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 19/25] hw/dma: Let devices own the MemoryRegion they create Date: Mon, 16 Mar 2020 19:50:00 +0100 Message-Id: <20200316185006.576-20-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 Content-Transfer-Encoding: quoted-printable 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 , Aleksandar Rikalo , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Avoid orphan memory regions being added in the /unattached QOM container. This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/dma/i8257.c | 2 +- hw/dma/rc4030.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index bad8debae4..ef15c06d77 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -553,7 +553,7 @@ static void i8257_realize(DeviceState *dev, Error **err= p) I8257State *d =3D I8257(dev); int i; =20 - memory_region_init_io(&d->channel_io, NULL, &channel_io_ops, d, + memory_region_init_io(&d->channel_io, OBJECT(dev), &channel_io_ops, d, "dma-chan", 8 << d->dshift); memory_region_add_subregion(isa_address_space_io(isa), d->base, &d->channel_io); diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 21e2c360ac..7434d274aa 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -679,9 +679,9 @@ static void rc4030_realize(DeviceState *dev, Error **er= rp) s->periodic_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, rc4030_periodic_timer, s); =20 - memory_region_init_io(&s->iomem_chipset, NULL, &rc4030_ops, s, + memory_region_init_io(&s->iomem_chipset, o, &rc4030_ops, s, "rc4030.chipset", 0x300); - memory_region_init_io(&s->iomem_jazzio, NULL, &jazzio_ops, s, + memory_region_init_io(&s->iomem_jazzio, o, &jazzio_ops, s, "rc4030.jazzio", 0x00001000); =20 memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr), --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584384896; cv=none; d=zohomail.com; s=zohoarc; b=be4Gpn5bPrMCNE3DAEJbyCYUP0UhNc6jtc6WRKM0kJNN+4NuGIzI+acbexrm1mI9eZh9JnBV0BW9R43NTzcFBZvWboK9yNbyNsyiUO8+eELgQqfVXAdK4GXVxfaKtbqLDdgz5A2/YjSjKozvYpOB/Gu+EoMvmgB8wIx4Ese+SEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584384896; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lJlVMKZax5qIb1MJWYEp8Y1G4BH96heGWQHiGeb4Cus=; b=ZLJ+fCIzZeURTZP3lA2okUxP0hNXEqxOpV7Wvfc2MPk0Th/mZJCNgcLD4qNsHkWcMxOB7x9fHJcktRJvCJ2nWoX2FQtCMRykYBqUEcV1KxnLrY9s11eHE9nvgC4PUwLXrQhzWwQw9MjJ8tCtEMR5y9BvC1PnOMEfK235woiVMnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158438489678896.13378263838115; Mon, 16 Mar 2020 11:54:56 -0700 (PDT) Received: from localhost ([::1]:46760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDut5-0007fI-R0 for importer@patchew.org; Mon, 16 Mar 2020 14:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40184) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuqE-00023H-7K for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuqD-0001sl-58 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:58 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:58691) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuqD-0001kg-02 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:51:57 -0400 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-388-pBxvc8JoNDWHfgysu8SpwA-1; Mon, 16 Mar 2020 14:51:53 -0400 Received: by mail-wr1-f71.google.com with SMTP id t10so3163488wrp.15 for ; Mon, 16 Mar 2020 11:51:53 -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 l18sm1082013wrr.17.2020.03.16.11.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384715; 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=lJlVMKZax5qIb1MJWYEp8Y1G4BH96heGWQHiGeb4Cus=; b=d6uBhmX+eIBxky7rrZS+RJ6LuTaGoJAxzDZForx91YIdFHKvozP/QAFC2QrSWi5maSc4VY icS8YBYSiyHYwv4vgobaT2XcS6SFqSZ1Se6OGQVcTTaey0Khk6tW4wIXRhNgHJTPg/Tk9O CQdwk2lYUNfs7xrtQnXdVzlBnvKNdAA= X-MC-Unique: pBxvc8JoNDWHfgysu8SpwA-1 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=NlR0W1rwyt02Ypkn/GIhl77Q2tixa1X5gZqoTZJ3XAc=; b=UyQtJDLwhobI2HmOF+hf5vEp9SrnAs+TvY/Xuzf8r4686rwWiHkU5S7N+19setDryw 8WFvej56pHvh3YHTsZ0rpf4c85JSb9tpboqCfX9IKa6awkxoQoNPyVYMSgQ6ypzxt7xY zWSxy3w11sWLjzPCDd2SfChE0TTaQROn5k/VajquymV53Ufb9THZLZi/C1fLi0gZ+ztr g3jx53+b9NLPl3jPlpowhFBpveXQK31DkvauB1rLFC1Q8I8sd9DqkuFSRrNUnA+fbSxw htRZem0ra1NbpAAxFSb/cZes94BNrtJsI0kPiPWp7ZDogbzPQowC2eWNXBiQtLvpfqYj GGQA== X-Gm-Message-State: ANhLgQ049SC1O6NJS17zhVawDPMC1/QcgmGu9cZQG4NmXzqq7hrq2yQL Ox7MXL0a2Zjy06v9YJ/jgPUOx2Bx2rQKlwEJRrFB3442wQWVSgadAWQ816OmZAqWS+spyQlDBm4 EkAZE+jO/uvkqGkM= X-Received: by 2002:a05:600c:204:: with SMTP id 4mr486838wmi.112.1584384712298; Mon, 16 Mar 2020 11:51:52 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsfokMzXIaYUKe+yPU0VT7cajBV5qDQv0gD5seZGtXEytA4OUpypM+GVgF/rry1m1L7lSzfVQ== X-Received: by 2002:a05:600c:204:: with SMTP id 4mr486823wmi.112.1584384712123; Mon, 16 Mar 2020 11:51:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 20/25] hw/riscv: Let devices own the MemoryRegion they create Date: Mon, 16 Mar 2020 19:50:01 +0100 Message-Id: <20200316185006.576-21-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 Content-Transfer-Encoding: quoted-printable 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: Peter Maydell , "open list:RISC-V TCG CPUs" , Sagar Karandikar , Bastian Koppelmann , Alistair Francis , Palmer Dabbelt , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Avoid orphan memory regions being added in the /unattached QOM container. This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic Reviewed-by: Alistair Francis --- hw/riscv/sifive_e.c | 6 +++--- hw/riscv/sifive_u.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index a1974ef7be..646553a7c3 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -145,8 +145,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev= , Error **errp) &error_abort); =20 /* Mask ROM */ - memory_region_init_rom(&s->mask_rom, NULL, "riscv.sifive.e.mrom", - memmap[SIFIVE_E_MROM].size, &error_fatal); + memory_region_init_rom(&s->mask_rom, OBJECT(dev), "riscv.sifive.e.mrom= ", + memmap[SIFIVE_E_MROM].size, &error_fatal); memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_MROM].base, &s->mask_rom); =20 @@ -208,7 +208,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev= , Error **errp) memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size); =20 /* Flash memory */ - memory_region_init_rom(&s->xip_mem, NULL, "riscv.sifive.e.xip", + memory_region_init_rom(&s->xip_mem, OBJECT(dev), "riscv.sifive.e.xip", memmap[SIFIVE_E_XIP].size, &error_fatal); memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base, &s->xip_mem); diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 156a003642..662d42a5a7 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -497,7 +497,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev= , Error **errp) &error_abort); =20 /* boot rom */ - memory_region_init_rom(mask_rom, NULL, "riscv.sifive.u.mrom", + memory_region_init_rom(mask_rom, OBJECT(dev), "riscv.sifive.u.mrom", memmap[SIFIVE_U_MROM].size, &error_fatal); memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base, mask_rom); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386060; cv=none; d=zohomail.com; s=zohoarc; b=Kt40CKJGVAwC9qwi4fDDNT1ErGMg/xWB0KOQ/boedjGy7DYk+uW78h52yvtPszc2lpx+dVMXXaa4sQbRqPizFCstglqGLnNI01C9po18HSxByZsBL8dw04mCS3mlhQnhWDCTvq3FiJ0tQmy1JT1oHeIC5+DCCvBDzgPRQEL8cLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386060; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7saW0lUMlIpBkC9nkeABH78vi2gIhiCg17Oi76zLWlE=; b=gibhZRo9Hhi1hE6VhlMRtYQtYEBGvY+Nf/pHMX5128RR3WSf5x9XWvG2Dh0nsMbWHmjE/8eENXP8No4SlW6uSEsUz+OUTp2CaefeSduOvduktXo0WPj08XN5EB/qAJdQop63EFqY6dS5o0tRBOajsuSOPTJp6Myd6FVEFS0A4fo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386059943651.9736558805879; Mon, 16 Mar 2020 12:14:19 -0700 (PDT) Received: from localhost ([::1]:47304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvBr-0008SP-08 for importer@patchew.org; Mon, 16 Mar 2020 15:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40335) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuqI-0002C5-DO for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuqH-0002Gq-Bz for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:02 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:54921) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuqH-0002Eb-7P for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:01 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457-h4i9B59kOXetzTfGBReSmg-1; Mon, 16 Mar 2020 14:51:58 -0400 Received: by mail-wr1-f70.google.com with SMTP id u18so9389483wrn.11 for ; Mon, 16 Mar 2020 11:51:58 -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 c5sm27146659wma.3.2020.03.16.11.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384721; 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=7saW0lUMlIpBkC9nkeABH78vi2gIhiCg17Oi76zLWlE=; b=bo5R2g3087H9owdyLYjATCH6T3eWrz3KpZ0/O+xYUOAMTwDSpV0g6Uva70jsHBsBrPp+X5 mTV6b+s3vXWwI7faNnZWCsVwiYqDFrDIK24pBgCud/IBPsUfn6m4dJpbB8FO5ICWCGnFOS CZA952ALMorBTHf5o52iXvSc9ih+SlM= X-MC-Unique: h4i9B59kOXetzTfGBReSmg-1 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=QoeDp95rhSeqOCx6yt/pZwQZkXPtM1sdq4xaQ9mSdFE=; b=h3aGVWPDS0o5Js3CidpK6I/9tnU1jbaWdU1rQ1MCItgwSC3ziZfrA1oLxOicasEBWe 1MD4THqWCFFRl9yNpz48C5w9cWgkUj8Grpgzbha0glphq2Zl/U8vURvMRcntgTv61g0n /4KmDhdV7QXGGBwA9/jI2x7nr/aHYSfNlh0XSN27vKi6GfSvn9gXowIvzb8DEohWlQyL +08ouxmXQNlhAdxZ+85rzH5fhBkKcMxdJlpV5yR3NjE0HXJIhnFQJRWBLievu9qylPDR xSe6Mz+0JdALmoVOARu6T2IxJODLNvv3EX6gxw6J7481Fu6O10DMxra/a2h9djUfo2Hr ruzw== X-Gm-Message-State: ANhLgQ1/yU2vkm88ZVKQQNNCnTea4U8v7rYMCCA18G/jo/9NzLYrFl2c ++dNPIhUhXL/SwL80sTPDQFGWTzANgY8+vhbps2CaFODg59ycOgNf/7i+H7DGuLLqZdNvJAfBjG dbOG7lFpk/U+CWD4= X-Received: by 2002:adf:fd92:: with SMTP id d18mr820967wrr.342.1584384717416; Mon, 16 Mar 2020 11:51:57 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvHiMyzQJBhIjrgn79306jr9XzhYtnTKRpX8ufMugmEPB0QdPSY1Q3K49hZAePtMSoci5d7BQ== X-Received: by 2002:adf:fd92:: with SMTP id d18mr820953wrr.342.1584384717274; Mon, 16 Mar 2020 11:51:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 21/25] hw/char: Let devices own the MemoryRegion they create Date: Mon, 16 Mar 2020 19:50:02 +0100 Message-Id: <20200316185006.576-22-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 Content-Transfer-Encoding: quoted-printable 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Avoid orphan memory regions being added in the /unattached QOM container. This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/char/serial.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 9298881af9..2ab8b69e03 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -997,7 +997,7 @@ static void serial_io_realize(DeviceState *dev, Error *= *errp) return; } =20 - memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8); + memory_region_init_io(&s->io, OBJECT(dev), &serial_io_ops, s, "serial"= , 8); sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io); sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq); } @@ -1106,8 +1106,9 @@ static void serial_mm_realize(DeviceState *dev, Error= **errp) return; } =20 - memory_region_init_io(&s->io, NULL, &serial_mm_ops[smm->endianness], s= mm, - "serial", 8 << smm->regshift); + memory_region_init_io(&s->io, OBJECT(dev), + &serial_mm_ops[smm->endianness], smm, "serial", + 8 << smm->regshift); sysbus_init_mmio(SYS_BUS_DEVICE(smm), &s->io); sysbus_init_irq(SYS_BUS_DEVICE(smm), &smm->serial.irq); } --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386180; cv=none; d=zohomail.com; s=zohoarc; b=QTrU4TunoiAVhHzHxStIH3iVVNNCFwU367HHrIvtTtL+IIk8tF2xYuw1q85q5v2piaXb2yqzQBE9eX7Pw3sJuTvhkW+IvDzxQlpH60uXsUJei/a88W8+aL4LcttvH82/oju8TivmbbiGIDFfvYLZD8EujvDJz1fX+QxhED9ZiEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386180; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lSVtvfrX1T1hW1+GelbNbTHoIYbtGWi72bTWri8Gs/8=; b=I/mEDmYpnvWGSoOhaAQkOnl7ai693xzan9J1YpMoQI11XOUMQZc5rB4QXIAGETt/jjTVwjByFhzvTkivTybQMQwqgkt7/AWdi2e+mwy4EjKXdeDkKkM9EnZObhDkf9xFTx0BXEle+njpRKourMndx6yfveZXb1vXG6WT/L4OHmw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386180396784.8728471456669; Mon, 16 Mar 2020 12:16:20 -0700 (PDT) Received: from localhost ([::1]:47360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvDn-0002lk-BZ for importer@patchew.org; Mon, 16 Mar 2020 15:16:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuqO-0002LI-H8 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuqM-0002nc-Lj for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:08 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:32863) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuqM-0002le-Gm for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:06 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-177-wkdutSsoNsePiGTRPUOfKw-1; Mon, 16 Mar 2020 14:52:03 -0400 Received: by mail-wr1-f70.google.com with SMTP id n11so8983803wrs.13 for ; Mon, 16 Mar 2020 11:52:03 -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 h15sm982743wrw.97.2020.03.16.11.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384726; 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=lSVtvfrX1T1hW1+GelbNbTHoIYbtGWi72bTWri8Gs/8=; b=Or4KTwQN52/3TDeizn72uUrxp4v0ZvC3BqHypsNRL3wrr4z+d8gmTqptvY2nbFJIzEzfyS vSRwtxe03uLnMOLGEJfFB62OPvjd6D2Fcg1Nvt9lwppu+DhqAdZPZlprWS7iiokUCPPjyj LhVTUZy8mqqaoaTxrfSPrrP9FlZrXPA= X-MC-Unique: wkdutSsoNsePiGTRPUOfKw-1 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=NVKGwUr8B+LaX+EC0RuZtqH9nmzRuKTSjfiL8jyxkwg=; b=AP+W79cmOQHyP8jvFrbXZOEwjRDZ9h27AhRBO0wvXLxShZlegIgoJgeiFWeKvcWmIv KOGf/vJ8Idpk+Osnb7ma/E24Xoki7PBkdCRxWEXtYufmX/tehQE4M5WPe/4f568hrVPT 7HTINbrCAzDaoR9Mg37hEuY05EKjAgS/6FKQOKNDEsZh3VHGehY5Tnp+Fj0f54ndoaC/ GUWzKKAFDm25pKhx81K78K2cHlrPRbZJio3FfmYkPJN2o0g5qsjJ1f4I2Na8Yh+k0f9t 9XjRm9wWIqo5U4Cn609TFnW2VIeTnqthiEnbNFRr/7cbWugGwBi5WadHtoJ3UKSrqzGf rjUQ== X-Gm-Message-State: ANhLgQ2tvFaEcPpSBNSc1x7ZvnB4fP2FJFPailfuq4Yu3KIENLzIIJ49 ymdIAJKaCUqTuijkvVZWyLF0TzwKteHMz4WYh6vwtHwmSagd2u5t+4gbVeL1b9GtcrpBhfIFNv2 p5/hI99Q9f8uUh0w= X-Received: by 2002:a5d:5342:: with SMTP id t2mr809135wrv.104.1584384722417; Mon, 16 Mar 2020 11:52:02 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsuN9M61MjtWTG++Ov/Gb/CrTvbKKAALU/K6Gwtg6c2cjeo0USA/J3BloXn6JNSH9n1Eo5nKg== X-Received: by 2002:a5d:5342:: with SMTP id t2mr809112wrv.104.1584384722219; Mon, 16 Mar 2020 11:52:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 22/25] hw/arm/stm32: Use memory_region_init_rom() with read-only regions Date: Mon, 16 Mar 2020 19:50:03 +0100 Message-Id: <20200316185006.576-23-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 Content-Transfer-Encoding: quoted-printable 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 , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:STM32F205" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" The scripts/coccinelle/memory-region-housekeeping.cocci reported: * TODO [[view:./hw/arm/stm32f205_soc.c::face=3Dovl-face1::linb=3D96::colb= =3D4::cole=3D26][potential use of memory_region_init_rom*() in ./hw/arm/st= m32f205_soc.c::96]] * TODO [[view:./hw/arm/stm32f405_soc.c::face=3Dovl-face1::linb=3D98::colb= =3D4::cole=3D26][potential use of memory_region_init_rom*() in ./hw/arm/st= m32f405_soc.c::98]] We can indeed replace the memory_region_init_ram() and memory_region_set_readonly() calls by memory_region_init_rom(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/arm/stm32f205_soc.c | 4 +--- hw/arm/stm32f405_soc.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 627fd446f5..2de56275b7 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -93,12 +93,10 @@ static void stm32f205_soc_realize(DeviceState *dev_soc,= Error **errp) MemoryRegion *flash =3D g_new(MemoryRegion, 1); MemoryRegion *flash_alias =3D g_new(MemoryRegion, 1); =20 - memory_region_init_ram(flash, NULL, "STM32F205.flash", FLASH_SIZE, + memory_region_init_rom(flash, NULL, "STM32F205.flash", FLASH_SIZE, &error_fatal); memory_region_init_alias(flash_alias, NULL, "STM32F205.flash.alias", flash, 0, FLASH_SIZE); - - memory_region_set_readonly(flash, true); memory_region_set_readonly(flash_alias, true); =20 memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, flash); diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index 9bcad97853..b8fca13f95 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -95,7 +95,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, E= rror **errp) Error *err =3D NULL; int i; =20 - memory_region_init_ram(&s->flash, NULL, "STM32F405.flash", FLASH_SIZE, + memory_region_init_rom(&s->flash, NULL, "STM32F405.flash", FLASH_SIZE, &err); if (err !=3D NULL) { error_propagate(errp, err); @@ -103,8 +103,6 @@ static void stm32f405_soc_realize(DeviceState *dev_soc,= Error **errp) } memory_region_init_alias(&s->flash_alias, NULL, "STM32F405.flash.alias= ", &s->flash, 0, FLASH_SIZE); - - memory_region_set_readonly(&s->flash, true); memory_region_set_readonly(&s->flash_alias, true); =20 memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->fla= sh); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386306; cv=none; d=zohomail.com; s=zohoarc; b=LtUQJIL2jF6AMx40rPJhN+Zu24CAuhkWmaLVCBykG+5Qp8mZNL5jqTGTyFSfzdLUO5Msgu2B0pFsEyIS6USWfNQAoE78x86umLPkVm+GKH3dHryCC1zCsvGibfBZ7RyHvEvfGXquXgNUbfKvj2oj421mPp7IYrx/cvo3a1A5EN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HttrlD9lCEsMBP0W9znyLPVsPA+6bjyfUNmOA7cXo6c=; b=oAmf/cgI0qRBpHDe0w/3itK/IwtOR4zxVaYftgbYEQJNfRceLWUU6saFnLfJRaEzWv99ylXun0aSXCkt9+TjcHvASkxvPfTtlGWk1vuMGMWsyr6VNoNwWdnHcH5Zc4WKDxVGzc6HbT/rqXv1i6eGlKnp9d0qIcSwk6DrjeW2pTI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386306253984.850313841908; Mon, 16 Mar 2020 12:18:26 -0700 (PDT) Received: from localhost ([::1]:47394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvFp-00060t-6Q for importer@patchew.org; Mon, 16 Mar 2020 15:18:25 -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 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 Received: by mail-wr1-f72.google.com with SMTP id g4so1811197wrv.12 for ; Mon, 16 Mar 2020 11:52:08 -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) 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= X-MC-Unique: HXE6KNYnOdm_5w6uVGxVxA-1 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) From: =?UTF-8?q?Philippe=20Mathieu-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 Content-Transfer-Encoding: quoted-printable 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=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" The scripts/coccinelle/memory-region-housekeeping.cocci reported: * TODO [[view:./hw/ppc/ppc405_boards.c::face=3Dovl-face1::linb=3D195::colb= =3D8::cole=3D30][potential use of memory_region_init_rom*() in ./hw/ppc/pp= c405_boards.c::195]] * TODO [[view:./hw/ppc/ppc405_boards.c::face=3Dovl-face1::linb=3D464::colb= =3D8::cole=3D30][potential use of memory_region_init_rom*() in ./hw/ppc/pp= c405_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=C3=A9 Reviewed-by: Aleksandar Markovic --- 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 =3D 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); =20 if (bios_name =3D=3D NULL) @@ -223,7 +223,6 @@ static void ref405ep_init(MachineState *machine) /* Avoid an uninitialized variable warning */ bios_size =3D -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 =3D=3D NULL) bios_name =3D BIOS_FILENAME; bios =3D 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 =3D 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 =3D drive_get(IF_PFLASH, 0, fl_idx); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386747; cv=none; d=zohomail.com; s=zohoarc; b=j35NlapbUa2ba9f7Qwx0YZEZ1i+9K0tO8275e5glgJqXpJ3XC1b6R5ZQhRBgpWOHa5xtA+SrCIeMFrcx8bkqM950XLZH3rpjh3U3C9AV3AALgImfPTUMczTGiLkXQn7zzIVoRvE9BlJMhu90Q2n6ddFYu8QuUXYOFeumItokNko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386747; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AR3d9nNMRFmjviCA9QeiC7WRyBhxuQ8IV0t5Cc30NxA=; b=Yt1hQVIxuCt3KQnMBVIviDjzBy2DFrJDicjhh7plAzqmgAF4sM7E3zJDFPN24VAXcqDGlDX6d9zmftytjfq0PfktdSB21tx3/9h2f1b2XVov6s3b97oueB+ES7Hf2aXKZ5pFYh8jr6VColPIoTLdB/GYCfvkDcph7wG1Wt5ZTQU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386747925693.7927197949938; Mon, 16 Mar 2020 12:25:47 -0700 (PDT) Received: from localhost ([::1]:47597 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvMw-0002uG-UL for importer@patchew.org; Mon, 16 Mar 2020 15:25:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuqZ-0002cq-FH for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuqY-0003m2-A8 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:19 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:31564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuqY-0003jJ-5m for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:18 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-I_KV75HMM2WbPqyMyvwK_A-1; Mon, 16 Mar 2020 14:52:13 -0400 Received: by mail-ed1-f70.google.com with SMTP id dm17so13897392edb.3 for ; Mon, 16 Mar 2020 11:52:13 -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 e15sm51724eds.2.2020.03.16.11.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:52:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384737; 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=AR3d9nNMRFmjviCA9QeiC7WRyBhxuQ8IV0t5Cc30NxA=; b=UOnK+QCEAIduUtzR4WpmA2AzLmKpP3A60lQqZSaTecbukW+OpEPpBqGuToOna+4bayq3Sw F5s1t4HtsmR4OK+PS1G0PFZ9FLBcEiz7kpeoVPV53Hz5PU28YYabapfYnlv5AL2lEw7JT1 ViQmZSdbVhRBb6970xHBeFPsoVOgrGs= X-MC-Unique: I_KV75HMM2WbPqyMyvwK_A-1 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=TBpfmSRiP+jw9OHkhFWUdHoGBaG1dAqB4VuWEQEEYBw=; b=N/AF96zMqDodo5oiE1rcKA3o8oNThc5U6I1eCwm9A07buXKx44Fdfpr1GWTxaRzxkV ZzGvQnq6lQn8ZZWJX/KL34ZYidGZxnjaAG+6X8FCfLSBz+y6FHqZU9eClKuviIvQcMAS PsLU/WbfYWxMuVv5JzgtDfv6eqzjjdJr9nmi+McJ1jNY9wZby4i8DPPJH4Qci6U17hT9 RAT5dIK+V7AqxnrZkQuCitVuxsLbUG2zLVj9936RegHdG0qoo4N3/YhgA0Fc5iXZ2kOg IeatQhfbvR438uKv6CUyd7ttBWhSWf64V4qCZZA1w2x8fNadzN3SN8bwyhh7jCQDaTlH 5zzQ== X-Gm-Message-State: ANhLgQ08VkD0xt0J2TqswYXN5eaJY60BrPUxjWOM35SBRGSdiDCqEeJ3 ptihqANHR0qPZ4fJRFHRCjfcqhQ1U4OtpK9/8guCXAnLzrcZk8MnDxzMiIbCSpo2dSlx61nwbu5 omqh5JkTwrZkoY+w= X-Received: by 2002:a50:ab5a:: with SMTP id t26mr1490340edc.380.1584384732774; Mon, 16 Mar 2020 11:52:12 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsJAlBuLmYcN8n8KFL+8zOP47JcsAxX5A8HD5CQdNHCIL6+R6SB8mBOjKPnNRopA5/vp7Zr1Q== X-Received: by 2002:a50:ab5a:: with SMTP id t26mr1490321edc.380.1584384732567; Mon, 16 Mar 2020 11:52:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 24/25] hw/arm: Remove unnecessary memory_region_set_readonly() on ROM alias Date: Mon, 16 Mar 2020 19:50:05 +0100 Message-Id: <20200316185006.576-25-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 Content-Transfer-Encoding: quoted-printable 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: Igor Mitsyanko , Peter Maydell , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:Exynos" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/arm/exynos4210.c | 1 - hw/arm/stm32f205_soc.c | 1 - hw/arm/stm32f405_soc.c | 1 - 3 files changed, 3 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 3af6502a5e..4e1fd7edb3 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -320,7 +320,6 @@ static void exynos4210_realize(DeviceState *socdev, Err= or **errp) &s->irom_mem, 0, EXYNOS4210_IROM_SIZE); - memory_region_set_readonly(&s->irom_alias_mem, true); memory_region_add_subregion(system_mem, EXYNOS4210_IROM_MIRROR_BASE_AD= DR, &s->irom_alias_mem); =20 diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 2de56275b7..6e93726d45 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -97,7 +97,6 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, E= rror **errp) &error_fatal); memory_region_init_alias(flash_alias, NULL, "STM32F205.flash.alias", flash, 0, FLASH_SIZE); - memory_region_set_readonly(flash_alias, true); =20 memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, flash); memory_region_add_subregion(system_memory, 0, flash_alias); diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index b8fca13f95..d590cd040d 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -103,7 +103,6 @@ static void stm32f405_soc_realize(DeviceState *dev_soc,= Error **errp) } memory_region_init_alias(&s->flash_alias, NULL, "STM32F405.flash.alias= ", &s->flash, 0, FLASH_SIZE); - memory_region_set_readonly(&s->flash_alias, true); =20 memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->fla= sh); memory_region_add_subregion(system_memory, 0, &s->flash_alias); --=20 2.21.1 From nobody Tue May 7 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584386485; cv=none; d=zohomail.com; s=zohoarc; b=V/iz2OSqE3roNNxjJ8nqLvPaa1QZerVmjbUaNtFQ4JybMnmJsIRBLCosQKKRNakK4ujRWQd9bs9VkHAeiiNY6LUJzapOITMh7vt5bnAnJb3ZQQwcdSqXtv1NieO/KtLv8yWpPGL5XmbUdLInKKnF+X3kA7f94uFbGey4jCi0MrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584386485; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nSn2lPNygsuyqxypctwa2HhS4HNcXNOkHOgnXb5MZLE=; b=Y6K6GBikfTbAgQHiL/56zUl+iBSfHH5xVg/1qBOgqZyOhNrlF6Ww5KprtS5N+J2elT1Imac14OLHNqGm5yb2AMfNK0ZRR7jnfURDAFLiQSmwZaF/V3S62qfQEB8Rtjhi2lS4oxOhTMrQUOwiGTWH/Ug44nFeb3SaYx58eTHzPd0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584386485613275.5649144880829; Mon, 16 Mar 2020 12:21:25 -0700 (PDT) Received: from localhost ([::1]:47480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDvIi-0003NO-4l for importer@patchew.org; Mon, 16 Mar 2020 15:21:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41078) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDuqe-0002mO-Fj for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDuqc-0004Dl-Co for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:24 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:40162) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDuqc-0004BB-7I for qemu-devel@nongnu.org; Mon, 16 Mar 2020 14:52:22 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-BGeylHI-NLWBFDlH4Gfydg-1; Mon, 16 Mar 2020 14:52:19 -0400 Received: by mail-wr1-f70.google.com with SMTP id q18so9453832wrw.5 for ; Mon, 16 Mar 2020 11:52:19 -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 b202sm805866wmd.15.2020.03.16.11.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 11:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584384741; 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=nSn2lPNygsuyqxypctwa2HhS4HNcXNOkHOgnXb5MZLE=; b=J192ECI/IOTUy1x6EL/ldhYgj/6fjPwoBdNnnO2cvq7S367WnKGZAVXQebNRCgOpqjTMpZ 3wTdUYGoK85JPXIrd0cuu/VGK/JIAvIOkJ32HsQNvM4KiU9gapzoOmn/mPhmaV7lYqiVr4 u7LcUjU2mbl02kQipjQaluKzLscXlk0= X-MC-Unique: BGeylHI-NLWBFDlH4Gfydg-1 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=jqS9Y63rT1HpddkVE7OyIkA9y6lX72u9ux/N6yXNBu4=; b=ai/QvhHdhfXcAAcT9VpIT4zhppl5n9QdKACJIvEBij21hayQ9osNGv07zup//nodKa k61oITSUsYjPGo/yZllBXzIQSZRVr7RUzCerD3Zi0RCCMifRSuT+sHD4Ci7Kpzw+efDG b6/zgRAo13dtDCXQTEs+FyGaKj/BP/GMsAv6PWVcgw2BnkxyR0/3H8JZhK4eshqPBtfv /l5WPmTc61mQnUfeGeT9pMAgAL0p+7vFmuwVK8FG6hOe6Gm/6xXZy9Cz1lXngKOVcwcZ RYgzQ38KQqBI0T75C2oXXrcaUTbrKN4ZP3jHl+ajyN381VvWFzSlg7czAuboTy08Uzvw BgHA== X-Gm-Message-State: ANhLgQ0Z8HAFYC3b5Z4+aqrY0Jo30/wFuW/DX5SFbpHgvc+BZ+7CPbqx Np5jlV5Luv8mO2dCgDRIBzcK3zoXPpuqp+C/iwZAtZwB26cr+7pL5CASfLRP58jV/ptqcMm3MQX GgAOKaTEDiYOqbkA= X-Received: by 2002:a5d:4b8a:: with SMTP id b10mr791792wrt.8.1584384738533; Mon, 16 Mar 2020 11:52:18 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsT46wUJQnSyTuqCa/NnPlYpaKk5DsQq9dh+kDm0JGpWfj3QwrwNKqpv5QyzFklW4n6809YSw== X-Received: by 2002:a5d:4b8a:: with SMTP id b10mr791751wrt.8.1584384738073; Mon, 16 Mar 2020 11:52:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v3 25/25] hw/arm: Let devices own the MemoryRegion they create Date: Mon, 16 Mar 2020 19:50:06 +0100 Message-Id: <20200316185006.576-26-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 Content-Transfer-Encoding: quoted-printable 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 , Igor Mitsyanko , Alistair Francis , Subbaraya Sundeep , "open list:Exynos" , Peter Chubb , Joel Stanley , "Edgar E. Iglesias" , Jean-Christophe Dubois , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Avoid orphan memory regions being added in the /unattached QOM container. This commit was produced with the Coccinelle script scripts/coccinelle/memory-region-housekeeping.cocci. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/arm/exynos4210.c | 12 ++++++------ hw/arm/fsl-imx25.c | 10 +++++----- hw/arm/fsl-imx31.c | 6 +++--- hw/arm/fsl-imx6.c | 6 +++--- hw/arm/fsl-imx6ul.c | 9 +++++---- hw/arm/msf2-soc.c | 6 +++--- hw/arm/nrf51_soc.c | 2 +- hw/arm/stm32f205_soc.c | 8 ++++---- hw/arm/stm32f405_soc.c | 9 +++++---- hw/arm/xlnx-zynqmp.c | 11 +++++------ 10 files changed, 40 insertions(+), 39 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 4e1fd7edb3..1f7253ef6f 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -305,20 +305,20 @@ static void exynos4210_realize(DeviceState *socdev, E= rror **errp) /*** Memory ***/ =20 /* Chip-ID and OMR */ - memory_region_init_io(&s->chipid_mem, NULL, &exynos4210_chipid_and_omr= _ops, - NULL, "exynos4210.chipid", sizeof(chipid_and_omr)); + memory_region_init_io(&s->chipid_mem, OBJECT(socdev), + &exynos4210_chipid_and_omr_ops, NULL, + "exynos4210.chipid", sizeof(chipid_and_omr)); memory_region_add_subregion(system_mem, EXYNOS4210_CHIPID_ADDR, &s->chipid_mem); =20 /* Internal ROM */ - memory_region_init_rom(&s->irom_mem, NULL, "exynos4210.irom", + memory_region_init_rom(&s->irom_mem, OBJECT(socdev), "exynos4210.irom", EXYNOS4210_IROM_SIZE, &error_fatal); memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR, &s->irom_mem); /* mirror of iROM */ - memory_region_init_alias(&s->irom_alias_mem, NULL, "exynos4210.irom_al= ias", - &s->irom_mem, - 0, + memory_region_init_alias(&s->irom_alias_mem, OBJECT(socdev), + "exynos4210.irom_alias", &s->irom_mem, 0, EXYNOS4210_IROM_SIZE); memory_region_add_subregion(system_mem, EXYNOS4210_IROM_MIRROR_BASE_AD= DR, &s->irom_alias_mem); diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index a3f829f436..6f1a82ce3d 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -303,16 +303,16 @@ static void fsl_imx25_realize(DeviceState *dev, Error= **errp) } =20 /* initialize 2 x 16 KB ROM */ - memory_region_init_rom(&s->rom[0], NULL, - "imx25.rom0", FSL_IMX25_ROM0_SIZE, &err); + memory_region_init_rom(&s->rom[0], OBJECT(dev), "imx25.rom0", + FSL_IMX25_ROM0_SIZE, &err); if (err) { error_propagate(errp, err); return; } memory_region_add_subregion(get_system_memory(), FSL_IMX25_ROM0_ADDR, &s->rom[0]); - memory_region_init_rom(&s->rom[1], NULL, - "imx25.rom1", FSL_IMX25_ROM1_SIZE, &err); + memory_region_init_rom(&s->rom[1], OBJECT(dev), "imx25.rom1", + FSL_IMX25_ROM1_SIZE, &err); if (err) { error_propagate(errp, err); return; @@ -331,7 +331,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error *= *errp) &s->iram); =20 /* internal RAM (128 KB) is aliased over 128 MB - 128 KB */ - memory_region_init_alias(&s->iram_alias, NULL, "imx25.iram_alias", + memory_region_init_alias(&s->iram_alias, OBJECT(dev), "imx25.iram_alia= s", &s->iram, 0, FSL_IMX25_IRAM_ALIAS_SIZE); memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ALIAS_= ADDR, &s->iram_alias); diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 55e90d104b..8472d2e911 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -206,7 +206,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error *= *errp) } =20 /* On a real system, the first 16k is a `secure boot rom' */ - memory_region_init_rom(&s->secure_rom, NULL, "imx31.secure_rom", + memory_region_init_rom(&s->secure_rom, OBJECT(dev), "imx31.secure_rom", FSL_IMX31_SECURE_ROM_SIZE, &err); if (err) { error_propagate(errp, err); @@ -216,7 +216,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error *= *errp) &s->secure_rom); =20 /* There is also a 16k ROM */ - memory_region_init_rom(&s->rom, NULL, "imx31.rom", + memory_region_init_rom(&s->rom, OBJECT(dev), "imx31.rom", FSL_IMX31_ROM_SIZE, &err); if (err) { error_propagate(errp, err); @@ -236,7 +236,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error *= *errp) &s->iram); =20 /* internal RAM (16 KB) is aliased over 256 MB - 16 KB */ - memory_region_init_alias(&s->iram_alias, NULL, "imx31.iram_alias", + memory_region_init_alias(&s->iram_alias, OBJECT(dev), "imx31.iram_alia= s", &s->iram, 0, FSL_IMX31_IRAM_ALIAS_SIZE); memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ALIAS_= ADDR, &s->iram_alias); diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index ecc62855f2..9c09f71435 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -405,7 +405,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) } =20 /* ROM memory */ - memory_region_init_rom(&s->rom, NULL, "imx6.rom", + memory_region_init_rom(&s->rom, OBJECT(dev), "imx6.rom", FSL_IMX6_ROM_SIZE, &err); if (err) { error_propagate(errp, err); @@ -415,7 +415,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) &s->rom); =20 /* CAAM memory */ - memory_region_init_rom(&s->caam, NULL, "imx6.caam", + memory_region_init_rom(&s->caam, OBJECT(dev), "imx6.caam", FSL_IMX6_CAAM_MEM_SIZE, &err); if (err) { error_propagate(errp, err); @@ -435,7 +435,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) &s->ocram); =20 /* internal OCRAM (256 KB) is aliased over 1 MB */ - memory_region_init_alias(&s->ocram_alias, NULL, "imx6.ocram_alias", + memory_region_init_alias(&s->ocram_alias, OBJECT(dev), "imx6.ocram_ali= as", &s->ocram, 0, FSL_IMX6_OCRAM_ALIAS_SIZE); memory_region_add_subregion(get_system_memory(), FSL_IMX6_OCRAM_ALIAS_= ADDR, &s->ocram_alias); diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index c405b68d1d..f4a9ed6c4f 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -543,7 +543,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error = **errp) /* * ROM memory */ - memory_region_init_rom(&s->rom, NULL, "imx6ul.rom", + memory_region_init_rom(&s->rom, OBJECT(dev), "imx6ul.rom", FSL_IMX6UL_ROM_SIZE, &error_abort); memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_ROM_ADDR, &s->rom); @@ -551,7 +551,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error = **errp) /* * CAAM memory */ - memory_region_init_rom(&s->caam, NULL, "imx6ul.caam", + memory_region_init_rom(&s->caam, OBJECT(dev), "imx6ul.caam", FSL_IMX6UL_CAAM_MEM_SIZE, &error_abort); memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_CAAM_MEM_A= DDR, &s->caam); @@ -568,8 +568,9 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error = **errp) /* * internal OCRAM (128 KB) is aliased over 512 KB */ - memory_region_init_alias(&s->ocram_alias, NULL, "imx6ul.ocram_alias", - &s->ocram, 0, FSL_IMX6UL_OCRAM_ALIAS_SIZE); + memory_region_init_alias(&s->ocram_alias, OBJECT(dev), + "imx6ul.ocram_alias", &s->ocram, 0, + FSL_IMX6UL_OCRAM_ALIAS_SIZE); memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_OCRAM_ALIAS_ADDR, &s->ocram_ali= as); } diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 8f84692e64..588d643b8d 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -96,7 +96,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Erro= r **errp) MemoryRegion *nvm_alias =3D g_new(MemoryRegion, 1); MemoryRegion *sram =3D g_new(MemoryRegion, 1); =20 - memory_region_init_rom(nvm, NULL, "MSF2.eNVM", s->envm_size, + memory_region_init_rom(nvm, OBJECT(dev_soc), "MSF2.eNVM", s->envm_size, &error_fatal); /* * On power-on, the eNVM region 0x60000000 is automatically @@ -104,8 +104,8 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Er= ror **errp) * start address (0x0). We do not support remapping other eNVM, * eSRAM and DDR regions by guest(via Sysreg) currently. */ - memory_region_init_alias(nvm_alias, NULL, "MSF2.eNVM", - nvm, 0, s->envm_size); + memory_region_init_alias(nvm_alias, OBJECT(dev_soc), "MSF2.eNVM", nvm,= 0, + s->envm_size); =20 memory_region_add_subregion(system_memory, ENVM_BASE_ADDRESS, nvm); memory_region_add_subregion(system_memory, 0, nvm_alias); diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 4817a76ae0..57eff63f0d 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -165,7 +165,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Err= or **errp) } =20 /* STUB Peripherals */ - memory_region_init_io(&s->clock, NULL, &clock_ops, NULL, + memory_region_init_io(&s->clock, OBJECT(dev_soc), &clock_ops, NULL, "nrf51_soc.clock", 0x1000); memory_region_add_subregion_overlap(&s->container, NRF51_IOMEM_BASE, &s->clock, -1); diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 6e93726d45..118c342559 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -93,10 +93,10 @@ static void stm32f205_soc_realize(DeviceState *dev_soc,= Error **errp) MemoryRegion *flash =3D g_new(MemoryRegion, 1); MemoryRegion *flash_alias =3D g_new(MemoryRegion, 1); =20 - memory_region_init_rom(flash, NULL, "STM32F205.flash", FLASH_SIZE, - &error_fatal); - memory_region_init_alias(flash_alias, NULL, "STM32F205.flash.alias", - flash, 0, FLASH_SIZE); + memory_region_init_rom(flash, OBJECT(dev_soc), "STM32F205.flash", + FLASH_SIZE, &error_fatal); + memory_region_init_alias(flash_alias, OBJECT(dev_soc), + "STM32F205.flash.alias", flash, 0, FLASH_SIZE= ); =20 memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, flash); memory_region_add_subregion(system_memory, 0, flash_alias); diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index d590cd040d..4f10ce6176 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -95,14 +95,15 @@ static void stm32f405_soc_realize(DeviceState *dev_soc,= Error **errp) Error *err =3D NULL; int i; =20 - memory_region_init_rom(&s->flash, NULL, "STM32F405.flash", FLASH_SIZE, - &err); + memory_region_init_rom(&s->flash, OBJECT(dev_soc), "STM32F405.flash", + FLASH_SIZE, &err); if (err !=3D NULL) { error_propagate(errp, err); return; } - memory_region_init_alias(&s->flash_alias, NULL, "STM32F405.flash.alias= ", - &s->flash, 0, FLASH_SIZE); + memory_region_init_alias(&s->flash_alias, OBJECT(dev_soc), + "STM32F405.flash.alias", &s->flash, 0, + FLASH_SIZE); =20 memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->fla= sh); memory_region_add_subregion(system_memory, 0, &s->flash_alias); diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index cab0160ae9..49f1c8d0de 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -318,9 +318,9 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) ddr_low_size =3D XLNX_ZYNQMP_MAX_LOW_RAM_SIZE; ddr_high_size =3D ram_size - XLNX_ZYNQMP_MAX_LOW_RAM_SIZE; =20 - memory_region_init_alias(&s->ddr_ram_high, NULL, - "ddr-ram-high", s->ddr_ram, - ddr_low_size, ddr_high_size); + memory_region_init_alias(&s->ddr_ram_high, OBJECT(dev), + "ddr-ram-high", s->ddr_ram, ddr_low_size, + ddr_high_size); memory_region_add_subregion(get_system_memory(), XLNX_ZYNQMP_HIGH_RAM_START, &s->ddr_ram_high); @@ -330,9 +330,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) ddr_low_size =3D ram_size; } =20 - memory_region_init_alias(&s->ddr_ram_low, NULL, - "ddr-ram-low", s->ddr_ram, - 0, ddr_low_size); + memory_region_init_alias(&s->ddr_ram_low, OBJECT(dev), "ddr-ram-low", + s->ddr_ram, 0, ddr_low_size); memory_region_add_subregion(get_system_memory(), 0, &s->ddr_ram_low); =20 /* Create the four OCM banks */ --=20 2.21.1