From patchwork Wed Aug 26 18:42:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 2292938 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=qvwiQ6OZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists1p.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4hVYTj56VSz1xxf for ; Thu, 27 Aug 2026 04:44:25 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wzIbZ-0002Ye-AO; Wed, 26 Aug 2026 14:44:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wzIbW-0002N3-WC for qemu-ppc@nongnu.org; Wed, 26 Aug 2026 14:44:07 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wzIbU-0002b8-7y for qemu-ppc@nongnu.org; Wed, 26 Aug 2026 14:44:06 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-c9e7391839cso1163449a12.0 for ; Wed, 26 Aug 2026 11:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787769842; x=1788374642; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=qwzEZxEmFuyhMgoWNMywLma5RZEuBk1uut9/tIFYhTY=; b=qvwiQ6OZrXG1J/EbTBIU//8IaUc4bTb6VDIKHOJKSveqI5esEcBSJf7FpVIXjx91A5 lJgySmz3cmTArAnChjc7MRBG6+XjoQWXM0NpsGTjimjaSmXnovzK76QXCtbIPaHfQsqB bDl9746eClKZ1KjYiDwO24O8khNI3AcaxJpEZnmbfsnk8H+xYCvTThsdklCqnD2cLdd9 rYwrRqaEFoOx/gTxPn2taSry0Q+4Vr0E1ba7dHDu0wI+kgk2jffGllBjjgyMDDWtM3y1 OsqhG58x8Tt80RmpvNgzLol5cbYaBHuLVwUSets0Gi5bDmWmMAIVhWjE7fNkDK7hhXzP FHRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787769842; x=1788374642; h=content-transfer-encoding:content-type: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 :content-type; bh=qwzEZxEmFuyhMgoWNMywLma5RZEuBk1uut9/tIFYhTY=; b=eUSaxExfWPvSgqE5rbcsJnmnTWFu2K9wVcjc95jJvd1sndUjGH1zMmCcnM4WU/1Ttw ShUeneR+Jp5PtDPJEB+7VL24ahsN8WBY/7sN0J/1xdQuuJNSyBEJwqqDH3YpXrs6C/Ma 0tAD2R8rI7p/jQTHd9RCrjqGgvHFhoF+n898O9b5yDgfpa8dKDqW2DHllepghGQ6PQYE sT7uodHX97wiZ5GLN89/cAI/94kbI9Mg+5gFEPC2kLmIGh/43p24TBem/nEpp57oEgSM lFqvXV2GTSNkru/3baHBlK7lfwojNPuRtfSB+lwZggV3cgK2PvIq0QfNIHrNYUQNW+gP Emhg== X-Forwarded-Encrypted: i=1; AHgh+Rp/DekeEU1cxHmiknjoFMvRotmKjdDNRGOYvMIjbhXZs/8MmEJ7v8pUX0YtcbgPayJKVKwFF7Qp/A==@nongnu.org X-Gm-Message-State: AFuF++mvzziDjlkxQZULWaFRwuUez+TvqWBb3SCyKrUC2xftREHo4DJ5 i+an7qDMuPPyKc58ffnq0jfCy+XTvnR67bfCtfmDEnLGC+8VMJoZJe/+ X-Gm-Gg: AR+sD11i6LuTCkbq1m1IlTEI738uZ8mKoDDpBZ9/fSB21tl8a1gJGTkiOku/t22aXS/ 2HmvNjadc6tJxShPJUC2B+IaPYf9b0/knOngqDQltTlZ7f3M7SKYPBfqZwYikqorkx6afJAmI77 R4JTQh/USqrb52KFp5afjSp2Ezf68RpBre/PHV4ec/QTsVUgutfV9XOzUY7dszgXXfWp4JpP3r9 aTbRCHZfzR56a6uHO64EhZGFhNb1agnq73yLXYAhMzq3qJ+pA/HYrcjZsxyTuY4v54TQxjM4XFP GjNkYL7pTfvMu3AcUNbrf9AAA2g0tkjsiPvb/o7XMjs8FzIBhSOnUCb6QDwv9EisX6RsW+0cYv3 HhcqH2wCpJ12r94DwSrEywOaGZaKFUCrHGEITaUsJF8MKT0spKO4Z/YMWreNk4NJ0WgJ9zhkNEe jk5+FlX9ADlruLu0VLh5UPOw6ZffOs14IjY4Xi3E/bpkZO1UenDOAZ8Xl5bGu63uyujuJcERD80 220DvfYMX0+fIrcnAZH9w== X-Received: by 2002:a05:6a20:938c:b0:3b3:216b:2743 with SMTP id adf61e73a8af0-3cf7576c44emr17712748637.4.1787769842497; Wed, 26 Aug 2026 11:44:02 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-3283d60c291sm17681846eec.6.2026.08.26.11.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2026 11:44:01 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Peter Maydell , Fabiano Rosas , Aurelien Jarno , qemu-riscv@nongnu.org, Song Gao <17746591750@163.com>, "Michael S. Tsirkin" , Jiaxun Yang , qemu-ppc@nongnu.org, Xianglai Li , David Hildenbrand , Richard Henderson , Palmer Dabbelt , Aleksandar Rikalo , Harsh Prateek Bora , Bibo Mao , Weiwei Li , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Matthew Rosato , Chinmay Rath , Alistair Francis , Alexander Bulekov , Chao Liu , =?utf-8?q?Alex_Benn=C3=A9e?= , Glenn Miles , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Laurent Vivier , Cornelia Huck , Zhao Liu , Eric Farman , qemu-s390x@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , qemu-arm@nongnu.org, Ilya Leoshkevich , Darren Kenny , Sunil V L , Daniel Henrique Barboza , Ani Sinha , Nicholas Piggin , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Liu Zhiwei , Igor Mammedov Subject: [PATCH v2 09/13] hw/loongarch/virt: prefix ACPI helper with loongarch_virt_ Date: Thu, 27 Aug 2026 02:42:23 +0800 Message-ID: <20260826184229.1145-10-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260826184229.1145-1-luoyonggang@gmail.com> References: <20260826184229.1145-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52f.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, FREEMAIL_FROM=0.001, 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-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org - virt_acpi_setup is the same C symbol used by ARM and RISC-V virt. Rename it now so a later combined binary does not need meson -D prefixes for LoongArch. - Rename the file-local virt_is_acpi_enabled to loongarch_virt_is_acpi_enabled to match. Signed-off-by: Yonggang Luo Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Song Gao --- hw/loongarch/virt-acpi-build.c | 6 +++--- hw/loongarch/virt.c | 2 +- include/hw/loongarch/virt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c index a0b445f297b..bbbac289b49 100644 --- a/hw/loongarch/virt-acpi-build.c +++ b/hw/loongarch/virt-acpi-build.c @@ -674,7 +674,7 @@ static const VMStateDescription vmstate_acpi_build = { }, }; -static bool virt_is_acpi_enabled(LoongArchVirtMachineState *lvms) +static bool loongarch_virt_is_acpi_enabled(LoongArchVirtMachineState *lvms) { if (lvms->acpi == ON_OFF_AUTO_OFF) { return false; @@ -682,7 +682,7 @@ static bool virt_is_acpi_enabled(LoongArchVirtMachineState *lvms) return true; } -void virt_acpi_setup(LoongArchVirtMachineState *lvms) +void loongarch_virt_acpi_setup(LoongArchVirtMachineState *lvms) { AcpiBuildTables tables; AcpiBuildState *build_state; @@ -692,7 +692,7 @@ void virt_acpi_setup(LoongArchVirtMachineState *lvms) return; } - if (!virt_is_acpi_enabled(lvms)) { + if (!loongarch_virt_is_acpi_enabled(lvms)) { ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n"); return; } diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 6693dea647b..74c9668b6e6 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -242,7 +242,7 @@ static void virt_done(Notifier *notifier, void *data) LoongArchVirtMachineState *lvms = container_of(notifier, LoongArchVirtMachineState, machine_done); virt_build_smbios(lvms); - virt_acpi_setup(lvms); + loongarch_virt_acpi_setup(lvms); virt_fdt_setup(lvms); } diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index d39a9bbf5dd..72268466def 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -132,7 +132,7 @@ struct LoongArchVirtMachineState { #define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("virt") OBJECT_DECLARE_SIMPLE_TYPE(LoongArchVirtMachineState, LOONGARCH_VIRT_MACHINE) -void virt_acpi_setup(LoongArchVirtMachineState *lvms); +void loongarch_virt_acpi_setup(LoongArchVirtMachineState *lvms); void virt_fdt_setup(LoongArchVirtMachineState *lvms); static inline bool virt_has_dmsi(LoongArchVirtMachineState *lvms)