From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675335; cv=none; d=zohomail.com; s=zohoarc; b=L21mmiklET1gBb9blKoirBVv1Nfrcpy6w/FeE+oKXcj3v+ZFOEoKzFTasDTPaxBGKibvs7vUHCigzEU7knV1dwNEcqQGPN2Zq4pPFibDNYggycO5RsDIR8nilzziEMSunupkVCqqUN7EshMgsHpGxSz5FYksA/mJ/VNWRUigHs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675335; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RGm17n3GNDykAs4UeW0nI6eNRzRj+Ya0fbeg5mVxNeE=; b=cSNkq4p12evW1P6/92lbD6+DU4f79T91nX3fHoUv8JoeBeV0HQmR68ZY8vSZ5ofvRii6oKw165nDn21cNxkxP3Fvs80YqjRlaYO8/zwcsjiXvQhs3mNE2sGlmaWx0T6b/3oWHqwCGCi5w4F0LMfK8AziCh+b9bJEuzTnR+hQsJ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675335796816.9620286654047; Tue, 28 Oct 2025 11:15:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoDg-0007Em-Af; Tue, 28 Oct 2025 14:14:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoD7-000703-OZ for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:14:32 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoCx-0001fS-Oc for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:14:21 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-427007b1fe5so5290215f8f.1 for ; Tue, 28 Oct 2025 11:14: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-429952db99asm22057430f8f.32.2025.10.28.11.14.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675245; x=1762280045; darn=nongnu.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=RGm17n3GNDykAs4UeW0nI6eNRzRj+Ya0fbeg5mVxNeE=; b=sC9/aATb1oTLFCmiUQmN0XFGPc1CVbxzXBCP0txLTTWgZIZ/OEMXWa7o3Bu7fDGIjG DZab6hrXetfOhvs0f3gZXNJ+/hBxiEVZ8gFB9zT6Nhcg5MOrMEwIU7GeRVpWxyPmYNBb +cFsxey6xO9+MbFnHlGSy8uY4961RJmUtCkuuXJMB3JFbmG38eMqBCaN6AL83MdHIiKI 1z0zXGImSU/20mAePbOc6BZ6V89Up26eAuIDM5LxQVjqDJc1RAbBzF2BNWIfy9lvVf4U h6biidzBPU23ltTzJYObge9MoVKT+ElMSwk+0ejIsTWe9ztsMd0+o6+Bp3dMyYkVlvmG wGUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675245; x=1762280045; 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=RGm17n3GNDykAs4UeW0nI6eNRzRj+Ya0fbeg5mVxNeE=; b=hYhwfXTTNM4NrjbG7g8Va5/VudaRe0B7P4m1VL4oAK8rw5HynJ5vrtN9D3vjMznY7y pvCSUSsg0jKiZUridMDP+GQ3GZJxejZm9jRganLLI9XfmO2HWLgoQgVWROtvJgPdqQNC beAvz8aOljaMg/W+VNSAgzBX36Tfc/WnaXdpFra1RoGx1W6mtdVGy5QEcPAamHlWufT4 kvwjL/9AbtCBgFKU63vnXgFtmtwS6YWie6KwE9GItfFGkyGHN75rUdzAJ9Spv77MPKnK HeovfhU9EmYFgNp1NKJmQ/0zDly3c0ZzOkTEshiH2ZVFJVOTdGtQhhKDddeM8dvw5gEF B8dw== X-Gm-Message-State: AOJu0YydS3Yilwxro3AMl15kk6Clbn1vnUZVtHtsOn2RWGkmxzcoANZA qFw8haA9SFKosx2v0UvGFbFrHlbEk7Y2OmkRHx8JbOzvYpuWw5AoPXiW55wYya+BLVLhiYuLxcW M30UyAvs= X-Gm-Gg: ASbGncuUeCAAavol3LPpEfp+GM2cKY7RUCFF2TofccdNAa3f725wHLgXuWqEdDfNE7V tuRJIO1QZ6PVFazF9zq4jkvrz6fVQ7wRwAUp8YIs/93RlK3wv7m7qhZpGNJmIIinjX156XMKolX dmhg7fih+1OI9ry8X7nr9OrVSqtydRNH432XcmeN9ct03Zvm69TacZ8uCJwHfjVUExPMlk+KmGh yfuZKzm12RjhA8ps4v+P/2Q56V1cvRPHzRu+CEtss+KoB6q3kHL7KCJv3vii3P94IzvMj+YpTFd pyiyBezWp7REXRIdWULSkonR02lMNN9PnxVuH7RFiKIq4kQbUCzBhTgE1WMEXmTtwOWxvq4LEvj fYx+fxQwKdMnmWQCacx8kbywPGJL8V+K6Khrmc5jR7lXE4ZAqpHlsFfuC7+V4fmb6IdoxFJGWq5 EWPvExfhEzdIAeEmmBfR6K0Rnj32S9GlwqBg98dONwlnkf2//HeA== X-Google-Smtp-Source: AGHT+IEn6BXLgcLqz8vdSXbRpjSkU44daKaJ2dzVUTotYkB7GlMJyzAOsTXte1or1dBi5x1pPqxwOQ== X-Received: by 2002:a05:6000:2c05:b0:427:9e6:3a64 with SMTP id ffacd0b85a97d-429a7e91ea7mr4547478f8f.47.1761675245209; Tue, 28 Oct 2025 11:14:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH v3 01/25] hw/i386/microvm: Use proper SysBus accessors Date: Tue, 28 Oct 2025 19:12:35 +0100 Message-ID: <20251028181300.41475-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675341654158500 SysBusDevice::mmio[] is private data of SysBusDevice, use sysbus_mmio_get_region() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu --- hw/i386/microvm-dt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index cb27dfd732e..d7f49bc1b5f 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -71,7 +71,8 @@ static void dt_add_virtio(MicrovmMachineState *mms, VirtI= OMMIOProxy *mmio) return; } =20 - hwaddr base =3D dev->mmio[0].addr; + MemoryRegion *mr =3D sysbus_mmio_get_region(dev, 0); + hwaddr base =3D mr->addr; hwaddr size =3D 512; unsigned index =3D (base - VIRTIO_MMIO_BASE) / size; uint32_t irq =3D mms->virtio_irq_base + index; @@ -150,7 +151,8 @@ static void dt_add_pcie(MicrovmMachineState *mms) =20 static void dt_add_ioapic(MicrovmMachineState *mms, SysBusDevice *dev) { - hwaddr base =3D dev->mmio[0].addr; + MemoryRegion *mr =3D sysbus_mmio_get_region(dev, 0); + hwaddr base =3D mr->addr; char *nodename; uint32_t ph; int index; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675409; cv=none; d=zohomail.com; s=zohoarc; b=MzCQ9W+cuL3EZiNVVyTilvPjlAMtOAQbLTlofStbZLAjesLOHwVzcU/I/f1UHvqJ0vafS4IqC86QeF2gIOIqaEz7fMlpgMWr/zVoU9WJrZDyZUYNFj9OLHa7KgPzU/sCLIiv7DkMhme8Z/Sm3cL731ENEnZhfZxKXnOSMD59SUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675409; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zA8SKmOgkqXDGcERg1H6mkjaSwJToDep8qiHL7yl9oQ=; b=ggrYiDrFJhAtSdPhPQX+OjSj2aDsVTTMj5cN5xaLRKfgDG6t0bsSMlyuQULyq/o5X10JTYhmT0lcM+EjtvVN89Gn78+RlLP6vixI55PBp5LVNEErvP65JFZ25biXJsme85u5Ur8cvE0Rx+AGQyqfSLWztOH0YUL5ArSvRMaAU6I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675409975134.99950246649507; Tue, 28 Oct 2025 11:16:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoER-0007na-AA; Tue, 28 Oct 2025 14:15:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoE6-0007gk-3v for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:15:22 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoDx-0001wc-EB for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:15:21 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47719ad0c7dso10646935e9.0 for ; Tue, 28 Oct 2025 11:15:11 -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-47718489d96sm26888875e9.0.2025.10.28.11.15.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675307; x=1762280107; darn=nongnu.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=zA8SKmOgkqXDGcERg1H6mkjaSwJToDep8qiHL7yl9oQ=; b=kxf2Gi8s4AXIQUzGKJMNUAQE2EeJ4nKagRDiI81YYeAKnKnY7DJBHdxYkaQVVEy+q6 xLQUPFAM6vmjvXixGDJRHeVU0y4y/u8OgScq3YYVGkmrJhapuhTnZe72smNYYpfGdrPD obBvya28p0wQHPbX+djEBGaKruCprqsksemVjDceMVbsvFqIYdoCeehORMFXBVoB/lwM s7wUut9A9baN2M3UzbtqvgznUJ7uhw5Mv9HkKiiDfQSAfSZDi95mts+u25tuIuR8+YGu VgWVSYtW/pQJXmBkl9/Ve7qb5HFNJoDCIZiWaphW8yaaLY4daQxaG97j5d0YCtF2Iwes pUyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675307; x=1762280107; 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=zA8SKmOgkqXDGcERg1H6mkjaSwJToDep8qiHL7yl9oQ=; b=qxNwnk0somEFTX/FgPq0gglC/rEOxgO9TXgipz3tS/m+SWlB8UxL7Nn7I3vVRJL3m+ O0ae2cqJ8JH57QoV8Nl7wDMPvMQaKuz6rngV+qViE3FS7UHaOWKI/pQ/n1jJnn4cxrw7 c2Vc3gWQ/YiocC8bwMAhbAsNMAXaA42gd+sBrhtQpauuZXrLKlVEkpri7yNfFANdhbOz 0In5A5H375glrADVh/n3ffB8iGJ1Ym9Bo8xJGD5uIrqr861CYTqp5igSDNyOvim+Ddx2 KGENIDfLIHugCHQZVMmE/hA4/ib8B4WZ8hrZJjxNHJNRDlw6grpmAla+M34VlF0rE+R3 CmWA== X-Gm-Message-State: AOJu0YwPg/Yyyarzp8KgLj/LY08b4UqgUnTryGgenHAIiHpeQhMjPjkZ bjLh/FTVEoZw1E2Df6EmpvB0NB5waTTUulDKMD+grfJh38Ohds9n9gLQImfXbrpw6a4MocMoFOu DUWXGb7Q= X-Gm-Gg: ASbGnctDdtVvFKBX6acA8CqDqQjlI1ub4z2rN4u1j/f4x0kKJlJZkrGA+2d2PuYiaU4 NYBmyO3cre2ZbRDduTQ9Z5uAecZMf0psmOF3b9MbQh4IznH2GQIEAG2+WerVP24dUBM25AlBVTO wcjYcEYvktL5ssIRGtwvxgWDINRM1D1fHPIDIDP+c8O+R5adNCA1pW0ma9LTbmHcb2HmqiTpnde x2DQEADYmJqaBvBRxNPuMT5s6O9Sqwuc62LPk8865q8D9i8huAcV1tYmpGNjI/kvLpS0XycmQCP dHX3SIank9WR9NlG3gFSY1gQT1kqHnvkSwwyYLBBrxmSLA1Tj5vS6sRySYqulInLcgsJpCcrYds T4NrQwHw9LrnF7d32lDrDlOuP9WI7EvL/ooppIN2ls5CeyngvB2LJx2rc5i+KqFEPFyj4MfuUi0 JlD341VIf+6aeaxlPMl4fPx9hDb19Spe+a0qjRQJu6Bvwg28SgiZuQfSIZUPy/ X-Google-Smtp-Source: AGHT+IHGa7i8N5C193MPmkOywSRQJAfkqFaPiX57WAZi/cfIO5WheZGBTLOuNNoY3ewFL4QjIRNsZw== X-Received: by 2002:a05:600c:1549:b0:471:1306:aa0f with SMTP id 5b1f17b1804b1-4771e20e400mr3209855e9.38.1761675307364; Tue, 28 Oct 2025 11:15:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH v3 02/25] hw/i386/ioapic: Use proper SysBus accessors Date: Tue, 28 Oct 2025 19:12:36 +0100 Message-ID: <20251028181300.41475-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675414940154100 SysBusDevice::mmio[] is private data of SysBusDevice, use sysbus_mmio_get_region() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu --- hw/i386/kvm/ioapic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 693ee978a12..0519432edbe 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -80,6 +80,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) { struct kvm_irqchip chip; struct kvm_ioapic_state *kioapic; + MemoryRegion *mr =3D sysbus_mmio_get_region(s->busdev, 0); int ret, i; =20 chip.chip_id =3D KVM_IRQCHIP_IOAPIC; @@ -87,7 +88,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) =20 kioapic->id =3D s->id; kioapic->ioregsel =3D s->ioregsel; - kioapic->base_address =3D s->busdev.mmio[0].addr; + kioapic->base_address =3D mr->addr; kioapic->irr =3D s->irr; for (i =3D 0; i < IOAPIC_NUM_PINS; i++) { kioapic->redirtbl[i].bits =3D s->ioredtbl[i]; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675454; cv=none; d=zohomail.com; s=zohoarc; b=cSimR7KabYgbw36Stqp8WscGg1PHOMu4FQIkwEfyvkbovl9PJGl6iXylgSKK/MnCYTUBi/dENwJUEBGbfC3m/DK1hdGjb/D6j6KB/ARd4Xuc8Mpi689h21Kh/FLPiDjE4no18d9TqXWfbjKcC6NdTcMU91+hkrqiztkCXfsStdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675454; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MMOoNQ4yfP8zRjN/wkqFcQTswPDQJkEjRZPyBLzoOO4=; b=a4Rae8eBQ+olcSFZ5V/hVEH3AdUr1iof1/1Z4750TPfbkQPvWs4cJe/hIE27jLuGZPzjGeZ3sFHMxVExPvAM2TAESva6Jte17EA0RwKPKJ7gOqJPdBZyGfV8PXHYJ/wUYPUPvP0ZFuOUDyQ2rV5idBCozLDRUCS5wbU0bVgBWRY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176167545467283.1753505356877; Tue, 28 Oct 2025 11:17:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoFY-00008j-5G; Tue, 28 Oct 2025 14:16:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoF3-0008Q1-LV for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:16:26 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoEy-00024C-3P for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:16:21 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so3263290f8f.3 for ; Tue, 28 Oct 2025 11:16:13 -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-429952cb7d1sm21956221f8f.16.2025.10.28.11.16.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675369; x=1762280169; darn=nongnu.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=MMOoNQ4yfP8zRjN/wkqFcQTswPDQJkEjRZPyBLzoOO4=; b=mBL6CLxA2L+RZlV9pzJ1CbK9eJTwCmMSHctZOe0EuyvLFVImmCocLgjtxEQlR3nbxE 9YAUrfno+siznb2VRG7aS6Dsv/TjvmZIHQKeyREjhi02m9D7QvEtgCdV3Ky6YiVkewv3 0wjvd+3P4bumVRu5Zuvl8kGMYfifk0pHPpmpIaYgKu3nJb6IPaXvk/I6UfALjouODPxA QBFHUY6qZfeNq2D/2pLH13JcqCi2MbF98xZLi9qpYM+m2GY5FJpkAHDgqGznAJoJB89N vMCIu/XI2QAvap/9kjptXGpflkJuZy7FN7nBfsb3shu0MTYB0QzsGn8b7036+6o9M5Om W8nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675369; x=1762280169; 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=MMOoNQ4yfP8zRjN/wkqFcQTswPDQJkEjRZPyBLzoOO4=; b=O7DBF5xiy8Ci7naUyXUVj8hG9BGYfQxVEsNzfOoh/OcP6/N6kn06fJxQePf9ZQuRbB VrzASlp/Cq+iobaKEDvcrnG3iEztGHtKbJTpPPg9BK6tdXHhPGKkCOAUMh9lGqGwRWIe 3NuK3cv91l4kumoL6BkTMeNPqF7bsj4mrt6bHG8pmK1OiZB2vQ77cBh/2ytL3UQP/PZo j+Jeq61EJaCv5TmslO9+YbKn5Qlf+cSdrM2DZCp1XCkuoFEPrOojQb8CDZVw/hsgRcsG SitZFs8StsSAB/vsDYMyUqrG1yp9rSnImACwG2OKS9EGCqdd32OCjwTjR6GmJoLQLZx/ oO4w== X-Gm-Message-State: AOJu0YxeBbOeV+wQE3nCkH0UOG55WPAjBLDV//rieyQ5bWsAVNYbY0j9 dPhudjdVrggWFUIm0JiSONpOqGS6XPvpoxB/0mBb/G6W7hQgnR7zLAac8F+kVyevJ5jZy7Ct1sU kf8a0Gvg= X-Gm-Gg: ASbGncsdyqYvfYadhIBUfDGQBvNOfFdSXLCwSlGMAd/7vDfLjoz2T5WlTA2CBsMJov7 wbKhIofOLS1WEb8NvPN1UkXh8SHvaqsAidd07XduIq11mDEKdj5+pYeCGxCO2XNZg2BMJK59XrF lsoAsVXOwTszag7zOafEyfcV6iqOT19v4pCKsyEBYsBNtArHR4YrSLShzTgaNKP3ETur5rtfGIW wvttwEDJjDQDZOZ3OcOll0LtN+umeL6V2LBv1kb5ZYGvPK8Sb04ABfX8edST+oveIojdJdm7/7V lT1FTQ1mxJxuv8UlsMDmzsI92eWKnI3LyBrefFDiThWkGaP/i5jcwvy5Fd0SLhEXCx88ZZxXfqy AbaDVjHeupE9aC9L0nANlnoLwbO647M7pK2WjGj0L8KIoaa9dcdhUFDkux6RkTqNCavwg4KO1LY Q0a+cHn57XqtgTIbSVMJ1hxGElNkSnqbxOxDFCkMHStetlK5OMSA== X-Google-Smtp-Source: AGHT+IEjfV7sF/zvHFmsLDmAn/faukg/F1LWBSlaDOpKZ7DB2WWlIEcz69CsAWaVreP4Y8dnZflKXQ== X-Received: by 2002:a05:6000:40e1:b0:429:89c2:d944 with SMTP id ffacd0b85a97d-429aef82febmr23492f8f.15.1761675369423; Tue, 28 Oct 2025 11:16:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini Subject: [PATCH v3 03/25] hw/timer/hpet: Use proper SysBus accessors Date: Tue, 28 Oct 2025 19:12:37 +0100 Message-ID: <20251028181300.41475-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675458902158500 SysBusDevice::mmio[] is private data of SysBusDevice, use sysbus_mmio_get_region() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu --- hw/timer/hpet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1acba4fa9db..c1b96d0a89f 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -654,7 +654,7 @@ static const MemoryRegionOps hpet_ram_ops =3D { static void hpet_reset(DeviceState *d) { HPETState *s =3D HPET(d); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(d); + MemoryRegion *mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(d), 0); int i; =20 for (i =3D 0; i < s->num_timers; i++) { @@ -677,7 +677,7 @@ static void hpet_reset(DeviceState *d) s->hpet_offset =3D 0ULL; s->config =3D 0ULL; hpet_fw_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->cap= ability; - hpet_fw_cfg.hpet[s->hpet_id].address =3D sbd->mmio[0].addr; + hpet_fw_cfg.hpet[s->hpet_id].address =3D mr->addr; =20 /* to document that the RTC lowers its output on reset as well */ s->rtc_irq_level =3D 0; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675539; cv=none; d=zohomail.com; s=zohoarc; b=jfMe6mLHYzqX5V5rr3u9ESZB7yM7XnjxetgPYh6BsMIMy1SxjEIsKphFVACL3W8RnZ3koB8+SiRZqXi6UjXLhypyMohG7bRsYtghp+CwfZR4KnAKn16HcMpIz58W0kCgbPDUaVndFAzCCJAZhhin0z5tuW4lnyqcxcm4PmLAxRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675539; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ogjIj2x0b+Ph1mDq8xs+aaEQIpc9IB/77pPj2JRToEQ=; b=DHPMm128cNZ5IZMl5RJXewxX3OEf4T560z4B+WQC1/+Kr6hWxg0HTVj/wg3awCLqxwleFrvzD1/Gb0dPGd68+u/dhrLNIv/N/qb1YCWQSGz+zUy2yidIeF9vA/0AN8q1c9UmmQUBbCmXCNrimXn/OZtxovPABUME5FhaZeeo5dg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675539438423.6602701517253; Tue, 28 Oct 2025 11:18:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoGR-0001AU-3c; Tue, 28 Oct 2025 14:17:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoG9-0000Sx-2T for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:17:32 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoFv-000286-Iq for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:17:28 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so3997576f8f.1 for ; Tue, 28 Oct 2025 11:17:13 -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-429952df6b9sm22503931f8f.44.2025.10.28.11.17.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675431; x=1762280231; darn=nongnu.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=ogjIj2x0b+Ph1mDq8xs+aaEQIpc9IB/77pPj2JRToEQ=; b=snw85uAJ0YE12Hnho7O/S5L0PLEcMKwytIZn5Mv7H5AgMkUQ8A8zl9lMIovgIq20Td WPFLZHcNzvvlrumhXQJ/epBOW1Zl2p/QNONH7/ZQLw+j3SwUx5ty9/QDOrKnSRBiO6DW c1jFwx1YD3msirEoP/93Hb8kw0Wn6jXSDQQYNkHydwolFfjRluQl4eJUbWSzsgdai7qS Z/QyNlJguFbnZTCMSz2S5TNxIMU/rNtOR4PwoiaA5RKtMnXI5B8iwb+ritDjkcFasAb3 XbdoyB4+A0MiKjpOIOfbSgQ5b12PPZYWW5nl7oaX8b3aniTGujmFb4jRhd8YT8uxRwb6 ooWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675431; x=1762280231; 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=ogjIj2x0b+Ph1mDq8xs+aaEQIpc9IB/77pPj2JRToEQ=; b=PXiydrIv1PBRK+4Vtdk+3VxEAJdjh9DpwhmfPdeuR/YOajfMnWJbP2OZiDJBYb75Dz v+aBZORe4R654VILLCJhol/ZugQiBb1XIuji02Y/xRMn8J/lvqjZ9EgRu9T31FScwAv4 PFzB5/nDhKSJCRX06DVAJQORIfjfsP0xss0FySW80GQJIz1wsKbGPGDUNA6/+CsbCiYp 98McI/oZNwTcTSUmJl1V9psPjCSkGGYAIb3LrexNfnWQ406wY+JTVLIXbb6fvtEThMNi IjZk+hkyHAhGAGPdWtdUK4mfTplu36uaEpmZaTJl0RvaIzUXiazNhqh6TEepE+uOfDLd Yjkg== X-Gm-Message-State: AOJu0YzUR+eJZRXxl2zY07JU0RRXEUCS+8wDG7aY1soUQlHS4HFQ2R8K MILyxWqXV8KHb33pM/ygLoRYnJNhRyWjHxzr3tF6Ig6tWuMPg/GqW0ymetJK/o1oXBuqWN8MVrE yCjk4nq0= X-Gm-Gg: ASbGncupG19Vayv+et/AUnB86+yOGLSNHKYYV8/JZltrbton2ATynhA7ryJ/xJoP9J4 J0fdCPEWIDbZc+TYLb8pa/yYgMB+bNYTKOnxJTum+7d0UrFIv/c19hnfUnIJPD4oGDC5x2feZP6 Ky6mny2kDTJAmgXKKYeJrUX9fptNrvF7XB2HWkScl1vOv93f52llqTHfOSeYjH9EFc2ptcNl2TT 0KHzMZUh7lIfNr7aFqs0iyaR8ZbegZRC/CBbL4a6TdzkaLr3ZMyTVfzoY/qFFiTv7FczNkizeuQ Ltogt/PvaO1JVGKicJu6WTmyDDRuPCesy08cheTW8Zhw1C2auQbi8D0l+PVOUx6KpYgdsqbVWIa eaiPI7vxJ4CvrhbN6N5I+2L9wWA29xs4YqvG4ethxoR465nH8oiyw/X5abpNrY5LiR53uthCEWS JlZRJI9cLkfOGP81TfxmuKXJI2WxsMDHWg2sEz2Qn5LUMCBapIfw== X-Google-Smtp-Source: AGHT+IGZXkSBvcMPXbgnK+FlW/f44gMl6lxA9bRKWCpTYzA77U/IZTSLqjuTQCa2An7uq/TgPnrKyw== X-Received: by 2002:a5d:5f84:0:b0:428:5674:7a13 with SMTP id ffacd0b85a97d-429aefbbd87mr4104f8f.36.1761675431530; Tue, 28 Oct 2025 11:17:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH v3 04/25] hw/acpi/cxl: Use proper SysBus accessors Date: Tue, 28 Oct 2025 19:12:38 +0100 Message-ID: <20251028181300.41475-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675542102154100 SysBusDevice::mmio[] is private data of SysBusDevice, use sysbus_mmio_get_region() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Jonathan Cameron Reviewed-by: Richard Henderson --- hw/acpi/cxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/cxl.c b/hw/acpi/cxl.c index 75d5b30bb8b..77c99dfb184 100644 --- a/hw/acpi/cxl.c +++ b/hw/acpi/cxl.c @@ -104,7 +104,7 @@ static void cedt_build_chbs(GArray *table_data, PXBCXLD= ev *cxl) { PXBDev *pxb =3D PXB_DEV(cxl); SysBusDevice *sbd =3D SYS_BUS_DEVICE(cxl->cxl_host_bridge); - struct MemoryRegion *mr =3D sbd->mmio[0].memory; + MemoryRegion *mr =3D sysbus_mmio_get_region(sbd, 0); =20 /* Type */ build_append_int_noprefix(table_data, 0, 1); --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675582; cv=none; d=zohomail.com; s=zohoarc; b=PiIA6koWq3qCZjs+ltbI0tp4gkgqCdRa0WPXeJREkUFUH9gnJAe68gxlAqw/z5yLQUTQE92vdPedkxYhHCA//bkL7QCy7WADFIwiihUTo5oi0BFv9MCLwf7DsrvW6Z1yqGllS7TLRKbuXkjP233ecVBA6KLX7MIcZIHVw4fP46I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675582; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=01hqDrORZqT6m82C01ACWFcfM3wBkQW5SH2Nidv/XUc=; b=THDZkU30tHXZ3HBMcIGneg/btoiUZwZIQ2PXbWfekbywRlvi0vXM2vnynadiAAO+NZUNVd8LUWsbSH2oU13SnITau20VQF9UIjJbmUr9/jayzPzO9ncY7Wwpx7JSw0KmURPFd0XxVYbhck/UtEIxTUgogAQnFLH4ZJotJFc9x6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675582055283.3498339796772; Tue, 28 Oct 2025 11:19:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoHm-0002I3-Bc; Tue, 28 Oct 2025 14:19:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoH7-0001Xg-8K for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:18:35 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoGx-0002Eg-0l for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:18:27 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4770e7062b5so22028225e9.2 for ; Tue, 28 Oct 2025 11:18:15 -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-47718fd69fdsm25186225e9.3.2025.10.28.11.18.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675494; x=1762280294; darn=nongnu.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=01hqDrORZqT6m82C01ACWFcfM3wBkQW5SH2Nidv/XUc=; b=RlaLx+tSY+hUqtRkv0QBR+kj18iFR0oQwiDaIcpvqhbALvf1QNldhOUZchhfDJ9fYt vaJLMKOXc2HE5nEMIn5s0yUbQlp2h6G77348/3JSSWddUK72pMTU8cRU5AfYpkliAL0u /9Xp+MKzGgbEqt147Adgw/AuP4MFbbwS9Ioy+E0SglbSAUhCK2J5ugVBgLhCBRcJMMTH PA4NqPmrcu0gbUEWw/z9mM2FoygWvtk1JUwP9CIvDQ3JGGtheNX84ctD3fcw/97XMaLf aykIJjCpZF1pg9tEzDbKZRJk31Eahu1AjB8B1wFwdnIwo8cLqahYIUeU4svH4TzxOwvb 6eYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675494; x=1762280294; 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=01hqDrORZqT6m82C01ACWFcfM3wBkQW5SH2Nidv/XUc=; b=YMvCGWOhfDYBIOhUqVIz3ak0KaX+tMEBU/zoL3JfphsR6lCSyeJkj5pfwqWOEdRYmA NPcsxT2PzCFvTHT6No0fLuYoi3uFfoWr617d9GHZKVvukcvM4z5Ab1x3MF3xDkVtWHyM I8Sc21y/9T79ac14RHAEotFTIvqyeNeZbBN9C5wpvjcwklCldPtJVekpTQLVumvMVpqo FYalf1zI8VdNV/tTUL3WeSeV1G2HsRD+VrY6CHQY87QRItLNgqjAcMXci+0Pifhowcjx nVzmYUiSg2714hcSz5gA8qhUJPomuL5C4TpCqDQS9otMjtCElI87kJCMtyYIAiksmy4B eGQw== X-Gm-Message-State: AOJu0YydCvY0Wt0z7C7HKGPdfl+7vP+A2m8z3TtcDupnc6HEc+iEF9EV TfaBV6+b91PrmvTPrhEJ0gGSkbTaUBjc7F1csZpmkPhgXTCck53AxhgRQMEdWrO6i+n6f863owc ILVoNUAs= X-Gm-Gg: ASbGnctO0Cpr6/Actm1Ajh1ZANWl4xPw694yNneFPuJw3cWlEKtat7nsXq0VmDNdNL9 fCTY1wq3aiNZ5KN+lyJesV4bZOzaHQYqGH+T6nXV9Zefu8JyRCo9PJg+8mbLBPT7kWaytKeXTQj C+JAAPeAtSTNraWEBIqeG0ZXsC6k3E1+WTqcf9QHTUMOZekwgBxOKV6Q0pZcQKxboTHQ3Of980g pXIS8NkGRjgJxk2Ngh46FY1awsye5C+Pf9m9GSZWzSULvmRy/s5yFdJsBwivJACpsewRLhsiXeY VNc6u4nX0OiK7QXITdGKU1ffV9qZKswn2DLcndavnp5E86+gDKD/+0nsy69tHHKzh3H5iwy+0fi CV6c10GzOoW/RhKXwwNSbUbLXXE0C5xarKSPt1d2qHD70WDQ38ZptVxoj4MgxYF1Z9hBrt91zkV 2jmE9Ig5OVED/J4xCHZkiIwzMf0KCJX/B5C8qkVFQTxcPN5NdQUA== X-Google-Smtp-Source: AGHT+IGiptqj6/iCv9W/NsMN2YruISusc2YzRGdBP1Bs0Mn8UNzSF4baihJ10riNMKzZLg8Yf/0Y1w== X-Received: by 2002:a05:600c:6218:b0:475:dd53:6c06 with SMTP id 5b1f17b1804b1-4771e20a66cmr3592985e9.40.1761675494104; Tue, 28 Oct 2025 11:18:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH v3 05/25] hw/ppc/e500: Use proper SysBus accessors Date: Tue, 28 Oct 2025 19:12:39 +0100 Message-ID: <20251028181300.41475-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675584518154100 SysBusDevice::mmio[] is private data of SysBusDevice, use sysbus_mmio_get_region() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/ppc/e500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 8842f7f6b88..fe1aeffe676 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -887,7 +887,7 @@ static DeviceState *ppce500_init_mpic(PPCE500MachineSta= te *pms, =20 s =3D SYS_BUS_DEVICE(dev); memory_region_add_subregion(ccsr, MPC8544_MPIC_REGS_OFFSET, - s->mmio[0].memory); + sysbus_mmio_get_region(s, 0)); =20 return dev; } --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675616; cv=none; d=zohomail.com; s=zohoarc; b=WpG9tzjKYyRebaDjxxrsMhrMZiyo9R24Ymev7nzpgw24IAq/B2fqRSkaKV+1YjvNqEzrw39iEfU1hfmMuTse8oNcI6hTRCrjT614kAbgyHSQh5dbqPKtOJ0y57ZKWtb6sqQ4gdyy5xA+g1bQf+eFURXFRJKuZs9nwwT/jHx1tQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675616; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fUj5tDuFxMrJLcMfMzba2XS192smTgWQLL5DdnxIsIc=; b=N7KtZAnaavijDNoHxoJgv8jtX4HqOv5BafObxQt5meHv2uzzaY2jVv1sPU31x2N6eGy5Th31n5kmZ5y/O0MPe8a5H4qmUO3h+Qa0ta1+G24JIACZVFZZGKZQuAXAHPpzZlSQ15HasTbuVNl2KUFszza2E3Wfx9FOmjkrC5lbhgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675616829700.6573973206107; Tue, 28 Oct 2025 11:20:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoIK-0003OW-Dq; Tue, 28 Oct 2025 14:19:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoI3-0003Ip-IO for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:19:29 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoHy-0002KR-KV for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:19:26 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-475dc6029b6so35412895e9.0 for ; Tue, 28 Oct 2025 11:19:20 -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-4771e196a4bsm6065935e9.6.2025.10.28.11.19.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675557; x=1762280357; darn=nongnu.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=fUj5tDuFxMrJLcMfMzba2XS192smTgWQLL5DdnxIsIc=; b=IuhRkrFVs+vVgPzP0yd83rXBTD1ivBFPi7bpG7j9cmaTAfYd2oSrfLpkNhO/EJ0GY3 nmgJcOqeJkmZ+kf9dE6QiVRg/mOOBUqaD33YUbAgMND2DapTwePLYxqK2Bclq9ieag8c Rj3M0WNTQHdrhajYg4zTBn6Rly9BqQ5zomqzL9WJUDqgdqSba+nq/iY9UnCNCHsu0t2j H6Q83GGKjajqL5ck7WeDhxIUPUPx2Eo6kLtO9tZo4hhL1s6cVKeZr9w4udNZcKO93tkj w96fQ76cY7ebJKXG16c/SwTxZ8Sd9cvvmRTMAM0gjiUgARe+aEchG/axA00mprGI5wUJ 4DyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675557; x=1762280357; 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=fUj5tDuFxMrJLcMfMzba2XS192smTgWQLL5DdnxIsIc=; b=r0zRfFwW7Etp5hk13LwrgMkPaAIq6bqvH7bJ1DCPWbSfFLcM95GEYljQeQeOIA5t9z uyq4qKJBviTvflHS3sFeQxrOaCnCumBoPW0ZzcVgD4oROoD+MhL3pqwJOHCU+WrxiJgd p8/66FqHSrqK8fm/AXBsW5XnMOEgLeA31rDlFaIrWWciUbycaTcwWYI8dGSkfGQmZU0a I4ltLvOWy+DRQEwEcK5VDhgMDO4X+ReH8JNpux+m1x8o3NU1KiLFVH3LzgNnBkmPBOd1 iX6WBHlxHH4nsUMuhOV+2ZKkZyAt2Sig2z9pXN2+Xtro4TQkTGLcKNchfD6uUAKhrFZ1 +sBA== X-Gm-Message-State: AOJu0YwpU4IpAtj+L8sQUfarYLMmcdRUnUjVzoaojbiiIHn6qfxAWKbe AbCETd3V+g6OJc0gMz5Uy8NVU1i8go47DcaFUraMlr2PBbGPrhk/6Nm4NmEATBCMyo+l11jqayl y/JR+xQ0= X-Gm-Gg: ASbGncskXHzizEU+rnDjrA3EiwvEF7LiiQMkoXoZkEglbRyFfpiKjH4X+2FrrxS/zui tLbJ5Nm49LWp6bRQgRNLbXt1LI8EUXY5I/xU5//JVmB9I3mjU1iDANBvLBRszCY7UoEUl8O46sD i0dYWq38PpSYRbHNQSraLd36JE3eGTJVgUBtFSmHpKSXEUMj2QpNZjm4siTXOvnQFYAQ/ESC3hD tbxMqEp8dh1UI/pBOSisux6DBwBSWhW+RbXEPJQ2d8jnEYVKk/e4PQyIacjHHkiSQn54LALpuG2 1VFHcsDGGGMnygBQSK8DnVP4+kWcb8gehUxGoIkhBGwPJGtXUlPZQkpVcWdND+96efFlmP3qnyN 11r9ggfznmvr5MSJimRE/giJqDXIGkL2RHrql60FW2c4Q0HLofxqBLJlB9JraQwP3DzfiklNZFE GOveKT9vJN0gsKo+NUWrSEXogplQBaFzAt82MrWNGJ3MG+DjMZRA== X-Google-Smtp-Source: AGHT+IFI+gul3yKAwz4c1fktmae3PtXn0re8tT5hM2q9v277iSe/eJTmPxa7M5Ll7Jfuyxo1LE2TRg== X-Received: by 2002:a05:600c:46cc:b0:477:bb0:751b with SMTP id 5b1f17b1804b1-4771e1e0589mr3761845e9.27.1761675557024; Tue, 28 Oct 2025 11:19:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v3 06/25] hw/pci-bridge: Use proper SysBus accessors Date: Tue, 28 Oct 2025 19:12:40 +0100 Message-ID: <20251028181300.41475-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675620868158501 SysBusDevice::mmio[] is private data of SysBusDevice, use sysbus_mmio_get_region() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan --- hw/pci-bridge/pci_expander_bridge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 1bcceddbc4d..aa55749954a 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -157,9 +157,11 @@ static char *pxb_host_ofw_unit_address(const SysBusDev= ice *dev) main_host =3D PCI_HOST_BRIDGE(pxb_dev_base->parent_bus->parent); main_host_sbd =3D SYS_BUS_DEVICE(main_host); =20 - if (main_host_sbd->num_mmio > 0) { + if (sysbus_has_mmio(main_host_sbd, 0)) { + MemoryRegion *mr =3D sysbus_mmio_get_region(main_host_sbd, 0); + return g_strdup_printf(HWADDR_FMT_plx ",%x", - main_host_sbd->mmio[0].addr, position + 1); + mr->addr, position + 1); } if (main_host_sbd->num_pio > 0) { return g_strdup_printf("i%04x,%x", --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675741; cv=none; d=zohomail.com; s=zohoarc; b=ECLd2UTgXDXy8o3lOD/GBRVKBVRqb7t43xUNNCb6cDJBx635ec3UcgXamTQq1+IEO5OyBr43YnL4W5mPQEjqDot2rSCaxrEolY+B4OlQZ1A2ue3oEEakUgusw7AV47AvgXRmwnprOoXctVluhdMzVIQ5pFXvgKrZcPjt32ohCTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675741; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GfeUVn3AUVOc8i76MmM0CIkfCI7XFzM26eB6JeFZWbQ=; b=IJkmvQ740qFBVXB9/MHp6nMFhbYqE/RcRgrXzmRU7WoOxK/ktJmpXN7p8oLWg+V91O6KQv6ERy8fl83RDFR8IhaHw656MWXTAaDgJG6WugdrV1uMYUPxaS/h2P+iVyMN1+u+vNJ5hfZ4AVdIctuQoXRPwKJLQOcx1hpqspmHCtY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675741134891.4961098559656; Tue, 28 Oct 2025 11:22:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoJs-0004Zu-DR; Tue, 28 Oct 2025 14:21:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoJC-00048t-AJ for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:20:40 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoIy-0002aB-SC for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:20:36 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-475ca9237c2so35891485e9.3 for ; Tue, 28 Oct 2025 11:20:22 -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-429952d3532sm22256679f8f.20.2025.10.28.11.20.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675620; x=1762280420; darn=nongnu.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=GfeUVn3AUVOc8i76MmM0CIkfCI7XFzM26eB6JeFZWbQ=; b=Rv8MoNlOdHMvYAovOZipVBJjL/z9TSyQipI+714suRCBub1wkvD/6hR4u8NNy4nXvL GUZFf+5vQdWBwuXW+/hir1xQrLOcA9NLi+g9JBcC4nhRtAifLJtfdMBNiHLGUwtZlvvX nUeB52U6oJFXMK6h/d9pq5FSTQLlbCWUtRqKbA4PEQ/2U7ywNnU1eiTkd/9Erg05FK9L by0NX3rhdCcGk6bu3y9ELdOuHkcH2iG+WUpDRI0/x11+2bAPjqPTf/gBBB5g5PI2bDfJ WERZK131fj4BKXyio36TiPyfV9jcpmM94JUeAp8enn3sfp41M/C8cd67DEw3oVeO/Zw8 1+3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675620; x=1762280420; 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=GfeUVn3AUVOc8i76MmM0CIkfCI7XFzM26eB6JeFZWbQ=; b=LsRWgYuLV6ZwpgOLuvkeILU6JnWzOcRvYi/vyf466jMvtvhDR5wpAZwmmZzNLFzq5e bimSIX67Kc5XogtwD/jQ/d/wJiITxSyzkDuAHS7uPTu/1LQ0QZmJ754McZW8QDFrSiSd aZ1+z+2ubDb8uDofYoguzPxZSRuTPPXq265Sk3J3Yr5akT3nQQGP95PHfFei5RK+LPIw QdXWwatISrsQHSVbJyBPDn3v/Y0KC8xMr8dByy1ZX9ipN/80nUcIxr61hXrOfsi6Pdf3 R4xoxMpWjgmf2rFKplaOAZ2sGYJLG2vrNMrLlFixjteY19ycOVXNAJpsQBoYenanMs0p uD7g== X-Gm-Message-State: AOJu0YzTLj17WskC1J+iG30f5v2u5QLOuI2AGIaweiZTsTTYA6VygHQO yp7zIboCUiTnMM66galaraec43sIyPlvvIPeAU5S+yLgFgjvGJ/4QWpg9PFtXn+GeLTACt33OUg 7n6iewns= X-Gm-Gg: ASbGncvjbKvdTUVk7MmBqF4+0axeUDSIHKW7pwDJMFu3LdhQ8IWQKFtrawY0KCCH+WU wEZG8jOAHB42RBKXNIXfe40J5oTf+Njhl5JSTt0WhqHmcvDzSOPjM+rypP6iV7gZC1mrtVe50Ll Y06y3sZ1ZLFL2NOfYWCLImo696O8aWVgHWKdSe78gsxYd2/xCp88Z9lKYN9aMw0SpTBDDyA0Rsq 9LxRWGOB096Q7YVIq82J/O+qu+uimQnrGErdP7SfbiYhhxS1e9HYEHiFLnAFPuGv0c6DkbmhHm5 qahhe2SR1AQqTBTwaS8XWi7qUkfSS/DGTfDC7WGTRpLp5+HR0XGeRGw0u+fh5UDityDP5fdnolX SQeD3lQpOdXvN6IpPLy1q4Iav3upP/tl3v+3+nGTShPpRs8QbzOsfL9ozeLgSnwoNF8X3R/82Js 7mflJLUijmZaQflb0zCO14v+mH+2ncWbmsNUNa4a4XOVKQtpGjgg== X-Google-Smtp-Source: AGHT+IE4+6k4M+b4NtcuWtYqw/qnC8+nn4S/fp9gmDCS5E4FcUYInz3VNgEQ2qiMYd5mzGgXsmC5aQ== X-Received: by 2002:a05:600c:848c:b0:471:16e5:6d7a with SMTP id 5b1f17b1804b1-4771e181091mr3312195e9.13.1761675619704; Tue, 28 Oct 2025 11:20:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 07/25] hw/sysbus: Use memory_region_name() Date: Tue, 28 Oct 2025 19:12:41 +0100 Message-ID: <20251028181300.41475-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675744318158500 MemoryRegion::name is private data of MemoryRegion. Use the proper memory_region_name() accessor, which might return a different name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson --- hw/core/sysbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index ae447c1196a..d33be6b2b52 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -154,7 +154,7 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr a= ddr) int sysbus_mmio_map_name(SysBusDevice *dev, const char *name, hwaddr addr) { for (int i =3D 0; i < dev->num_mmio; i++) { - if (!strcmp(dev->mmio[i].memory->name, name)) { + if (!strcmp(memory_region_name(dev->mmio[i].memory), name)) { sysbus_mmio_map(dev, i, addr); return i; } --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675729; cv=none; d=zohomail.com; s=zohoarc; b=encZCWtUBZ+cLbQGsbdV6LU8U9shrAEmJpNrttVB4t7aY0aKAx6/ee8o5au1bc8dnkxhdVPakXlqGqgNST6NVa3L6dTrK2CX4P/FsOZBzRxHDlGKfnX9CLyO/EmyAJpgfopMed6+KIEPvHqjYsywMJXaC3vXUZ/V+ofpSlZWQtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675729; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fNxVM5WlfMGkdiBkQUKUIDFWTm7wwHT2PE47Xc1PuFg=; b=h26vTZ/xr0vfWe3TKyuXa3yEN436q+i21ibkyvqxhPtjJaQLg8WpE8OZDE8ZDKnffawHOim6MMlU0MGkoI0PB8Bxcfh8aKNoALfVmFXgY5wHAUx/YrC6FykSPLVlaFlw+6E0sikJKchxwvsFpyresFuqdYrBmzCbi1PXiBshIwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675729689882.613855165035; Tue, 28 Oct 2025 11:22:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoK4-0005At-Vg; Tue, 28 Oct 2025 14:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoK1-00057q-RF for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:21:30 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoJy-0002hl-2p for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:21:28 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-475dbc3c9efso27207985e9.0 for ; Tue, 28 Oct 2025 11:21: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-4771e196a22sm5526535e9.5.2025.10.28.11.21.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675682; x=1762280482; darn=nongnu.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=fNxVM5WlfMGkdiBkQUKUIDFWTm7wwHT2PE47Xc1PuFg=; b=KoLmBxvjni58P3I/OQ5aT+my8uWkJEZkfW6mDilqMOHKizGej9pakEWC8DXH9Z6BQZ 6IueRWyctihuPHNVNI9Gk5FzyX5M5pfP5G0gY/MAfYi3DmxzdiTg2xLAfvM/MGg//Vj3 uBfcJeYZ3rS50B/Az0qi61vt8/Nhrbd5fTBsgNcdIo7QWYHokLUoccjy+y7vkkF2+QjW R5eFUuyuxBaF/DRsHFxoGzobE0ap4Ar2Yg46b+ixZJigr3VVHzIyNL9PWJUlAbjyltG0 E8Wqa6SG2Um5qu0UuCG9dKrZZrUB7Xub3ZdtrjvXHUm8xUANKlPXbPQQpHcbs5gVcILb tgsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675682; x=1762280482; 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=fNxVM5WlfMGkdiBkQUKUIDFWTm7wwHT2PE47Xc1PuFg=; b=SkQMypR7JjlOgsNxt1r334Ca3Nzw5t39tjxUCy1Ali7AhA2w+NANwt0+NXHIWQT/J/ oxF+DDXfNUtbAijT7QpoUpBybAxbcm6vO8GTxiDYqhy6wCix5v0LQltWRH9MbDOSAk7v JK48PxbJI95Y1O9iX3fzcO3Ivtjegl2jm+4C/T3c8u/Iv0eFIXePuwiNu9tCjhvazrno IiPslL4bV6mfPHPXFeZf+GQ1mTA+T5Fj5i5mlIbXCwEnFCQOS6TNZR0mEcBvIQnvQRQa tVdVdvlinzQyGba8jyaEqsydmnL3YfY1kXkPmOgJgvbNJM/QjHY7n5l55H1QeNHLvWK2 CoXw== X-Gm-Message-State: AOJu0YyrJHzNDrhsaPXNVuzXmWFPK1tw0mYhxc8L4XWSQMQ7WzpZe3Bk LWTvKBBWTegnH/m6xWf6GlI0CdBrkivRJgil8Aun9YB/pvTty7zY93U7ICCKA3QcDRKKr6O8Sep 13uPpcMk= X-Gm-Gg: ASbGncvC1jdUOJh2zS03TILCX8QPYEjtHxzC7lEC3wbWx4UkB1PaNvZabXJv/4yjQOo SpyrMMBlHgALj75wKXy4akE99FjwCzG9Yo+j+sFKShENcXL6OCRuSyJD92X3S1MrcdfyH9wP3y0 hmRITRM65Tqz09Dk7IJLN0uF31kt+RT4Vqqnt51TD4CbsEvHN3pQ1gYaOuu7oLPmgrsYUchPl5o jlSyb3mPvDfrytaGteHnkAlI44jIuYlfZcKxUlRkHTNdaVjcjV44hNCkTfJCZnWIpAxCjfsaOgK G70re55iXIKQuOheE52TiAkSKA+gndo0M8OGKSIr2yetnVR4fwJz4Lrtp2tI7k13qVyDhsMfUeX kWyD84IF1qkgPjOcZwMTNhx/n4jiTM9HRgkvEAz92t/DdFiMXRZPUF4Mb8LfFXC+Wh1l3u9zGQk pI9uAikXmsb8gw84mS9/9n/SCwaCBCx+u+TziDqS5iJm26p2bv3Q== X-Google-Smtp-Source: AGHT+IGPvvSboRVK4jDOdh6s27u0FTr4UC3OsgbP4owA92aeWHz0dL+KCqlvt2kB6S2acByZkxFTfg== X-Received: by 2002:a05:600c:46ca:b0:45f:2922:2aef with SMTP id 5b1f17b1804b1-4771e235900mr4315395e9.28.1761675682354; Tue, 28 Oct 2025 11:21:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Busch , Klaus Jensen , Jesper Devantier Subject: [PATCH v3 08/25] hw/nvme/ctrl: Use memory_region_size() Date: Tue, 28 Oct 2025 19:12:42 +0100 Message-ID: <20251028181300.41475-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675732515154100 MemoryRegion::size is private data of MemoryRegion, use the proper memory_region_size() getter to get it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen Reviewed-by: Richard Henderson --- hw/nvme/ctrl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index cd81f739975..9505f291f62 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -514,14 +514,16 @@ static bool nvme_update_ruh(NvmeCtrl *n, NvmeNamespac= e *ns, uint16_t pid) =20 static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr) { + MemoryRegion *mr; hwaddr hi, lo; =20 if (!n->cmb.cmse) { return false; } =20 + mr =3D &n->cmb.mem; lo =3D n->params.legacy_cmb ? n->cmb.mem.addr : n->cmb.cba; - hi =3D lo + int128_get64(n->cmb.mem.size); + hi =3D lo + memory_region_size(mr); =20 return addr >=3D lo && addr < hi; } @@ -540,7 +542,7 @@ static bool nvme_addr_is_pmr(NvmeCtrl *n, hwaddr addr) return false; } =20 - hi =3D n->pmr.cba + int128_get64(n->pmr.dev->mr.size); + hi =3D n->pmr.cba + memory_region_size(&n->pmr.dev->mr); =20 return addr >=3D n->pmr.cba && addr < hi; } @@ -563,7 +565,7 @@ static inline bool nvme_addr_is_iomem(NvmeCtrl *n, hwad= dr addr) * in BAR0 as well, then this must be changed. */ lo =3D n->bar0.addr; - hi =3D lo + int128_get64(n->bar0.size); + hi =3D lo + memory_region_size(&n->bar0); =20 return addr >=3D lo && addr < hi; } --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675809; cv=none; d=zohomail.com; s=zohoarc; b=Iwsx1iQJ5Nkw7T4Vnl2fVj/9pX/HxzY98XMaG39uGlu57x1k3fz1vqrgFrlNdrd8vm+UsAf4RvM5JG72sRCCAEGrKot+wQB5vpDX/ubvA7vZFsCHfkT0bqtGHb2iWoRyOU/NhAAtoh8DUxR0Hz6vqpaCrfqBJrJIVZSR6y3zGdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675809; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=W84UIv/lTOoO7nPMc2XCHCkjsy4aJN+uqWbkHrcZ9FM=; b=Lq4Ji7Zu5sAcSWmPSSbFQc0vY3vgTyWbxcDS8M1OBn4J37rgggQ6SvBA+R64t/rVVQgKorz57G+1RWXtPyuze1JuQWDnaRa7SIyVt+Vh45BOvgz9Xdb69wFtlkyuZdM1K1F10JRqOBdKsGl4Q4ueIn1k3EAwoMqR9jPKbGhQDRs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675809360318.5305178335735; Tue, 28 Oct 2025 11:23:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoLY-0006Dy-CM; Tue, 28 Oct 2025 14:23:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoLG-0005wr-Ni for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:22:52 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoL5-0002mB-AF for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:22:46 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-475c9881821so1220755e9.0 for ; Tue, 28 Oct 2025 11:22:28 -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-4771e196a4bsm6202165e9.6.2025.10.28.11.22.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675745; x=1762280545; darn=nongnu.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=W84UIv/lTOoO7nPMc2XCHCkjsy4aJN+uqWbkHrcZ9FM=; b=caaGyTTpavepaS7GhXnulPvqJuDaMyYkgV5A43NAj5A44HJFsF9LC2W6MzOZyx1cAh 5dRfusbJkIRP47a7ECBfbrySRcKJ8ptyuL2W3YVP31fMgazfEpcG/KPcDzCvoP1yc+bc ruDbS2XYBtcC3LhKfL7HnHXIzsIcs7XhXP+0PLn5xOARNYc6tum8Y7AGLwtJBCyrA57c BnPiuo3KYGZwLO5RFHLregi8EluDaF5/KBRYQdMsqGx95GWJOZqpv9MnDCm8vsaJX8cv nN5MahEKEC00Utl3QJ8lTk9R7wfr4+kRTX0Guqrlzp5EA+Nh9qZC7mBQpky7ZGsYaerr nY0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675745; x=1762280545; 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=W84UIv/lTOoO7nPMc2XCHCkjsy4aJN+uqWbkHrcZ9FM=; b=pyqjuZnvBHxkvcSX4dNBNF+1PqxTKhlq1GIA6P/0XXvKEWiLKj6kBJHuRWp/rMdgOR ZtuEF9tSQGbR4WzD2ozC+NpJODIf5dGCpG5QpkszU2iPymsGFKBtanlE43+nx5O1HzhQ jMS8EtRLzq5PK+nf9Huo9TFJ6YQJy0mGa82TVqdcRCdiunzsHsxNT5ZzRMU/km1nqLLr ypmD6ThzPBQTr5ZpReWECO93PmhQD2VB1rrhDpgsXnNxkQ3e2LfEACfDik4blX+H2V1s rcSw+xdkFfN61Zv/8NH6gkXuW3I/BKyuFlJDg0AqTvQOhCfrCopIR6soSIr4tWHCMC8j v0/g== X-Gm-Message-State: AOJu0YzTYQgepSpdKT2Xl7O+XlIhznesUwTRO0BXaw3o/c0IRirWJgd4 pz3fquG3gAxCCyFIHOy3jw29y0vzt7PpD4G4WvEX3hfWJ0PpzQBWYEzOIUwL+vaftjBapl1zFI1 A3iWw024= X-Gm-Gg: ASbGncsOEEOC5U26TE5rQLr+CR9+tk3zDIlmCju1s7RuZlSvlOXaoJotXqnmYzCH+KD ZixhOC3UznfPA3CdKf/cMVVRYNQy2effLGpvn5aR5gE5E9zSl1DeS8ZW1Ji+YRresIp9BMfOwye nRJtf7/iM873v/km+9zSAFakj7SYpnKe6nVLKM3FNNglUHcbyMM/aqh7o3BpUUwZU4e55PGe6CL DDq8wzM2/ovKOliEfU4sdZjdBzFAM9nkubK/9qeQtP2FDUJWVbCxsswHbdK/6J9Mgf3iFjMgu4m 9etF8xuYS6SFceYVCrX1tzNN8OesaDZ0ziDBNvXwZ/Q68ZQ7uHXVNoSFq38m8+i/OIGfdKgDYn+ ZwnzKdLh4yPCJKFVwG15gyiXz6oqhHwi3CFRd3g8F8IbK7UkzYR/GuAtmlyDYzCxyhYfdnPT43R kcoMYDkROttZcK0VunCZOrtZdLVBCcflr18+ZnpGOSmyRsyAdfSQ== X-Google-Smtp-Source: AGHT+IHoIWA9q0RB9bwHfvDWf20UMqmMOg5jqKWauXSldNNnghGNAT3/AIE9q0U5PgZ4q/ePm3Vq2A== X-Received: by 2002:a05:600c:8595:b0:475:d278:1ab8 with SMTP id 5b1f17b1804b1-477180f3b38mr27235385e9.2.1761675745118; Tue, 28 Oct 2025 11:22:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Matthew Rosato , Eric Farman , Halil Pasic , Christian Borntraeger , Thomas Huth , Richard Henderson , David Hildenbrand , Ilya Leoshkevich Subject: [PATCH v3 09/25] hw/s390x: Use memory_region_size() Date: Tue, 28 Oct 2025 19:12:43 +0100 Message-ID: <20251028181300.41475-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675811151154100 MemoryRegion::size is private data of MemoryRegion, use the proper memory_region_size() getter to get it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/s390x/s390-pci-inst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index a3bb5aa2216..5841dfc4fec 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -396,7 +396,7 @@ static MemoryRegion *s390_get_subregion(MemoryRegion *m= r, uint64_t offset, uint64_t subregion_size; =20 QTAILQ_FOREACH(subregion, &mr->subregions, subregions_link) { - subregion_size =3D int128_get64(subregion->size); + subregion_size =3D memory_region_size(subregion); if ((offset >=3D subregion->addr) && (offset + len) <=3D (subregion->addr + subregion_size)) { mr =3D subregion; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675854; cv=none; d=zohomail.com; s=zohoarc; b=W5u1nUmdNqbO6zj13FjDCTQaEw3YjVKQUD3alTsm1KwbTdfC09IiiNy3VeQ0WHknjrL6RAZ4gEu6/Pv0ZdIpaZYNLMPCMaeO/C5e9yjKX6fGrU5PnfxVVUoNGxwYsc9a9P6CtzcHogb8VsvEUNJEEc4wqoxiwR5fkYaFJveM9ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675854; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WoHwNhtMDor8o+FjGbtvuP7x4iyOcb67+1ndjCl6FPs=; b=G0EPsSF+7Nnu14IrxAnBf0EbFB9Uuhbo6w7rAC5RLfzDKi/SRVy83iXOtTBCBag55z+rtDLLDQcX/Pf6d1VkOCFH595rjbXIPVfFrM8Ej5ugILYeaavRXfM0Ld8oAQsxPQOc0zQowpSRkVM/adPwRGvbby4aixMqquQmjp0CanA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675854351180.0224274408431; Tue, 28 Oct 2025 11:24:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoME-0007Qm-7C; Tue, 28 Oct 2025 14:23:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoMC-0007Pg-CP for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:23:44 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoM1-0002tg-MS for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:23:43 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-42421b1514fso4516850f8f.2 for ; Tue, 28 Oct 2025 11:23:31 -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-429952de971sm21385316f8f.39.2025.10.28.11.23.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675808; x=1762280608; darn=nongnu.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=WoHwNhtMDor8o+FjGbtvuP7x4iyOcb67+1ndjCl6FPs=; b=yL3dPBqlxVHcRk8gQDSD2o7Goafp2GwUkDcIllWjk6hgmj4jQbOWDmAqABGvYhpsgk noMGdyGjAfQEgqsh/xgpFUOTdRM7Nbyz2LnCV6mcZVAULhwoSvzNHJn/g3O02N+qzoeI bgqI4yJer31l1QzkRBV79GeEhkjyDK8WVDA2ttM58ljiGn9nyAtboysscWajLgVFnH5a 0U4bB/c0QLGXKqmA2FoP7PtbMJZWxcIJM8PDuL6MQxYM16g3nVG+fSYMs7WHw8DZD6Oi OvApPqgVgMy6kZM8zdI0ucB8g650k0ls3lZHPV5ezP+hRZMjIlqOfMSBcqKVu24WLWqJ uV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675808; x=1762280608; 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=WoHwNhtMDor8o+FjGbtvuP7x4iyOcb67+1ndjCl6FPs=; b=pu17TzqFgjEuMz2pPSEa7D9Er+obgSLKeiHO9RBQqAihVsnASGuYk4pgKifCS19222 kiX5eWsDfLSqVnnorcbydXpOlXzKV+CncPA7pFlpj6DB/CCeRWv8uAYVn/zIUFgR64c3 8yzCGkKgwoxhm+cnyakQYMuCXqLO6CDypS6uOahxmDBKVvjAzrGEQ+Eth93fos5rSOuW W9AcOSaEROHGblSx5tQOpqDWxE93rLZDnMc0/A6R3NkiOhjHEBQchJ9r5OzxinEYJtCf TalrFUGLfnfdEphxM4xyOJCPQTxVVaqHgHskgdZow1S97YIqma0dL/zuLA8e8RV0uGvv cwdw== X-Gm-Message-State: AOJu0YyfLSUS2BRWymEX20uus+CCXSzfsq72lRUPRFU3cQHdsgkXrQAB nXfZZ++gtpTp4R7QMXmztMbaCNI2iRyo04EBjEP0e2vrzYQhlb68odWlwk/JBRa2LlzbPjHcxU6 XCulNA4Q= X-Gm-Gg: ASbGncuYASFe7RgTksWT6KwfMsF/LzEO1/ft79ZRbNdLczLpW4RP5MJN6tx+g1EC2Au IpX7dgfC+8nq/Ei2cRGRCjlKLvr31tumgx+nE3+rHi/cazoSBvoeS6H2Yl/bDWR/Oxsu/BC+W/X lq+MxTVQHCzfEgu967Inr87VrYcPKd1q+/IyGlB6xaeswa0dofclD02UYHa+2FGh2j4T1X5AIh+ 6aRShfo/vBLj7xa4B+E/FWgfW4JJBMiU+dRkr6YVq4zW41So6c6sSuR/jAL4BenWnvQdzii62xP gYEdYL5WH5MGnpAqbVTJg9sOBwV0qClDj618y2PQDdkVvWwxKH/liDjAkmyZb1ZMNmfQzQtVfoF 7ZzZXcKR3ee4jxxr4NflcwqcQQY/A/HOlIOspnSHclZAtHVlXknz7tVPUsSXM9nk4B3uTeyhXf2 lE+T+LmBz0CFG1/SnTMBdo5tltSuvQ2VTmOwJ6iF4F9WHZWR8vkA== X-Google-Smtp-Source: AGHT+IGri986WtJrSWRuJcZKJ1SgsvgYMCfKaC5tw5REdmYqAIJDfJN/fbTOMrDLAUOSMV8GEimzLg== X-Received: by 2002:adf:e18b:0:b0:428:3ee0:6953 with SMTP id ffacd0b85a97d-429aef7898amr36378f8f.3.1761675807789; Tue, 28 Oct 2025 11:23:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v3 10/25] system/memory: Have memory_region_size() take a const argument Date: Tue, 28 Oct 2025 19:12:44 +0100 Message-ID: <20251028181300.41475-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675855515154100 Since the @mr argument is not modified, it can be const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Xu Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- include/system/memory.h | 2 +- system/memory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index 3bd5ffa5e0d..45de6946812 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1776,7 +1776,7 @@ Object *memory_region_owner(MemoryRegion *mr); * * @mr: the memory region being queried. */ -uint64_t memory_region_size(MemoryRegion *mr); +uint64_t memory_region_size(const MemoryRegion *mr); =20 /** * memory_region_is_ram: check whether a memory region is random access diff --git a/system/memory.c b/system/memory.c index 8b84661ae36..d1c060b2b50 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1870,7 +1870,7 @@ void memory_region_unref(MemoryRegion *mr) } } =20 -uint64_t memory_region_size(MemoryRegion *mr) +uint64_t memory_region_size(const MemoryRegion *mr) { if (int128_eq(mr->size, int128_2_64())) { return UINT64_MAX; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761675936; cv=none; d=zohomail.com; s=zohoarc; b=Cy/MIhENZhhlE9pma/iNPPgNUOIWaNYtalJuq5vbWnt2qBgktcrml8Tt5eiIdrOBtESETyMcmlKjBE1QLv71m9+QykliimdmskLZSwP2HYKAsCn9iAoCq9cxKKcZt7JXFrLhO6yJAz0Jagr8AmUHy2wIQFp2E4FpGVY9jmxR/Wo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761675936; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bb8ct1msdop66cfNc5jZbjnVVPLBi3asYT3AOca3j1U=; b=RFAtlx/47+P8YJchuSS1ombFLu3VCUnwqBF1YUKrX75XxTIITgPgQO5xYtcxlnj4XArRnyO4XR41USuC5Ne/8qCyfHQ5oHp+NChxwebhoDWtsHXuFn56WqlL2wSZhFBwsH05VUPIYDaF1q/EVvvTUXKV4ObkyVAp+nkn/eXKVyA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761675936756117.7588379021737; Tue, 28 Oct 2025 11:25:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoN8-0008Kv-9s; Tue, 28 Oct 2025 14:24:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoN5-0008GY-DB for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:24:39 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoN0-0002ze-Ez for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:24:38 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4770c2cd96fso24743235e9.3 for ; Tue, 28 Oct 2025 11:24:32 -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-429952da645sm20772209f8f.30.2025.10.28.11.24.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675870; x=1762280670; darn=nongnu.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=Bb8ct1msdop66cfNc5jZbjnVVPLBi3asYT3AOca3j1U=; b=nFVDC9ORWdMuMwYyt+KPwMjVwQ6c46l6pCu+M7fUW0/dkIuwxKhwa16anwWBBbVAHK zf9SN/k/Tw/ZOLwtUPOlmjK8kkwBBE7kZ1m0DnjQXEjjAud8CwNyhGoGSFYiWxd3Eh4a Gc1eDdXSAb66vvT6xd/FzZN5FVijLinkgg7b1fZ6n+3OUNgFUjWs5sZGiBBkr0hXt3o5 t3229y8OKIFbPNFYtu0Hbt7gjZmVLbkBBBiqiRca8N5hJO/17rK1wwKDZk1Dx4dJ38AY 9/mgVMnmxrwUn2S/AP624bMi8PfOwnaX4BDXXVVg1zVyITJsXA0TL3qjLmcscWoqJtyJ rDUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675870; x=1762280670; 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=Bb8ct1msdop66cfNc5jZbjnVVPLBi3asYT3AOca3j1U=; b=cLS92MaHCm81YqryMJ49+iOFLoF49XeGynPg6TY94/n6p8KMsO8ID+C3cU0MSrulht D+O1vsNtfWWH11ROiNpjlYZcjqFezxL77ArGmEU7Pdt3IGG73xy+UP2jO7Is6MxZkJSz UIH0GOkEt/p+Fi7CNBvw/+acuXOzf5cMgBsmubmiikS5IEpG175rNadXou1y5QGn/NZc +tMXm5MGx1gnXJ8nAm9shdHqgjQ9j7XASKuR8tTNUOnLDONFPqh7Tt7Vzrmx1sM4+prz sOa4xjsvOiGhudYfCO7u0ncaOnA/9fFJHLYvQZ7HJuZ1NExAvKYCp9BJm1SiEd/LH4nK 85JA== X-Gm-Message-State: AOJu0Yw2N1vYy/qCfMULMiIawiJN9CwYjRV3PoO+I58lPkxtCemvMQxt K24Hb9HUxK/2nbFY7tP2H+D5GCkV+PobqPwFBjRX+8IGOhU038pfSSk5RdxMGdGOWKRBfLRViF9 nIMA0H6w= X-Gm-Gg: ASbGncvLdWxk8xdqB8HLfMW4Th2pWVPNOFK/tnx01pvLR2HJQnWlgDaqziMS68P4l6g q8RXVQt42T818WzSBk6zuhqYQYqq5dZKmJhOWsC7f8FBVsbPNbpgyvR5fGgwh3VFpT2vizSP0sy Nrez3Cr75FEiIUlf5ZvGF1KwheIzswuJIa3/pY3ttkmbkfUxw3TGAs3tI+a/vOG2a1ZrtWyXhtE QdnRCSDFnagNa4wmuYvsf6+eyMUUNCEKJHQWWGpl7fvr+iwPUR1/YjQIVZqUqEIibrwJcjOvecP fpMPFA24B1iJa3gX1KW3CXZfLH6rrcNfc/xcROphMKXi2Nt18ZVQLOOJPrxZV3kgclA9gvDy2Y3 CBLtt7yKnvBCVAaUtkzNvJW4b8ILC1Xawoo7Tn7Wq5XwWolZILbePj/EjAaVTrJ0EH8z3PJdyhr KaFPXm2vsdllPnnzKL+aN9Bc6PXp0g8gRZ3rgjB0zbN8PyNfOqTQ== X-Google-Smtp-Source: AGHT+IHGtrcGFoBqbOWM/Z4ZKtNkpIoAicr60V8rp7HbelNRNEGwujVNu0ILye4Zuu0pu6nn0bXufg== X-Received: by 2002:a05:6000:2507:b0:3eb:d906:e553 with SMTP id ffacd0b85a97d-429aefda844mr13371f8f.55.1761675870517; Tue, 28 Oct 2025 11:24:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v3 11/25] system/memory: Introduce memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:45 +0100 Message-ID: <20251028181300.41475-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761675940635158500 MemoryRegion::addr is private data of MemoryRegion. Introduce memory_region_get_address() to get it, similar to memory_region_set_address() to set it. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Xu Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- include/system/memory.h | 7 +++++++ system/memory.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/include/system/memory.h b/include/system/memory.h index 45de6946812..d2a5850a360 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -2481,6 +2481,13 @@ void memory_region_set_enabled(MemoryRegion *mr, boo= l enabled); */ void memory_region_set_address(MemoryRegion *mr, hwaddr addr); =20 +/** + * memory_region_get_address: Get the base address of a memory region + * + * @mr: the region to be queried + */ +hwaddr memory_region_get_address(const MemoryRegion *mr); + /* * memory_region_set_size: dynamically update the size of a region. * diff --git a/system/memory.c b/system/memory.c index d1c060b2b50..f48b586122d 100644 --- a/system/memory.c +++ b/system/memory.c @@ -2777,6 +2777,11 @@ void memory_region_set_address(MemoryRegion *mr, hwa= ddr addr) } } =20 +hwaddr memory_region_get_address(const MemoryRegion *mr) +{ + return mr->addr; +} + void memory_region_set_alias_offset(MemoryRegion *mr, hwaddr offset) { assert(mr->alias); --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676049; cv=none; d=zohomail.com; s=zohoarc; b=N5gDLOzAcSTYzjLhdh8CVt0b3Lqqwv5DcxZKFfLSnK2X/DgC9nKZ2QT7CJGTCjQ9nzDSOMxXIlNqBQ008wa8H6WCPaisiXoyQisvgvk/iWG3iM4fXUf30uy5bj/MQ1l/4z/gKZjbPBBmwNOSbZSc/ZX+09H2xE7iofXg4rCKZeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676049; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tn83gNQMZpvVjlvYJUMJlHBXZNHdMQkO0M/7A+q+76Y=; b=UafCCp2Ja9A3yLS0NdzxiEZk7feVjtAUPsYkIcMAyH4e7qW9OjGbBc3MWJq7o08kKgIR6DsIxmtN08n3yDJcAH9zguFwQ41P6ih2QD5PS12VSkGgCaxckfBr29MRSdni86Sa+MufPqHGx/dOeQx5qHejSMSxBIy9Vbr0+jEzJ5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676049699754.6451707160759; Tue, 28 Oct 2025 11:27:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoPD-0001Md-SR; Tue, 28 Oct 2025 14:26:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoOH-0000kY-Me for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:25:55 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoO2-0003GA-KM for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:25:48 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47112a73785so40617095e9.3 for ; Tue, 28 Oct 2025 11:25: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-4771e3c878fsm4355455e9.17.2025.10.28.11.25.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761675933; x=1762280733; darn=nongnu.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=tn83gNQMZpvVjlvYJUMJlHBXZNHdMQkO0M/7A+q+76Y=; b=CPEgcorJWuh5w4SU7dv13EhD9PMppxLRyO8RNI3Qt5sOY3iOmnhpQLv6TjtXG6E9Dp eMkcUw/TEVmMsZxwKb7lirnboaor1hdLYeu+5W1TPSfsDeG1eQd290GNgiXrDSBgm3cn pnQ1kCowibm3a41sY2i3sxRGx+6M2IScZauZhdjD+YthxbRd/y679TfuaasEYZNmMIK6 Ba0hYYCutEfQEb5OWUrnCKsDD63PaLP1qJD3Ucl38j0LYAagPBR2576A4m6mR08nF04A e8y1BYzfHa7OfKKwDtgWAIBmjrlefZeOmNeOH2JWw8DijauR322hayi/hpAkcRr5chNF rVTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761675933; x=1762280733; 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=tn83gNQMZpvVjlvYJUMJlHBXZNHdMQkO0M/7A+q+76Y=; b=RUQ2RlWa50LyQxGOFHMu5TSFyd1brQrKI/BLz4RtjF13t1itbEf3P0EUF01rF4SJhF uUp53ZPNoMY0F7XBiBLbZmIaKaiSwIQ1AnyMxdw8PHsSSv5WSdKxGhCe0ADqUXNKXj6U mbUXTmFWjJH/ZAsmIZHhIqvbyRIMV+Fj4WI2VDgoje0Uy8P/3icQy5lBukz9/9mlAezL g5lvyIUfsx+6VOccrPGMFNdjt8XyHIS0veLZYzB33GK/gAm0MUC5Dh02weGUYQtdT+kz TS2fRfyJr7SpIyRClAFUBZNBQbluV9lzMF6XieIiA9oJ9SHJeWf+DWYYeKEgjich+J3E T6Zg== X-Gm-Message-State: AOJu0YwRuJmJB+AayMn95aUUv1KyRYyFNdPeMRr/b7AtVsikC8SHO9F9 8mkAWqj5TRAS5MJgKjcOpllAxaf5SI1XAL5iv9UjY5H04fwaMSURhJZQEk8eTYJFhrLIfKsgMa/ J0HMuiDQ= X-Gm-Gg: ASbGncumoi2CrfgR2RqYtrasLdDUWd7TZgbfBSDBCy2SJ6yol+xsmRlfyGnkgY2nlXX ElaOt845834TNQlsR8He6PjWrf9c93UXu+dBTKbcjSrvmbpz7IXQEo9rTAjlQUgH3mfvvLCH660 qzWpsncGPa6KJDHUKhQ09z9f9HhAf8HZh6lwKPtsoCnGzXDq6XUGqglzkPmJcSEBi7zwh358JVG KTORDohcdu1gny/t7zvCzl2qaLqyGnHbpxYqBTOx3cEp907rE1ehN/Q/MfdXowTbhIQCZ5Tgf5g k5yWkRquIX2WopscPwWAShYdJL+mvrZsSU4R2bnkIotkxMR8Opo5hA1yfNzypyl9tpb6vX8kPSS l4uFERnE5l6rAvGruAsD0hoaBT6T7Q5Nv+U5aBxSs4OKTNwVLC52EBAir8NArOCifjSsKP62k7V vXUZb/5wjStm5SyKnVBSRWp8gX9fdFeu8ppwlms7JVyjZ6x4go+w== X-Google-Smtp-Source: AGHT+IH1ugfFe0oxceS0sC4ktUe81XxAtBXaff6IVRGZbXQOpQBQXV+FUBM+u54B1peIOrlXSRWN6w== X-Received: by 2002:a05:600c:4683:b0:46e:4883:27d with SMTP id 5b1f17b1804b1-4771e3aca51mr3030645e9.30.1761675933009; Tue, 28 Oct 2025 11:25:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Fabiano Rosas Subject: [PATCH v3 12/25] migration/ram: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:46 +0100 Message-ID: <20251028181300.41475-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676051904154100 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Xu Reviewed-by: Richard Henderson --- migration/ram.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 5eef2efc781..3330c102977 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3144,7 +3144,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque, = Error **errp) qemu_put_be64(f, block->page_size); } if (migrate_ignore_shared()) { - qemu_put_be64(f, block->mr->addr); + qemu_put_be64(f, memory_region_get_address(block->mr)); } =20 if (migrate_mapped_ram()) { @@ -4190,11 +4190,12 @@ static int parse_ramblock(QEMUFile *f, RAMBlock *bl= ock, ram_addr_t length) } if (migrate_ignore_shared()) { hwaddr addr =3D qemu_get_be64(f); - if (migrate_ram_is_ignored(block) && - block->mr->addr !=3D addr) { + hwaddr block_addr =3D memory_region_get_address(block->mr); + + if (migrate_ram_is_ignored(block) && block_addr !=3D addr) { error_report("Mismatched GPAs for block %s " - "%" PRId64 "!=3D %" PRId64, block->idstr, - (uint64_t)addr, (uint64_t)block->mr->addr); + "0x" HWADDR_FMT_plx "!=3D 0x" HWADDR_FMT_plx, + block->idstr, addr, block_addr); return -EINVAL; } } --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676265; cv=none; d=zohomail.com; s=zohoarc; b=ipF/9bZPsgpJiUwdmmy4sT04JeuZ+/LRuZAeIn2R6l/9phWi2567HOJ+U7eUznM8YOrEVVBLeQjbvrgDPDbD3PvvsTHXVceG3IaCd7DJE5iLQUlGiWJFps7Y6VGTfbe6lAkAilgUOqPn33YVVRwqG+YmBrgbM55XMppcjLeArEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676265; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qTqEXniC4Ziu9AqtErkRaLa7hxRjuJdoZvomCUqIauw=; b=QHfX/dkxUsVc0tLmS1yxA+E+s61rdOL80WNqNka1zdp4gCBtaF9gNLC87bNS/BdpI4fa4TQ32fElcgRhHwLEUwLlxjQ/YFKKTJBUmh/I3/Mx10y2Y3j1TwuIVPojED05CsNRz+yWg28nxmrq3LwToy20EwwoYuJaUaGqNC7rfmY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676265742529.5825479783797; Tue, 28 Oct 2025 11:31:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoRv-0003cw-Pc; Tue, 28 Oct 2025 14:29:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoRj-0003Ol-Qf for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:29:30 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoRP-0003bB-U7 for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:29:26 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4711b95226dso79843075e9.0 for ; Tue, 28 Oct 2025 11:28:58 -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-4771902981esm23762575e9.9.2025.10.28.11.28.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676135; x=1762280935; darn=nongnu.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=qTqEXniC4Ziu9AqtErkRaLa7hxRjuJdoZvomCUqIauw=; b=aDWUqVV8D5iQ3Wozzsv6bTLZ2cZYn4Xrc6pIfmo+l3Ny7hUdlrDAipu87txrQjuqGc /x9zwZk3LYvV/plBBN2dt2hFBNbtbGtrrmO0yQUUh6yh8g5hl+yR3HQdPIP46ybM9Eg1 iTqLpNtiTal9PRCgISSC2rSa/umsJCG2h2GGdDbOmy3N4Ni5Ft5gTGKTrjBrvagiLzRi z5iN119Ui06IyKTlJw6c/9c17K6pjozJIb0/DGGB5sq1yUQCW6WZBZefa3iBNjDeEKVG hp3hb0CKEQij1E6WCSiCl6iihnBRxjmtD8X/RmPHgH/B3mdSuS1Q5jetSwAVEisbI9oI M3Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676135; x=1762280935; 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=qTqEXniC4Ziu9AqtErkRaLa7hxRjuJdoZvomCUqIauw=; b=sIPH/MGkdnEhmGmRUmBMeZNJvvqKVqPY9gtLnxUW7BBhYtg5jkjBylWu5vFRg9v4eb JXxbO5nqZ1S7x+JqvWoLs02Dx7ifI5EvWX142AU2ld91Wu0WGToFQp7FItok7PCUbrQ3 6nacz3H3b6AsMJez/lipjY+Wo5cLD6l5YSbbcccZshVNkcrjIHofHukR6kuV3kQjedCL h8FcPigiBnV7dnfamjpJnhN7eIBQsShNp5uvBIg/9lwUOL4AjI7HX40kkELhStvyZQS5 A+3qI674dqOOSRxwh75LUXvLBn/uFNe9v8shvzTMVDwg+ldjV+bX+DII3DmyYEPU8P5H 7FZQ== X-Gm-Message-State: AOJu0Yy0lEGdapo6zxYeTF2dqM61IFsMz040SmFDAeS+K7UEXU5m9s+b wxUBJhiUpV0EPi6lJOtP+8QcohoYIr71UAZNIDSAta/gxSYSajOBHKUU/TPzJ0/cDr5N2QVLsEx xIeADBE8= X-Gm-Gg: ASbGnctOA/LNdv6ibApUh5kzMOj6cZQRysaNqsDODKxBEsyq0/Rljc098sWPIJdhplg rUGzzhUgQ9eQWLF3P4/C9aS0yto4FmVrHYKTqZU/olTMRd1qhJWMvkUQLZBjsKApfAzYWFlPOoJ yBoyCKNuBqkRPSjDPF4TArXrlB5XUX1gIDpimGo+UKN1O1nZgcZQN1Q2MHZDKk0k7S4o6GwcNUn 1YcsjAYcY43PNHm9KJCOHS4VHrEfduNUehlCQQLuAZ6fIYxp8mfDiZK6a1bDpe45IUtRsXlWz81 F6TBzsTRJYYSpA5P/X7bphZQcR5Ox+L0/c+zSNV8xspnBqt7IChxTJcUvP7juMmmMp9ydpbZgid UyhFr2sYAI35ZVxwUNdi90ZFFyHDnoOMtDFzWjcRDZo8LCYw9z16PTSFfupcDyIELuGHhgx+8HJ NKQf72p2szo0iBFuL/jnGpLtA1mMTcSdkCoeb9oDwguS4cM9djkXck2kpXfh+1 X-Google-Smtp-Source: AGHT+IGgEQmNZW/VdvN3gmZwK4t9JcBXVteP83+Z2Xlkr80E9yVxkFA6II8H4a1vEDcjbIXIvUnfIw== X-Received: by 2002:a05:6000:40cb:b0:428:5673:11e0 with SMTP id ffacd0b85a97d-429aefb9d57mr38221f8f.40.1761676134968; Tue, 28 Oct 2025 11:28:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Song Gao , Bibo Mao , Jiaxun Yang Subject: [PATCH v3 13/25] hw/acpi: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:47 +0100 Message-ID: <20251028181300.41475-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676266837154100 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Jonathan Cameron #for CXL --- hw/acpi/cxl.c | 8 ++++++-- hw/i386/acpi-build.c | 8 +++++--- hw/loongarch/virt-acpi-build.c | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/acpi/cxl.c b/hw/acpi/cxl.c index 77c99dfb184..92c032851cc 100644 --- a/hw/acpi/cxl.c +++ b/hw/acpi/cxl.c @@ -105,6 +105,7 @@ static void cedt_build_chbs(GArray *table_data, PXBCXLD= ev *cxl) PXBDev *pxb =3D PXB_DEV(cxl); SysBusDevice *sbd =3D SYS_BUS_DEVICE(cxl->cxl_host_bridge); MemoryRegion *mr =3D sysbus_mmio_get_region(sbd, 0); + hwaddr container_base_addr =3D memory_region_get_address(mr->container= ); =20 /* Type */ build_append_int_noprefix(table_data, 0, 1); @@ -125,7 +126,9 @@ static void cedt_build_chbs(GArray *table_data, PXBCXLD= ev *cxl) build_append_int_noprefix(table_data, 0, 4); =20 /* Base - subregion within a container that is in PA space */ - build_append_int_noprefix(table_data, mr->container->addr + mr->addr, = 8); + build_append_int_noprefix(table_data, + container_base_addr + + memory_region_get_address(mr), 8); =20 /* Length */ build_append_int_noprefix(table_data, memory_region_size(mr), 8); @@ -154,7 +157,8 @@ static void cedt_build_cfmws(CXLFixedWindow *fw, Aml *c= edt) build_append_int_noprefix(table_data, 0, 4); =20 /* Base HPA */ - build_append_int_noprefix(table_data, fw->mr.addr, 8); + build_append_int_noprefix(table_data, + memory_region_get_address(&fw->mr), 8); =20 /* Window Size */ build_append_int_noprefix(table_data, fw->size, 8); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 9446a9f862c..201fdbb39f0 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1039,7 +1039,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, /* Handle the ranges for the PXB expanders */ if (pci_bus_is_cxl(bus)) { MemoryRegion *mr =3D &pcms->cxl_devices_state.host_mr; - uint64_t base =3D mr->addr; + hwaddr base =3D memory_region_get_address(mr); =20 cxl_present =3D true; crs_range_insert(crs_range_set.mem_ranges, base, @@ -1822,7 +1822,8 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linke= r, const char *oem_id, /* Capability offset */ build_append_int_noprefix(table_data, s->pci->capab_offset, 2); /* IOMMU base address */ - build_append_int_noprefix(table_data, s->mr_mmio.addr, 8); + build_append_int_noprefix(table_data, + memory_region_get_address(&s->mr_mmio), 8); /* PCI Segment Group */ build_append_int_noprefix(table_data, 0, 2); /* IOMMU info */ @@ -1857,7 +1858,8 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linke= r, const char *oem_id, /* Capability offset */ build_append_int_noprefix(table_data, s->pci->capab_offset, 2); /* IOMMU base address */ - build_append_int_noprefix(table_data, s->mr_mmio.addr, 8); + build_append_int_noprefix(table_data, + memory_region_get_address(&s->mr_mmio), 8); /* PCI Segment Group */ build_append_int_noprefix(table_data, 0, 2); /* IOMMU info */ diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c index 3694c9827f0..101d083ae6a 100644 --- a/hw/loongarch/virt-acpi-build.c +++ b/hw/loongarch/virt-acpi-build.c @@ -409,11 +409,11 @@ static void build_flash_aml(Aml *scope, LoongArchVirt= MachineState *lvms) hwaddr flash1_size; =20 flash_mem =3D pflash_cfi01_get_memory(lvms->flash[0]); - flash0_base =3D flash_mem->addr; + flash0_base =3D memory_region_get_address(flash_mem); flash0_size =3D memory_region_size(flash_mem); =20 flash_mem =3D pflash_cfi01_get_memory(lvms->flash[1]); - flash1_base =3D flash_mem->addr; + flash1_base =3D memory_region_get_address(flash_mem); flash1_size =3D memory_region_size(flash_mem); =20 dev =3D aml_device("FLS0"); --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676331; cv=none; d=zohomail.com; s=zohoarc; b=DptNgAEb5pmf9RIde0bRQnq9JbeBzlR6Jrky860yGUvzNoIZ/g1/wK6DW0OeM7y3Vdv/sO+wYKmxoYwvkz9LVtBBwwUDrhMVgKLm+mzamRDVyPczRv9I2vRBZ2XyoUizrMfaRePPK2BR+6WzMQyroDoNtechkKnVtJUDauC/kdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676331; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HL7ij399tVGkPj9RDTG8sqr6pEwl1ZnFEvIaoIEp9eA=; b=hZGZUdXeYUPzBh0TS/vP2ik4cOwNM66xuTd70dblkfwYjCqoG80VH9UKkyEfO+0YNLnxUTROMCZdrkf6g0HDv7nHBFzjfmgkWQbBJfBop+RRPlVjEPZqDQoNNmOQ7V9MpOeaa6fd39z5qXqVSidsZIyzb+FKLHaQ6salmMhMEFk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676331303993.1532424123898; Tue, 28 Oct 2025 11:32:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoTn-0005IZ-KD; Tue, 28 Oct 2025 14:31:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoSX-0004Sk-MU for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:30:25 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoSK-0003gM-NX for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:30:16 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-470ffbf2150so1048155e9.1 for ; Tue, 28 Oct 2025 11:30:01 -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-4771e20205esm5286525e9.12.2025.10.28.11.29.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676198; x=1762280998; darn=nongnu.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=HL7ij399tVGkPj9RDTG8sqr6pEwl1ZnFEvIaoIEp9eA=; b=SZQlqVPnwwzM/P1jLSUNQMXhMyhLjrYztVVsHIBXyP5Tv4mjXFrcsTM8pbicF5n50J 8wAC0uNwl8wfr3wwcHKlUDHPgcIB6C5k/bUbyzHe8SpnfNni5okmCCoF225pw5FHs1Ip kc2ph8roKx8XyD8RDk9KYrdEQzVK2XbTO/fH7Z/PFkAqeNEin12fvYwqfiO3xNUp7gwr VcxCSONvCIPqyIhlWgVEfvWzou3l8aJL+aVD8YMjctG19OqortPrPz0NPXRFp8nnVDi7 XL3VgHXJRb7/yUGPYl3e8J1fdXuoQoaffTP1pHCwjISW7oh16Rvn9cy2Nq45LsKbOqDf CxrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676198; x=1762280998; 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=HL7ij399tVGkPj9RDTG8sqr6pEwl1ZnFEvIaoIEp9eA=; b=UQNcxN7rvwQhUcUwet0+jzNapfDf1lYR6nN5pGia5HSgs6W9TSzH6sxSg9qKZyDnqN bX+UQj0r0v5FtszbEzAG+/QpjAehoUz3wrRLO3Y1C7wh4D058CWADEgVrFZF4BSevuYF RPpZK48WMf/vmVwDwpt2lVyrOGT/gaBGBkTr1qcmrK5Vrxt+V5Z0cAPZH6vf60P08lqE ufiDli7EQQUw9YoFqnkkCVRMMUsr7XlelUkeGsiND1Hrn2bnVuJ2I3h0vJVsuEcdcEp8 4oH0Gp6rGDJvi48yiObwd94fDU1l091DCsKbaQwx7G0JzxSvX8ADX1nUi5SO4qcIe4VM M8AA== X-Gm-Message-State: AOJu0Yzh5yP5BlFg8AgXVgtBHoBAN/30HmZYIxYX0Ar1xnWKUt+QV8tQ uTpip89j2m5f5ykkIQ1C26j6N22jGOmhQZZl2Se4/kdbP7sH4QPa2oo6p/8VyHv3s4P+NQ7QwSs 9JI1aihE= X-Gm-Gg: ASbGncuG+3s1ZgBZ/sE8/Bv4Evv1ZCEz+d7JWXSecwGg5yefHjGsrYH5ChCgvBc14Fd /P0NSHCynI0rqf9q/Cj8GVpBPSddY4taCJ5QCAB6l9S2CmJZvXhwgUEUe7QBAtukd/O5HzAgFeq VPOFb4/dndfgkTEX2WXnC6pDTHELTFY3VELOk5DO4ifHhNQDVWuBqMFpDtNvq2Z6k3rTes9NO97 k0+RApjOcttEOv9rMZL4ElMPgrhWqXkmESWssu4nfu2IeVYURE5CbiXmDsM41DvQ7NUxCPMmA85 BWCOEWUacWXPv1Ybh5HddNJMWMMiaWB+yPB9T8P9oyu3HQa7CPUq1XZzkPpo+7aeeGm/2ILbSm+ 0IFqP5xCJyAGBn5dYoRWeM14lRaMjYD80FiN5lSsLvZrj060vdJUAwna7oque79uDb5DDLK9QNb mN85w+hJ4FhaQRJ4Hv2YupV184LpO/QDmHGY20RlQHCPvubImumQ== X-Google-Smtp-Source: AGHT+IG97QAQdAzX9j2A8+XMHl21id0uAywezIfpohf6gPFZ5+SmTTd/0RziLpMJdteJH8UW8U3PBQ== X-Received: by 2002:a05:600c:8518:b0:45f:29eb:2148 with SMTP id 5b1f17b1804b1-4771e5ec5b3mr2070435e9.7.1761676197953; Tue, 28 Oct 2025 11:29:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Song Gao , Bibo Mao , Jiaxun Yang Subject: [PATCH v3 14/25] hw/fdt: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:48 +0100 Message-ID: <20251028181300.41475-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676333593154100 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/i386/microvm-dt.c | 4 ++-- hw/loongarch/virt-fdt-build.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index d7f49bc1b5f..5b64f5b7f30 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -72,7 +72,7 @@ static void dt_add_virtio(MicrovmMachineState *mms, VirtI= OMMIOProxy *mmio) } =20 MemoryRegion *mr =3D sysbus_mmio_get_region(dev, 0); - hwaddr base =3D mr->addr; + hwaddr base =3D memory_region_get_address(mr); hwaddr size =3D 512; unsigned index =3D (base - VIRTIO_MMIO_BASE) / size; uint32_t irq =3D mms->virtio_irq_base + index; @@ -152,7 +152,7 @@ static void dt_add_pcie(MicrovmMachineState *mms) static void dt_add_ioapic(MicrovmMachineState *mms, SysBusDevice *dev) { MemoryRegion *mr =3D sysbus_mmio_get_region(dev, 0); - hwaddr base =3D mr->addr; + hwaddr base =3D memory_region_get_address(mr); char *nodename; uint32_t ph; int index; diff --git a/hw/loongarch/virt-fdt-build.c b/hw/loongarch/virt-fdt-build.c index 1f0ba01f711..54524e5aca9 100644 --- a/hw/loongarch/virt-fdt-build.c +++ b/hw/loongarch/virt-fdt-build.c @@ -195,11 +195,11 @@ static void fdt_add_flash_node(LoongArchVirtMachineSt= ate *lvms) hwaddr flash1_size; =20 flash_mem =3D pflash_cfi01_get_memory(lvms->flash[0]); - flash0_base =3D flash_mem->addr; + flash0_base =3D memory_region_get_address(flash_mem); flash0_size =3D memory_region_size(flash_mem); =20 flash_mem =3D pflash_cfi01_get_memory(lvms->flash[1]); - flash1_base =3D flash_mem->addr; + flash1_base =3D memory_region_get_address(flash_mem); flash1_size =3D memory_region_size(flash_mem); =20 nodename =3D g_strdup_printf("/flash@%" PRIx64, flash0_base); --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676336; cv=none; d=zohomail.com; s=zohoarc; b=W+7S3iN3+HlggUb4Gx7Xlq9H3GuW7zVbExH7nR33/zNMLZsKCvVc/6Q7qurc569kkh7MdvHkhTfuhXWeMl8iBVLZrXrok+wEhfph3wI1JOls4rtrOxU+klwl4HenZwdorGw0fmPgHRKv+bPq3dWvaVb/lehXHxuNmXsHwTotuOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676336; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fermtkBdaDZXNajdjB6zA0OKZzLVtlqaDe4tnQa95wQ=; b=mPBc+5hBKPOXqi5s+0s/vJgx7zVpSglAEqivzsCZ7TqnftBoNbU+aaGMbSpQ6wqePySLFk0dIT4coF98R981o/AKPb9S92uphzas1lkW209Nfa95QwbVOOv9pU1VYz+laeD3qSlYPM6Rspcdf7/1r4aycclQCuN4Rur+bGcEo1Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676336156338.38079546292386; Tue, 28 Oct 2025 11:32:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoTy-0005cJ-3z; Tue, 28 Oct 2025 14:31:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoTa-00051D-O5 for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:31:27 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoTL-0003xt-31 for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:31:21 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-46fcf9f63b6so37978645e9.2 for ; Tue, 28 Oct 2025 11:31:04 -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-4771e235ae1sm7425275e9.17.2025.10.28.11.30.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676260; x=1762281060; darn=nongnu.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=fermtkBdaDZXNajdjB6zA0OKZzLVtlqaDe4tnQa95wQ=; b=vCf0zEE5whdPAXxSBMXnQEZaUwkA/TX7GdNiMMRtNpZF4Olxm1uSvP1An4v+xRuN9a k8UytmH/tJqe+NHZloTzA1BxiVAEDnqdQ1MA9FodbmleelD+eZ79i8+1E/huUqe4HzVa 76jWdhbW6gGAoIhTA5CHmCthYeQr7lGGmnSEmTOd/2gAnoZmEB+59tyyWqEXZ+T7oQYC CKAqz5qLnm1Zh+IhIkVJ2w1qIkw6fkl7WUtb+E2sQd5zE3/jvMat4CgPuLE8c0W/Gutk LZYBzWtHb7bwQREUnIw2uV6xte0atqGkZpqs7bwRby4gvpET3Eng8B6bBbdaQ2Wt+sek iKog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676260; x=1762281060; 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=fermtkBdaDZXNajdjB6zA0OKZzLVtlqaDe4tnQa95wQ=; b=paUMnWw0q2VXs/q2f8Gf3JkE4b9SkBLFNdJexqwFfjBqDtqKGBZDCT4GfHSUGRA6Mo q58fQ4t18ZNItEtOiReoxiwr1XjwqVbJKtBXYveDEPJttqKFJAV6HGg8TSH76W539iPc 4IQ9HbY/JjmRAin1x7IHLV1e6OgV0kk+d+00HFX4yxJIxG7oHCu2oV2ezO3dW2FigV/z pph+MEOkmheOd4lrHlOInigIius/cIFUYBYSQ+exZ4hfOdZRlBEFeazhdss2xxkgGHn+ v7C8Y/9YzrqfPkVqRGHllxsZfl3SB3MiA0kR5q53rfHB0u5MHz9J+BlseV1gpR5/EoOp O6ow== X-Gm-Message-State: AOJu0Yxp6TuFBptK7isdmWWM0Gte2DE4AcCmQpuMLmVW68b5dDYfFjyh bEcJcklrmmBKUlcTjh3yp3WrJASh5rB2GCiTNBKCrKo2Y/PBX7g9r3fWUtR+BlMSWnzXHDRMwv5 m1XDrAwU= X-Gm-Gg: ASbGnctqPCUk51UnUOrLFEhFJJF4yJw6K5UDpGEpwYG0c82xpNhbouvP5/TejU0bgew DL9J7JMurN8VmMVcNjWgq8vLrBvoAAWMyMjCC0JEx2VRcgLIFevXhNp7XunoYUrClagveSaPBZX 3fSSh2cQuYCnmhRPtCLNJgQCANqQNxWewXVVSbS+anQ0cJme+LKEyeQc7Kza3MRLR35NelKfYS5 SnnNmWRyWSiseE/hLAZ504Ml4mJe3bjqPyZPY4FszNxzcgmTS8kn8eLqEADG+t8qnOlCbHgsdKF 5Nawr7f4RiPL1Q8XedxCKMb7RbsR/zno9sqmk/ZDJZbJ71NA/wz4vYDoahZlKhcAACmnEOOVMs8 J+m0czFCyO42AIhPEQv+ipXgtSS1LvZJFVwAdCn1wBE/DceeTNC5f2b3nEHx+EUNAhGfRHQKBN0 +pSX+X737eItoE3N955/8SD2boj38tumHXF30X89ApD3+ubpDBRw== X-Google-Smtp-Source: AGHT+IEZrBqet2EhgHnX4L/FSECsKa8z/HIEet5qdiAHu/FmoGeAFC0bJdCuXELcszN40D53pYxkaA== X-Received: by 2002:a05:600c:3b1a:b0:477:58:7d04 with SMTP id 5b1f17b1804b1-4771e1abf88mr4154275e9.9.1761676260305; Tue, 28 Oct 2025 11:31:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Busch , Klaus Jensen , Jesper Devantier Subject: [PATCH v3 15/25] hw/nvme: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:49 +0100 Message-ID: <20251028181300.41475-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676350378154100 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen Reviewed-by: Richard Henderson --- hw/nvme/ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 9505f291f62..65cc1c8ee52 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -522,7 +522,7 @@ static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr) } =20 mr =3D &n->cmb.mem; - lo =3D n->params.legacy_cmb ? n->cmb.mem.addr : n->cmb.cba; + lo =3D n->params.legacy_cmb ? memory_region_get_address(mr) : n->cmb.c= ba; hi =3D lo + memory_region_size(mr); =20 return addr >=3D lo && addr < hi; @@ -530,7 +530,8 @@ static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr) =20 static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr) { - hwaddr base =3D n->params.legacy_cmb ? n->cmb.mem.addr : n->cmb.cba; + hwaddr base =3D n->params.legacy_cmb ? memory_region_get_address(&n->c= mb.mem) + : n->cmb.cba; return &n->cmb.buf[addr - base]; } =20 @@ -564,7 +565,7 @@ static inline bool nvme_addr_is_iomem(NvmeCtrl *n, hwad= dr addr) * that if the device model is ever changed to allow the CMB to be loc= ated * in BAR0 as well, then this must be changed. */ - lo =3D n->bar0.addr; + lo =3D memory_region_get_address(&n->bar0); hi =3D lo + memory_region_size(&n->bar0); =20 return addr >=3D lo && addr < hi; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676449; cv=none; d=zohomail.com; s=zohoarc; b=U5fnLeFNdLOZq9bhhQUWBDrWwMtppMjBM9tWdt3UNdZG7dwYXhMczQh9jbQVzXLEpOa1Lqk2nyVXWFGe1PgUoUkDsL5Vvc0U+AklNps/2CdCQCV6ds1r/ZtBLsS/9fFRI0KGQW8NXUG0oWBwuxHtAvvwvN6eFw6Cd254EXxp82w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676449; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IaTjF09SMgISnzDEeFqSTFyM00Tszf9mX6IdYxJoDH0=; b=X0NMSV4Sr0DRFRENFJO8MLpWiZGRLReMjhKrLF2wzFDmYPHzBG1IX79J6777YZcIPk1czeAfC6i9Bra2NcaaAeSf37bJuceP5myErYcCVXZokknh73b15lfE9TTldIHnQXF9WWfiPiZePsiDl+wT+XX/KLzbrwtvLWaqzA/GSug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676449863395.2813800236087; Tue, 28 Oct 2025 11:34:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoVf-0006Pk-8E; Tue, 28 Oct 2025 14:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoUX-0005vD-9g for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:32:32 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoUN-00044p-No for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:32:19 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-471191ac79dso66772075e9.3 for ; Tue, 28 Oct 2025 11:32:06 -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-429952d5773sm23558062f8f.27.2025.10.28.11.32.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676323; x=1762281123; darn=nongnu.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=IaTjF09SMgISnzDEeFqSTFyM00Tszf9mX6IdYxJoDH0=; b=albqiIAmyTsoZqMcLCX4yCZHpvnaxuCbScltHjjLppfShOMUxhSj2t1AVbPJbPMEGO Q5qmOy10hBn+o+4lFyJEzQasmnUtBrj+OjDl5TqoDAwOuHqz+dtDqxsyNCpLhvjAJQLy zasXs8imyHfU9KOpvcDRGpikibe25SqTDmXyyRqZTJfNtkfv6kGaqV+Lh9TpwgvuDBCO fFbDDMnOZWaKJUN63rxmdn+bnewPGH3F79RqFDikX0dj55Jv4niX91HLCFWIxsP1TpOZ BnE3X+gctoS7a55jAJVWitemWi2Gvodvqv7ZpYwGks/262ZAfBZ+mS6xWfM5zBhChwFW CY+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676323; x=1762281123; 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=IaTjF09SMgISnzDEeFqSTFyM00Tszf9mX6IdYxJoDH0=; b=YDdkzPJAoKGVi/9BQvx72fRqcd+RrmXtNhMc7LRo1LZt4BKxk+MCJaNHSRQ33H8HlB k7baID38QTAksUsb8MNgGTn9oe8XpHszTcqniGOehbE2IonewH6ZI9aWn8WbrK5y1JdD C9YsbbozGKCMef01DcW44oE+rmjMx/0tN1ZxTaknSurAJdxR3JqFnDg3BBAm19j1H1Cn qbjfASfyiytRWY56MHi5tEDR4Az5JTKm6HBWyPKEMo/5zqOeJGoxXmJZ2z4k09SGPmfW 8ha5YLt6vVnJ6Fk7ZTAwHq3JWy0r7D0q6zab3KhsH84QyS2PqS2Fi1Y8yFi9S571lqvh 2BbQ== X-Gm-Message-State: AOJu0YxjzKQIMonwUG+MRi0x9OpBFfbtqgsFlqf28v4wSnogy03Aa/XW EZI39pU+w/JRrgcoRKJe3fbknVeiySqqxPT7ERfQdslsCoOcp3ob32vmvMX0uv3OFVnWQIZu+8U 2JzhHS7U= X-Gm-Gg: ASbGnctpsfwB4V3GALLenruIQ0zhytqfBQFIXrTAZ6sztkQQU2EaycYrDpB8HtZYFhb dkpBolu4bt9zjtsBehwIJrA+lYY5k2uDEQlxC2egZCRmxsTgiP19AwxAvRi4Pgj4h/wxvbpW2R8 1Pn7Et/qv4/Ab9v3P1ww+v1iTnFx7ViESXZyRoOdwapbzcaLH3odax770OSFGPnJCSTWJuNxEmk UNtp5IrF+4g54mdkqx+v/rP+iqVrg3sD6bbq44IuXNyh8i9DFuXRzy/TCO5AdhUrSmf36GRIbhk LdHnEIOugXARPr1CaycDfGzkEIYnGzn4DqKY3y3/2x2uYJCVzDvtx7qfmoB86u9M5iCcpk3sARc Qqiaf3JrnwM98wKlxUJzP/ZtwQw38uOxQSxJqc1uuj+ELMcSsPcosrx7tB6niuiX1GArW5FYn4T yV8ZQP7Gb8cUGRPcrnvz1UhDmfZUnxJr1oncw1/GgaCdeIHvszvQ== X-Google-Smtp-Source: AGHT+IGNoilMZftYdlFoABEz7HqlIZBlWvUUKsoIyM+4ZJE0nhNjCJZlyq17dqhndnBKugd6FhWXWQ== X-Received: by 2002:a05:600c:4ec6:b0:475:df91:ddf0 with SMTP id 5b1f17b1804b1-4771e1f0f49mr4024465e9.33.1761676323157; Tue, 28 Oct 2025 11:32:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Matthew Rosato , Eric Farman , Halil Pasic , Christian Borntraeger , Thomas Huth , Richard Henderson , David Hildenbrand , Ilya Leoshkevich Subject: [PATCH v3 16/25] hw/s390x: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:50 +0100 Message-ID: <20251028181300.41475-17-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676454698158500 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/s390x/s390-pci-inst.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 5841dfc4fec..d4adf782ca1 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -394,11 +394,14 @@ static MemoryRegion *s390_get_subregion(MemoryRegion = *mr, uint64_t offset, { MemoryRegion *subregion; uint64_t subregion_size; + hwaddr subregion_addr; =20 QTAILQ_FOREACH(subregion, &mr->subregions, subregions_link) { subregion_size =3D memory_region_size(subregion); - if ((offset >=3D subregion->addr) && - (offset + len) <=3D (subregion->addr + subregion_size)) { + subregion_addr =3D memory_region_get_address(subregion); + + if ((offset >=3D subregion_addr) && + (offset + len) <=3D (subregion_addr + subregion_size)) { mr =3D subregion; break; } @@ -410,11 +413,12 @@ static MemTxResult zpci_read_bar(S390PCIBusDevice *pb= dev, uint8_t pcias, uint64_t offset, uint64_t *data, uint8_t = len) { MemoryRegion *mr; + hwaddr subregion_base_addr; =20 mr =3D pbdev->pdev->io_regions[pcias].memory; mr =3D s390_get_subregion(mr, offset, len); - offset -=3D mr->addr; - return memory_region_dispatch_read(mr, offset, data, + subregion_base_addr =3D memory_region_get_address(mr); + return memory_region_dispatch_read(mr, offset - subregion_base_addr, d= ata, size_memop(len) | MO_BE, MEMTXATTRS_UNSPECIFIED); } @@ -510,11 +514,12 @@ static MemTxResult zpci_write_bar(S390PCIBusDevice *p= bdev, uint8_t pcias, uint64_t offset, uint64_t data, uint8_t = len) { MemoryRegion *mr; + hwaddr subregion_base_addr; =20 mr =3D pbdev->pdev->io_regions[pcias].memory; mr =3D s390_get_subregion(mr, offset, len); - offset -=3D mr->addr; - return memory_region_dispatch_write(mr, offset, data, + subregion_base_addr =3D memory_region_get_address(mr); + return memory_region_dispatch_write(mr, offset - subregion_base_addr, = data, size_memop(len) | MO_BE, MEMTXATTRS_UNSPECIFIED); } @@ -832,6 +837,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8= _t r3, uint64_t gaddr, S390PCIBusDevice *pbdev; MemoryRegion *mr; MemTxResult result; + hwaddr subregion_base_addr; uint64_t offset; int i; uint32_t fh; @@ -900,7 +906,8 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8= _t r3, uint64_t gaddr, =20 mr =3D pbdev->pdev->io_regions[pcias].memory; mr =3D s390_get_subregion(mr, offset, len); - offset -=3D mr->addr; + subregion_base_addr =3D memory_region_get_address(mr); + offset -=3D subregion_base_addr; =20 for (i =3D 0; i < len; i +=3D 8) { if (!memory_region_access_valid(mr, offset + i, 8, true, --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676464; cv=none; d=zohomail.com; s=zohoarc; b=akCMWQ3p3gUPY4JcZU066tnU9AgXZ2/Ua3cn8glhnOdIAd0orTtlfW5auuktjUmOmkMcp9WfkPgenLD+MFXOTRt1H9pvzzgUMOu6D5x27Hn2g9cpvW6HsMtf44LONHePPGNL5aT+63uyrHgvv9YbSzR6dipXp1m9aj0higv5Tfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676464; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7j5BIJP17+UqRO/W8Lo+TNqHDVnZzxsQi9DL2cIQNS0=; b=Nw4yObDthCN9SZJyUBCDlOl24dOSHtJCirsaszf3p/uXncX4uHXNCqr1UFaHAWVY4uC2I7dCM1cYwT4nCz/v6PnPqB/t8PXc2/gX+7FRDdUCAABXF63I8MFLYEBunJzP2M5dLfkzoDGcJQMgd76ALeu87YyrsImIcBl303EX8Hc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676464871366.06378714026243; Tue, 28 Oct 2025 11:34:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoVn-0006Ty-7H; Tue, 28 Oct 2025 14:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoVW-0006N6-Nh for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:33:26 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoVO-0004CA-PK for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:33:22 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3ee12807d97so5893799f8f.0 for ; Tue, 28 Oct 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-429952b7b43sm22092394f8f.6.2025.10.28.11.33.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676385; x=1762281185; darn=nongnu.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=7j5BIJP17+UqRO/W8Lo+TNqHDVnZzxsQi9DL2cIQNS0=; b=uUSZq0AZ2+NE+FjHjxXlJPjfvrdR9V5t0OUJQvQqNjGbOWmMRlH4OJ9+ytdatimHjl tt53IUpylOvKrcq1orPIVFtN82oM390AsP/Ddyflngw1vv65v9b+hXHRBJMEYlFFGPiT +JVDF3Ja38+yuVlv4s5Od2vcfh6+5J49W65bU/672MzlJd4wr6ydVV8l1WtqIffdm/if W4JR23oQ/N6+SeC+FTRkAGRDt/KxEh4RijhPEM3XI4edArJ4PRRobPURjqqTX551LwhK 255B1361Jy41nUJxd6gXlIiF0BPqozgl5o1Y3SWGgdvbQqHq7ERhGj4ofQsB6T/b86bP qoDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676385; x=1762281185; 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=7j5BIJP17+UqRO/W8Lo+TNqHDVnZzxsQi9DL2cIQNS0=; b=S5+abAgN23JwfftP+Dy1BnI0bClssMqvqVma5XBSwqZuNzuIS9lsG6P6kWkOcB1JMx z7ZVHYRgx40oo5bqN30vJiQ//PMJEOjqoOUrX+bQXnb9N3ghy16fBDdmlooPQDqUjSwd LNlvbB+4IGC0pB1lUh4qopmbChfcX6aeGntYmGdhqMrAuVxIAlZNUHmoX80ezQpS5p3E z5n35eRbbubwEanOqaRPFDhPR0RfBn8YO/ekpW9zz6sd2VMe4GG+1MeOaHPZHPraBLPZ TGJQEzgsXhEQ2aaZ16tgb3NUZaRlNIWxRkERs9GXcR1MnMpeSs1LdtC5QGWPVRmrqELu FNqQ== X-Gm-Message-State: AOJu0YzMZaR57PqzHusG9SeWA9nMXjAcvyE7IYuKIY8aIpTYNi99SDag 3v8mCNFb1zlM6HCe7LZBS6xlln+pzxgyC5FrPfWoJQG9pl26afiviWfAm/4PVIm64qzbSNd8nSX czcPv5xw= X-Gm-Gg: ASbGncvKGrwNvXdmpycOuOAUodzJk93egO9UeZVo09Yh6e2WBn7gfzSlYkc8Q1ZmZpR lqQNhQI8O6utANq1cKqNsXI5vFgci1ycMskWJzsKQIr29DzNbtBMrnSpuqDx+ujbFEHCsSqmc8V Hp9fJA8uC0262Bffhv+sCRBwTnV2fv3s8jGNBaoswxL7lxpRAl1iCU1jpsunD9TM1ez465wgMXU ThyzN98n8Zxs/NeHyPJWSbA2LNlmNHAoAAwv3fvgGZ/GFiuBH9FJc4+7b91HMUZpj7t+hnR5b5x jzB5HQEf5R8aj7EcwN/13OhYQ/5f3a5Wp3hlLgvZQHr5gndbJtpRMLoybboRLcsTgojk4pOF8VN 3bXWcWbeU7r63o+7Wcz0koVqwgm6kf7NM7sGVOt8UphUgbcx8jDTW6xff5etGKyEyQ57ZP/yEsA MuBKZwu8wL/05UWGyv4rqSWnHzNPVvdmM1Z7jEGNX9xS2FIgMlgnO2m5CHD4JX X-Google-Smtp-Source: AGHT+IHGiWmEGr7Mocg3dTC4g97uHTSqAkS1iH5OLYhopZsv0+nhnWDP5kXiVjZvDYeQlZsSjlXfNw== X-Received: by 2002:a05:6000:2313:b0:429:8d21:572a with SMTP id ffacd0b85a97d-429aefbdb9amr35337f8f.34.1761676385531; Tue, 28 Oct 2025 11:33:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini Subject: [PATCH v3 17/25] hw/timer/hpet: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:51 +0100 Message-ID: <20251028181300.41475-18-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676466582158500 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Zhao Liu --- hw/timer/hpet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index c1b96d0a89f..e2cd0c9cccb 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -677,7 +677,7 @@ static void hpet_reset(DeviceState *d) s->hpet_offset =3D 0ULL; s->config =3D 0ULL; hpet_fw_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->cap= ability; - hpet_fw_cfg.hpet[s->hpet_id].address =3D mr->addr; + hpet_fw_cfg.hpet[s->hpet_id].address =3D memory_region_get_address(mr); =20 /* to document that the RTC lowers its output on reset as well */ s->rtc_irq_level =3D 0; --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676511; cv=none; d=zohomail.com; s=zohoarc; b=k/d32BSdr6Ql92Wgi14vCCbbncNuk9IueYSsYtSllnonhVNuKXe/biexX2cYbcOCEhYhSDZ8Uac/cvde+RE+i6nV1U02Z6sZ7mOSD3iB8TKPeDsO3iFbYBkOgG3SrjejuBXjbKXbuT8ymG3pAu7RAK4G1311MJR0/M1sINzoTX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676511; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5DmeGIOtnQgeitCackLcdl7/cs7kVLgAOODhMbDoGJI=; b=V4mxCm8/XcTFAGvFoaBPPRnHcAaJPelPpGO8lLeugnkS0q9h9PkakMHpsb2Uoc4LQDFMEutMwAKJ0Yt3C+SgZRsnXkp5RxM0eg4S3yd6MK7SuRmjlgTdgZp0g0Dw7folevZW4t/0hI8mTgmEtnhAIxa8H+AK21dWNkxv19V9xAc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176167651118382.65183676849813; Tue, 28 Oct 2025 11:35:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoWj-0007L1-EQ; Tue, 28 Oct 2025 14:34:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoWc-00077N-U7 for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:34:33 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoWO-0004Ib-Lz for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:34:30 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3ece1102998so4579049f8f.2 for ; Tue, 28 Oct 2025 11:34:10 -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-429952cbb2bsm22064803f8f.13.2025.10.28.11.34.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676448; x=1762281248; darn=nongnu.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=5DmeGIOtnQgeitCackLcdl7/cs7kVLgAOODhMbDoGJI=; b=dlz//2b/LqJ9+l44emJzfc7Ki0c2Rt+fLe1uIMudzuhcnHcKiOB8+KeU+peYtwkR2o kw3RgIUWwBd81ellbWlWVhAz+xwr9zIFOqjNftHEkbUEEFNwsXFIrq9TU5ngrDYaztXd /YaxG1MvMULNR+6oOBHG4R7+pJqyixrWBOBSZEEAK7UrChBbLmx1N7BkzZtHr8YSA/Cz X5AuoAlGm99hknm7ODnyfCqU4q0N2b5c69FOVF/xLsCJdC87R7oO1lG4ZgD408IwpOMW nNDI5IYWhY8iwfzCxhhpWOtBeGGoHs5WDCs2+HUmxDMB8CYiNwEt7F3EmVy1HXsiMTBh iLdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676448; x=1762281248; 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=5DmeGIOtnQgeitCackLcdl7/cs7kVLgAOODhMbDoGJI=; b=Lg0HLh+aF3t2koUi1eDNiBFrblPB4Wry1whF2z8b8sDpmeddidQwakYsQSp0My9PwQ 74PMreJYI5LPg2ublH6WvhIESN9DhBEQPxSFYZqB0vy5r+r55hyqdDpISEE9sBqH68nC PqTKthDzBGaN/rur1gP3eUcCzSz2kNi16EjzGgKWpGH49pdWJ8E2gxFXsyV1gi66QJJo AwG9HEDYAdQwJphMzKvXeIK7QiEqVzGJo7Rv9LRiLHVfw4Yka+ADZf2gflPSJARWAWfz LWDcGHyPKSnu/BCd9bKh6Dux3vumrd7Y6+dF/DhudFgOzv5YMOg3nmRqL6FceuMiN/sE MuKQ== X-Gm-Message-State: AOJu0Yy+TB2n5Tcr/PFRysR8t80eGDAF0NUyuay3UCGOKapj3Bz4kqSP QcOG2YhDizSbRgQUIflKQ09eh/zExVg0KqHslBAGdvnCZp6/YdbtrZTBgNyyha/aHII2EJ8zAT9 zfoe/wCg= X-Gm-Gg: ASbGncvUwnKzh/FuI67CzLj/VxpEgUNibmUfLqH3Amr7Q0eOTsww7hlEG2ZE7lueEcu eVA+SjtTAvSen2O7joTLZ2J6IJ78hYv9ZdD4x6mYb4O1cGT+RpCXIOfa9peK8e66lt7+AVNVyAi VwitggNa2h9NcxF7n6zpiQ+Nu4vIh8D9uwFmAC8umWv0cMQM0Nn7V16ggNzgGoqwMpt44KTASde +HAQF8i0mNpUR9vSpHzXR2NMggTUnkrUFG6n56jWMsBnFXXKD9SqZ5VoNP02Qznulof0gw8Wu5d lMg3Nq7Z6Ylu45hlYPtDc0hCR9vc44X1jHe2Mv5avB5mf8BPXoh/Fo/SLhBU0c2APR/v1O9QbjY OcYl164hyX775Mwl5ObWyGYYRkKSsHPhsE1NVAD1xMsYOSR4t/G4m4dPRjKxVBLy2Jg7uwcR4YV 6qXJ0Ia55UUEaNdVEsoI5TaUEsavkiu3xVZWeeh7LcDig0S/dzAw== X-Google-Smtp-Source: AGHT+IHsIum+c9nT7pG2emhzPJVq5xAQ7ZBeEj43AMtw4RcW7IdMZOY2egDdd/SBNbjY67+SkP8JZw== X-Received: by 2002:a05:6000:2512:b0:427:6a4:93da with SMTP id ffacd0b85a97d-429aefbe0c0mr45031f8f.49.1761676448174; Tue, 28 Oct 2025 11:34:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley Subject: [PATCH v3 18/25] hw/watchdog/aspeed: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:52 +0100 Message-ID: <20251028181300.41475-19-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676513759154100 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Richard Henderson --- hw/watchdog/wdt_aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 30226435efc..f842d8e973a 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -274,7 +274,7 @@ static void aspeed_wdt_timer_expired(void *dev) } =20 qemu_log_mask(CPU_LOG_RESET, "Watchdog timer %" HWADDR_PRIx " expired.= \n", - s->iomem.addr); + memory_region_get_address(&s->iomem)); watchdog_perform_action(); timer_del(s->timer); } --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676605; cv=none; d=zohomail.com; s=zohoarc; b=BSBmCJ7XRY3RxixqFSPSGb6JOTmauavbRObKIR6XsN+ai/bH8G4L9uD3szwdMvtQmAbPLt2FMaN3EceJvXaMPbgD2KKi+fRIhKAZUptwCjJii7AN9f77i0vBpzD7fkfS5SuYQ/IvBcfvPJjHPYUblP0nVMCKZGBF5pkfvGaq3L4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676605; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vbV20QgyIxlspSHe3slsxqgoOZCxZe5hmrWfCx1z6jY=; b=mdVGK55V192kjLcEaYkhw4PXP6wgfGTUm67Ncc67LdqyoTLbkpjR/TnWnvP99lK00/HaoQ6onUyRpl8laU3J/XcLY+dmKer7qKvZ/Qbg1c7MUouBTLFzAsHdb0X6siAyDRf8GEpg5/tae8eStThiCtBXpbfA6m3chSSCLRouias= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676605707930.6779413713941; Tue, 28 Oct 2025 11:36:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoXg-0000ZS-KT; Tue, 28 Oct 2025 14:35:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoXT-0000Me-K7 for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:35:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoXL-0004an-QN for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:35:22 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-4298b49f103so2236347f8f.2 for ; Tue, 28 Oct 2025 11:35: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-429952db9d1sm21375687f8f.35.2025.10.28.11.35.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:35:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676510; x=1762281310; darn=nongnu.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=vbV20QgyIxlspSHe3slsxqgoOZCxZe5hmrWfCx1z6jY=; b=ht6gfUrVraJDYYa0CBatWamXOspZgpNax59eNF+2RDl1ryGeVu5+1fxwbJitjTO8oH nvlqmWC4cTjwkl+iJ0+L0VrutYFHeEcnmd+Nog2c2JdTzscJlKUyMvR8pkuLjlLXkPUk kw9O1aug88IGRZ7wEqlVpIFPzkLNSxw6AFSeyIdIaymdsfKB9VyaV/K8G4aVht3TaGz/ xRe75ZrKr/T+rqTI8jJgdkOXDlvnPoRjB11YdSDnLYwQ2bXd4mprMIALTqxrs78htQTP nCzw/haCNywpdTQS+/o+nWgX5YAQqjSqvYvST7G1CaeJiEvdLBhKQfFATDPsSdHFGSgf fiuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676510; x=1762281310; 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=vbV20QgyIxlspSHe3slsxqgoOZCxZe5hmrWfCx1z6jY=; b=Ab1TwAVXaPI3Tt6Ay9ULRs7FpXHyR6hkVdhAq34sW6NwP89Mii3B8HmQpXchueSCB6 ID+toN0aF9ltuWnsGvontL15k8FlQ0c6VEuFZMBxw9VadJG8X5VA/+6mm1X1ZAM7arm7 V8m0vgvnT0aXyV2QV6fE1wKVEsdUZsRhAkJCLlolrbSCVfvg9J0q6GZR9YjqnrAtjbbA j7KE/EuooE+PuwaRCppxNSs2WjEsjj9CKqWmSoi2YC9XUdVoRQ1R/GtFgm7PFnaOqji7 nKfONbVEdUExb96xAk2SC8IagiJVq/mVDy4No6z9Tuu+94ArdBHnqUpDBGkOlwZiVQLx ka5Q== X-Gm-Message-State: AOJu0YwrDBiJFri4uiUduU9cHnUjy+WTLs35M5wOyDB7oq2bQKF3rRZh OEGiNsVacZMx1VB1i80XofCBGUM8b7JVRH7S5eUNMgGvjCWMeFTtFh8itAE1AytOPdRhwkaYilG 8vO7ILIY= X-Gm-Gg: ASbGncsV3o0qZau6mOdy/ZAr89UZwfsZthQLbjNWhpuJQJYDIbf6O9DuuYTJGMWl0uY w76Tt6EJSbGbmnO4s3NysONBEBG9Xi30SpvyMqWTZE/EDZsB/0z85x+NsdW81LuDiejtru5gbA2 bDsb/zMBlOf1nS+6R1qvPX4JGRkaxiCJmMXONckSPqcEhUjDrUlHdWJwyXLtPYZYLzX7qlTLFGi j6nU6xs+pj52/GBsRIyRkGTfdeaEMgPZwTf9BUaz2C+zab9dUt//edRPTwjrUe/7Z4VC7uGV64l 1Rym8MrYDPpSTkCR81w7yufKK8qd66LXfSZ6TezwMCQmCD/I2/LnK1yABT1cfjdVL4XynrvR3ZU OIU6LZnbML/IOaYjtZIY1+trlt1Whn3H+VuIW5T/ajpD6qYKJqGkOH3NtJZwD3/7Fn4lIvAus2S 2uWIzRLwtz3zFYwPtL3G9OrxYhirBdKcFpzMttvBNxvvA0uzkFXQ== X-Google-Smtp-Source: AGHT+IFZvJ9NpojrZnUC56Rkdt1ACx7aQJVJlyE1/s6DyXLlTiXnLMfxQJUA3nNkIlmy15bezLbfdw== X-Received: by 2002:a05:6000:2082:b0:3e0:c28a:abbb with SMTP id ffacd0b85a97d-429aef77d9bmr77676f8f.13.1761676510363; Tue, 28 Oct 2025 11:35:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v3 19/25] hw/pci-bridge: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:53 +0100 Message-ID: <20251028181300.41475-20-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676608434154100 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/pci-bridge/pci_expander_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index aa55749954a..0cb94fca9c0 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -161,7 +161,7 @@ static char *pxb_host_ofw_unit_address(const SysBusDevi= ce *dev) MemoryRegion *mr =3D sysbus_mmio_get_region(main_host_sbd, 0); =20 return g_strdup_printf(HWADDR_FMT_plx ",%x", - mr->addr, position + 1); + memory_region_get_address(mr), position + 1= ); } if (main_host_sbd->num_pio > 0) { return g_strdup_printf("i%04x,%x", --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676659; cv=none; d=zohomail.com; s=zohoarc; b=cg1VCNmGUbDmqihdlDGEh5T/BwhoVDr4xNHcxt7mnCn0ZKSHP7b1EBtEIw+8BJ7KkvEOEQvaZm8y8C/05e1wQEw+85kZAzJK+iCUt2SolBwryHAhcOs8OlXd9fG/8WtW4CISAGBMTtak8fSvw46bJoIspoZgS2KirmS72Pr5PGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676659; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tDDIpY5DBZefLzt1zYAEWbfOSaDV/iJd8y/kxVHu9fE=; b=JXjIekdieg4d9EHdBG6CYJMiFsTOjuH9xlZG3+XOHVeUy/Icr2LUW/cusLuemmn2sORYe6qUUruPw3LqE0J+ydZZ355MYtAaVKn9nOTIVVifBADH/l/Sr8cpyCx1mYQp9ohUoljag22ACWWzJALzYyH78+zKt2aMeODCo86qs40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676659294666.7599916294823; Tue, 28 Oct 2025 11:37:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoYx-0001M3-Fc; Tue, 28 Oct 2025 14:36:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoYT-00019I-TI for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:36:27 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoYL-0004mK-Vi for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:36:25 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-475dc6029b6so35562725e9.0 for ; Tue, 28 Oct 2025 11:36: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-4771e3b9994sm4335315e9.16.2025.10.28.11.36.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676572; x=1762281372; darn=nongnu.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=tDDIpY5DBZefLzt1zYAEWbfOSaDV/iJd8y/kxVHu9fE=; b=iXdrD0KzpeskL7GUL+WFhInBsjK7TOjCVQ2nqxAvSw1YEAlr9ZabssbPr6i+fobDqz sZr4TAqGYt64YJQlrXHsBI1TC35M2D5n69mSmF1sYVWETE38xKw3fTE+Dq35gs0OmT00 Smk6Q7PTa390DwQF7z5IUsdCI273HicECuYjcM8LBp7ZNBTNbr2K/JVjhDR6oiWbaqgi QASNQfOFIWJ2jrM+AcSL8cCLT1UqbpV7dn5VGRKn/iKHSI/6KorgFvsfQyxrIhd6yvNW 1wS8kMULWQwfuAoltr3BsUujCoYQN68Y2dWmTa59DfnMixmaJH6e1mRh1g9XydJLI0Zc CDrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676572; x=1762281372; 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=tDDIpY5DBZefLzt1zYAEWbfOSaDV/iJd8y/kxVHu9fE=; b=mHWf7vDr5EPm8J2RkF8RqEML7j9eQusDEdNHb3zUTQPQK4IhWUaQar8UMS2JhvG7Ah +bZcRJBJjgj2ZjivyLBXCKTJo35ydUav6h69VvTPHP3ZD93QAbNG6U27+9RdOIBK2ems 5QhkaYSo1xw7389wTj1RH1TVN+4kH70fkeu0fnIEYNDug7mI4gYDyqCUeE2p2ai/94Gm oK9dhDdktfUp8s6qyEvPSVo2jK0FOJCLIvKWXrMLc2wd/6MhmuleviZEJ6XB3kuNgOIj e7m+bK3VpdYmFsjGXbUmi7cbstN73XJAJ/0jECnuaQNJoHhBXj9J3wmP8ytkhdj0lkvN fyfA== X-Gm-Message-State: AOJu0YxKf+9lf/3Dpg9l6g41y6CyZWqMrvkDrr5yE1K2UXZdJ1sEjNVk iFGLRe5fHMTKN4gnjIY9FB54wh0K77sf6kbllekfdFceNqP2KLQjHCZoipGdMwggtwt9X/gRTwq ATRGsCqk= X-Gm-Gg: ASbGncviI38cnUM6q1OdLYWDq8FGUGhVjV61rn7DDFowjjq5TmAstxduAwx/O36Lf8R VEuu7vumkuQUOvoNpglC6BTnv9ntaq3kkAHp+waS6e+m2n0YtbFRvdnl4cpHtm7g8qyJW5Nrkt4 CNANYLxA+gXpCWH75cfSTVIFlwxfX5zqx3aE4s3Nxh+sS/ardITNPOwdHoKRQsewYxQQ0gYf8tp lQPCju23OQD/2KURZqaEVQOdA1bIL9oja7ijWIPE1B7GKtMbkDj6z5a6L++tN5pnZsrZivgBDOE W4fzOPMxFErrkDK9gHio2ApUTT3ZjutdRXEMN0d22aIZJ4jv6uCuEG0hcr7MFUrSQZ0D8hEb6/S 8k/dbsDQu/xmG7p7qidMTEJGvDnd22b5WX0fWyaHJNtGEX8oaD01DCX6T2Onh5EPCUesvs8sD+C 0fREctLg16bDJmQTHWaRTQLjg/gGFKY03dVD7U8A6W2jyjClfFEw== X-Google-Smtp-Source: AGHT+IEQHBby75ghyQxhJs2H+uO0E2xg04ykfY1VExJwXzc1JWKcrYMUPxFAIHU+uZPdSQ4Ux37r3Q== X-Received: by 2002:a05:600c:820c:b0:477:e70:592b with SMTP id 5b1f17b1804b1-4771e16e792mr5356505e9.2.1761676572454; Tue, 28 Oct 2025 11:36:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v3 20/25] system/ioport: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:54 +0100 Message-ID: <20251028181300.41475-21-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676660769158500 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- system/ioport.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 4f96e9119fc..9bb8df5e757 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -177,17 +177,19 @@ static uint64_t portio_read(void *opaque, hwaddr addr= , unsigned size) { MemoryRegionPortioList *mrpio =3D opaque; const MemoryRegionPortio *mrp =3D find_portio(mrpio, addr, size, false= ); + hwaddr pio_base_addr =3D memory_region_get_address(&mrpio->mr); uint64_t data; =20 data =3D ((uint64_t)1 << (size * 8)) - 1; if (mrp) { - data =3D mrp->read(mrpio->portio_opaque, mrpio->mr.addr + addr); + data =3D mrp->read(mrpio->portio_opaque, pio_base_addr + addr); } else if (size =3D=3D 2) { mrp =3D find_portio(mrpio, addr, 1, false); if (mrp) { - data =3D mrp->read(mrpio->portio_opaque, mrpio->mr.addr + addr= ); + data =3D mrp->read(mrpio->portio_opaque, pio_base_addr + addr); if (addr + 1 < mrp->offset + mrp->len) { - data |=3D mrp->read(mrpio->portio_opaque, mrpio->mr.addr += addr + 1) << 8; + data |=3D mrp->read(mrpio->portio_opaque, + pio_base_addr + addr + 1) << 8; } else { data |=3D 0xff00; } @@ -201,15 +203,17 @@ static void portio_write(void *opaque, hwaddr addr, u= int64_t data, { MemoryRegionPortioList *mrpio =3D opaque; const MemoryRegionPortio *mrp =3D find_portio(mrpio, addr, size, true); + hwaddr pio_base_addr =3D memory_region_get_address(&mrpio->mr); =20 if (mrp) { - mrp->write(mrpio->portio_opaque, mrpio->mr.addr + addr, data); + mrp->write(mrpio->portio_opaque, pio_base_addr + addr, data); } else if (size =3D=3D 2) { mrp =3D find_portio(mrpio, addr, 1, true); if (mrp) { - mrp->write(mrpio->portio_opaque, mrpio->mr.addr + addr, data &= 0xff); + mrp->write(mrpio->portio_opaque, pio_base_addr + addr, data & = 0xff); if (addr + 1 < mrp->offset + mrp->len) { - mrp->write(mrpio->portio_opaque, mrpio->mr.addr + addr + 1= , data >> 8); + mrp->write(mrpio->portio_opaque, + pio_base_addr + addr + 1, data >> 8); } } } @@ -335,12 +339,15 @@ void portio_list_set_enabled(PortioList *piolist, boo= l enabled) void portio_list_set_address(PortioList *piolist, uint32_t addr) { MemoryRegionPortioList *mrpio; + hwaddr pio_base_addr; unsigned i, j; =20 for (i =3D 0; i < piolist->nr; ++i) { mrpio =3D container_of(piolist->regions[i], MemoryRegionPortioList= , mr); + pio_base_addr =3D memory_region_get_address(&mrpio->mr); + memory_region_set_address(&mrpio->mr, - mrpio->mr.addr - piolist->addr + addr); + pio_base_addr - piolist->addr + addr); for (j =3D 0; mrpio->ports[j].size; ++j) { mrpio->ports[j].offset +=3D addr - piolist->addr; } --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676698; cv=none; d=zohomail.com; s=zohoarc; b=VbZ6yByd9sFYqR2fnJXxzei5kItuwgHUsh+h0/mo8RZaAsI+WzpBifukK0HmA5UEcNJlO6iRzOyP0zhBod93Wplb34MluluvO9lu0XcJdivS/5Lw6wIkVNwVa61xj7CyOmnF7fuiZwvXPsHRFFoJns8QUwjD8HGqMKywMIC5kuc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676698; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=da20sap9SAei7iAOsl6G96LauqZxiVssKlSk19y/1Tk=; b=Rq9V/4TcMRahNsKrG0atIJLebdY8VKVsuvCJTiegljr7up90OaiP5i5zKUblhb0KaFg50TbbcdpbgbJadKCyHjCDYR8sxMLzhfKGGgTkarX/XgJr5QdA3/+m79kL9CU9/1V0KOVgIrA92P7e/f/KtzxjhmWFjncVcvSdaeh9N/s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676698247556.552276634586; Tue, 28 Oct 2025 11:38:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoZa-000296-MN; Tue, 28 Oct 2025 14:37:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoZY-00026W-TF for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:37:32 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoZO-0004zl-1c for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:37:31 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4710a1f9e4cso51541055e9.0 for ; Tue, 28 Oct 2025 11:37:16 -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-4771e372a2asm4969435e9.1.2025.10.28.11.37.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676635; x=1762281435; darn=nongnu.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=da20sap9SAei7iAOsl6G96LauqZxiVssKlSk19y/1Tk=; b=XELCyF9cVUcKv2F0ges/gg8zm0dId+/iDI3HEDKKSurDbnJZe0ehGxc+gvsw6S3yJL EzwWeq2Cd7RB8NncsRv2LQuTbghnsN8cjO6bPn3jUR8L2zM5c5klRofJwbVmhHfFi7s1 JGYjdqCXDxv9WFj2sGVX9Xz2wQdRxoAnTCgfCp6fMIvRmS4rfeWnsYR5kiqYZfTVAiPX 8xtl4n7mY8eb4TgRX0wTkgokXT2V6NYjyaJ0sjZxpJ5y+rsnoIPGrsuUG5bcrBtzG1Bp JpfOpBfs1HvXT/39nmH/9aZ7eyYUqaKVPm6ZfyAO7YVrgKNIhbz+mbVaOAN0au2/Azcs CLng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676635; x=1762281435; 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=da20sap9SAei7iAOsl6G96LauqZxiVssKlSk19y/1Tk=; b=bedD6T07fdn28/Y1dwdAM2ocekUXRpj/D5RRmAXT7lxE8vccyPKrNAoa4hCxLUF90z a8WXGgwvfFtvn+hCz+U0cSKXqOQHR9azhaN2dJG1tld1cJqOnlSzmbBoQG6EN4ASIP++ 1Df0PuN78/CRLRpMk/n9PEA4WH92qmqc1h5pRAuWlFER2ceMJ1mWeem+jfwq/Xmyof9N 88IjlOkZ5vWWpolliky4noac7VQEUQO8qRU5td0hCjCa36gVZaB54oEmrrQ7ZF5gqPtF xAq09YoJVaNB9eGYkkiaW1vIvoRNZVImi2X2eHLyXVZeHyAfEZj0gbZoBJ7yYkVgDwBm 7aGw== X-Gm-Message-State: AOJu0YzaItJkLzSYu8Nh6Xx8MKkb46GFRqO31O4p9g57pISdyo0H7v4A a9KOpDJWbfqb8N7Nran5MWoFAnWFkWxfUoOWHSpSlJ8M7WtKL4Mwjtawn+AHR1IUiqGP8SebTwK 1yckjH2s= X-Gm-Gg: ASbGncvQCdWTS+IoBdrG8VnYeZpXC8c6c1bHWU5YmgzGOGfCwADfB7QOv9AVwlr2Rru 609/XZRArDuEN3rdsOmzeOYVTD0lVc8AyHEgOtX6kzAgvEOy6rqDwrkhAE43JPwFf1kvyHRR2fi bSrQ8wU55bgXmZtBK7F2msmloviP18XVkGJ3HoLNMMRvVBcrreiV6Z9qqxK2ySzvWVABLYvGab4 EuOTqdaJWScyi3Hw9XZXiWy8jcDurOy5GvVQtC/L0iN9e+6t0YXuQal5zSzyowA2dR67yHR3oXs 9QBKHDUzNvlZLOVJpdAV5OFjqfXzvVfv3GKINzSIV2e7W4/DGUpYsCNbZu+Aqfy6X86lvWTh5Cb XZGP38nU94Mc1eZvtFxmjVbf2lnCwHN8ORLj7/7g6yahgHnjoP0WG1BFatKxYcfzlk06y0nHOM/ fhYQgrDVuMd9Hz2vEUZ8g36b0rUgS54pBQlNyBjLioJcbn9fjLmw== X-Google-Smtp-Source: AGHT+IFapD6B1mwLK5l5mb2JHMsdWVzmVKw4vmGK+atso96F/zVqkutbGq8wyv3L0Md4xYfeUTvgrw== X-Received: by 2002:a05:600c:5197:b0:46e:2e93:589f with SMTP id 5b1f17b1804b1-4771e17ef8cmr3841085e9.14.1761676634843; Tue, 28 Oct 2025 11:37:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 21/25] hw/sysbus: Use memory_region_get_address() Date: Tue, 28 Oct 2025 19:12:55 +0100 Message-ID: <20251028181300.41475-22-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676701506158500 MemoryRegion::addr is private data of MemoryRegion, use memory_region_get_address() to access it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/core/sysbus.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index d33be6b2b52..414b3f806d1 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -257,13 +257,14 @@ bool sysbus_realize_and_unref(SysBusDevice *dev, Erro= r **errp) static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) { SysBusDevice *s =3D SYS_BUS_DEVICE(dev); - hwaddr size; - int i; =20 - for (i =3D 0; i < s->num_mmio; i++) { - size =3D memory_region_size(s->mmio[i].memory); - monitor_printf(mon, "%*smmio " HWADDR_FMT_plx "/" HWADDR_FMT_plx "= \n", - indent, "", s->mmio[i].addr, size); + for (int i =3D 0; i < s->num_mmio; i++) { + MemoryRegion *mr =3D sysbus_mmio_get_region(s, i); + hwaddr addr =3D memory_region_get_address(mr); + uint64_t size =3D memory_region_size(mr); + + monitor_printf(mon, "%*smmio " HWADDR_FMT_plx "/%016" PRIx64 "\n", + indent, "", addr, size); } } =20 @@ -282,8 +283,10 @@ static char *sysbus_get_fw_dev_path(DeviceState *dev) } } if (s->num_mmio) { + MemoryRegion *mr =3D sysbus_mmio_get_region(s, 0); + return g_strdup_printf("%s@" HWADDR_FMT_plx, qdev_fw_name(dev), - s->mmio[0].addr); + memory_region_get_address(mr)); } if (s->num_pio) { return g_strdup_printf("%s@i%04x", qdev_fw_name(dev), s->pio[0]); --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676784; cv=none; d=zohomail.com; s=zohoarc; b=CoPwbjh/RYUutEKILeXanvxeUMyoUOYXLDo7xT6CtO4nQ7kdmZRZJ0bOiE2U4bwvx0id3OcUkGd9T3JH0AtLsfkFj6Ka8xdVAS7ICubyWZHdu9lcYOhQsDDbBBepgqblR+CcdV+oN+7GwEphytb4T7zXV3vBjf0PbvkniKOPKuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676784; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3LiVkULu7cpH5vHA/z/rbLa6gWXf0joU93uS+b0AUFI=; b=Bh7eFAmeW9KooCPHDiDucgIUVCqPWxGrcLhETbbiSCyTCWVEcRvwAu3lj9gvjY/VQJ2TFS+bhj4/ukWSGcZo2AcFj+wz9aQ/2csaKI8Z3LxzKL573ZlZrHTjM3Es2MBTY4jv+mO67Ujr73fc+PHozepDht/2xsI284cCPIuXaMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676784364640.7440882716646; Tue, 28 Oct 2025 11:39:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoaW-0002u6-Lz; Tue, 28 Oct 2025 14:38:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoaU-0002tr-PC for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:38:31 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDoaK-0005Dj-KT for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:38:30 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-475dbb524e4so25052835e9.2 for ; Tue, 28 Oct 2025 11:38:20 -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-4771e202093sm6130775e9.11.2025.10.28.11.38.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676697; x=1762281497; darn=nongnu.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=3LiVkULu7cpH5vHA/z/rbLa6gWXf0joU93uS+b0AUFI=; b=W2o/QHE9Pbnv7kcpIVuc56Rr4SwyeHGHsEhkTM6qc3+1qSzIqvCu3Im9paA7EdQcJs /SN6tmfrc4z7lXGjpEGTf5HccKnS7uOH2FPUFirNrG1u/BdO83XYApV+Z4pmzSgHr7RP tNPPwyvd1ATc9aD2EqF9FWsxgWdoTu4Gi+8dHnWtfE/mD93OxHvj8bjTwZVGYtPHCCXN MZh/K35hs1tMMWfsnMnJQQnirYF0ddPs+97w+INPX7yCtuF2YXQGpO1f7kMM4Om89XiY ark42+layZZ3czw2Hur6BtmuZJxdWLXzgGao5gmggfxwzCBnVZX+ov6aELqLqk7pdmcz CQKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676697; x=1762281497; 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=3LiVkULu7cpH5vHA/z/rbLa6gWXf0joU93uS+b0AUFI=; b=bQXY/kORF9/djiT4m9v8THfMVaWGxL11nxtj/zrc0dr9DqgFjCDHpB8nH6Op7u+Yie dXb4mDdkSesWJl0+ZzB26yw0dFDgFEqkuyrh1hAZiSjxcCL4kZQkFoQEL5aWdK6QcNDa nuG/R7du/arj6SA6HdGyZ+hJ3rY2vwU5d13Vw7173H68Je0RX0xXquS/4ZfL69irI9Q+ 3bD8VfTQ3hiJ4V7hhE8px9pP2O6P6gQ/+ySy43vD7w9UR6u09Z+kEGTHoG1Bw6XbvWDk x+45pVV05NmGA+J69Wm35+GuFOMnKIs3KXZDW56Dx1OVOI+9xOXoOe7Dpduk2D55J2EZ LJHA== X-Gm-Message-State: AOJu0YyzgsM2q85QVD71113/ijpEZD58QpI+TKUumA2QFC2BYswZM0sK l4gGLQPmXC6TtF5Fx4s38nq5TsUoDpzlv2wT5LTg8GHYigod8msShiJ0pMxRQmmKV9of1JzUL8i Exh7JxpM= X-Gm-Gg: ASbGnculYW6mYJgmQUuNe9LbWTB8Mx/o4eHcKsc3tv8BSPd5xXUsxDIb907mU01PN8s wNtfXBmzpEmlYtwJUBFtgJNtDQMW+ggHygn+Q58fEDpFWxJ/pyR71drE/Hw3KeWvrmATRXOkPxL 3h78fietRzQh1X5G6Z8wRhRqaxtsWJtCnxyKKRoLxD414KLtgoUNgDtHwAHMw0wGgw4CD0KoYCH jZ+2PK1QIvAoJPkBdBF07NYAxIs/YVSaUaf72BVt+r1uKc0P3WgkNFQMHZ6T395VhydQ0WNUD8N LfjzGGOt4LTghatr+Q9LPGoEkyPxMGO+x0/jQopypiObmPsRDW6KUIOqzvhvTRt4NHf1fyaJpfd 9Zxyc7losztohyZ6oa4x5aNPrFA52koeJzJ4Rhyv9H8SHoZV0votxgaJWh8hUNQteWInNoXiMwD i1yFkdwkSpnfyg6xdv3wQRh+XYoPKaLH/CfoEglsV76M03Iwfxcg== X-Google-Smtp-Source: AGHT+IHlAKKbu1BvepCk2+xKmeMgOIpCiIa0/Yll5w1gh4uX8422ccZ4n4jMUDX3DYA0RYB95NOTig== X-Received: by 2002:a05:600c:198f:b0:46e:32dd:1b1a with SMTP id 5b1f17b1804b1-4771e165903mr5014625e9.7.1761676697458; Tue, 28 Oct 2025 11:38:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 22/25] hw/sysbus: Hoist MemoryRegion in sysbus_mmio_map_common() Date: Tue, 28 Oct 2025 19:12:56 +0100 Message-ID: <20251028181300.41475-23-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676786466154100 In order to make the next commit easier to review, use the local @mr variable in sysbus_mmio_map_common(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/core/sysbus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 414b3f806d1..dca6e67a92d 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -122,7 +122,10 @@ bool sysbus_has_mmio(const SysBusDevice *dev, unsigned= int n) static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr, bool may_overlap, int priority) { + MemoryRegion *mr; + assert(n >=3D 0 && n < dev->num_mmio); + mr =3D dev->mmio[n].memory; =20 if (dev->mmio[n].addr =3D=3D addr) { /* ??? region already mapped here. */ @@ -130,13 +133,13 @@ static void sysbus_mmio_map_common(SysBusDevice *dev,= int n, hwaddr addr, } if (dev->mmio[n].addr !=3D (hwaddr)-1) { /* Unregister previous mapping. */ - memory_region_del_subregion(get_system_memory(), dev->mmio[n].memo= ry); + memory_region_del_subregion(get_system_memory(), mr); } dev->mmio[n].addr =3D addr; if (may_overlap) { memory_region_add_subregion_overlap(get_system_memory(), addr, - dev->mmio[n].memory, + mr, priority); } else { --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676886; cv=none; d=zohomail.com; s=zohoarc; b=fRntr5bbFFvF1HCojVIBfRqhunl5w8RQp9sfFsvCcM1lMeGny2pnLMYNTN5KUPnCXLtNtM+lUO+wr/qDaM3/iFAXyTTzaLhTUCx2d4ewEQ/8aBVqBdrF81AOCAIWNd5PokxLTDioyiyMdIebU1HXz3BMFj5NS/Kao5+2APX0l70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676886; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WHowBX2Df07n1T0yG1K/ZRt6j4FXOVAvsLv2ZkOne3Q=; b=fMS0HxdDJrKiy6elDOYCCiRUtLSDgcoZ+rR0rmM6y1uDhshAHhjH43NhX2N6KqBXNQZ9+8VY4rEJluIMyEGvjQ1/0/zCoz7rWPgOiP+89Uzz/eT4BVzaZ1GTvS0Iawt0ej82zQ9z3HYAfgXCz2plQmBEtNwx42IE719nShWrPBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676886359679.0849136262476; Tue, 28 Oct 2025 11:41:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDobs-0003ea-9v; Tue, 28 Oct 2025 14:40:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDobg-0003dH-Li for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:39:47 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDobN-0005QG-EB for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:39:40 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4710022571cso65839835e9.3 for ; Tue, 28 Oct 2025 11:39:21 -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-4771e3a8209sm4599205e9.11.2025.10.28.11.39.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676760; x=1762281560; darn=nongnu.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=WHowBX2Df07n1T0yG1K/ZRt6j4FXOVAvsLv2ZkOne3Q=; b=xzgwUY/j/fypRfifDU/UfAwUsMRjwG3YWbvl/eXktWsXO2dOUOsEi4d0fFi4rMIMmO f8XMwrBthOBd3xgHenWVEnWn28CCokePArgSMFeEOj8HsfMBif0Nc+OyqQTpztA9fQl3 ii2AtyJsfZUQAJyWT8hV1XrnRQdvt44JVMOKEBeAfKaVhCS9LQmnERL+EsjjLMSJG91s lffEQlIOim9ffpV6ic0eYtX4iiih0+AN7D1HZG7g0DEROJ/ML8XrnTFt1oQM1kWYYEB7 Nwo7Bog4S92xl6xcJytE5a2eBTA34/hEtMaZ2vuWUiPOTtC+MUI3NtH6Dk1TASe9vV/y 0Qqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676760; x=1762281560; 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=WHowBX2Df07n1T0yG1K/ZRt6j4FXOVAvsLv2ZkOne3Q=; b=oYdspmy9qy3NbfIW7ymWKr3q7PTLL5B9DCqS4vyDe0I2bCJYNguj+gIF5jbZpggElN 86jLQy5Prh5+3DPWiBe6TucWKbgcT7py0UhZVkF5PIZjoux5Yh2b0vsLZJKCweHf3Cjd gSw7Q0bhCueFzwReuP/LHIgGgRLVMS1xtEvY3G9gWgq4xX1+N53tOUggmGsc4pv6XFEi SkjNtlhqrOgIlzW7eA8ZDQbJxWRuxzsZEaXEpzjY9D2JJPDTIDrF7j1Bx0JQxc11S08w lfbSo0wuiJ9hRcOhPPgpYX3ORkrlvOhHYZhs/bHgVh13CVV/LX5p5+UAPEkzeVK3Svtc b8OQ== X-Gm-Message-State: AOJu0Yz7et3/rehjEMMxftWTnneSpXIMzXQTuae3d+M4AJ7aUMK8mkPO rO0Y5LNZ6R0lEWGvZxI3eVtzhDbCp1zQeyfI041GypiIQtDSxWW9uWvMUfJLTfEpgKEXhOVNnce Lad0pNe8= X-Gm-Gg: ASbGncupkAzflleoHHyNjf28srHSDAOSarxZjxds2Xf8UoC/UcOBx+I2rp7EPiEnoNq rEZYqTgT9By1eT76FK2n+sh/VnhlgDuI9E9hvHJHLiJyfB4AyDj2uxdpu8kaohDhNUK4/80t4Si bu+mPawZ4nUFz2QLM7JkYyWQSIk90vF7qZ4zDZujIMtPHvnj5XUEd0YBey4HgLWs5R+YUPrrVTp 46WgZO0bBhQsg14c2e3rYKh9JoDl2mn1vIZ5O2b792ueRc3d9+W08JiYKLVTflqlFzHiQamg5AY lViDDxvYbuyQXZQdKiY4aK2E7lJQ6DyfHMAYMZI0k3D+e+wxhO2cytjWTht5gJU5PJiEjw2Aud3 QEDp0uA0pITaUweiBHjW9IhqhjDQGzsBlnIQXJfb7/hnRAEBqeNHL8HheSPWXd1eqrfQ5Tk+pOH ORKdT81jOGxgTtje86EGQjJS6ggiN6sUODSiyNCuwPjnrjvQCcFWhbUBtSr0ku X-Google-Smtp-Source: AGHT+IE7qtAGaEHOUPfc/qOTGQFIp/rFHMuxQNkbkoSFzl16xR11m2qcZXSdonN3rPR3t6pvvzFvoA== X-Received: by 2002:a05:600c:1e28:b0:475:db8f:ae0e with SMTP id 5b1f17b1804b1-4771e17412fmr4848315e9.2.1761676759905; Tue, 28 Oct 2025 11:39:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 23/25] hw/sysbus: Remove sysbus_mmio_map_common() @may_overlap argument Date: Tue, 28 Oct 2025 19:12:57 +0100 Message-ID: <20251028181300.41475-24-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676887703154100 memory_region_add_subregion_overlap(priority=3D0) is identical to memory_region_add_subregion(). Just use the former to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/core/sysbus.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index dca6e67a92d..e6acf8dba3b 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -120,7 +120,7 @@ bool sysbus_has_mmio(const SysBusDevice *dev, unsigned = int n) } =20 static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr, - bool may_overlap, int priority) + int priority) { MemoryRegion *mr; =20 @@ -136,22 +136,13 @@ static void sysbus_mmio_map_common(SysBusDevice *dev,= int n, hwaddr addr, memory_region_del_subregion(get_system_memory(), mr); } dev->mmio[n].addr =3D addr; - if (may_overlap) { - memory_region_add_subregion_overlap(get_system_memory(), - addr, - mr, - priority); - } - else { - memory_region_add_subregion(get_system_memory(), - addr, - dev->mmio[n].memory); - } + memory_region_add_subregion_overlap(get_system_memory(), + addr, mr, priority); } =20 void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr) { - sysbus_mmio_map_common(dev, n, addr, false, 0); + sysbus_mmio_map_common(dev, n, addr, 0); } =20 int sysbus_mmio_map_name(SysBusDevice *dev, const char *name, hwaddr addr) @@ -168,7 +159,7 @@ int sysbus_mmio_map_name(SysBusDevice *dev, const char = *name, hwaddr addr) void sysbus_mmio_map_overlap(SysBusDevice *dev, int n, hwaddr addr, int priority) { - sysbus_mmio_map_common(dev, n, addr, true, priority); + sysbus_mmio_map_common(dev, n, addr, priority); } =20 /* Request an IRQ source. The actual IRQ object may be populated later. = */ --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676965; cv=none; d=zohomail.com; s=zohoarc; b=ak35CggLQp+0Eb5Ji99B8T1MWTBHp4dZL15nNocNg84p8VAKqlPJsN5nw6+MG8UliIWCdofeHjKxqqnNv7YKRnKgqr5/uE/AMgOsIHtvy5OFhq+/jlXbUgzRQU5nm1Wz0w8jDu1RP0Emz8e4XGT2oFQw0q8YQcAvaCyvwha41us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676965; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=B6mKiRR2Y6gxX/FAMko5pwvzjUpcIA3Fae2uarELE6Y=; b=PBYJpkVWJjhJ6b7X1ZRRA3xj0cXFwh+Lm6udoJW5SS9lNHtepvneH+5DZw34RXl23nkZotkRGkkgEo1/l+7h/tK1nlLggdU+0ZKt3rphQDcFlW2E2qW1iqn0yORFVyyGRTmg6XWleN7Mz4ah2GNlP9ObjYnhnWWHWnjgSvHl7wk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676965942393.4658941422266; Tue, 28 Oct 2025 11:42:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDodI-0004RR-GB; Tue, 28 Oct 2025 14:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDoce-000418-Ke for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:40:50 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDocQ-0005gk-4U for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:40:43 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-427091cd4fdso3678322f8f.1 for ; Tue, 28 Oct 2025 11:40: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 ffacd0b85a97d-429952cb7e8sm22036083f8f.19.2025.10.28.11.40.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676822; x=1762281622; darn=nongnu.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=B6mKiRR2Y6gxX/FAMko5pwvzjUpcIA3Fae2uarELE6Y=; b=a5OUm5rvAc2zT5YAl6qccxmd12IzXY6ConRlbtk/U3ECdgTXsadlp3XS3YNMb4fIi/ DOuqMtmjw5s1gp3FcXAyLM6wUmVahgzuVQwvW21h5qI2SGGUQKMbavn0ths5ZLuwdFkN GhhaR0cIGca5k99xQkFWibX41aJPj7WlOtSGKxoDQvBWf+rVde5gzPlkvZRiLrxUUAQ5 lXxT91l/mwxbxV9O+Zb8ukjWnzXZ1oHQyKp3S/dV1xdobILNZMmIdP5PkrNXVzYFx7XR d8Jde6jPkkgVRWyID7b4e31QwZT/gk49HdILFRNrqyW3FpiShLouHQ0EBfkrU3Suz8US fmsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676822; x=1762281622; 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=B6mKiRR2Y6gxX/FAMko5pwvzjUpcIA3Fae2uarELE6Y=; b=VqPTfYwGbVSuOOq3xajTAUmeWlvwCIKSyiGH9+1RU/LriLCfMb3nrpeZzg+HvN/L2S D16VHMcOma5sP8CFW+ewr1NO5K0G97d6ZEuRCJjQBrFsU29H3AxWaNpuSInySczi5tbF 5zXzQ7pnLhMsW7P4driC/dTtbgJ+TEB2fgLRHZxGsWYJ6gG1OTQIkaPQRd0C77Kd3BtQ GPauy3KlpGxRjxVSUT8MjpM2W/cC546kdBcRCGoxjESq7EkhiDb2zgninp5u6fIi0odg BBMt/Cc2iqfENnL7mAptBfwA6bZJXNhHfbUwqX8ukDK065c6ErQ9zu52DvGqBo6rNu0y ZtPA== X-Gm-Message-State: AOJu0Yx2YURT5dcdFq+c9QU2ZmvvHV+U9UMvzi9MaEANLBI0EcCCaLvH ruZ3aQeITJ4Q5BHbYv+sRPhxvCuF2pZD7I8JFQ/M+D79DrejL/BtwxP26ZEk1VvoY4mKBLHuurH lPOuF8Mk= X-Gm-Gg: ASbGncvyFWYHk8LLG7ijI3wcQw3w8HXwhagyK7FbWbdtzvBhYV7MOxTy8PJoG3Oo44x /lSjks6oYrX1gSrK2kzmszaTeg/6EeMO3EDduBpwFHH6tPsYu9Rg9PSBEf0wao5Nlfg4/ixCEhf FDW9T7eXN2PIrTdt0T2THYUa0I8w+FN4V5m/JcygcGFeNzQkYgZII4h0w9e5RC4993sRt/2ZrZy 3vUihIg1e4bEhCJZT231VmzjZLD7Yq5MFzb0as9gxdQjjBmAnDiB167XnwP8UOWc2Am+aXeyYi4 aFrkBkPoefJvjdvj0qVIdGEpVLyALDIP//zB/kdRpegU8HhM9ObWjuWlILS5HY6AmJKjEJSVsOE FsGEvm2YWT7E4chNFKbxNNhwAM9BfWyutCFW3owWF2Fm2FLbSy432MkJmybvYgboQpAi4div3WW Zx62X2qKjgT7IIEny1a1ivwt3ZflUrfRL+kr8Ja5IbswU3K/A7cwJElomAEVfq X-Google-Smtp-Source: AGHT+IFZufGnD6vOxjoeW0cJzH3Qc5Y5bQi7vWtGrXP+qS8VWZFsyyYdyVamRJMlHNRGlbUSwVgg4w== X-Received: by 2002:a05:6000:4382:b0:425:8559:5d17 with SMTP id ffacd0b85a97d-429aefb9a30mr54307f8f.30.1761676822404; Tue, 28 Oct 2025 11:40:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 24/25] hw/sysbus: Use memory_region_is_mapped() to check for mapped region Date: Tue, 28 Oct 2025 19:12:58 +0100 Message-ID: <20251028181300.41475-25-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676966585154100 Check the region is mapped in the global system memory with memory_region_is_mapped(). SysBusDevice::mmio[].addr is left unused, remove it. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- RFC: Are we sysbus-mapping containers? system/memory.c:2835:bool memory_region_is_mapped(MemoryRegion *mr) system/memory.c-2836-{ system/memory.c-2837- return !!mr->container || mr->mapped_via_alias; system/memory.c-2838-} --- include/hw/sysbus.h | 1 - hw/core/sysbus.c | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index 69eb62e29c8..b2a2ea507ea 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -60,7 +60,6 @@ struct SysBusDevice { =20 int num_mmio; struct { - hwaddr addr; MemoryRegion *memory; } mmio[QDEV_MAX_MMIO]; int num_pio; diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index e6acf8dba3b..b3060e02484 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -127,15 +127,10 @@ static void sysbus_mmio_map_common(SysBusDevice *dev,= int n, hwaddr addr, assert(n >=3D 0 && n < dev->num_mmio); mr =3D dev->mmio[n].memory; =20 - if (dev->mmio[n].addr =3D=3D addr) { - /* ??? region already mapped here. */ - return; - } - if (dev->mmio[n].addr !=3D (hwaddr)-1) { + if (memory_region_is_mapped(mr)) { /* Unregister previous mapping. */ memory_region_del_subregion(get_system_memory(), mr); } - dev->mmio[n].addr =3D addr; memory_region_add_subregion_overlap(get_system_memory(), addr, mr, priority); } @@ -180,7 +175,6 @@ void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *= memory) =20 assert(dev->num_mmio < QDEV_MAX_MMIO); n =3D dev->num_mmio++; - dev->mmio[n].addr =3D -1; dev->mmio[n].memory =3D memory; } =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761676996; cv=none; d=zohomail.com; s=zohoarc; b=AbzncCCEraL7UCvc/bC0RiS2hp+hSeNPkwY1Sn1wVS/Tc5fKQp3Mv9Lz8OMIToorazB/ynkc0GE8h0R1gLbRRKt1FHC7CPbpsuLvghr8Pb5EQGxfsy7L+VfznfFPGpwQYLlkLrov0y9aC0bWg4KgmGezYgSyWsJx/IfvagT3PrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761676996; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lIoBZbv7mBqCNJwjBiHWOo22r8zKTe2GN0MeWBRTiMU=; b=i6Y5tVunnO0X5YfSJPewxxbw+S+8HOZ+SOXsyGp1yZ86ITS53YJ8Poh/VR3TLhK+yCceapY3eEeh1wfYiUS68n2AlM9Z2VOlKXIZO4PuMfel6UylsGm150nod9n8Td3AVhjWl4OGhZBaMfcbsTFKVHz3T1cFASk2jCo3NeAM9QU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761676996607116.50995149447772; Tue, 28 Oct 2025 11:43:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDoeC-0005WW-4k; Tue, 28 Oct 2025 14:42:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDodj-0005F8-HI for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:41:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDodP-0005oT-Ez for qemu-devel@nongnu.org; Tue, 28 Oct 2025 14:41:51 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-42557c5cedcso4097163f8f.0 for ; Tue, 28 Oct 2025 11:41:27 -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-429952b7b22sm21462186f8f.9.2025.10.28.11.41.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 11:41:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761676885; x=1762281685; darn=nongnu.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=lIoBZbv7mBqCNJwjBiHWOo22r8zKTe2GN0MeWBRTiMU=; b=RGWToCDLWr1Q/lPxNTpG7oizwf2ZUPmyRjaVW9rSCLhTOiA2HxHUa9KhdVEm2Gx3W8 x7qO/4+Ip4/jBGSvWlvqWQJUVinZT+vf5390X1jAD2LG90mnx1KWCe44tN0k2TBYFlAO ZLBJgQ2q0i3Y+E0JMVq+6Y2PNQIN0tpOJbnYVhKVn3Kzwts/CV8DthPo7FY10crbGS7a tUMuSn4E21PTXt/AlqV/8SzcbBRBtZeRL5PABr07LvVn1AG1mCsSqx2qdfqFX+Mbv+zZ /c3kwxI9bAEYpksHDjNkI/0F7LIyYP6VUL8s5J/vUw8uNPRoAxQZga/MhidhbGiO2dM2 pb8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761676885; x=1762281685; 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=lIoBZbv7mBqCNJwjBiHWOo22r8zKTe2GN0MeWBRTiMU=; b=BYZqHcslY1tYd9HIarzLDshjjwRkoBX6Ls+NgBdMH6eq3ASgOo+G1AAz36peseGxas tHJ3/M7xAyhgHrFTKX1DimaGhndscyEY91S+fTZGwHUfm3KMgsZ6kSs+kHq0rZKmUOL+ HCSUD7nY13oJEyfxKcT/qVa16xciq1hd/JEvpJuOLV2mNd7+RTyvAUR9OesO1fH3b01E voge5M892cfZaScGvgJj0m/2XyIuBZG9as8bcFKlGUgo0gauCvOJMscO6ODbh0alI/qm /meGOZkz6YnGDB2Pw9jGs4ePPqE/6FmsfFcdr6pwCmF1ISGjaoYznTPKQpyYBY8Z2+f2 VxIw== X-Gm-Message-State: AOJu0YzRwseaw7Z9TUjSyIesQrKHoC5FX664pjwB6Kr7anyU6/eh2cNS vDr+lOxR9MTvgnQG6dzPWvH38iXiHatF2+0KcO2uMCBHyLOU8Q3UL2z7kclY8X25mJ3sMPWk9re p9LILt9M= X-Gm-Gg: ASbGncsSCtgrMeTBnR77/iIo8bBmkrcEG0NJyOUFrIBeeHTdeXRnf/y3PsIAFtDN60U 6BKKlr4/2qETZoBurm5oovFuImx5vq+T+0gveSHTtGtoDwaPaj4zktIUL863qod1IGwIlAVUG1d gXfvAk422R8cPhs7OIoFjZlSBW5D2NeIMv6jSnMqReBfved4nu2uxrrGJFGq1X2kZTg2qi/hO4j FMM0DOQzAfJ86UpzWL3a5+ALQURWkfB1WCb/qv6+PieEI4wMzgf8wGSW1cfwUdRtQnRSGGfgAiD HCXDSOJKvT9Jw0CXXQD+ZCTJd3bOFoAwwi5HSFM+rZTxwSCoAX3Pzc1ZDRNgi/axkRzzhg3nWXE aQ89TLCdjfk7ngICcKiyjzVa3Vhxjd4s7ov3X/BT6IQsiovvoakLc8H9NBQg+c08lwPC7ahLPaP EAJPVzAhzmYNu15ceYsU8w86yEXw/SjXfjmRGg4Yby3V/G6DGELw== X-Google-Smtp-Source: AGHT+IE9Bg27htI7e9/HI71s8ONLKbXXTD8QFcUk7hl9xI6nX05rgKMPsTlhPJM2WGdvc6SN+XjgAw== X-Received: by 2002:a05:6000:40e1:b0:429:8b01:c08c with SMTP id ffacd0b85a97d-429aef82eb8mr76573f8f.19.1761676884736; Tue, 28 Oct 2025 11:41:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 25/25] hw/sysbus: Simplify SysBusDevice::mmio Date: Tue, 28 Oct 2025 19:12:59 +0100 Message-ID: <20251028181300.41475-26-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028181300.41475-1-philmd@linaro.org> References: <20251028181300.41475-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761676998993154100 Directly access the MemoryRegion array, removing the need for the embedded structure. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/sysbus.h | 4 +--- hw/core/sysbus.c | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index b2a2ea507ea..2cee5bcd44f 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -59,9 +59,7 @@ struct SysBusDevice { /*< public >*/ =20 int num_mmio; - struct { - MemoryRegion *memory; - } mmio[QDEV_MAX_MMIO]; + MemoryRegion *mmio[QDEV_MAX_MMIO]; int num_pio; uint32_t pio[QDEV_MAX_PIO]; }; diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index b3060e02484..188a6ab055e 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -125,7 +125,7 @@ static void sysbus_mmio_map_common(SysBusDevice *dev, i= nt n, hwaddr addr, MemoryRegion *mr; =20 assert(n >=3D 0 && n < dev->num_mmio); - mr =3D dev->mmio[n].memory; + mr =3D dev->mmio[n]; =20 if (memory_region_is_mapped(mr)) { /* Unregister previous mapping. */ @@ -143,7 +143,7 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr a= ddr) int sysbus_mmio_map_name(SysBusDevice *dev, const char *name, hwaddr addr) { for (int i =3D 0; i < dev->num_mmio; i++) { - if (!strcmp(memory_region_name(dev->mmio[i].memory), name)) { + if (!strcmp(memory_region_name(dev->mmio[i]), name)) { sysbus_mmio_map(dev, i, addr); return i; } @@ -175,13 +175,13 @@ void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion= *memory) =20 assert(dev->num_mmio < QDEV_MAX_MMIO); n =3D dev->num_mmio++; - dev->mmio[n].memory =3D memory; + dev->mmio[n] =3D memory; } =20 MemoryRegion *sysbus_mmio_get_region(const SysBusDevice *dev, int n) { assert(n >=3D 0 && n < QDEV_MAX_MMIO); - return dev->mmio[n].memory; + return dev->mmio[n]; } =20 void sysbus_init_ioports(SysBusDevice *dev, uint32_t ioport, uint32_t size) --=20 2.51.0