From nobody Sun Apr 12 07:21:50 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770907723; cv=none; d=zohomail.com; s=zohoarc; b=UgQMHuduQ29WbkipNcP+97gXoSFSwTE1qY83LQ4V/OnT35ScMGlNBOinXWZRY4dKmOrhkGL5pYwC6K3UjVeH9YUdBrxNBrMGgbfjO9SMiFeQDB5U+yHcf8Eps1z+F3/Uiy03yI9JhJu4qvPKvBLAxkFbNbSQ+JQEUrcx8RehwhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770907723; 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=88S69tjfHiWtrSxu0v7zYgbs5OyDo7TvODXnvOF9ylI=; b=jAPYoSQwYc5qq6YSwFrasLo6is8pK+EOoYSn3O0lOMICFPBeFgNsfM03IDWkGG2bAYS5rij1Py1IwROeliFygMjOacWgKy6d2slafPsFkvco7ueNN7Rb6GpPyVsmScHuobSqkvPYSPbjq7OCBgOmE+t3pOw9tuGnyt8fuz8h8f0= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770907723364714.2471766731087; Thu, 12 Feb 2026 06:48:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqXvJ-0005pK-GT; Thu, 12 Feb 2026 09:44:05 -0500 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 1vqXux-0005Nk-P9 for qemu-devel@nongnu.org; Thu, 12 Feb 2026 09:43:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqXuW-00062Q-NG for qemu-devel@nongnu.org; Thu, 12 Feb 2026 09:43:41 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-mXAw7z5MO-WxNfb0AbGfmQ-1; Thu, 12 Feb 2026 09:43:14 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4832c4621c2so60279945e9.3 for ; Thu, 12 Feb 2026 06:43:14 -0800 (PST) Received: from [10.60.241.123] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4835a5bf1efsm93492635e9.0.2026.02.12.06.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Feb 2026 06:43:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770907396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=88S69tjfHiWtrSxu0v7zYgbs5OyDo7TvODXnvOF9ylI=; b=bhyZfuAB4kPX5hmNCicobTRZkXa2YX7jYzeXm7vuY7oXYDgb4sm/9/BVZsbBedVf1SCCMe O81YIrEBqImIsiYGp20kHdxz+una18u7/CtY7iMFAMCBhpR3T4aFev1neI+S0mG7FuAn0h 2ISwp8QPms844b5lGb/i2uwY4YbrRs0= X-MC-Unique: mXAw7z5MO-WxNfb0AbGfmQ-1 X-Mimecast-MFC-AGG-ID: mXAw7z5MO-WxNfb0AbGfmQ_1770907393 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770907393; x=1771512193; 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=88S69tjfHiWtrSxu0v7zYgbs5OyDo7TvODXnvOF9ylI=; b=InOpTc8OIfwwcvvCNqc4KKIX2dWoK27GAq8UQgFKYCtEDcmWvjNuTMU+SmnFYO5PzY ogL1Lh2rhswVeEUm0X2ck5pjGQcDfOuuG4s5KPuVTyiQQA12wfyCfr3iS+Y++U6Rm6ow Yy2yzDz+MIKlbr3iHhUrFleQo2ji0sPspqLTiV5ZV5xFSRmrZKSTbty1DTv9hD3WLaHB IkhmXTo7HnshWb/CnK9m+Y2UHZcJ92bwleHerz7JWlbuIZcopUXRDXExgNlk9j0z3rub 2mHtJndQHMjGcVZz2S8sSWoqZGBO2T9jRakButE+jPVBQboEcHQybqkzVqkTTSNkgpPy heOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770907393; x=1771512193; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=88S69tjfHiWtrSxu0v7zYgbs5OyDo7TvODXnvOF9ylI=; b=HZs3LiWtwxlTOZqih7cXwuPBNlQsrFPTePsClYQh7hxI+Urkz/wy2pkspK2eNisYTr oDdYV0i23xvdz8SlCHCh/4jartQTSIeSgb3qBM2rBtqQyOFLBunuHb7anhXegJ+MaFg4 lnpEV6MdYRKlvEdM+fZMJws4HmwV84l6twpzVnnGl37nWq01PnHdcgfgqCPa5qyIXal6 RVPg5J0iaYH1eICrdya/O6icKHpm6MEAUwgDrSIltaL9kdHeTeKgvKUoIr2QolTZ8bB7 neqUWEtvVgKMTYJ5NjgdGWjCECjPhT1Is4IsU+Ri+Md461ItH3kMPWyBkj/gi8qbjwEY kvVg== X-Gm-Message-State: AOJu0YyteQv2Yl39vK9Tn2+3kyig6ddLxfmGB4P8BM14MrKMn5UVPWJd EbXpSFxD7mIP+TAvHgGiF2Z2edW8I7IEtkCuGOWei4nVWjJme4BypWv8rLg3S4h53zbWqOfT9v9 LMpxUVCLwze6fVuc0hxuLXRguosCJS/mWrZVnwj2Hn8mjKHwyWyzIXhHlygxtgLklWubT+xjqHf JmRtsmrxogMd+eH74S6IomebwX1fpwFlbLBRLfwYSx X-Gm-Gg: AZuq6aJS4VQDY1dWEtEwP3kBdhJiDwp1dK8dps89GP/FdmAPXU5enFh+yCT23q/G7ZA KBTA2rBaU7wJwOEAhwpkODHTHSfLLtTZaVyWQTQeTVkRC2b+lt4jv0fgoJ85xVkxqWDUIK+ttNN GBZb8t8N4KqpG+mmxMrBDJiEDSz0TLCihjFRkSCXi579IZb9vcv0tSwfnOSftf6QhRb4wY2GZFz y4O3hOqiWRIJBT4YkE5+EBEUnBWpcnMcdbEeH54C4oYbWRoA4q4Jv0wcGHCBdlG55jmwPI95dxP J3s7kNVfcqBDheQSeR1tBBrE3ihOvc+SwnJY3aiAoX8lisSHKoyGa5Z0d4C/a3Ewwtu9Jurd9Jk 4W3TWTHv+TLQyoJbKjKzKmoHZ45a87/8rjMCR6jVG6TURWd55O4Q16HEP14ZVisEI9+sCccs/KO VMYlf2DunbTihsFv7bo0JFEtP8BOB99ipqgrFIHmN5vYsz/kuQ0SQ= X-Received: by 2002:a05:600c:a09:b0:483:47ae:7c00 with SMTP id 5b1f17b1804b1-4836570d0e7mr35992125e9.20.1770907392615; Thu, 12 Feb 2026 06:43:12 -0800 (PST) X-Received: by 2002:a05:600c:a09:b0:483:47ae:7c00 with SMTP id 5b1f17b1804b1-4836570d0e7mr35991585e9.20.1770907392049; Thu, 12 Feb 2026 06:43:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Xiaoyao Li , Igor Mammedov Subject: [PULL 12/41] hw/nvram/fw_cfg: Rename fw_cfg_init_mem_wide() -> fw_cfg_init_mem_dma() Date: Thu, 12 Feb 2026 15:42:14 +0100 Message-ID: <20260212144244.22579-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260212144244.22579-1-pbonzini@redhat.com> References: <20260212144244.22579-1-pbonzini@redhat.com> 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1770907725278154100 From: Philippe Mathieu-Daud=C3=A9 "wide" in fw_cfg_init_mem_wide() means "DMA support". Rename for clarity. Suggested-by: Zhao Liu Reviewed-by: Xiaoyao Li Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Zhao Liu Link: https://lore.kernel.org/r/20260108033051.777361-12-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini --- include/hw/nvram/fw_cfg.h | 6 +++--- hw/arm/virt.c | 2 +- hw/loongarch/fw_cfg.c | 4 ++-- hw/nvram/fw_cfg.c | 6 +++--- hw/riscv/virt.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 510b227b7ef..56f17a0bdcf 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -309,9 +309,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_= t dma_iobase, AddressSpace *dma_as); FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, unsigned data_width); -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, - hwaddr data_addr, uint32_t data_width, - hwaddr dma_addr, AddressSpace *dma_as); +FWCfgState *fw_cfg_init_mem_dma(hwaddr ctl_addr, + hwaddr data_addr, uint32_t data_width, + hwaddr dma_addr, AddressSpace *dma_as); =20 FWCfgState *fw_cfg_find(void); bool fw_cfg_dma_enabled(void *opaque); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 390845c503b..13d2057fb30 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1412,7 +1412,7 @@ static FWCfgState *create_fw_cfg(const VirtMachineSta= te *vms, AddressSpace *as) FWCfgState *fw_cfg; char *nodename; =20 - fw_cfg =3D fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as); + fw_cfg =3D fw_cfg_init_mem_dma(base + 8, base, 8, base + 16, as); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)ms->smp.cpus); =20 nodename =3D g_strdup_printf("/fw-cfg@%" PRIx64, base); diff --git a/hw/loongarch/fw_cfg.c b/hw/loongarch/fw_cfg.c index 493563669e5..d2a79efbf76 100644 --- a/hw/loongarch/fw_cfg.c +++ b/hw/loongarch/fw_cfg.c @@ -23,8 +23,8 @@ FWCfgState *virt_fw_cfg_init(ram_addr_t ram_size, Machine= State *ms) int max_cpus =3D ms->smp.max_cpus; int smp_cpus =3D ms->smp.cpus; =20 - fw_cfg =3D fw_cfg_init_mem_wide(VIRT_FWCFG_BASE + 8, VIRT_FWCFG_BASE, = 8, - VIRT_FWCFG_BASE + 16, &address_space_mem= ory); + fw_cfg =3D fw_cfg_init_mem_dma(VIRT_FWCFG_BASE + 8, VIRT_FWCFG_BASE, 8, + VIRT_FWCFG_BASE + 16, &address_space_memo= ry); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 8a21cdae4fc..1d7d8354213 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1088,9 +1088,9 @@ static FWCfgState *fw_cfg_init_mem_internal(hwaddr ct= l_addr, return s; } =20 -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, - hwaddr data_addr, uint32_t data_width, - hwaddr dma_addr, AddressSpace *dma_as) +FWCfgState *fw_cfg_init_mem_dma(hwaddr ctl_addr, + hwaddr data_addr, uint32_t data_width, + hwaddr dma_addr, AddressSpace *dma_as) { assert(dma_addr && dma_as); return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_width, diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index bd8608ea5bf..07e66b39364 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1274,8 +1274,8 @@ static FWCfgState *create_fw_cfg(const MachineState *= ms, hwaddr base) { FWCfgState *fw_cfg; =20 - fw_cfg =3D fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, - &address_space_memory); + fw_cfg =3D fw_cfg_init_mem_dma(base + 8, base, 8, base + 16, + &address_space_memory); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)ms->smp.cpus); =20 return fw_cfg; --=20 2.52.0