From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170803; cv=none; d=zohomail.com; s=zohoarc; b=n6BVhv5UUg5pZohsw4wWC5Ch2TaIviOeiS6hXCUmBZIQ0k5TFJhTm7B1AG+LBOyZujybU+XKzQ/OGEw+EEKKOzrYB3YXl43PfatLM3umHbAQMHJnQPk4N/NDl3cMSchrLrrnXLd/VcGkiONB9Vh4tReV0NMvzy0vSGu1ZhRBL8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170803; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o8vf9ta3nqwm/Fyb5G7ZjHvxKsRPPnP+TTAqHaMFdKE=; b=loSTmglzxGRMUPAHmSVSxUc8U+/fZ9OiaZRJJpFqTEirhxXGJ5zBrzn0D+KaMQWs0JxgC+FaGsY6wLLKCvd1RkEAdSpoY7NVAkq4/LvsyuBIkXQvfom324Ekj15eDX4VPGp+XZ6adQr2uhhtEAIjEeaSmtotpCvLASAzERN2OXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170803629326.32439402370494; Mon, 29 Sep 2025 11:33:23 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133115.1471290 (Exim 4.92) (envelope-from ) id 1v3IgM-0000wG-Es; Mon, 29 Sep 2025 18:33:06 +0000 Received: by outflank-mailman (output) from mailman id 1133115.1471290; Mon, 29 Sep 2025 18:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IgM-0000w9-C5; Mon, 29 Sep 2025 18:33:06 +0000 Received: by outflank-mailman (input) for mailman id 1133115; Mon, 29 Sep 2025 18:33:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IgK-0000iD-Sw for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:04 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bbcaa35d-9d62-11f0-9809-7dc792cee155; Mon, 29 Sep 2025 20:33:03 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-46e2e363118so49025485e9.0 for ; Mon, 29 Sep 2025 11:33:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fc88b0779sm19057657f8f.58.2025.09.29.11.33.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:02 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bbcaa35d-9d62-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170783; x=1759775583; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o8vf9ta3nqwm/Fyb5G7ZjHvxKsRPPnP+TTAqHaMFdKE=; b=BxFF1A6aSFT9Lh5ufG7ZKqr/zqzAHro76dWDLVcVuNzi4LROc/uw9J+3L7AgKk0nk+ UCB+nAbGe43nut/lMYTYkCSwlVMpAmBDlyQ1xffFBl4ddR6t/Jq4piStF7HzQSxPYjQ1 V/bcBjImLtDVrg2kYCtpocYyey469IRA5hT6rnmp5BshoxQvMxF8fL9WByfqev+P7/lN s/8HRjWc+HddoGog8HL+U8yU7OqYamNa6svgOft8JnJ5/c+rPPLn2N9omt73cepGRgd4 1rX742C5sRjhqgeIMVqtGNh2EX1NfsPF6jhBkwBLAJgD0SLOXw2hYWPCozN2hhJqphT1 iSgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170783; x=1759775583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o8vf9ta3nqwm/Fyb5G7ZjHvxKsRPPnP+TTAqHaMFdKE=; b=kovjke9VJCd4vPIz+DpAWOhtRsJp60ZbUJusQP7yMq/YRnPCWWdZPomtQ1FEub7Of2 v20JVYEPlDwAsoqHUUv2qgZNYLzhDQVnchiV8vmrOhZLILn1AjUD3zsXu4fRAK8H7xH1 rbDBmhjODsVkFAjlGocBxQTQcaFP5nyXfP0nW77OQZHWX/XcUlad/Z+5WOIWALrEBuGg Jfbxa5vTtlIVP8rx3V8V/jTZUbzk4T9w5UH05z9dPkOyMkoIjLtnYVrN8hCGjg1jd0z8 dTYUWnbPLeB7q0gOuBRxQDkOMWNkk/xEwhgdZKW8jJCe+mdCOxvBnl15JX7wJ6XSzHFJ 6hrg== X-Forwarded-Encrypted: i=1; AJvYcCXIt/4eSobyfwv0UCUHxpN/CfVqe+f5f7Sb+h2RdjbzvbXNyp7irGQ/XENpM1Ap7Ez3uI7Mjrr/dv0=@lists.xenproject.org X-Gm-Message-State: AOJu0YwK3QWg5gSwN0fy2U3PZCYxmqnLlb27Cwwy3WCTM5LQ4Om3YwoY xIYUCzO09Ck3GW/tTib0oQgRhVCVa438roAb++QXpi4j/z6M1yHo+zT8UN91NIy//lo= X-Gm-Gg: ASbGnctb3xQnPhl0p5yZNXT2YGRggXtUPcqK5vbUph8Yfo8ZhwWM9s8wgR+Q87ZkglT KiXfpIolviWs4QX+fO+c2cpwl4lzpPTvXHBSB9T8LQyTgsbSEqc5R9HNt9v1Bc8mpqcwjOpLUqw OruL9NXQuL7rr3MH2dcc7eanabT4Tu3MJ1NENAemOTFjvYwSmH22/weNpzFG+gB22NGoFA0ZoHy s7v3gKCjwJ36pHsyRlGRYGIoqAdkAdvSWr1V0bXG80FRtnqFfzwdyxfym/x8elhh7MDvL84f76y lUxbLNzUTZOekBMVRps6p2ZbsiArS+oOmq4dITi0eLb93uWEzST885oWClXvyX1fdUnSQCjrexK 7/kn3rMy8yxFFKGCIHxn+uScFWEwxTjhYqOwOam2hsT2n/2MCMmXmqfGi0L6MOrbtmu7oqxV3GY Qph2KrYUk= X-Google-Smtp-Source: AGHT+IHvn5eYPMtDO5pcLQu1/TqV9ktVhW1E6kH/3j8sdOMbTO5qR8/yD6k9KVyFZbMuU0yLOSpWPQ== X-Received: by 2002:a05:600c:1508:b0:458:c094:8ba5 with SMTP id 5b1f17b1804b1-46e329b62bcmr112008465e9.12.1759170782675; Mon, 29 Sep 2025 11:33:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 01/15] docs/devel/loads-stores: Stop mentioning cpu_physical_memory_write_rom() Date: Mon, 29 Sep 2025 20:32:40 +0200 Message-ID: <20250929183254.85478-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170805430116600 Update the documentation after commit 3c8133f9737 ("Rename cpu_physical_memory_write_rom() to address_space_write_rom()"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/loads-stores.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 9471bac8599..f9b565da57a 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -474,7 +474,7 @@ This function is intended for use by the GDB stub and s= imilar code. It takes a virtual address, converts it to a physical address via an MMU lookup using the current settings of the specified CPU, and then performs the access (using ``address_space_rw`` for -reads or ``cpu_physical_memory_write_rom`` for writes). +reads or ``address_space_write_rom`` for writes). This means that if the access is a write to a ROM then this function will modify the contents (whereas a normal guest CPU access would ignore the write attempt). --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170811; cv=none; d=zohomail.com; s=zohoarc; b=eKtPxGxkO7CCSNNVkXDFuGco13xYnCwC9CkjraoEr+i3wEUdrGyZ+q1ThJ9b+frOio6MR4OaSWH6jO8X0njINZ83DLl1y9yq5cIGxGpKUHIOusVmy+74heOg7tL62Yd0vmYspY5rAtGTXBbqimU9FduGYsTcoLAPD0sp53QvpOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170811; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rGMp7t36URRQSytZ84th6z88iiyCKyUd2WF0ymWy9Sc=; b=RzXsaFrR7I99P3nyAEOwbpPYakEEXOwp7rPu2hb08DLLBVYf3KSx+kDtMvjZ2/qwh606l/RalV0Etv/q7ML/lz0dx6W43EkxLdy8kIg7Vh9002qsbVp6CxBKmhQikKfyT88u9RRv4EVf7DlG9yXmhPpNiC8IyQshRIBM72UhygA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170811621539.3093067534601; Mon, 29 Sep 2025 11:33:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133116.1471300 (Exim 4.92) (envelope-from ) id 1v3IgR-0001DZ-R3; Mon, 29 Sep 2025 18:33:11 +0000 Received: by outflank-mailman (output) from mailman id 1133116.1471300; Mon, 29 Sep 2025 18:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IgR-0001DQ-OH; Mon, 29 Sep 2025 18:33:11 +0000 Received: by outflank-mailman (input) for mailman id 1133116; Mon, 29 Sep 2025 18:33:10 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IgQ-0000iD-Bw for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:10 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bf092008-9d62-11f0-9809-7dc792cee155; Mon, 29 Sep 2025 20:33:08 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46e2e6a708fso32634665e9.0 for ; Mon, 29 Sep 2025 11:33:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fc5602f15sm19310452f8f.39.2025.09.29.11.33.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:07 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bf092008-9d62-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170788; x=1759775588; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rGMp7t36URRQSytZ84th6z88iiyCKyUd2WF0ymWy9Sc=; b=bkg76a5r4eVsmU0pu9ZzzVUVDnDKMWB8BiF7gykQDQI4Rb0QrVsg2iEMazeUi3n8NO 8CuH11s81FtNP66bcG8eGu0wgLDYyZyw87YJRmND338QFCvOZ/gWUWDI2grA/w/GGLWm SBcMnr/qyl7j5FNy9MkyLhp7Q3QA4XYyHRZRVV1URqoReAYD8wlH5o7X09ASTscvEog0 B57Plxi2Xkml8obROdsB+7pK6Ue47Ob7rsmdYqFxu8btO9ENUcoGRp9vK9NOP+5z2sWP 01WYvawR+BWYnkjxc9fzhhB/7hTC4WyO1Ex3W29jTpMwRGVppYatXuW+ZX18yuMZiXuP 7p6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170788; x=1759775588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rGMp7t36URRQSytZ84th6z88iiyCKyUd2WF0ymWy9Sc=; b=K1aCXBeGjYPka6u0b+JSRoMZy/2gVpMfCDDZMXoOUqzkpus+vkdQyiEkWUXM+gG87I 8wPYbbmT/SJ34AnD4WYGoovd3OaGqipzg41Z/AU4lQE5//X4icQtoDpG0nhlUzmRVkUD Qu3QX2BaSk4m0UWuWMt77O3RFk78pzuW8zNIClmt7o8A7wBaZSJgW8WkpkkkQ6G/dHXS J3BAFHgqFneylDvneuQAbPQu5VP5qSlRmlI1QyhFEvnR2uChn5j1G2Ou0ItQJuxLHU0S lsNQ8vRecVHtxlOkKLmRg2VhqQkRBg+Q5CAna1iJQHhT+vIuOx1ukKwt/rQ3Ct+sZZqF n0kQ== X-Forwarded-Encrypted: i=1; AJvYcCUynGZ8iVtCyNxfSmby61XE1J95Be5Qg+iqij2/FrEq31Ta7mlO2W9QVZN8BR79v6zD7shdTe7VqLY=@lists.xenproject.org X-Gm-Message-State: AOJu0YxWhLSyxIJ34ostEqaG/L51UXw3VENJblvkGb6MByW9nTED5Lxu PNmE0SzssN2TmNL7J/+9arVPNyPeiWhSmYTuUnSnxo25Uj/UM3yta0/Plf6+TbW7GY4= X-Gm-Gg: ASbGncspl5WQ3FXJsUhI8u8kicxx8PXbf7P6nSKdaitkzqc9CAfIVxca0Z5L9+qth7v NlNK7AK+XkD7NmfTETnPMbbEzB56K3xTTuoY4qK2B6G5TKo04XP3k0aM2doMRF5rIKwFESsdyq0 xfzenu1GTTdhuHe17XiwDrXeUE24gH8QNF6yJ4E3k5D8oSwG5WpMq6aUmO2iGEhs1Z4VECgoh0P srfNLWVTqKXxf4NZv05GteV1fj1B7xijp0xcQ8rNr5kyXWYBz8KaVCN7bu9oBZTvCrz49kOSJld GY9Afd9zuby5ZDC3rS3KJBIizwm/0iHueX5h4DN4BBNSvGViouiZvMLXOEYbkVmiJM8VzRQmFVO sAHBO3zxc/7PdFi/K4Zsgzq5X34QfL0OPxKQFdRNNlM8q+Z8Vum9UGELBF4n5AS6YC8hwzP/U X-Google-Smtp-Source: AGHT+IHywbu3bHq36g4SNbzTfpiE+7B23z7rbV7w73oeTvg9ANkjyrRL+PYW3W+Y3jHxmFSC/MGdsQ== X-Received: by 2002:a05:600c:6303:b0:46e:376c:b1f0 with SMTP id 5b1f17b1804b1-46e376cb318mr142020765e9.7.1759170788090; Mon, 29 Sep 2025 11:33:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 02/15] system/memory: Factor address_space_memory_is_io() out Date: Mon, 29 Sep 2025 20:32:41 +0200 Message-ID: <20250929183254.85478-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170813390116600 Factor address_space_memory_is_io() out of cpu_physical_memory_is_io() passing the address space and range length as argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/memory.h | 10 ++++++++++ system/physmem.c | 21 ++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index aa85fc27a10..6cfa22d7a80 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -3029,6 +3029,16 @@ static inline MemoryRegion *address_space_translate(= AddressSpace *as, bool address_space_access_valid(AddressSpace *as, hwaddr addr, hwaddr len, bool is_write, MemTxAttrs attrs); =20 +/** + * address_space_memory_is_io: check whether an address space range is + * I/O memory. + * + * @as: #AddressSpace to be accessed + * @addr: address within that address space + * @len: length of the area to be checked + */ +bool address_space_memory_is_io(AddressSpace *as, hwaddr addr, hwaddr len); + /* address_space_map: map a physical memory region into a host virtual add= ress * * May map a subset of the requested range, given by and returned in @plen. diff --git a/system/physmem.c b/system/physmem.c index 8a8be3a80e2..18b3d38dc0c 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3358,6 +3358,17 @@ bool address_space_access_valid(AddressSpace *as, hw= addr addr, return flatview_access_valid(fv, addr, len, is_write, attrs); } =20 +bool address_space_memory_is_io(AddressSpace *as, hwaddr addr, hwaddr len) +{ + MemoryRegion*mr; + + RCU_READ_LOCK_GUARD(); + mr =3D address_space_translate(as, addr, &addr, &len, false, + MEMTXATTRS_UNSPECIFIED); + + return !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); +} + static hwaddr flatview_extend_translation(FlatView *fv, hwaddr addr, hwaddr target_len, @@ -3754,15 +3765,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, =20 bool cpu_physical_memory_is_io(hwaddr phys_addr) { - MemoryRegion*mr; - hwaddr l =3D 1; - - RCU_READ_LOCK_GUARD(); - mr =3D address_space_translate(&address_space_memory, - phys_addr, &phys_addr, &l, false, - MEMTXATTRS_UNSPECIFIED); - - return !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); + return address_space_memory_is_io(&address_space_memory, phys_addr, 1); } =20 int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170811; cv=none; d=zohomail.com; s=zohoarc; b=nO+HTEUDKe4CWYmANZEMtoTlx3wwcT0r7f5t+7+g2+xn4MSRWZiAjUdk1LluUI78kWgZHJ+MHCusAGtIfU/VRGdC/y2U+n9BLx1iotCuEwKY1zGhkCD8izLoLqORGaZ29i+1j0Uv4yfHBCCR/2nRZ6iSqruk9dXTtHA8BQbEZmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170811; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=23QTyPjiy3YtVC18SQIGMGuPQmXq870ERJAMX9bHv6E=; b=aYaqhLgM960AZyDmKakIYnSY3hOOpx+Kq+vVRCb/nvUavatPbHNnyrcaTDuv+q7WwTbUgXHFaE5BFf48UWdRU29QZykrO77PqQAfDB7rv0zvzKAvslD5hDeyvTr5cggWuMj1eXVeyl5Dt4WmBrCWOFo8vSSPYdVRWLAi0VALhd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170811446571.5173567764003; Mon, 29 Sep 2025 11:33:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133118.1471309 (Exim 4.92) (envelope-from ) id 1v3IgX-0001Wd-19; Mon, 29 Sep 2025 18:33:17 +0000 Received: by outflank-mailman (output) from mailman id 1133118.1471309; Mon, 29 Sep 2025 18:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IgW-0001WP-Uj; Mon, 29 Sep 2025 18:33:16 +0000 Received: by outflank-mailman (input) for mailman id 1133118; Mon, 29 Sep 2025 18:33:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IgV-0001U2-Dm for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:15 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c241ef56-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:14 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3ece0e4c5faso4274681f8f.1 for ; Mon, 29 Sep 2025 11:33:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fb8811ae8sm19065012f8f.19.2025.09.29.11.33.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:13 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c241ef56-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170793; x=1759775593; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=23QTyPjiy3YtVC18SQIGMGuPQmXq870ERJAMX9bHv6E=; b=yz9Ho+iW6Hem25yjL6Z5dyrPGX8O43ZKREqA0rfTjODo/DoG02AahpMhJdcVQ/V42Y C0rj3lcUzIcDiYG2RWTtwuUotRFGvOiXOtMwgJSJ3b5JPj9vIkXs2fM2qcWQzOOYUf9K rHHVL/nnJq8V/QfR8DtZxxYOSiOwE1VoH3h+7o0aLV+j3SMFzeUMvLfDT6Rq93VeWQzV 6Ea7RplwNpv6wglQbxkgMhN6zapv1sfnd4v5Hqi88wVbdhtglB5iJ8rRcwJfMwUSgqQO kzn1WkqrSH/WAY5A7jy9u76iiBCuUgPlFddsa3hKkb2kqR6N94TrluD1mVJ71VgB42SA ZB+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170793; x=1759775593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=23QTyPjiy3YtVC18SQIGMGuPQmXq870ERJAMX9bHv6E=; b=O4G6VXDKwFxY8nkFwSWn+knRXlx/dw8Oe0G8XOHY701IrqLbYfe/q1ABThPCCWTjTc gRJafQ61mtiU8wk0TEyVBDc4jBPka/ZNfCboM/HwnjoyrDxBIc3JZR/bg/4P5tI7O5j2 W58WX+uzrgTp9/4stGFZeNEXl0VZ+HICvH6zU4smZmSGYF2c1Xtr3AkdtyINP0lrZuob FZJSBtvB65zhBXKCaXNVjQ4D35NJznJrnUCL00yqUwG0EVNKe/QR9Kgjey7Kb24Q+YtS W9LBpTlboDRMf72m4J0/placJQRI5GPOy7PD9ydSWePBtgiHJGCbe6HMFKe5/rHF5FwJ TTcg== X-Forwarded-Encrypted: i=1; AJvYcCUDRnW5lqXzifjfz0AUNJCo3jvRbxAOKV4LP8Cifp/70CW+f7ort3Lq/Fb9w+Guva8ShX2U72+kAag=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxkv391uu9tnlcrCa2+0j1SlFDO6LY0ScekUzZPkWi9Bxo5KWRN TbaNSMAScsq9lXVhNQRuCSS1yko9gb/bDItzsP+bVbrdpx+y7zG/CYid40er7ENjsbA= X-Gm-Gg: ASbGncvcDljKzIz1d/PKUnOpyg2hf2Te+8z97NOMIlxm7IPra/C2uWx86lcLoMxVA/T JZo3sCN1d1M1BGV3G2/nJlwgbn/PiW89RGB5AleKmThPjZ+cn4UgMlURenIObwJPnOIOsa72ZWF BJIgRpiflZmVnapiPKqNxTa8hiefN06qCMozlvR5kEpwmL2G2kj+8LE2bj0DHy4OXJeUodxd0Fn mXWCVeBLKdzUDmjMCO7hiQrHhB09UNWeRfvc7MOkxdqwig/mpee6FFnorHVRx+7OwdNXV8isKPs Qmm/AlWvVwAjj7IXiFYidaE/svYtTr1hNXFMYUw8hh6DPFaIt5iSWWj0sEezRGKTW0+Kc156fM/ QnOl2CJhEs1r6dRVcdvP8qGz7lG4Fm57XnIN7XzwubqeY+csoBPZf5etq9gcMV8Jf+QNSMGY0nq QeKO4vlaQ= X-Google-Smtp-Source: AGHT+IEcDsohAJY1q22fsASxxAoYQtWlMdbA7XCLoeuebdYNdITcBiYeKjk+UAJn3Z9pxuCxt6ME3A== X-Received: by 2002:a05:6000:2586:b0:3e7:65a6:dbf with SMTP id ffacd0b85a97d-40e429c9c42mr14229584f8f.6.1759170793465; Mon, 29 Sep 2025 11:33:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 03/15] target/i386/arch_memory_mapping: Use address_space_memory_is_io() Date: Mon, 29 Sep 2025 20:32:42 +0200 Message-ID: <20250929183254.85478-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170813462116600 Since all functions have an address space argument, it is trivial to replace cpu_physical_memory_is_io() by address_space_memory_is_io(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/arch_memory_mapping.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/arch_memory_mapping.c b/target/i386/arch_memory_ma= pping.c index a2398c21732..d596aa91549 100644 --- a/target/i386/arch_memory_mapping.c +++ b/target/i386/arch_memory_mapping.c @@ -35,7 +35,7 @@ static void walk_pte(MemoryMappingList *list, AddressSpac= e *as, } =20 start_paddr =3D (pte & ~0xfff) & ~(0x1ULL << 63); - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_memory_is_io(as, start_paddr, 1)) { /* I/O region */ continue; } @@ -65,7 +65,7 @@ static void walk_pte2(MemoryMappingList *list, AddressSpa= ce *as, } =20 start_paddr =3D pte & ~0xfff; - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_memory_is_io(as, start_paddr, 1)) { /* I/O region */ continue; } @@ -100,7 +100,7 @@ static void walk_pde(MemoryMappingList *list, AddressSp= ace *as, if (pde & PG_PSE_MASK) { /* 2 MB page */ start_paddr =3D (pde & ~0x1fffff) & ~(0x1ULL << 63); - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_memory_is_io(as, start_paddr, 1)) { /* I/O region */ continue; } @@ -142,7 +142,7 @@ static void walk_pde2(MemoryMappingList *list, AddressS= pace *as, */ high_paddr =3D ((hwaddr)(pde & 0x1fe000) << 19); start_paddr =3D (pde & ~0x3fffff) | high_paddr; - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_memory_is_io(as, start_paddr, 1)) { /* I/O region */ continue; } @@ -203,7 +203,7 @@ static void walk_pdpe(MemoryMappingList *list, AddressS= pace *as, if (pdpe & PG_PSE_MASK) { /* 1 GB page */ start_paddr =3D (pdpe & ~0x3fffffff) & ~(0x1ULL << 63); - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_memory_is_io(as, start_paddr, 1)) { /* I/O region */ continue; } --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170821; cv=none; d=zohomail.com; s=zohoarc; b=Y+fq5u/a/biBwoYvmzCdOCDNexT2gkCzkTsDzvtJNrDfOY6pz4xItMisVDBrGyK/tuGRAFBNQmiTTz6R7TClG2jKe3YZmD/V0eF17sOEJlZkbnbY8ZW6zhCvwSyah5vG0+2qy6Q6dVRQG2dkbAIqSVsdTVfdfw4t1tTM1gbmKf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170821; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=P3WGf5UHYCyuY+qdMKaaLuq+dGZ/nmDgi/rxgNJ1Ah4=; b=QZSP5vN+Y6Wij/6WQnCQRLS80gguu+8WPVt0ehj2hUl9LYH9KsayJeN8sj+0psnI8K3LvT11wqpVI1W/zUn+MdqlFLRrYjn+aLYv2qykpyixhtbLj/zoJXvO6Ly055MO/Q5eaU5FSmR8qd7mKBNa37SjpInQa8ZEWKc5e6aBoRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170821715817.9283842649623; Mon, 29 Sep 2025 11:33:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133123.1471320 (Exim 4.92) (envelope-from ) id 1v3Igc-0001uj-Bx; Mon, 29 Sep 2025 18:33:22 +0000 Received: by outflank-mailman (output) from mailman id 1133123.1471320; Mon, 29 Sep 2025 18:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igc-0001ua-7Z; Mon, 29 Sep 2025 18:33:22 +0000 Received: by outflank-mailman (input) for mailman id 1133123; Mon, 29 Sep 2025 18:33:21 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igb-0000iD-2V for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:21 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c56bb365-9d62-11f0-9809-7dc792cee155; Mon, 29 Sep 2025 20:33:19 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-46e3af7889fso27784855e9.2 for ; Mon, 29 Sep 2025 11:33:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fc7d3780asm19281036f8f.52.2025.09.29.11.33.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:18 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c56bb365-9d62-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170799; x=1759775599; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P3WGf5UHYCyuY+qdMKaaLuq+dGZ/nmDgi/rxgNJ1Ah4=; b=waulXQMdrAHfziQiNraoPlDiPYlPE+ca1viRcMdcCLNPu3uuTZJmJE/dPfRD27NNE/ 4fiKCDPPTZMZO15KbLiz/XaLHg+lquvPvv6JxpXVst3j1Enjg/b8cuhx0k8n8JiqjNik o8VmPyAsIwc2qY6O+WipTcImxtaqcV47/r7TrUE+fx8qaiYGU0mc/7IeyxwBRKtQqHvG BmdAGree7df165emhsz/rz2wdmtqasgl/6ozl1ieO3es5BHodgk/S6dLII32qP2K0+1W orapiO2Wswuh07BCtRZXLePnLt6VEVsOanopkhFkELMH8yCgtNl/sCYBhIxKcdKOg95x LABg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170799; x=1759775599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P3WGf5UHYCyuY+qdMKaaLuq+dGZ/nmDgi/rxgNJ1Ah4=; b=V0oEl12WBXbT93nEnKK0Kcs4SY3rjF2a+RU8kmhfHIbNRqW3XoYGJtKopWIKQ8hQqt rXLEuWHp778cINV7waBNa+weLMi68Q0Vd40lB/YKywtDkrK6M1Fqxvs4YpZgW3JxvqBc oTjnCTKRp9igboC9nqiNAbt0f7v8Grjd0t1K00ZO0jr3xvTYyqbtbpmyXihofLAYLWLi eQYwZv0ZttB9Zl2ixB+54hccDK9tDgu5ytFCarIHd1JbUCQCD+4yMuUyS+65xW2SHVIa K5GHWmklNPDRQl32UWb1nkcnd4k763nt6g7elrW8BFYbXUcthg5PTNIPXZPSO65Q4Prr oqwA== X-Forwarded-Encrypted: i=1; AJvYcCXQc3M8kGW1UtZupfoYrHzlXQ1xAmYFg6oK1e+vM0chWKxqImdQ121x8YzxRcqlihnrUnybvkEgVtA=@lists.xenproject.org X-Gm-Message-State: AOJu0YxJvsjSUJ0u3PL5qPbQhjUi83y7+MqKAWF/hARF4oac0YH1aslt 10erhcbFa7YPqcWkTMKZgTGwFYmZ9QPauFXtUiH4RALw/81KujMudVn5jf4RoQNE26U= X-Gm-Gg: ASbGncunfwbHoQDV+dOoSEBz5EKdEs4LIVvY8RqkxV4gtWAwpBhROWU25fNqpaBqtb2 MVseAlp9WqTkSx0w1Y6BazadDeIEhj9HBxEzxC2kXO4Jm8Kp+2kDZ+5uVew0TaMokg5aAht2ftT UKWchTTWJzgf+oQ95y7J6BfZmiZomlPZ2LNOf2NRmmyPya01+GXyANNQ8m4ItHAGuJP3sJGH1jU SSzKZenpjjHSBHXJhFDD8+rveED5HJaNGPCQlOzlaAc0quHyUz1uEv99xgKehUqkQ/JsJVEk/gg wSPZ9vtRGEXTlRpeRQjSRW0u2PWvQa6tjXaImN/IpSf736kgdy2grC2PKAoTafg4s1y3EdFwtqj oXe9+B9zMoUi9GB45xO5PYSStAAdityYZpwgRFciFnRYgITsWqt3hlvC+o38mZlw7joK1QwgbHb hp5SWRQbsejSUFcjkg7Q== X-Google-Smtp-Source: AGHT+IECk0pxJcrABdWnp0wBblgE/rUdgkYk2QyHdrh6Fg0EQMQZuDnjhZ/xllYj8G986Z96HgDgnA== X-Received: by 2002:a05:600c:1c01:b0:46e:5208:ded3 with SMTP id 5b1f17b1804b1-46e5208e228mr55680385e9.15.1759170798830; Mon, 29 Sep 2025 11:33:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 04/15] hw/s390x/sclp: Use address_space_memory_is_io() in sclp_service_call() Date: Mon, 29 Sep 2025 20:32:43 +0200 Message-ID: <20250929183254.85478-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170823671116600 When cpu_address_space_init() isn't called during vCPU creation, its single address space is the global &address_space_memory. As s390x boards don't call cpu_address_space_init(), cpu_get_address_space(CPU(cpu), 0) returns &address_space_memory. We can then replace cpu_physical_memory_is_io() by the semantically equivalent address_space_memory_is_io() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/sclp.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 9718564fa42..c0d8c335b44 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -16,6 +16,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/boards.h" +#include "system/memory.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" #include "hw/s390x/s390-pci-bus.h" @@ -301,6 +302,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) CPUS390XState *env =3D &cpu->env; SCLPDevice *sclp =3D get_sclp_device(); SCLPDeviceClass *sclp_c =3D SCLP_GET_CLASS(sclp); + AddressSpace *as =3D cpu_get_address_space(CPU(cpu), 0); SCCBHeader header; g_autofree SCCB *work_sccb =3D NULL; =20 @@ -308,7 +310,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) if (env->psw.mask & PSW_MASK_PSTATE) { return -PGM_PRIVILEGED; } - if (cpu_physical_memory_is_io(sccb)) { + if (address_space_memory_is_io(as, sccb, 1)) { return -PGM_ADDRESSING; } if ((sccb & ~0x1fffUL) =3D=3D 0 || (sccb & ~0x1fffUL) =3D=3D env->psa @@ -317,7 +319,8 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) } =20 /* the header contains the actual length of the sccb */ - cpu_physical_memory_read(sccb, &header, sizeof(SCCBHeader)); + address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED, + &header, sizeof(SCCBHeader)); =20 /* Valid sccb sizes */ if (be16_to_cpu(header.length) < sizeof(SCCBHeader)) { @@ -330,7 +333,8 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) * the host has checked the values */ work_sccb =3D g_malloc0(be16_to_cpu(header.length)); - cpu_physical_memory_read(sccb, work_sccb, be16_to_cpu(header.length)); + address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED, + work_sccb, be16_to_cpu(header.length)); =20 if (!sclp_command_code_valid(code)) { work_sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INVALID_SCLP_CO= MMAND); @@ -344,8 +348,8 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) =20 sclp_c->execute(sclp, work_sccb, code); out_write: - cpu_physical_memory_write(sccb, work_sccb, - be16_to_cpu(work_sccb->h.length)); + address_space_write(as, sccb, MEMTXATTRS_UNSPECIFIED, + work_sccb, be16_to_cpu(header.length)); =20 sclp_c->service_interrupt(sclp, sccb); =20 --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170820; cv=none; d=zohomail.com; s=zohoarc; b=bXjh6LgDvEyJIC+dRFoaldDg1kGOHyf/XHSYN6ovj/kBBuzFmsNyhby/wqJMLKQzh8xDBz/sZ2ADb5lHeAGOinI1kEsBQLxWz72+QFiA+V+oubau9vV+wS77NZYU8dkWtjeXf6dfkLvJPixEukRovwnC/CU7qzUV+vytUIoGJYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170820; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VjyCCW7HHI1dG8y1m+qgvriOV7CMEgsHNpX6hQdnX2g=; b=VoD6xI40engiU+hEjlRExu9CwoQEUQtNZFK37ZKhtYa8DK55gXSE/2M22m75gn5srQT/4j8PRx98RzNZWWs19ZsTUI02oUYlBmHW6tgf/TaZkK/qF1ksZ9q0iSOcmKfdqxY7f3R0m0CTrv64PmqDOk+N1YFKJukPmF3H22Wuc7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170820094500.16313833171114; Mon, 29 Sep 2025 11:33:40 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133130.1471330 (Exim 4.92) (envelope-from ) id 1v3Igi-0002Sy-Lk; Mon, 29 Sep 2025 18:33:28 +0000 Received: by outflank-mailman (output) from mailman id 1133130.1471330; Mon, 29 Sep 2025 18:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igi-0002Sq-Hi; Mon, 29 Sep 2025 18:33:28 +0000 Received: by outflank-mailman (input) for mailman id 1133130; Mon, 29 Sep 2025 18:33:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igg-0001U2-F5 for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:26 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c8bb11f0-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:25 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e3cdc1a6aso27634205e9.1 for ; Mon, 29 Sep 2025 11:33:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e59ac769asm2811925e9.4.2025.09.29.11.33.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:23 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c8bb11f0-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170804; x=1759775604; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VjyCCW7HHI1dG8y1m+qgvriOV7CMEgsHNpX6hQdnX2g=; b=n2Lr4ocEkBUzchZUMThYeYkfUdbjxEdsy8/JhkIga8BAF0WvSOm1WN/3/E3K7RkAXL qm+88qfTxRMSCz1bOyfcfBf9+mZh2AW0yOxcWVA9o3AD3w62UNFUmcy8d6k3e+CVUQm6 KRSZCdIwidwvTZUw3wXDKTjcHadYbsERN90GC2x7dlKVn/WHUDYV0FWQEbimx4w6TD6w eDEbxpcRd2XOkPOwsxqgnLYoihyE64tXpIYg7zjnpf+X7xd2iiwf4BMbxzRul9ogglYX fCelFeKvbj2WiuqjsqUmQ6UCHXkX96L3T27nktQDbNm/7Pg10Bid3OTm7A8IVM+udb6c 5rzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170804; x=1759775604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VjyCCW7HHI1dG8y1m+qgvriOV7CMEgsHNpX6hQdnX2g=; b=RfCzbWt9lyeQMNvp5Aq2BbbAnE5EieG0Cmu/P6nRrfpui6nnz2w6H2Zo5MStk6YSSl nFA/lpIvv+yCPnwCvtnyR0sOYQbZLE3flCUH3taj4jiFxT4jysfHNRzfj+F0EjgeqVHT wPUZg9HwVuSkovc4PAv6xfHdxDs14Lh18kh6eNByHFk2Y9C+094KaIeBVp/lCZg4vQfv BpHkhhJ9XIYFJue82mhoHH202UbYOOWb08bxtWaGFVvcSacEgKTrkKx40HCEELzFMvY5 RjEC1w+R+eRdHkHzeKBT/5LaJoiV8ootTd9vfa0/gW5iNhuxwaxpLRlRPNiYb3378b7T dTXQ== X-Forwarded-Encrypted: i=1; AJvYcCVLBYaxtz22fRI+u/Xl9Xc2LmkXHYJze9zdRSTJpNqugwNK4gVPo3umCMFCddcf2TYyTYZYtT+54l8=@lists.xenproject.org X-Gm-Message-State: AOJu0YwcQw45Jw6wcGVGBw1rQIFFMBrs2JlhWTy7H0NTMltXRv8JiCUA MrNH4DiSlmNUQL6hSZkXreGp0c8PZt+FA+5a7myxidoadyIEFprCWHufhntYBKm8yO8= X-Gm-Gg: ASbGncu5gD6OfdH8lfQ9RZGiKoTCvEXlyQnT+KVfDQ77oJCdSCrn3fizNg3/9YgWRJn on1V7LHQyRq+rb7R9DCKAL8iv4lITcEMmuRy1XEFrbzdyidMBAkL4UL8sUFD9IAwzrIxPelvTga WFXdtITVOkHICOzihQNT6UYP2aonTeyQ8P4F1G3loPx5BG7nht9reS3zbjtpVExxv1y2t/hzaw1 swPXOkx8HerWiaWEd5kmiGKQ8BuK1oLI20sykNhsL4x1zR2d731T+Zo8XDf1SQ+37CO8E/Ha3Te IW/GacUBAd2dDQf0rTm9CTirYrVZtA6zPFQiT32ZlrULlawr5rU7OO7knWGtUQpiGYP+mwCVo1I aikEcgy8ghe0sl0wo5pXVvYtEAUdMPOLVXg6PqD07nRtTSALjCV/hnTKEt9kUCjHcgFS0JAc7 X-Google-Smtp-Source: AGHT+IHQ2XCQX3HS0p3adUQdcJQXlpyRbo0k/r6XrZhzUXT4d+zZkT16mDlxSIQ19wUJoBTgikwi5g== X-Received: by 2002:a05:600c:c10b:b0:46e:33ed:bca4 with SMTP id 5b1f17b1804b1-46e58cea408mr12664365e9.15.1759170804364; Mon, 29 Sep 2025 11:33:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 05/15] system/physmem: Remove cpu_physical_memory_is_io() Date: Mon, 29 Sep 2025 20:32:44 +0200 Message-ID: <20250929183254.85478-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170821734116600 There are no more uses of the legacy cpu_physical_memory_is_io() method. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/cpu-common.h | 2 -- system/physmem.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index e413d8b3079..a73463a7038 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -149,8 +149,6 @@ void *cpu_physical_memory_map(hwaddr addr, void cpu_physical_memory_unmap(void *buffer, hwaddr len, bool is_write, hwaddr access_len); =20 -bool cpu_physical_memory_is_io(hwaddr phys_addr); - /* Coalesced MMIO regions are areas where write operations can be reordere= d. * This usually implies that write operations are side-effect free. This = allows * batching which can make a major impact on performance when using diff --git a/system/physmem.c b/system/physmem.c index 18b3d38dc0c..fd2331c8d01 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3763,11 +3763,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, return 0; } =20 -bool cpu_physical_memory_is_io(hwaddr phys_addr) -{ - return address_space_memory_is_io(&address_space_memory, phys_addr, 1); -} - int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) { RAMBlock *block; --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170828; cv=none; d=zohomail.com; s=zohoarc; b=XdYng2ygUh68r+qu/sk2YWwhivY3di7kcbljQPNbtlHDTjupQW8+VaQS9IMS9frUKcSfOhGYeb3OrM1yNhVdiI0XAzlu/bzyN9u32N9O4CJQ8fxrvbUai/2ysQsC0uR7eI0lCzhQ8plSUxvIT0Owgo4XQq333dqLGeHkdAe6L0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170828; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PEWvJYylRbkib8yXjJlQ3r1Fc9sZ+i1G3AKqr/Nn6n8=; b=LPN2LUXevVbU4i7iMqUVWH/1+QZMDz6bO95jisxN5KXgoUMTLnEYDrnPzMU/45wvYCuIBMIF3vebay/S/myPiniVdvyAh4+3eSvj0GHSSohDmXTO+Bs8LQsyWlgzySddQWd2h3Wzj7FAYJgZOTrbw2DDgypZeRqWx3nASWeKFtA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175917082814135.76101934756991; Mon, 29 Sep 2025 11:33:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133143.1471340 (Exim 4.92) (envelope-from ) id 1v3Igo-00032a-5c; Mon, 29 Sep 2025 18:33:34 +0000 Received: by outflank-mailman (output) from mailman id 1133143.1471340; Mon, 29 Sep 2025 18:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igo-00032L-2Q; Mon, 29 Sep 2025 18:33:34 +0000 Received: by outflank-mailman (input) for mailman id 1133143; Mon, 29 Sep 2025 18:33:32 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igm-0000iD-TB for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:32 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id cc042e6e-9d62-11f0-9809-7dc792cee155; Mon, 29 Sep 2025 20:33:30 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-46e37d10ed2so48131645e9.2 for ; Mon, 29 Sep 2025 11:33:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e42eee0b6sm125709405e9.10.2025.09.29.11.33.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:29 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cc042e6e-9d62-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170810; x=1759775610; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PEWvJYylRbkib8yXjJlQ3r1Fc9sZ+i1G3AKqr/Nn6n8=; b=GCwt3AlTYFW6tyHaW+MemQnB1CJRubd6bmE14DQO88o9hoMVzkTydUXloKV3CDRjfM lUakLoAlMhiCxQBHjr/v2L1z0mMSF+I+rM/bD6yVuVTUkJxLpTk868HHWkqOHCRV5N1x P4Wko6mV+Iw3K/pGbsJR/HnUJ2rM0AMYMUZuD6mHbtz23bM5kS+qgafY7C7ZHxN163/7 X5cRpYwjVR2tc6NO2KY2xwadsN6VHPb2dm7bCDfHrBvMp2no0Zu6XrSpgFmXkDfVWTk2 2RaJBBf1BQBYGTG5Wm4EzDeJv5c5Dj4jGFbmLjnIM7k6Y/iA+P6KCpazrlvNfURBSMDF HANA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170810; x=1759775610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PEWvJYylRbkib8yXjJlQ3r1Fc9sZ+i1G3AKqr/Nn6n8=; b=TqYak0A4D4CCFrzPSV8+7VdIIRy7nHmO5wk+/+w/DiLYZa+TA8cxMKSCXtltIVwCG/ mQwd4GZKnvNVe16XdEqg+F1ZVWBUMToBr2GmSbvvie/Sqk8MaHGGqq1nEf+yGYB1KqAU q6pYPMAV3bywZf69NT/3Cqywi29F6XVqOTw4x4zXBSuR3CdEKd34VmlB4WeblaMBpHFm lmbVj+VB3pLqB0iRnKSUpMUez9Mp5+ZiMHzsYeHTt+2XujLgF8qYatxBO+Ms1R6M+ldi W0woflHSNSnG2uSL4RQX7JgAbXhxY3Ke1k71R2qp3UIcEgHl2U1rQvmIW1oW67x76Z9b IqUg== X-Forwarded-Encrypted: i=1; AJvYcCUF20FzEM11z3Ykz21S377TxYK1+P1ijtQyyb2diitwNme7vtYUoe245YXz0nCiSWNhPadGeuC5YWs=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz84COtTaDLpqc3ZxPi/zPrNxin8oxrbdGKIiY6qQycJGcdUpWY Ji9Pz/85x8ro+FBaU9F+JmyCs5P5/8cNnK3uE8kUpQ941FMFQnpew28aW3DdMxe2Kdk= X-Gm-Gg: ASbGncsnl5oF2IKkpBZStVVL+hvHQjDHNQh1hvyZmRUH7kmS6A96GHg988dJ7REoVzY hzbUxFNR67qMbGSftKjideSXgv6v/oMbuhGNqn7VwU0emhWePyli+SOQFTWZLuo9La5+J2pNnBA 1QvMu1dj+RzFkAsfQAJAVtsocWLzVZgu5EKkG7CuPcek/E3GYG+4V1oBkVB4cLCnK7+suM1BZKS y5NRUX+O7m6rcb/hegywZny0iOsnF3lopM8CIyfXJ/1NWPii/+rJGW4I0XqogaFeZ7OgErd/3By UXQJtPLxS69lJ5Ovqer/Fwdb+QDBp8OVbQQIrJBZ1atKqjB0TI6I3DhjCCZpEm/CdqJwYeoP2BE aBPE3DH1SB4BxaYPdkHFrDGf7NM28xkXIux++HcNH2WgbxDC+WU2arlDrO3EqxLXM+KY3VOsuVZ yAu3pmUP8= X-Google-Smtp-Source: AGHT+IFlycBakp5EkJDN7dbxjK7i5JzbYULjjWcaNxhP9aXTBI6jbDWLO50skO4rhy6UhWAATwe2kg== X-Received: by 2002:a05:600c:609b:b0:46e:4814:4b6f with SMTP id 5b1f17b1804b1-46e48144bbcmr82071665e9.2.1759170809908; Mon, 29 Sep 2025 11:33:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 06/15] system/physmem: Pass address space argument to cpu_flush_icache_range() Date: Mon, 29 Sep 2025 20:32:45 +0200 Message-ID: <20250929183254.85478-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170829649116600 Rename cpu_flush_icache_range() as address_space_flush_icache_range(), passing an address space by argument. The single caller, rom_reset(), already operates on an address space. Use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/cpu-common.h | 2 -- include/system/memory.h | 2 ++ hw/core/loader.c | 2 +- system/physmem.c | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index a73463a7038..6c7d84aacb4 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -156,8 +156,6 @@ void cpu_physical_memory_unmap(void *buffer, hwaddr len, */ void qemu_flush_coalesced_mmio_buffer(void); =20 -void cpu_flush_icache_range(hwaddr start, hwaddr len); - typedef int (RAMBlockIterFunc)(RAMBlock *rb, void *opaque); =20 int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); diff --git a/include/system/memory.h b/include/system/memory.h index 6cfa22d7a80..00203522ae4 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -2977,6 +2977,8 @@ void address_space_cache_invalidate(MemoryRegionCache= *cache, */ void address_space_cache_destroy(MemoryRegionCache *cache); =20 +void address_space_flush_icache_range(AddressSpace *as, hwaddr addr, hwadd= r len); + /* address_space_get_iotlb_entry: translate an address into an IOTLB * entry. Should be called from an RCU critical section. */ diff --git a/hw/core/loader.c b/hw/core/loader.c index 524af6f14a0..477661a0255 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1242,7 +1242,7 @@ static void rom_reset(void *unused) * that the instruction cache for that new region is clear, so tha= t the * CPU definitely fetches its instructions from the just written d= ata. */ - cpu_flush_icache_range(rom->addr, rom->datasize); + address_space_flush_icache_range(rom->as, rom->addr, rom->datasize= ); =20 trace_loader_write_rom(rom->name, rom->addr, rom->datasize, rom->i= srom); } diff --git a/system/physmem.c b/system/physmem.c index fd2331c8d01..dc458cedc3f 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3214,7 +3214,7 @@ MemTxResult address_space_write_rom(AddressSpace *as,= hwaddr addr, return MEMTX_OK; } =20 -void cpu_flush_icache_range(hwaddr addr, hwaddr len) +void address_space_flush_icache_range(AddressSpace *as, hwaddr addr, hwadd= r len) { /* * This function should do the same thing as an icache flush that was @@ -3229,8 +3229,7 @@ void cpu_flush_icache_range(hwaddr addr, hwaddr len) RCU_READ_LOCK_GUARD(); while (len > 0) { hwaddr addr1, l =3D len; - MemoryRegion *mr =3D address_space_translate(&address_space_memory, - addr, &addr1, &l, true, + MemoryRegion *mr =3D address_space_translate(as, addr, &addr1, &l,= true, MEMTXATTRS_UNSPECIFIED); =20 if (!memory_region_supports_direct_access(mr)) { --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170832; cv=none; d=zohomail.com; s=zohoarc; b=OH0ttvFOcX2bc2SmPEKDvkYXm6cP6LF+IoiBoUhr2C8ykVrPMpOt6Sif8ZsUDPGKyJKc3P1YRpCESM9KpjwFakglCNdgaEBCl6baGF7Fx8FSAibOsZIVOiQ74lUi2Mq5WG25HSoriTfw7SAqoWwH8p3/OoGc4KtRTGDykcCTLqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170832; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JRsfrHQBMjnrXhlxfeiXrXfyISPq/9LUWh417J9QSAY=; b=IEQNI0D8ubaO3+G9sGMIvUVD9M88hkTNKTSp+iuJyh9KAn7i/7rZvp3pMAeqNOGL83uUNF3GpgtfLfwu7/+ZpaFgQw9EvX0wf+RlIUOPuHUybMqkgYQtKgpSp9GOVCkaDdPc9EkKL3US2qdYBQAwo+qb8wJLKg2bZ2PeGEhh574= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170832060188.69270249682722; Mon, 29 Sep 2025 11:33:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133151.1471350 (Exim 4.92) (envelope-from ) id 1v3Igs-0003OP-EL; Mon, 29 Sep 2025 18:33:38 +0000 Received: by outflank-mailman (output) from mailman id 1133151.1471350; Mon, 29 Sep 2025 18:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igs-0003OG-AV; Mon, 29 Sep 2025 18:33:38 +0000 Received: by outflank-mailman (input) for mailman id 1133151; Mon, 29 Sep 2025 18:33:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igq-0001U2-Ij for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:36 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cf51b038-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:36 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e3cdc1a6aso27635575e9.1 for ; Mon, 29 Sep 2025 11:33:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a996c03sm236802335e9.3.2025.09.29.11.33.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:34 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cf51b038-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170815; x=1759775615; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JRsfrHQBMjnrXhlxfeiXrXfyISPq/9LUWh417J9QSAY=; b=Fmwo9CfvXaYB/hN0GcuL6pwB0lrzu5OgHkjy5Y/C+InDUhjdrM4/cxoEfYc/YP7XWJ dTkRTAEeqzY5sZCVVheJPeIwZUkcvgzD/ebY+9zmI/hnSl86dOhFwevkS6bHnpyy3slB Z9rmonKYH3sNQKsFmvyApYlEW2d18y4umIEFVY7RgK6A/oyx+odcnG91ZIPh0D/s++DU vzGcBEl6eSIdQt0MbPIGgrK0p+UxDvRSgVBBkEnTU+rlyUzGDj8nOn2ODK3HzYcHUNSg xxEybFBSz+I9ephHdp059eyHsikdiyB7NzucVqPLGHl5UGIV60D9b8OFDrtUd3MvNDZg IT5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170815; x=1759775615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JRsfrHQBMjnrXhlxfeiXrXfyISPq/9LUWh417J9QSAY=; b=TaX9ry1Hr7DscG8ch24xkE4aAvMFJRS4r+GvnLhPeBzblZrbBHrQuYsv6d48WOo27U SlyHoW+nEsYoC49Ch6tg2UjKt/DlvA7dR5vjA8bCOHaCtHYPO4dDgpalGLmgzoFqKToD i84KyBWzKtdYu4EI8KBmEBhOr6WvEekkGtEKOXUIgFQHZ1CMO6Axgm+EBDZNbFnCzXhm GT8CsyWMpQ/xu9rwZOVXLV+hXTEKbOWhshqn0HNEyOec3rY5NrCzLyxXvvptPqfX4/Y6 3LR3yHss0wngvPBSz3Uib1BF1rEehnA6sHMl4WckOzV860urd69jP89Ucehs2AQz39Pi 3lDw== X-Forwarded-Encrypted: i=1; AJvYcCVkYSs7YDIX/XXTIym2RMGD1FZgPVFeHgEiwEhTTWTI/vcJx67zDPYzbDF/FRaWDW01evEAV+cd6FI=@lists.xenproject.org X-Gm-Message-State: AOJu0YxDfyECbHg716dmgtrM592p5K4rGyWPyDEzg9WTPINHUhyN7AQU gLe7SoxioGaV/Wa91V7jss7wE/lFfSauEULIUlaXuoHw9qzXQj5YJt2sJunMcbKT3rs= X-Gm-Gg: ASbGnct0DRyw9Eo2UVcLwLt9MzWtR86aTjJxwUhxqBJa1BQ/BxzKVvu4CgD4pdIxVjN N7YdEIGXBoInFsMX6MLmcr7Uf9uvvok4o50puaQ2RmiE3eMbX2y31kLrJlimptR3qG0uYsR6cor CBeCCEDF+XxSZ2B2Cb5Do9e5evJCeba0Y7wbrLOcPKGW4E6YSmSacJEmH5tjRu1G5Suzp0xE8gY Xv0JMOi/jptYcuuQ393DJJ4RJu7XYWD61PycYeWwkPJkiMsrOVcxE98jCt/sapxGl6X91EsAaP7 sMyKDpUnEtunxyZppMbgwXufeBi9sn2g+L/rmPF7ySJyDxG6z+1X5vrejN8QO/LjYq+WcRrsmjF qsdizwIC43TrQ8pR5tb+UXnRND16azdEXhatNo24ZXlzsd+Ur+sCMiKASV+6LYmOfyaqR20lO7x y7MbX2+y8= X-Google-Smtp-Source: AGHT+IHnK2dcf5REXjP75RtjLmG0FRF3SPCN5/ScyVADUNX4W97Ctb9XEl/zwwWPFNLidNab3G3GOQ== X-Received: by 2002:a05:600c:8285:b0:46d:c045:d2bd with SMTP id 5b1f17b1804b1-46e58ac80f9mr17543845e9.8.1759170815433; Mon, 29 Sep 2025 11:33:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 07/15] target/s390x/mmu: Replace [cpu_physical_memory -> address_space]_rw() Date: Mon, 29 Sep 2025 20:32:46 +0200 Message-ID: <20250929183254.85478-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170834072116600 When cpu_address_space_init() isn't called during vCPU creation, its single address space is the global &address_space_memory. As s390x boards don't call cpu_address_space_init(), cpu_get_address_space(CPU(cpu), 0) returns &address_space_memory. We can then replace cpu_physical_memory_rw() by the semantically equivalent address_space_rw() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/s390x/mmu_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 00946e9c0fe..4e2f31dc763 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -23,6 +23,7 @@ #include "kvm/kvm_s390x.h" #include "system/kvm.h" #include "system/tcg.h" +#include "system/memory.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "hw/hw.h" @@ -522,6 +523,7 @@ int s390_cpu_pv_mem_rw(S390CPU *cpu, unsigned int offse= t, void *hostbuf, int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *host= buf, int len, bool is_write) { + AddressSpace *as =3D cpu_get_address_space(CPU(cpu), 0); int currlen, nr_pages, i; target_ulong *pages; uint64_t tec; @@ -545,8 +547,8 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uin= t8_t ar, void *hostbuf, /* Copy data by stepping through the area page by page */ for (i =3D 0; i < nr_pages; i++) { currlen =3D MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_S= IZE)); - cpu_physical_memory_rw(pages[i] | (laddr & ~TARGET_PAGE_MASK), - hostbuf, currlen, is_write); + address_space_rw(as, pages[i] | (laddr & ~TARGET_PAGE_MASK), + MEMTXATTRS_UNSPECIFIED, hostbuf, currlen, is_= write); laddr +=3D currlen; hostbuf +=3D currlen; len -=3D currlen; --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170990; cv=none; d=zohomail.com; s=zohoarc; b=aY+d/lgRM8y+jTcRVRbrGywMV+HC+fG6bQJquYVnfGG73iy1PelO18MbEFDZnVFkshT6SatMPTaNtncLValH96U6ccmkjiU0NPc47jzv6AK4L+i09H/2smjxLcdkUk1MybUsQ0EA8HJukNW3daKf2BxWjYm6np8w/6BmaEjDA4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170990; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DbEYNZgIU6LqvkF49qge8kIj2C3i6K2S813tsyxbWwg=; b=Ma8A1j7LuxOoBRdTw4cc5gu3q3hURvLkDmr9aQulNVjNqwATTKmOn6gqKs0vZtFc17HCDleZ72/l/BpPYvdDSXtTdYFM9JVPamELGcYDmjkWMzfvGu8Gluj05CbJ0248FfYmL31U1BN/zIAGNAyuWQ3E9NevmbdsIctdIQ4KjZE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170990441522.4538761905812; Mon, 29 Sep 2025 11:36:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133192.1471390 (Exim 4.92) (envelope-from ) id 1v3IjN-00065h-MW; Mon, 29 Sep 2025 18:36:13 +0000 Received: by outflank-mailman (output) from mailman id 1133192.1471390; Mon, 29 Sep 2025 18:36:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjN-00065V-HY; Mon, 29 Sep 2025 18:36:13 +0000 Received: by outflank-mailman (input) for mailman id 1133192; Mon, 29 Sep 2025 18:36:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Igw-0001U2-2d for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:42 +0000 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [2a00:1450:4864:20::42b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d2798b95-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:41 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-42421b1514fso44467f8f.2 for ; Mon, 29 Sep 2025 11:33:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e56f3d754sm23909085e9.4.2025.09.29.11.33.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:40 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d2798b95-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170821; x=1759775621; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DbEYNZgIU6LqvkF49qge8kIj2C3i6K2S813tsyxbWwg=; b=khWgzdBbP1CktaqF/uejPNCx9iCRhNo9MSSZxK/Xm70o/6Z3Q504TsR+Q+f82xg3No lK1U+BbVCLyHazyZ3RHTsZgGkEs3R4O/ClKjuCB/Vug4O18JJ8JcNRPvBO5Vwx2cnNSn p10n2Y+VczwCc/XT2tRA0WhYr+wnalpUegiS+SfvNkyxBg8IrsJXcFLIY3v7hSbqzIKF gjRYuXz8auiqSzdMQGv/Oliz2FmutLPv/8efQrFXhV7XTg3QOwf7Tpl/ZyBY+ZztgVyT o1K55RIYDz9+OsXj66PHKLWMwdNTeUL42tnB3FeVsw7Njzqa8g7Yzdurmn1JoLFOun1V m7zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170821; x=1759775621; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DbEYNZgIU6LqvkF49qge8kIj2C3i6K2S813tsyxbWwg=; b=dDBPxLftd/sA2Jb1f4OdKh9JaqmqIT37EMDZKuppFrRxCzVLs4cBmSGtgU1hh9dDbs FtieOMINFkm65fd3mTWNLXB3aZTk2HD21xczFQODa6Xf+eoqwNESi8LDk+Z8wZ0INz4a ihmreJJFSURkyH0EqDDPoJX1oZL6vdYqxMRgu5a8jvRgTAAgZoWNpCc2gf9hm2MrfV96 3CKIwwUwCLxlNNcypdq4RKgI0/hf5OYqNuK5X4l+x4UOC9AtaoPnrZ1lCFzQG/tznqCt ECaBgVIu9Nb2RNdqeTqGidUbxSndzkP2RDAgcRdLb89QJ555oIEyUURtaU9R2vAoWQ8K umAg== X-Forwarded-Encrypted: i=1; AJvYcCWblW1NIPTRPdOuWSc23zcXKknGsyeISmNSBDrzf79Tet0Kjeco2R3li+W4DqQwqCllUBKvU50VPAo=@lists.xenproject.org X-Gm-Message-State: AOJu0YyWvbZ+fN2yaBg7CHbVm563D+aOsgYhAxLKUMNp58T54vv6yiKi vK7mjDbiCW9Qa/zLEXqypaq0KEinF0E5b9ocl/PNM0JdpxbYLpnk4moyqr/laKvSexU= X-Gm-Gg: ASbGnctjMp6KJdvF/t12TMrzOMU1Qf38zQM6r6FNVSx46lSbLZRqaTlNijpEAyU0mf/ SGld6HLx+zhhuHawY/W+sw33PLGXcny9xqj3RvFkYS7rWycLrtYKou4419RJ95YHmqDR0cj5j+4 58438nRPcscbrAS/9KDgnITwm/ojklm4ISlThFudDVQdGMcvUM3FYdk2Yyh3aViApcuSqhrTfpb v3zZNHrMn0HZDk+n3KOgQ0nlN2ga0bOdMUMxE53FUmJ/gk+pbo7QPQ5pvBjyWfevv2FNryjL/Jt v5m+xEBcFq8eHM/6oLOLRlV/2GYLeh91y+Nv0PtEPxrCUtyat7TQNaBKirPtTc9A9Nt9nt5c3D3 uEgOW0xlQgk+wVlsmyxNyCPeXTW0gGc8bwCJYpQYieOX37VtXT/dtL+M3ue1lthEH1zPF/S0oMw 73ekKyECCPVKFGPMxuPQ== X-Google-Smtp-Source: AGHT+IHaOBKfpBuD9vwP/E//+ppjcdL0t+dVKZj3FJZtAkNcYom3O6PaZLYCHSxxg6LM7gcPXW/sAQ== X-Received: by 2002:a05:6000:2c0c:b0:405:3028:1bf2 with SMTP id ffacd0b85a97d-40e4d0372cbmr15214118f8f.62.1759170820742; Mon, 29 Sep 2025 11:33:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 08/15] target/i386/whpx: Replace legacy cpu_physical_memory_rw() call Date: Mon, 29 Sep 2025 20:32:47 +0200 Message-ID: <20250929183254.85478-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170991888116600 Get the vCPU address space and convert the legacy cpu_physical_memory_rw() by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/whpx/whpx-all.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 2a85168ed51..82ba177c4a5 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -788,8 +788,11 @@ static HRESULT CALLBACK whpx_emu_mmio_callback( void *ctx, WHV_EMULATOR_MEMORY_ACCESS_INFO *ma) { - cpu_physical_memory_rw(ma->GpaAddress, ma->Data, ma->AccessSize, - ma->Direction); + CPUState *cpu =3D (CPUState *)ctx; + AddressSpace *as =3D cpu_addressspace(cs, MEMTXATTRS_UNSPECIFIED); + + address_space_rw(as, ma->GpaAddress, MEMTXATTRS_UNSPECIFIED, + ma->Data, ma->AccessSize, ma->Direction); return S_OK; } =20 --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170999; cv=none; d=zohomail.com; s=zohoarc; b=kLEKlUkq2rTZUeZJ58oNMFq1m/SHE2o1KN1r45jp0Avpws26hVWRmPduw3t6dJHkfzpg+HgDmYMPax99uFxgn6C+ZpG3poVKyvSpcAfFw86bEA3c80biWIa0VqaANZkZxA7ItBDgzvh4gr6x67a6r41LWtgbb5j3JJ67jDkx1Hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170999; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=onCfEhinWarPReSMP2g+nvBYz1NYywUR3fuXcFIYVYM=; b=SY3cvcO3iQQUZqnCmD3MPbGI0cCwjC0jabDOzEWQXQuI2dzfnTTu+8w0mIW6ZDuaGeNXBxEBk7HqpA2EGTNynEgs5HmHVew+uTWJmJs75FvOzd9lI+yUxmGs52aVu6jzZYSB0yOCwfET8q/qVSDYkBgrhJwOb+0NqoXURd2rQc4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170999104903.8403132008965; Mon, 29 Sep 2025 11:36:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133220.1471429 (Exim 4.92) (envelope-from ) id 1v3IjV-0007fF-E0; Mon, 29 Sep 2025 18:36:21 +0000 Received: by outflank-mailman (output) from mailman id 1133220.1471429; Mon, 29 Sep 2025 18:36:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjV-0007f2-AT; Mon, 29 Sep 2025 18:36:21 +0000 Received: by outflank-mailman (input) for mailman id 1133220; Mon, 29 Sep 2025 18:36:19 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Ih1-0001U2-95 for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:47 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d5b891ee-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:46 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-46e42deffa8so40586345e9.0 for ; Mon, 29 Sep 2025 11:33:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2ab48c28sm234491505e9.18.2025.09.29.11.33.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:45 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d5b891ee-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170826; x=1759775626; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=onCfEhinWarPReSMP2g+nvBYz1NYywUR3fuXcFIYVYM=; b=T72BL611RshT3+AuRgAhGKtatD4dP8JlCUuT7U4KADuQ89zb45T3x6jgsSuTuLjnRB L6/OVBaAqR7BdycTxi4XhMzzwKSP5F0N5gMpqUXsA++PaDJujZGRqgeCMAHKuvjvmKfg u9fUleJfidSaUiVmaDBg+xIAGnr5f0yP5tSgQdoluWnuW4ABgruT7hPtBwEwlsea8cYn bYIvUSthyE3JzD/fAIbIj7G7mehg6qP1yX4NJdQz3q+2oHseIWEreQU6jcxfMqrnxrfq ojuw9hKG4MxlAEtyp9HStJAyRg9CNwvAB602DcNFek/Vka4ZRMi08nltGqV8No4LJyZw 0geg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170826; x=1759775626; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=onCfEhinWarPReSMP2g+nvBYz1NYywUR3fuXcFIYVYM=; b=viuT0hCRXbnPJcU2iOjMsLJhnQxerMB9sG+lqYowLqDTQD2Bv03JLZmKpYy6xY52i3 Gn3fdkmjvrVnKGH94eVoMjKIJBaNX/qAf9H6QNXOE1VMNY2JYnXqyOEfuj1ep0LFKorj ldYAjXUms4f9MzR0ZT9vYBQvXs1kGlzQTjhOv2r+RozAqQffeYob9XCZ3/1ViYDZpUGL TCF//h2kjAJU8Fc++FAVCsgls8hVGGjO2JyCF9BAjpRp82vvmEC/8GhFzxwEvQrElCJW dp3fcQg0YdnCfo+6QgHWYKJ449dxo0pGHz4t/x69WRPX+xePeIKzdLyt0RaEDXbMXqhU Ib0A== X-Forwarded-Encrypted: i=1; AJvYcCVY+p+XyDXLhYtFRqyfKM3fXewW441csFoKC6nWzVFqbhQnvLOko6m/F0CMJsVg9KLsX8O/oAp6tRc=@lists.xenproject.org X-Gm-Message-State: AOJu0YyS7xUf3eMRjLAdTnU4Eo/Fx/INawMBF4xWY9Tn5ONZBXJ0dVr6 B6lbpi83r1XT0r1ngNpsrfmdrVbT5WummpozxLXWG33frVfbMk158QSbegI9PSL+apY= X-Gm-Gg: ASbGnctdglo6+f9gl9CiznW2YkiGVYe713xjkEeaYxQofqtUeU6ZB+rVBEnRE49Gey9 enfB5zHGgWIfkGLBxbQKzTMKlQJBEmQN2idKy3kdIqGacbUwr1LEz030z/H0l3jJ1YZPTPUPQdS spt+wzWD3XNEKvt/NUXfJmRWB7h5ljBEefvxx3MwfbOoOsvGHg6dTeIdSRGsxm4zgDZNI4VMLaQ KUOpUXlDNgClD7vYStVlz8ZmUm1/+2OgIUq1k2hYiUhTx0P0owflOuFhQEyJonemoDt3MGW3jz/ BtjSP5MxLq60JawzsQ0I1ABLQgBwlqhiyV99qSUplGOEVisIE+SbiDtO+2bKGpeQ2UKrT8/EkxY ueiArfuKQB6uD1HYuZ3bZ1CAdsIINkktaS0n2hf1LrBHNDzaGTPQKsE2kw3QPsS1fWrJqrGRb X-Google-Smtp-Source: AGHT+IGY3Rr3VyTE3S7oem5ZxfcOaYJ6i/vEMLPbvgnpiGprZwacrZ9bUpREdcpvLgXehTAMtkJc6Q== X-Received: by 2002:a05:600c:348f:b0:46e:447d:858e with SMTP id 5b1f17b1804b1-46e447d8828mr94281545e9.28.1759170826202; Mon, 29 Sep 2025 11:33:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 09/15] target/i386/kvm: Replace legacy cpu_physical_memory_rw() call Date: Mon, 29 Sep 2025 20:32:48 +0200 Message-ID: <20250929183254.85478-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170999640116600 Get the vCPU address space and convert the legacy cpu_physical_memory_rw() by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/kvm/xen-emu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index 284c5ef6f68..52de0198343 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -21,6 +21,7 @@ #include "system/address-spaces.h" #include "xen-emu.h" #include "trace.h" +#include "system/memory.h" #include "system/runstate.h" =20 #include "hw/pci/msi.h" @@ -75,6 +76,7 @@ static bool kvm_gva_to_gpa(CPUState *cs, uint64_t gva, ui= nt64_t *gpa, static int kvm_gva_rw(CPUState *cs, uint64_t gva, void *_buf, size_t sz, bool is_write) { + AddressSpace *as =3D cpu_addressspace(cs, MEMTXATTRS_UNSPECIFIED); uint8_t *buf =3D (uint8_t *)_buf; uint64_t gpa; size_t len; @@ -87,7 +89,7 @@ static int kvm_gva_rw(CPUState *cs, uint64_t gva, void *_= buf, size_t sz, len =3D sz; } =20 - cpu_physical_memory_rw(gpa, buf, len, is_write); + address_space_rw(as, gpa, MEMTXATTRS_UNSPECIFIED, buf, len, is_wri= te); =20 buf +=3D len; sz -=3D len; --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170995; cv=none; d=zohomail.com; s=zohoarc; b=LpscFkff07canrOeIBPIbz+qSpfzl+iM3gkT3tMtuuZ0U6Ze27xMp5ot1nvMQyzZXh9+mfBKoWRu0DQimzsC0tCYU54HJL9eXXFop0oj/inbM7V81bqCDxifFf6lodIhH0Wxo2+JrXEFLVSiEEvbGNyUChbfvltgoAZWsW/H1OA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170995; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QtU1C0M8U0OTbHcI2E95ZD2Zrsmz5/OESKETD6NudSM=; b=HCiMq+iejd3cWjsWHq4TT+mgeFvOEX7rBCe9baPPolqxdya/y4B2q7oSGTu0Fk9gH/QHQ2iVCL4QAZibs7EGJbQSMfvEyX4u7LwMUH4mYge5ip3qPBjZMfYZbbxpzvIjRf593/3ZrUpD5DHpGJIbCy3BzVlrgY4pSMlrqeDv+WU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170995824998.9509867965976; Mon, 29 Sep 2025 11:36:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133200.1471400 (Exim 4.92) (envelope-from ) id 1v3IjO-0006PO-W5; Mon, 29 Sep 2025 18:36:14 +0000 Received: by outflank-mailman (output) from mailman id 1133200.1471400; Mon, 29 Sep 2025 18:36:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjO-0006Ng-R3; Mon, 29 Sep 2025 18:36:14 +0000 Received: by outflank-mailman (input) for mailman id 1133200; Mon, 29 Sep 2025 18:36:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Ih7-0001U2-9k for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:53 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d904bbf2-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:52 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-46e326e4e99so26057545e9.1 for ; Mon, 29 Sep 2025 11:33:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e59af1975sm3031215e9.3.2025.09.29.11.33.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:51 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d904bbf2-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170832; x=1759775632; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QtU1C0M8U0OTbHcI2E95ZD2Zrsmz5/OESKETD6NudSM=; b=nNTJeVA4KhFLgMwncIWleSYFYtyXR/SZ4APubPoFRihPFYCWhgXGDJ9n1IIXqm9qDu WaLmaIScVm/fF/4/CVo0Ukiggcm1Mc1dMlI5J3beWMD9BdVgrC/FecxZ8xhEp9TTH/Mp tkhA0jTHjRnY4SpFubFhSpIoY897b+kEHRotFNct5I/gvMyiAlcEdEUIiSlBvucdKst4 Rn2Ux82WoEr3yAlia4Vgb4LgdSSEHZgPLGT4wjiwn7e7PAf/4xUCYIWbn/nPu153FDi2 3vRWyNpE+OL3XOfgQXb+oSwucV01Asl7k6vGvuOs2+LyJTXBTC9csYdugqU4eYWtGEFi iTjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170832; x=1759775632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QtU1C0M8U0OTbHcI2E95ZD2Zrsmz5/OESKETD6NudSM=; b=GOorQGZO4Dp5ieemCOuM2Q9tTX0YWPVG3rIdtA7UGty4k8t2jPS5foTG791/ixmlEm eDzaYJDkOgO3z+lPH2zZpO5Ohx4890OAObsc3f4Hx5hmd80fhp43y8vX/gciwNrTYAz3 kkg4PHbZ3Ix37PDUOLDgvCbZnnBFJgP6rzHddTxmjxxorM5IjCKwKO7w/mQneZ4zWciZ 1ql6DpS9wMWfSShJm/4SrZB6/mgcauhpIH3VIevlg5fOi7LmDw3Oa57nz32yrlMzTmfG f5K6lCBLL1eWpM4yEzZyK5um/R+brzr4XaAuyhAL9b66ujZVM+8Fl44cRhpCuinLFnZD Ao3g== X-Forwarded-Encrypted: i=1; AJvYcCXx3EgzGjYugW3NBeFjXt5MLd34oCsXu0Ga4YvYWV6fqfvMrcV68aw7GfbQv499y/Cll+USuKjBsJk=@lists.xenproject.org X-Gm-Message-State: AOJu0Yw0iVp0v09rD/xa5I7KreLhIc4EFlbVAFDJi9Ypvrs3eDU+740Q grji2mAEdgyF80WmOjnqKsBqEyaam2spX7d5LlJUDn/VZa9pdutB7/Dtp25wNnjobvI= X-Gm-Gg: ASbGncuJBIHELD4QmVm7m/W/XmhdrSezezA+Lh936emm7/7Ao6WgvOPppiOSWIYPKcc XxWt2Cdfrw0Uy0kE3+9o2pvSjYTHdwARr5u0CQkUws4uA3tZG97l4ZdUJdyW1yoT3Ar1NmTWGLe jbpQY8N2QUIL4MYsT3Ljirw8mVPuNUcbIzKO8Uh42PGcMtbULh55YCFKAK5X2l2k8Cz4gZ70hKv QmRZ38yDcycp81J38xA4B+05D8nYsxsmkQBqKPUbf2QF7qWVQudF2D3jI3FunoPzXJFYxA1fQxK WQhsLXuN0ehjEaii26gOx2a1nHkkdIY+RxlRT/psglEgivoC5fUlMg5NBX2Mnnl0PcLRdvxPouy Jcd29bOLro1FG0z+gRnXDqKZhilduYIuhiD8ZnArmPTxJ6FFrzw03nXj6Q4smco2my+t2VHPV X-Google-Smtp-Source: AGHT+IGjnZG6/qjEBZy5PcjHjXj9r7KBUUors89ckyudEmcNpuheEZ9krTQTynjT1eMge8vskVxhUA== X-Received: by 2002:a5d:5f83:0:b0:3ea:fb3d:c4d1 with SMTP id ffacd0b85a97d-4241111f6d1mr1595433f8f.18.1759170831738; Mon, 29 Sep 2025 11:33:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 10/15] target/i386/nvmm: Inline cpu_physical_memory_rw() in nvmm_mem_callback Date: Mon, 29 Sep 2025 20:32:49 +0200 Message-ID: <20250929183254.85478-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170997706116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/nvmm/nvmm-all.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index ed424251673..2e442baf4b7 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -15,6 +15,7 @@ #include "accel/accel-ops.h" #include "system/nvmm.h" #include "system/cpus.h" +#include "system/memory.h" #include "system/runstate.h" #include "qemu/main-loop.h" #include "qemu/error-report.h" @@ -516,7 +517,9 @@ nvmm_io_callback(struct nvmm_io *io) static void nvmm_mem_callback(struct nvmm_mem *mem) { - cpu_physical_memory_rw(mem->gpa, mem->data, mem->size, mem->write); + /* TODO: Get CPUState via mem->vcpu? */ + address_space_rw(&address_space_memory, mem->gpa, MEMTXATTRS_UNSPECIFI= ED, + mem->data, mem->size, mem->write); =20 /* Needed, otherwise infinite loop. */ current_cpu->vcpu_dirty =3D false; --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170992; cv=none; d=zohomail.com; s=zohoarc; b=UQnw/tXb1tufPgICiVNGsm8zuLJkZswZ6f0EhnfzdyKuHmpnQ1tlFAijM4uSRsVyCBY/ddQP4ber3i4BuoU+TEM4hoSWP/WCWlbZmhE5Y0QF3bVN95buQzsNSy+lx+LtmpaSFzCkngjnErJ7y3Oqj72avfKwDfKAU00QLGDaaY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170992; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=U9bErLRqv9kjbdzs2kwz9FzL8C8SAPMQ12Esuz3D9Fo=; b=GcmkBoeXsMmXEx+CsEZtE/IMqTDEBP1C5icdCzQhvvmYeUVZIwUZpFPLhmO2pOwMkoxKIiuFkkdHuEuwGbZN5MgXKH08Q0dhgwk865fCB2lKwyge5dz9P6sAqUsW6gvih+kxOYlj2IZKAFi//WDdubIniJpei4LSvkPLxm6rij4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170992069298.5259435491895; Mon, 29 Sep 2025 11:36:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133183.1471376 (Exim 4.92) (envelope-from ) id 1v3IjG-0005QX-Bl; Mon, 29 Sep 2025 18:36:06 +0000 Received: by outflank-mailman (output) from mailman id 1133183.1471376; Mon, 29 Sep 2025 18:36:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjG-0005Pi-5P; Mon, 29 Sep 2025 18:36:06 +0000 Received: by outflank-mailman (input) for mailman id 1133183; Mon, 29 Sep 2025 18:36:04 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IhC-0001U2-6k for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:33:58 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id dc36c137-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:33:57 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e384dfde0so51429035e9.2 for ; Mon, 29 Sep 2025 11:33:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fb9e1bd14sm20127006f8f.28.2025.09.29.11.33.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:33:56 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: dc36c137-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170837; x=1759775637; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U9bErLRqv9kjbdzs2kwz9FzL8C8SAPMQ12Esuz3D9Fo=; b=gnvR+fdIZooHKgj7wLHK+6Bi6IpBiDx3+6WxyqhRU0GrezC5Z3bk8R07XrqirNWSMs LC5IpCxvMh23eSoM3py0Bd52Hz/d6cQjulxcVCvMZa6boTQZWaumgm8yV2Bj39qBVYIv +CmFRd17tTA3V11BpZXdvmEJNiGh4TKiQrBjuA0i/aOYP23NTookydPe36r4n4lOMzH/ d8AMZxwmgi0PequktmEH9usP21D8S0VKOhWw7ns029OTAUbyJoFSDRYyBcXyt49uRsF3 Zkd/+D+VuKiJZMnCuK4fn5A0Tgu71mVVxlmDDWmhpSKyxN2vubuFBPFC5TEMH7sgYMx1 PxIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170837; x=1759775637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U9bErLRqv9kjbdzs2kwz9FzL8C8SAPMQ12Esuz3D9Fo=; b=nL6QrLpUyt5hKVBWyTuMxBqcAZsV6QNm3/1PXnZ0saVhIO9e6pqM36JJL81nBkehOz Oq+F6XLykYI/N8fDu+mJMF5GBuEYQEnAVjFp0tSk3WXHUzlCgwbH253BVFhnjwPyZsPe mkT+R6GJphiM1MuLqSBDcvDm6YPRle3nTh4W2TgfeD00NXp40dLLnt2pPt7NwPrqk5// OwOiBOvj70F8Aey2rRWSHdyOXshvHGb7Jr7l/lTjBBcQjDvN7iEcoXoTYqDMj3VtxmY/ bVTJPRyo1Wr/6zZWsavdJEP+fIL1qkSkldckaz0ld7fzXG8QvKi1M39iGwQPT+jOy7Cy 681A== X-Forwarded-Encrypted: i=1; AJvYcCXZZN60bgHwbVn2PCSY0pEdF/NHdJFySxG2eOwIJblQtS72mkgb3/zM2Rxp6+H5wK+dQa0yuyHdjhM=@lists.xenproject.org X-Gm-Message-State: AOJu0YzZnbTUhCcduYxXvNNrQrUAE3eGH8qP7KRZoacrsibvWvk5MvET q3lae2K7vBIBX5z7ZkfM3SJD78mvy3UlLNjf+INNuqienl59jZHHk8aNFLqXAjC/DMs= X-Gm-Gg: ASbGncte2lY0gAqumM7a/ooewSp7FBZxf3lJ3T0bmDz2u9x7v+J8e3ia8QucdZqeMTu 98qoLMjI8MJQe4tmLcX9uK5+Z/ZWhCdZY47zUAJtu9quHhw/lM1lfk4g8fBJ6jHNw47rykpJ5Fh /z9qGzUSi77TSUfLat/MP0qjYUxil/g+nF46QhDnb8DfhmS+0Q5eOmJIwlsznN7Znm2ltlEq3gP ufqdW7x3E3HUNUjo9R+RemJyE96tR6ZdlufswrEC8AP7/d/gtUwQChArnhwrQm9tW7mBsSB03xD VAuFaoemvBcyjRMV+u8SjORY8iKiHG8UVFbFBr6Opk3chSr1rB4NkbyJ4CSZvmIcSgJ57u4zIQs 3cM+H0xDavFEFZmvembsfGLYnkmC6cgpJ/BnWEus1uENTKcPJ/y+a5tkUMa+uNJEd4GavT9DwMp zO2Z7J2BU= X-Google-Smtp-Source: AGHT+IFV+pWpl9RpYQY3/vKNUQDjfsPx6DQqux2wn16tRZPr0u8FrK0pJwBF+V9pyB/rSvhEdc2qCg== X-Received: by 2002:a05:600c:4b16:b0:46e:326e:4501 with SMTP id 5b1f17b1804b1-46e329ba996mr129660275e9.10.1759170837108; Mon, 29 Sep 2025 11:33:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 11/15] hw/xen/hvm: Inline cpu_physical_memory_rw() in rw_phys_req_item() Date: Mon, 29 Sep 2025 20:32:50 +0200 Message-ID: <20250929183254.85478-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170993645116600 cpu_physical_memory_rw() is legacy, replace by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/xen/xen-hvm-common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 78e0bc8f644..52e2cce397a 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -12,6 +12,7 @@ #include "hw/xen/xen-bus.h" #include "hw/boards.h" #include "hw/xen/arch_hvm.h" +#include "system/memory.h" #include "system/runstate.h" #include "system/system.h" #include "system/xen.h" @@ -279,8 +280,8 @@ static void do_outp(uint32_t addr, * memory, as part of the implementation of an ioreq. * * Equivalent to - * cpu_physical_memory_rw(addr + (req->df ? -1 : +1) * req->size * i, - * val, req->size, 0/1) + * address_space_rw(as, addr + (req->df ? -1 : +1) * req->size * i, + * attrs, val, req->size, 0/1) * except without the integer overflow problems. */ static void rw_phys_req_item(hwaddr addr, @@ -295,7 +296,8 @@ static void rw_phys_req_item(hwaddr addr, } else { addr +=3D offset; } - cpu_physical_memory_rw(addr, val, req->size, rw); + address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, + val, req->size, rw); } =20 static inline void read_phys_req_item(hwaddr addr, --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170991; cv=none; d=zohomail.com; s=zohoarc; b=EdSAE6+/oiiniozGp5H5eGcWYVH4yPfvKEUXfePu33kXZBEBEr4Q0n0ORVn2Pmpo0rttdr8I6OYYzXAqK1BUear+9sQjidICJBCl+RKRy55/xfqg0JydrZ88DiyJFdhA+B8b8LnGCEyd1bZaGLav3au3ddeMHlvP5FB4Rsi3nl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170991; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LuYVzxDYsV8q8g9d3IDIaYEYUyrQfEG5rj8P4oQ0OGY=; b=GCeuHH3TrgPU9E0Le9fLl8D2iVUc2pzMXc+LIjHX2Qw/6kgUEUzpjV2xU3c6lleJeviQfBaNjlFmIT/PlXzc4R9S39sDKlXo6EfORwR/sKu6By0TfTATx9XpxreYPWF97V6CJVClH8ZMefyl7QGSA7ucO/CIWjxBrenWR/nSgiY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170991584495.85547888600104; Mon, 29 Sep 2025 11:36:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133202.1471410 (Exim 4.92) (envelope-from ) id 1v3IjQ-0006kn-CT; Mon, 29 Sep 2025 18:36:16 +0000 Received: by outflank-mailman (output) from mailman id 1133202.1471410; Mon, 29 Sep 2025 18:36:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjQ-0006jK-5d; Mon, 29 Sep 2025 18:36:16 +0000 Received: by outflank-mailman (input) for mailman id 1133202; Mon, 29 Sep 2025 18:36:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IhK-0000iD-0W for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:34:06 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id df8a541f-9d62-11f0-9809-7dc792cee155; Mon, 29 Sep 2025 20:34:03 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e34052bb7so50766285e9.2 for ; Mon, 29 Sep 2025 11:34:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e46de67e1sm103906645e9.6.2025.09.29.11.34.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:34:02 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: df8a541f-9d62-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170843; x=1759775643; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LuYVzxDYsV8q8g9d3IDIaYEYUyrQfEG5rj8P4oQ0OGY=; b=A76Kp6l0IsB4Z8L+4DQh8WUL3f8eI4biLcjqDiHIpTu39xNSfouWCVLq8JKHvozjaQ /tkqas50rbx43U/UJNgEMkZ6URBLO88lI3AMK6xd14SphocnE8bLOGd7ir0zxtnxTykv zaq8OwSHzWikMOif+IK5xo0EsDmn6HuHuv5ejb/ueH8X8jJ2x1ZQ10mjHa+SsKm9frH1 T04grTuEyglJ53/qC3MfhBZHo8CJsutBvw+qZvHv1zskOxtyyAfll66RNuoN1//MQw7r w1Hd0611WI5FzQtTrOBiQHQz573Ti/IYmkADF80nCxOyjtTqFtb9q7xRYcp5lvQSWBZh FSgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170843; x=1759775643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LuYVzxDYsV8q8g9d3IDIaYEYUyrQfEG5rj8P4oQ0OGY=; b=O0B76h4XRGqSbhzWbM5c/HAYSs119r6aZWMT7fjTEWn8E21T28aeBbGUSqISg+jUUq aksy5E2oJbxabS3XngD3pOf+AnC8tnccgf7b7v/xnNVOilG6ZUaG9WTDOfTDXfhcwwBw t8JHDMFNVGppp9Fe17ZDtx1mB0xKW3G0uRfOI+24Qk58g3s2rN7AZ2kHOJxv/mBGMUui kZdkldriWZDjeM9Hvs70OZJAMj7yTe2HvOCXSXqjYuEht8iSd/kqRga3FpNcY+DGfnjU 5TrV8A7jSd5P5rz0doD8IBo07UGrQ9rNcSCQhurbLJzTOAmPb2nxzNeRcK6wBHTm4lPi aLXQ== X-Forwarded-Encrypted: i=1; AJvYcCVe3i8gHOAitrtAEw9ph8MWamSoIseAjQMkcuak1qrHhlFI5uNguvvM8C2u4xK/ujh1D3Y0jaIlmtI=@lists.xenproject.org X-Gm-Message-State: AOJu0Ywjzg3daSNqsgKf1nwmusbRDBuCUxcKH+VGna7r2t0EbCgOE0su VbsZ3079Vn7uYfoO1W2q6SlE2xLSx2yy3DBbA0jM63gAem46oaZ47mr+8Zy3gc0/E1A= X-Gm-Gg: ASbGncsn3g02bK7JEbOOsa8UhPPTvppxYVlnCrT06I+2sd4UjgeiDPipOgpDoUTbOH+ xctanpi/bcKYp/8X00QXlE30LSbMPTBYsPn/DnMZxf4UBPuibC8pBx0B8CgDxEGAF1Ydupw963R jdG5kaSTe6BOY7jVPO59DStavKGvugXmGSAcyAuXwo1HKAX367FJjomzxfLhh78nit2BnYeJrE4 waNu1CQAgsEAv3Kpk/7vruIrir9prBsyPadhYNqaNBjo0i83I9kXpW+QVckkV/tJeMVwB8PqpL7 cDAYIDp5++58r1aow0qbZBaClmj3EE42AViTC5q+zboZVeoK3B2d0Rz9Ax1Av8XnPd/Owg1j2hf 1ru/P7GOXRjXD6YvZEkKIm1sNM28zctuP8ihkYggDlM/zOi5npJNo7J49oJySF0plx9/nf2SvAi Y/j17OXHDFerpvi9hE4w== X-Google-Smtp-Source: AGHT+IHxkSBKZz9UIKJGJ2MuyS+JOGfRYnVKVs7Y+XK907wXLr+RITSG6kYiNQobFw2cPjU7tACI6g== X-Received: by 2002:a05:600c:a47:b0:45d:e6b6:55fe with SMTP id 5b1f17b1804b1-46e32a32b56mr143974255e9.34.1759170842607; Mon, 29 Sep 2025 11:34:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 12/15] system/physmem: Un-inline cpu_physical_memory_read/write() Date: Mon, 29 Sep 2025 20:32:51 +0200 Message-ID: <20250929183254.85478-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170993621116600 Un-inline cpu_physical_memory_read() and cpu_physical_memory_write(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/cpu-common.h | 12 ++---------- system/physmem.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6c7d84aacb4..6e8cb530f6e 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -133,16 +133,8 @@ void cpu_address_space_destroy(CPUState *cpu, int asid= x); =20 void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, bool is_write); -static inline void cpu_physical_memory_read(hwaddr addr, - void *buf, hwaddr len) -{ - cpu_physical_memory_rw(addr, buf, len, false); -} -static inline void cpu_physical_memory_write(hwaddr addr, - const void *buf, hwaddr len) -{ - cpu_physical_memory_rw(addr, (void *)buf, len, true); -} +void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len); +void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len); void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen, bool is_write); diff --git a/system/physmem.c b/system/physmem.c index dc458cedc3f..5a0ee3b8e58 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3188,6 +3188,16 @@ void cpu_physical_memory_rw(hwaddr addr, void *buf, buf, len, is_write); } =20 +void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len) +{ + cpu_physical_memory_rw(addr, buf, len, false); +} + +void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len) +{ + cpu_physical_memory_rw(addr, (void *)buf, len, true); +} + /* used for ROM loading : can write in RAM and ROM */ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170984; cv=none; d=zohomail.com; s=zohoarc; b=GC5+N6zBPOLBrzM7/ZsxTeKfGtrRv4GZDg4NUfbGBPhxM1tF9bJqWILvw6XYw36dVISx/s8vvNXmbCOCGwfvhpRnmsrYk1QKq4euxCdUPXaho4wo4Zp2JYUAS7iyzrqHood8x8m/TG9b8gi+QGDjSnAT9hRFSZeZTyl612lbZvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170984; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8IprTsHK83+//o00MiFkngA2W2onv/YPnwzWQKra2w8=; b=lY1c6sQN9NZ+v/OanHknQPQKIqAJipSEAVlSleh6HdLvmc1CzajPOxUV37Qc6XIFe1wyrMY9VG3mxAQKAtvcknhLvPFHZtQ3w2mQLpVNXI0LdDmpJS6/lDVZUCo6WkYTcgIhLBOAzFJjvVUB5qPjlU5/DpsFvm3otKsLVbmZIfQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170984946597.788802023043; Mon, 29 Sep 2025 11:36:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133182.1471370 (Exim 4.92) (envelope-from ) id 1v3IjG-0005Ni-1m; Mon, 29 Sep 2025 18:36:06 +0000 Received: by outflank-mailman (output) from mailman id 1133182.1471370; Mon, 29 Sep 2025 18:36:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjF-0005NZ-VN; Mon, 29 Sep 2025 18:36:05 +0000 Received: by outflank-mailman (input) for mailman id 1133182; Mon, 29 Sep 2025 18:36:04 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IhN-0001U2-GB for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:34:09 +0000 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [2a00:1450:4864:20::436]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e2e7109f-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:34:08 +0200 (CEST) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-414f48bd785so2659460f8f.1 for ; Mon, 29 Sep 2025 11:34:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2ab4897bsm234657245e9.17.2025.09.29.11.34.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:34:07 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e2e7109f-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170848; x=1759775648; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8IprTsHK83+//o00MiFkngA2W2onv/YPnwzWQKra2w8=; b=B1qC8Pa65WojuPUH9YkoSCzr47EcA0CzK9i9qnLsU34vd6+4Y8RpwaK0L1nvzNFjbZ h2d8ESpnFW4CMh0ElPv/4N/wK4TsJFhuxUB/jNRgWQTR4JVVshZqTbwV/C/Gi8V5j9sZ WQqFhtpW9ww6S8hWWGtCIIlpZstvvp3Rs7Q0KOLrn5Op9T0VzFPC/E1bD5FlS3Liiv6d 7dbt60E/utGNmn/5OxbbLD9egCWTGv4VtEIZDkNQyAJSCPDI+oJZdquk9JGPXLdjE3tm LuMndkin7uBOAW9/tEDHvyYPvrZziIuT6e09vZOAGcIVEUwN0NS54OokkJpndHpkPqi7 eD3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170848; x=1759775648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8IprTsHK83+//o00MiFkngA2W2onv/YPnwzWQKra2w8=; b=naORXrUOOZZIH60btQzZq5cajyCLYaRk1+tk+5ja2ZU5XRXjfIAmNgcfEzBb7oMmhF DsTFceoNrmo3yBVy4WrS7u0aR3WEgR9jFbzyLFwZ8yuuEIs2sYGrAo4wMyfzGxKUPAyg YBMbY0vXX+JshWI9uudh0Qy+gs1t7Ux2mGG+2Bt3a6ny0B15shm762VSZp3WBvkBYXWd TW1XbNeFz7VV2TSUfXXIPu+kV7qkljQdYuqofSaQ4+p2Ce9GgnAqnL2K5wW0+5LciX4s XV6jtlWiNS4Hzs9w/3GujpUd/TdWnwCze4hx/j6e1hP4OBz5gnQ258nZkWu0SRz+dxIp 2Rxg== X-Forwarded-Encrypted: i=1; AJvYcCVevjMw1OM0Tryla8JhSOp+ro+1pnN/8wt80mpnfdkaX2nQNy9tv+GsX4/Chn/iw+QzxmRxy0hsImo=@lists.xenproject.org X-Gm-Message-State: AOJu0Yw2iQv9UG5B+8+Z2hvLsVET6mVw3pAhWVkcE5QoBj4zSo9PMjm9 2tdI1Y9FtZBYfMU+8sVH+/pfNUazebcr4YQeio9buLsl41zHlVfJ/rRm9WHTwqlD7lo= X-Gm-Gg: ASbGncvAP2rIFb86RejimQnmeuJ2WsKr3txEOKK3N2CTmqw41Tu4jUQ0INf8acJgKhm /3RM/sQf35JaCM8mhDheUwPUu2tWJRseLO5uZjvDUW6AVtgtU8qP/6xheY3QHq6nDFL0v7xfNX9 AIakgsLSo6asaGastOMRRtZnjoW0lgrq2ua9714sm0pwaKLt8ApWHS5lQjCmZXmbvQX9TB/aMQb NlaSdX8lNTI3jvF7jnMfTabivnaz9seMc8lHLOBK+vrRmOdSn3Xzgc0YM7xgpkItA//Blb8X3rn PQnDtFStoAqLGUwXVxoxQfwiP0KPcVcT9V3p6WcY4Bh9H3i4J7Jzhxxm8a3O8oE9i2dW3JwzqJb hekAoTOXy9rUpv+qGR6guCxtmM6yJ0Mf8z9p7mGHrcHphniGGXvq13PqJPkQ3Kd+s2zgymh9u X-Google-Smtp-Source: AGHT+IF/C6oWT8UwF1sEc7lk12OQ3847JVrL7Xi1bCnoAAIGAt33I27+pHrZ0wCfK5j980LBTwOBoA== X-Received: by 2002:a05:6000:1846:b0:3ee:15b4:846c with SMTP id ffacd0b85a97d-40e44682b8dmr16577132f8f.28.1759170848080; Mon, 29 Sep 2025 11:34:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 13/15] system/physmem: Inline cpu_physical_memory_rw() and remove it Date: Mon, 29 Sep 2025 20:32:52 +0200 Message-ID: <20250929183254.85478-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170985591116600 After inlining the legacy cpu_physical_memory_rw() in the 2 functions using it (cpu_physical_memory_read and cpu_physical_memory_write), we removed all its use: remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/loads-stores.rst | 4 +--- scripts/coccinelle/exec_rw_const.cocci | 22 ---------------------- include/exec/cpu-common.h | 2 -- system/physmem.c | 13 ++++--------- 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index f9b565da57a..c906c6509ee 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -460,10 +460,8 @@ For new code they are better avoided: =20 ``cpu_physical_memory_write`` =20 -``cpu_physical_memory_rw`` - Regexes for git grep: - - ``\`` + - ``\`` =20 ``cpu_memory_rw_debug`` ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/ex= ec_rw_const.cocci index 1a202969519..4c02c94e04e 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -21,13 +21,6 @@ expression E1, E2, E3, E4, E5; + address_space_rw(E1, E2, E3, E4, E5, true) | =20 -- cpu_physical_memory_rw(E1, E2, E3, 0) -+ cpu_physical_memory_rw(E1, E2, E3, false) -| -- cpu_physical_memory_rw(E1, E2, E3, 1) -+ cpu_physical_memory_rw(E1, E2, E3, true) -| - - cpu_physical_memory_map(E1, E2, 0) + cpu_physical_memory_map(E1, E2, false) | @@ -62,18 +55,6 @@ symbol true, false; + address_space_write(E1, E2, E3, E4, E5) ) =20 -// Avoid uses of cpu_physical_memory_rw() with a constant is_write argumen= t. -@@ -expression E1, E2, E3; -@@ -( -- cpu_physical_memory_rw(E1, E2, E3, false) -+ cpu_physical_memory_read(E1, E2, E3) -| -- cpu_physical_memory_rw(E1, E2, E3, true) -+ cpu_physical_memory_write(E1, E2, E3) -) - // Remove useless cast @@ expression E1, E2, E3, E4, E5, E6; @@ -93,9 +74,6 @@ type T; + address_space_write_rom(E1, E2, E3, E4, E5) | =20 -- cpu_physical_memory_rw(E1, (T *)(E2), E3, E4) -+ cpu_physical_memory_rw(E1, E2, E3, E4) -| - cpu_physical_memory_read(E1, (T *)(E2), E3) + cpu_physical_memory_read(E1, E2, E3) | diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6e8cb530f6e..910e1c2afb9 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -131,8 +131,6 @@ void cpu_address_space_init(CPUState *cpu, int asidx, */ void cpu_address_space_destroy(CPUState *cpu, int asidx); =20 -void cpu_physical_memory_rw(hwaddr addr, void *buf, - hwaddr len, bool is_write); void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len); void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len); void *cpu_physical_memory_map(hwaddr addr, diff --git a/system/physmem.c b/system/physmem.c index 5a0ee3b8e58..93e9550338f 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3181,21 +3181,16 @@ MemTxResult address_space_set(AddressSpace *as, hwa= ddr addr, return error; } =20 -void cpu_physical_memory_rw(hwaddr addr, void *buf, - hwaddr len, bool is_write) -{ - address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, - buf, len, is_write); -} - void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len) { - cpu_physical_memory_rw(addr, buf, len, false); + address_space_read(&address_space_memory, addr, + MEMTXATTRS_UNSPECIFIED, buf, len); } =20 void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len) { - cpu_physical_memory_rw(addr, (void *)buf, len, true); + address_space_write(&address_space_memory, addr, + MEMTXATTRS_UNSPECIFIED, buf, len); } =20 /* used for ROM loading : can write in RAM and ROM */ --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170978; cv=none; d=zohomail.com; s=zohoarc; b=mUMy9HS6lpXr8QMGgGYJOhSjNH8iOTsa4nWG9ZSQn2o7QaK1W5yvBN3e13jNvBIj4yw8bIHovXN2n80KIW0f9VNvIYYB7h6Qq78MS5s8uYghj/HrCSUfO6joHZDzSldsuYz86N/sUElvhCnVtyci36vUcf1GsyA16p2EtwNtQxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170978; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MBpejQiq0e/vydo49FSQoIaJ0P/BjZpeA7dR40L/9NI=; b=NgS2EiswAbid4N58adL98imxKV87Bjhegq0oCUuYwDqL0cJxW6fuZQgXISRLbut8622C+6euKNKNo04EEcEv9kakCWDaNfusS+F0ZCG2UJNrg+fgC7PqXT2MoSS/N4cULzp0sWtv/bj3Hxokbr49la6KXSqb5jX1O5jXFTOKaKQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170978306880.6782475171944; Mon, 29 Sep 2025 11:36:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133176.1471360 (Exim 4.92) (envelope-from ) id 1v3IjE-00055S-Qq; Mon, 29 Sep 2025 18:36:04 +0000 Received: by outflank-mailman (output) from mailman id 1133176.1471360; Mon, 29 Sep 2025 18:36:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjE-00054c-O0; Mon, 29 Sep 2025 18:36:04 +0000 Received: by outflank-mailman (input) for mailman id 1133176; Mon, 29 Sep 2025 18:36:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IhU-0000iD-Ck for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:34:16 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e62002a6-9d62-11f0-9809-7dc792cee155; Mon, 29 Sep 2025 20:34:14 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3ee1381b835so4178802f8f.1 for ; Mon, 29 Sep 2025 11:34:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a7c8531sm237281965e9.0.2025.09.29.11.34.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:34:13 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e62002a6-9d62-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170854; x=1759775654; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MBpejQiq0e/vydo49FSQoIaJ0P/BjZpeA7dR40L/9NI=; b=BliYw8ObxLx0c2q/rLWRW/7rj/rwztZlcklyFoN5poh9KkHSmpLhlQtuvdVdg/9Fru wdXAAKD5LEr84Y+U8jlGNoPUaSVesTvfgB2mED8CpmHX7zMl6tIjEUPDmEc0wwbtiung lNts7nCgL/PNjEnMygd/6hvlHimwsX+5/6XepUIo0JWGDj0kDXGRAEzDPf5sPU9weGXk JfYbO4mcuDoIYQLPIPSjpwaf/amNKGwmpWwl2352veYY01CPevanVjYdrDAoEVaC294K DJwZeymUgIIIyAjOfN+ChrCCYy8vKfp30BC8wHTGGIRwAgQklQXOoNbWW7jlogoo8+a8 Bjgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170854; x=1759775654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MBpejQiq0e/vydo49FSQoIaJ0P/BjZpeA7dR40L/9NI=; b=nLlghcP4GXq9wyDS5oNMpkfMJSteDpBuxPbWhoq+ORGfOzziVfwR/wc9wvZRKiSGgF 4QWocVs431IWYSqlfj6QcwDbXeeZvU2vTequuTsVsGbJ24nRa0QCOuV+IIxt72Bnf6px dj4EMaCQTSlV7oCRMINOALso1QM+duUAlJXcUqtc0n4S6MA2ef5U48WOgS8Fzo356Vbe PQktNcpIjqI9izHTu6gct9i7fyEOIV1EtcFVRTaxmg1IcGqN5mTKpMjey4H/C28ojr6D FaerTMt2izDWvLKUEYWzbioFMCCnoYAPlxvoXSToYAQFNDKENdtTgnferfmi3esaA9eZ JSjw== X-Forwarded-Encrypted: i=1; AJvYcCXxkQrXI9fpn+CdzqVDCQq526Ut+lLBpGFS1CQ6fQ+b/WV1p4DEElbWHSmFUob+Hw8JmoX4sVUMzGM=@lists.xenproject.org X-Gm-Message-State: AOJu0YzJqDiwGrPPWSxn2Gb0rGP5ACbbWOG6qo9LAA23fMueOi3Fe8WG 6laUtis7z7EYZQ0QnR+GXMCnoLezrwJ4pg/2fTLU551A0V/IN7ikxbxZ3dVhcg+BpUQ= X-Gm-Gg: ASbGnctv7vpJZs0R78gVEvqSno2uKxMA9TqCsa5S6Gs38ifR04Rln2Wcwl4mUOTXjn9 QWjAYaquJHbG6vMZxF0XCshCZbUXsc1E1eMOz/AxtIWQFrszk9nVEO4WAKMdzm0qTYTzvN3DQIS GQQmzMDDi1qsrJnJNWOVIe3e1IAJAluPdJA2f/lYtEZKVqwywIr9wDch+/0oT15VfvzGBymGwzz JZmokCGXtY2CGbv41KccjnQd+1PK7Jb8i4+p89h72TeI7UoB5tFN1PjUrAoL/MwISxBLpgLgljd 8gThzzmVy2PhBggBr6jb/C1F/K40Dj60Alke4zqwBkGBHpJieuLI/9jxEujF00EVwMsIicpvPEu CwABIRNde3nOzyhxno0hGVtGME+Duw/yZlBSi/BQz3VWNt0LzHL6LjY8Jfeq+GjaS0cS238WSFx Eo/gm7GRE= X-Google-Smtp-Source: AGHT+IGDdDVnNCTQHNmf7VOOiV8zymTG0ZaCom+HQXr9Sc1CkJ/8s/f399s7GfQrqulF9pKPADkmMg== X-Received: by 2002:a05:6000:22c5:b0:3ec:d78d:8fde with SMTP id ffacd0b85a97d-40e4ce4bademr17302303f8f.44.1759170853668; Mon, 29 Sep 2025 11:34:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 14/15] hw/virtio/vhost: Replace legacy cpu_physical_memory_*map() calls Date: Mon, 29 Sep 2025 20:32:53 +0200 Message-ID: <20250929183254.85478-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170979425116600 Use VirtIODevice::dma_as address space to convert the legacy cpu_physical_memory_[un]map() calls to address_space_[un]map(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/vhost.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 6557c58d12a..890d2bac585 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -27,6 +27,7 @@ #include "migration/blocker.h" #include "migration/qemu-file-types.h" #include "system/dma.h" +#include "system/memory.h" #include "trace.h" =20 /* enabled until disconnected backend stabilizes */ @@ -455,7 +456,8 @@ static void *vhost_memory_map(struct vhost_dev *dev, hw= addr addr, hwaddr *plen, bool is_write) { if (!vhost_dev_has_iommu(dev)) { - return cpu_physical_memory_map(addr, plen, is_write); + return address_space_map(vdev->dma_as, addr, plen, is_write, + MEMTXATTRS_UNSPECIFIED); } else { return (void *)(uintptr_t)addr; } @@ -466,7 +468,7 @@ static void vhost_memory_unmap(struct vhost_dev *dev, v= oid *buffer, hwaddr access_len) { if (!vhost_dev_has_iommu(dev)) { - cpu_physical_memory_unmap(buffer, len, is_write, access_len); + address_space_unmap(vdev->dma_as, buffer, len, is_write, access_le= n); } } =20 --=20 2.51.0 From nobody Sat Oct 4 22:05:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170997; cv=none; d=zohomail.com; s=zohoarc; b=hiexCSv/BdjmHMXIAtt+LFwVOsjxYPOt/xna/Yu4IxjpC/gXNRL5MP6GsP6A9dHksC0laoO41HxIxbvNE55gRFuevouw8JhlguJwkHGvyJ9F+ft+VRt2X2eDNKb6cHsClkVaL42Q31MsrBkKxwGwYsrPvQBDU0MbPvrQcvU2KpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170997; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=N52A89VzDMEjqtiIM9iI4rGakIgUvccMkqJKYSbtITxfkuQ8qjb2y2RIQgNjOGxOA93YJ2RhUT6fZUxVWRqP9srppgcLk/I7slvmBS81+ZI8xHAJvTylpOwRYuPpzLWJR00QsX/3/LXv/MDipp7w8e6QHlg3XB9DGLdmIzdwZj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170997116361.55449680137303; Mon, 29 Sep 2025 11:36:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133210.1471420 (Exim 4.92) (envelope-from ) id 1v3IjR-000798-NU; Mon, 29 Sep 2025 18:36:17 +0000 Received: by outflank-mailman (output) from mailman id 1133210.1471420; Mon, 29 Sep 2025 18:36:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjR-00078u-DE; Mon, 29 Sep 2025 18:36:17 +0000 Received: by outflank-mailman (input) for mailman id 1133210; Mon, 29 Sep 2025 18:36:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IhZ-0001U2-7G for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:34:21 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e96d1105-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:34:19 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e52279279so10850945e9.3 for ; Mon, 29 Sep 2025 11:34:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fc6de90desm19572933f8f.47.2025.09.29.11.34.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:34:18 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e96d1105-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170859; x=1759775659; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=Y9+30Hkz4HHQfdraVyqByB/w2vXuPn5+NgKp75yXarQCOItV4arzp+UljZnDb2r+wk uOtH/8hu/grT1nFpqIw+vFiwHI66+1xxDeIBp+BiypFmu7fl4twgnT7Be6RNDX0hfYmN ozT4+xQSVKySdSGZ/7GW8hE8d/qVVEM/aFXgnRDlmqZQeGw9LTrIQU1MoKlYQbXKINw9 pehIP/lffCEoWF+8z5b7ovpOdmT73pFJXYXHpPblQxyh+dJoK2R7mHqwIhaeQSPD/doG PRnlOMpbtAG0puLc6U/46RgN6ueuqHt25FygtxeZKkCY3DT2Hwl+V1BACy/GZAfDDlZ+ A98Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170859; x=1759775659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=HBt/UqifR5AuGk3jA0Yx3dzY/w6l9sRG7niKwT3Y/39olE80Jy2rqVFV4CiW9ZOO66 Akv120kaE8skmJYAjYe3Vzeg8t7iKfNOO72RN9kGukpc/On6YfDKv+/+HDuY2YEY2psc xq8grKwErZC9Rgg8rWdTa0ulN4YUItqE36gyMYQ4Yv3ftBMkqz5KUVUXOaxqOWBLddmN h4+1dsOGHYYPmLIMWxtrk8QBrgrcQG3vG7FzdqyyWP9ok2fy3WZsaDQz75yKWbkkoxU0 7JcKUKcOfC20XUktUMC1RXFRul5tRl9F8LpGk0FWGXtTecXcKD0IqqboJcLGetKLJbU6 omPg== X-Forwarded-Encrypted: i=1; AJvYcCUM0eD5DrHj8qohU4credFtCl1j9Ohtu01W7gqv8DIyevge4puOWhzwKxo1bu2PHxkqckAELoIMqLE=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy3ccE60tPD6cdNenC3g2VfXA46eiqp92TM4F/8wDyRErp3Ud7Y E8YIlAiRlPJVzrjK4o/+P6ct4NHjkfiu2274aBFe5UZSZW8q0lMm4sGDDjuMHZ6KvRI= X-Gm-Gg: ASbGncsbacjyyi8UPlOO2zqObZstwhMhNtJFBDL//BlwrTDVyfkS7oV9QoTFIrmz2bs +pxSApQ+YVYj4hH8Q6Rm429MBAiH3SnFUIj75o6KvIjkl4PfC2QvyILL1XJDe0vMv8k3UVZm1nW aLz9mTdB85zhiG6q0+cCziAv5r0d0iJBie1cUnD8sAQRIaAxf5b8UBMW9XAazXIBQlX7571ypNT Da3pmgQ/8US5p/wSgZdwDp0MiEchdvBdhRRALNN/YJrXdjav4bffnuSC0PioiJxMbcai5toyupB gP120Sc/o7BEWVHOQbhR3VpUB2nS92GMK3T3bgcgR2Y3b7Ds7wR5s0yOmHAyv8rM88AqchtkklG 26Dzob9U+4yLU9OkTn+LhYukTywSFhGOOGN8+LmHy5i2TO6NfYBvqsDznkG9sBDNNu6cS4ZiB3V 94EV0E/SY= X-Google-Smtp-Source: AGHT+IESuOr/9kkTMP61JEo78aO/qu+Se16k4y0bZLp5zO2vT4tUYcRGwPC2KF7trcFZOrvkB6y8nA== X-Received: by 2002:a05:600c:5491:b0:46e:345d:dfde with SMTP id 5b1f17b1804b1-46e345de049mr203777245e9.16.1759170859187; Mon, 29 Sep 2025 11:34:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 15/15] hw/virtio/virtio: Replace legacy cpu_physical_memory_map() call Date: Mon, 29 Sep 2025 20:32:54 +0200 Message-ID: <20250929183254.85478-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170997677116600 Propagate VirtIODevice::dma_as to virtqueue_undo_map_desc() in order to replace the legacy cpu_physical_memory_unmap() call by address_space_unmap(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 9a81ad912e0..1ed3aa6abab 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -31,6 +31,7 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "system/dma.h" +#include "system/memory.h" #include "system/runstate.h" #include "virtio-qmp.h" =20 @@ -1622,7 +1623,8 @@ out: * virtqueue_unmap_sg() can't be used). Assumes buffers weren't written to * yet. */ -static void virtqueue_undo_map_desc(unsigned int out_num, unsigned int in_= num, +static void virtqueue_undo_map_desc(AddressSpace *as, + unsigned int out_num, unsigned int in_= num, struct iovec *iov) { unsigned int i; @@ -1630,7 +1632,7 @@ static void virtqueue_undo_map_desc(unsigned int out_= num, unsigned int in_num, for (i =3D 0; i < out_num + in_num; i++) { int is_write =3D i >=3D out_num; =20 - cpu_physical_memory_unmap(iov->iov_base, iov->iov_len, is_write, 0= ); + address_space_unmap(as, iov->iov_base, iov->iov_len, is_write, 0); iov++; } } @@ -1832,7 +1834,7 @@ done: return elem; =20 err_undo_map: - virtqueue_undo_map_desc(out_num, in_num, iov); + virtqueue_undo_map_desc(vdev->dma_as, out_num, in_num, iov); goto done; } =20 @@ -1982,7 +1984,7 @@ done: return elem; =20 err_undo_map: - virtqueue_undo_map_desc(out_num, in_num, iov); + virtqueue_undo_map_desc(vdev->dma_as, out_num, in_num, iov); goto done; } =20 --=20 2.51.0