From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 655DBC38BE2 for ; Mon, 24 Feb 2020 20:50:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E545218AC for ; Mon, 24 Feb 2020 20:50:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UJiKXsqY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E545218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Kg1-0003oj-AJ for qemu-devel@archiver.kernel.org; Mon, 24 Feb 2020 15:50:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48566) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Keg-0000n2-Ah for qemu-devel@nongnu.org; Mon, 24 Feb 2020 15:48:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Kef-00060T-9W for qemu-devel@nongnu.org; Mon, 24 Feb 2020 15:48:42 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28934 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Kef-000609-5a for qemu-devel@nongnu.org; Mon, 24 Feb 2020 15:48:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582577320; 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=aBf1Nz3dO7lmnq6x8HgckUD4/9P7/UEzlUI+mgbV/5Q=; b=UJiKXsqYoZH39Vy5amsYnhSHCMJV/gludANRIJ09mbCqgVyo36ppRn7P/6pfg79bCmdw79 eNjUfKhyyIOoF0yozO5EjDzVSf7Hnzww4O9Co8avW9Zw7YZWzQ8dJyo5TXnUsP4SA7hcFA VZ08XcQbH5m/T1tYrG0Kknty01Lg6rw= 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-426-E_QdaMtbMTSy5Mf8Nm1AAg-1; Mon, 24 Feb 2020 15:48:35 -0500 X-MC-Unique: E_QdaMtbMTSy5Mf8Nm1AAg-1 Received: by mail-wr1-f72.google.com with SMTP id c6so6133889wrm.18 for ; Mon, 24 Feb 2020 12:48:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T9F9enB4mqr+YPnaVrLHGBnKs+NXe+icyfAm27ef64A=; b=BKYNsZYGPCTxRzw7n1ZqwLReiMbYj3JtCZQZG9VIJ/bSjXFEh4G+JWChVUw4vZmusP BI/xHqlDrV0ch0WMevHHz3TSgg5Uc4uQ2MjThhPbG4XipOxgQy2UpEixmdHtGaCU4rBU n78quzIut0oGVAnk58kaHR2h9JZPgnAnBg68mfSRLiTSWzglpDbYnvupFL4bMA8gbAls ZwekINYGYsgpYEq7ZtvfgAO0Xt8CLBbLrgVEeRNaFhcCC2za2AsHUqZ8/7gM2OY7wGd8 WMlXYjXKGGr9zV0j1x7iGrp8XEZ2r7hhkv/Cv/CWXWhvDKI3y2RM9Djw23EJPdiq3D0h toVQ== X-Gm-Message-State: APjAAAW8SQoMOGgYzQqPnss2rgMsThqmK5UQkpC90bKik8N+2nnl3otE xVUh06DMKIR/XZ13hiBHtL/jxNQy9jSYpwUXO1sa41lUtB7bIpsi3HRXkwLocDIVeuH/RNtfw8A Q/kWBOG6wSzdyQf4= X-Received: by 2002:a7b:c759:: with SMTP id w25mr805780wmk.15.1582577314794; Mon, 24 Feb 2020 12:48:34 -0800 (PST) X-Google-Smtp-Source: APXvYqwxBizVAfehGk3miduLVPYkPJAIfgR+35+r8qEsbPuDdZQRaeyaOJy4zQqQ4Y2N2h4q3ZdVrQ== X-Received: by 2002:a7b:c759:: with SMTP id w25mr805686wmk.15.1582577313662; Mon, 24 Feb 2020 12:48:33 -0800 (PST) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id t81sm863436wmg.6.2020.02.24.12.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 12:48:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH v2 01/32] memory: Correctly return alias region type Date: Mon, 24 Feb 2020 21:47:57 +0100 Message-Id: <20200224204828.23167-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200224204828.23167-1-philmd@redhat.com> References: <20200224204828.23167-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Sagar Karandikar , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , KONRAD Frederic , Alistair Francis , "Edgar E. Iglesias" , Max Reitz , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Magnus Damm , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Joel Stanley , Palmer Dabbelt , Aleksandar Rikalo , Richard Henderson , Artyom Tarasenko , Eduardo Habkost , Alistair Francis , Fabien Chouteau , qemu-arm@nongnu.org, Peter Chubb , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Subbaraya Sundeep , David Gibson , Kevin Wolf , qemu-riscv@nongnu.org, Igor Mitsyanko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Jean-Christophe Dubois , Michael Walle , qemu-ppc@nongnu.org, Aleksandar Markovic , Bastian Koppelmann , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- Cc: qemu-trivial@nongnu.org memory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/memory.c b/memory.c index aeaa8dcc9e..ce1179874e 100644 --- a/memory.c +++ b/memory.c @@ -2818,6 +2818,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 mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j6Keg-0000mr-Ae for mharc-qemu-riscv@gnu.org; Mon, 24 Feb 2020 15:48:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48464) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Kee-0000mB-B9 for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Kec-0005vT-NU for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:40 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44617 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Kec-0005uV-IR for qemu-riscv@nongnu.org; Mon, 24 Feb 2020 15:48:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582577317; 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=aBf1Nz3dO7lmnq6x8HgckUD4/9P7/UEzlUI+mgbV/5Q=; b=XMj7UkRy2EpxhnTeNtl2VVqUfFnxHqfFiLuDbQCuM9B7KNj6x/QlXSe9Dtze/eNk9x2/U3 +6PQU0RI3AUYB15gHeKDUfCq/1U0yPNBMhb1SYEGciP9jmcdsW6wEiXVl5Pw/KoAH1VCVU Bot3eIAmmMkzuDVrDtxWRkC2dBAziSg= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-111-HDVdCyIaNWieDjgOxoR6Ig-1; Mon, 24 Feb 2020 15:48:35 -0500 X-MC-Unique: HDVdCyIaNWieDjgOxoR6Ig-1 Received: by mail-wm1-f69.google.com with SMTP id n17so244857wmk.1 for ; Mon, 24 Feb 2020 12:48:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T9F9enB4mqr+YPnaVrLHGBnKs+NXe+icyfAm27ef64A=; b=ud+EoqvvnZ2Q7k7xSWPoCgLn7GzEVo47xdf7zAjz66sY7AEd84sNaWMpMwnnBSmcki A3dK2pJgH7MMbNdPV7t7RmrsVItqWUFctblOn500t7co3U9zhkPA4B9ixL4mmnAIIQjj x9GQLSoR+NmS67XuVkG7DmtfWxadty365a8JuXXOGbHjkJRfNzZBmKE58fQSINR9gwLh ap6WEv9qTHfOhPVRORWakEgSrYMA71PvQG+41e3Ogx/ceU6/BkFg/GN5+FpWDsSedbW4 tjxHaAEvqW4DgzrG0G4Tyc3zy5LIWoLDnZd8jek1/mZoeiSfuEkrywljQ6xOS1hZyq80 tWng== X-Gm-Message-State: APjAAAVMhxfZ4RnHr94xrMoBzt/4F6QWbk0zWMlPvhtIp7Zw2FcoFvO3 PzZ1AHeFwq4i22ciRnK8yF55PdoYj4I14N9Bv8kgIvJ8kCBi8l4GXIkBfoUitHXMp3bycQBqn8Q obcUaNOaIZTF4Cng= X-Received: by 2002:a7b:c759:: with SMTP id w25mr805779wmk.15.1582577314794; Mon, 24 Feb 2020 12:48:34 -0800 (PST) X-Google-Smtp-Source: APXvYqwxBizVAfehGk3miduLVPYkPJAIfgR+35+r8qEsbPuDdZQRaeyaOJy4zQqQ4Y2N2h4q3ZdVrQ== X-Received: by 2002:a7b:c759:: with SMTP id w25mr805686wmk.15.1582577313662; Mon, 24 Feb 2020 12:48:33 -0800 (PST) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id t81sm863436wmg.6.2020.02.24.12.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 12:48:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org Cc: Joel Stanley , Laurent Vivier , Aleksandar Markovic , Richard Henderson , Andrzej Zaborowski , KONRAD Frederic , Peter Chubb , Palmer Dabbelt , Michael Walle , Max Reitz , "Edgar E. Iglesias" , Marcel Apfelbaum , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, Magnus Damm , Subbaraya Sundeep , David Gibson , Eduardo Habkost , Jean-Christophe Dubois , Sagar Karandikar , Igor Mitsyanko , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, Mark Cave-Ayland , Aurelien Jarno , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Bastian Koppelmann , Fabien Chouteau , Alistair Francis , Kevin Wolf , Aleksandar Rikalo , qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , Artyom Tarasenko , qemu-trivial@nongnu.org Subject: [PATCH v2 01/32] memory: Correctly return alias region type Date: Mon, 24 Feb 2020 21:47:57 +0100 Message-Id: <20200224204828.23167-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200224204828.23167-1-philmd@redhat.com> References: <20200224204828.23167-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 20:48:41 -0000 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 --- Cc: qemu-trivial@nongnu.org memory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/memory.c b/memory.c index aeaa8dcc9e..ce1179874e 100644 --- a/memory.c +++ b/memory.c @@ -2818,6 +2818,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