From nobody Fri Nov 14 19:42:41 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