From patchwork Thu Dec 12 14:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 849725 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:2c4:b0:385:e875:8a9e with SMTP id o4csp946672wry; Thu, 12 Dec 2024 06:10:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVCzpIDtJ1GB93EoJMO865dIfNokqLkrnqZACCYFTpAZio1ftCtoQDwFFoPQqhdPHnEI71XEA==@linaro.org X-Google-Smtp-Source: AGHT+IF/yK+RHbniK6ddzfWdncwG3AXo+wYKfhJE/K8lq81GnAEfBf6OdHCqMD25QfZGPMuNCwfs X-Received: by 2002:a05:620a:3950:b0:7b6:785e:ce1a with SMTP id af79cd13be357-7b6f88c53b2mr102310485a.4.1734012656992; Thu, 12 Dec 2024 06:10:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734012656; cv=none; d=google.com; s=arc-20240605; b=iGYu8oIk1GBiNod6Ctr3+6wwnICQ1A6El8ZR7nTu7g6kN92K6C+NzmH8uk38cTnljh qwduQW7p2NbYdIBSFGL41lJ/ebtP3DUsdH+pGFH6cCWtnFEabz4flgsmOrxQ7P9DUjUq XEpCoQhx0dh2vPK/xKssu1SqBbPdAz1HBUE/A+4lWDAPaol/kgeVaOLaYdo0tqYIEJhd 8JAyMNEuy6JAQgBne1a7eFRIgspX3a157DXlKGD9w3KdAFK4+1VVyN1I5OKZsjYwT3mn JSnVxLEIqm8Xoqhnf06UP9+TP30PRgkFlpbqqtBaG18eQLrWv7B3CW7uRet/fEJ6dJ+r V3Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CPe6MkxOM+2LtrF6h7PO35BI0eJhz93c0BZ5FQYQd0o=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=WErqhq2zc5Lg3hw7NdUARWjpfGhgmWYm47MK3tzgdPHudiu26ySchB/lQbkrhCDxlx 8yHNForUCZxwtYpaMZhabQYBNdd6eHZ+zXiJjmzpSKoEgWv+T16s6VDfiBZND+DNEBln Hn3ikAtRxV56LQwSUI2aWXV6zQ0O2CrSO1RSoHRRJ+PcFpriK/6F6HXtvOgazVedDEeL m/Bo1bzdbWH1ncottO+G6juRHXso7l5Sm6kHj8v2wp2WOkX+LuLh0lRT/MhLfmiIKVUe MzhysA6WmprP3UWNrQ+fIXYuxFF1sxs3BuxHSRi2/Vpt8RivIVDEF3QECvAVTy1h1AaO joGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HH5VyK1s; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-85c49d87c6asi3379856241.58.2024.12.12.06.10.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Dec 2024 06:10:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HH5VyK1s; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLjtl-0003eN-Rm; Thu, 12 Dec 2024 09:10:37 -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 1tLjtl-0003e7-57 for qemu-devel@nongnu.org; Thu, 12 Dec 2024 09:10:37 -0500 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 1tLjtf-0002eq-0i for qemu-devel@nongnu.org; Thu, 12 Dec 2024 09:10:36 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-382610c7116so309267f8f.0 for ; Thu, 12 Dec 2024 06:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734012629; x=1734617429; 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=CPe6MkxOM+2LtrF6h7PO35BI0eJhz93c0BZ5FQYQd0o=; b=HH5VyK1sjPDF7QcPjKagdZVYTLpfZ5BpYSlCT6crllgCHQ5gGziDGcbjFXvL9/vzkA FY5ADDp4LbsvusRMQrNXCJ66s+3DAln5Duhh3Z0w6E5/t3e8uR7M/iY3bUOr/ttuaaMp 7XXMfP8eTtXyntxYUDS1v86ly+XSRqNOSBQjHztUQS+4N+aiV/w5vz9FvcgNrsgutUGu M6Y3t3s3cnGv2HUPz1dfsWbwPzfxZ3bgw7ty1Q4O/iSvKv4EGq0ZFqg1Irwl56jOfN9a zdWHvwksSsaqFtT7Fkw9fytKO69GuIbsNTY/reo9XyNPOCpugPRh8F3ILb4VLgEid483 ekWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734012629; x=1734617429; 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=CPe6MkxOM+2LtrF6h7PO35BI0eJhz93c0BZ5FQYQd0o=; b=eJbISqJVME9/5GD+2bQA5jJ+ZVONETd+PKMT140FSdVTl6Mec87nt2hmXznplpQijK D/qhG4iVf1LxjGYof190BrFXYup9TnBxZbbQJrXtc4bTVdVmb0viim1iVkW7sW2+TtWv iM7++hr6zLpe1WGXHQ6Ab+F+fm50i9EpBf1PmH7uTQF7tYcm+ad/8KkVfG8zIqkK7O2M LFNrTtiuypmMwPxV5ZLV1U/Tw+yefPvQx7wPIpOqQyhryuuLZXmiGtCtiQH+f3rJXX2H 2sgTlwt6bCZtES0zNt4/dDtu9OiAM96sni6eFaMl8vmbmoBWGVFczz8yfPqRoAVcb+jJ zRLw== X-Gm-Message-State: AOJu0Yy8fkcSoRVJLPzBz7JpoNrLQ69QE4gB92Ff/PjJF6W1RxRWJ1V2 k2u3oGxV0SbViIdr9BYqYu58ImPUIBXVJf/Tz2M95D6bx1YP4ZUcrx7bP9gjhIan5zWs3OKrizB k X-Gm-Gg: ASbGncu6tIyvxhSvqOr2p8Fgr9uH5/2DMDZDbXj9LqSDShsdI6MQYdMZf2o+ervpOcF yPx8o2a64Ok2kDoNduHPpQiAeq0lPVuytkyWD1pj1sSVT97ryvS2UX9X6tYumCLBEw6Yf0KB6Iy aYzuuBILwbcSPJ/5mpUXioSWfLFGGefJ/VNn09UPw6M72OLUJksav9jQH24hBtSGYootKnS8WxA m5AGGDUQT/CcByaOPAIlTN0F+XMbILLKd94Utr3/NFTcLdBgTXI/XEDU5pl0K+EkJGShxHuEzt7 HNS36ez4Pkn6RSNCuC/2p3yuBtOLWAQ= X-Received: by 2002:a05:6000:471c:b0:385:e303:8dd8 with SMTP id ffacd0b85a97d-3864ce602abmr5527140f8f.26.1734012629124; Thu, 12 Dec 2024 06:10:29 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4362559ed6csm17844395e9.24.2024.12.12.06.10.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 12 Dec 2024 06:10:28 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix Date: Thu, 12 Dec 2024 15:10:16 +0100 Message-ID: <20241212141018.59428-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241212141018.59428-1-philmd@linaro.org> References: <20241212141018.59428-1-philmd@linaro.org> MIME-Version: 1.0 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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented in the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'. Signed-off-by: Philippe Mathieu-Daudé --- host/include/aarch64/host/atomic128-cas.h | 2 +- include/qemu/atomic128.h | 2 +- .../generic/host/{atomic128-cas.h => atomic128-cas.h.inc} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename host/include/generic/host/{atomic128-cas.h => atomic128-cas.h.inc} (100%) diff --git a/host/include/aarch64/host/atomic128-cas.h b/host/include/aarch64/host/atomic128-cas.h index 58630107bcc..991da4ef543 100644 --- a/host/include/aarch64/host/atomic128-cas.h +++ b/host/include/aarch64/host/atomic128-cas.h @@ -13,7 +13,7 @@ /* Through gcc 10, aarch64 has no support for 128-bit atomics. */ #if defined(CONFIG_ATOMIC128) || defined(CONFIG_CMPXCHG128) -#include "host/include/generic/host/atomic128-cas.h" +#include "host/include/generic/host/atomic128-cas.h.inc" #else static inline Int128 atomic16_cmpxchg(Int128 *ptr, Int128 cmp, Int128 new) { diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h index 88af6d4ea3f..03c27022f0c 100644 --- a/include/qemu/atomic128.h +++ b/include/qemu/atomic128.h @@ -58,7 +58,7 @@ * Therefore, special case each platform. */ -#include "host/atomic128-cas.h" +#include "host/atomic128-cas.h.inc" #include "host/atomic128-ldst.h" #endif /* QEMU_ATOMIC128_H */ diff --git a/host/include/generic/host/atomic128-cas.h b/host/include/generic/host/atomic128-cas.h.inc similarity index 100% rename from host/include/generic/host/atomic128-cas.h rename to host/include/generic/host/atomic128-cas.h.inc From patchwork Thu Dec 12 14:10:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 849728 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:2c4:b0:385:e875:8a9e with SMTP id o4csp946985wry; Thu, 12 Dec 2024 06:11:23 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCURKqkVSVxYdCCcIKdP+zalu5BFzRIaSeoyu/N4OrKLVln1UEsXXLFNFgAGn3jbJurQwzMFOw==@linaro.org X-Google-Smtp-Source: AGHT+IHQWNg7F4J6sxAzunGFTSne/ynYVEyLKxcr0YciDROA5jCOWxGtM/ZkjzfPrZeVU8HC/497 X-Received: by 2002:a05:6122:a1e:b0:515:3bfb:d421 with SMTP id 71dfb90a1353d-518c5779a73mr796660e0c.6.1734012682954; Thu, 12 Dec 2024 06:11:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734012682; cv=none; d=google.com; s=arc-20240605; b=HtLBspky4FbQADlxR2WV+hnMj1tdEugbD2V/qXhhNkkTrirMg6ZTkDa/70aJMp0UKE 1M0vlMz94QWeBuJjccKOqykG7F1rn/L1G7qK261vXMx4/jkLzoxbuhjBRLZAqWFCPZnI Ib3zFmP4Vpd3Hb7leudK9++aWxEDAgUXESrgevFdVtjGtuwzhyfg9qqbBq8vWCfmiUhq b8IcDJMzTFNf88cZXWnjDD2cf5Bl/CoV/s3xZsCF7DGvasoBCPuduz2ecgbkb1ZQZlzv 4VweO2AE/GvSCYyaEPl0PDdRp5XDXilO1i/1Y4Oo+hIYMssUGAeZD9GesPl88ASLEDg/ upPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yrZRzKLnqM0xHROTlyJJVw5HS0SnJ0v+L1SXG1iynS0=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=AdTiTJGmURi4CX8x+SU025bSbZ1Kol7kPq2m9rT+Ae9nBojORaEABxGvnfdVlNKR5V jt94wLw5bJpP9j0NUQnO4lSMIN7rFJi0xxR6rdILUdIG7BOX6tt5tdVWIDRDIdYuB9xt EAuc0kwRnKyblvs8bnMsA16/wYbNbUjjxcy+v634N4SlkbciKiGkuLNdFnNfkWxT0yyW itlutANCmwxKL+InbAZ4f9KUnAPU9hn5hlRp5EPHtV/bhR2NduF+oEgiVuJmjHdstUG5 Qd+fX4mqPihbeebIBbkX3TYsVaq6M+TCw4SguhjcbWPwMxjb+tdE3Jo7jDBhG1F3tYco nYww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HWEb2Djl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4afd853c758si3231958137.727.2024.12.12.06.11.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Dec 2024 06:11:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HWEb2Djl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLjtq-0003ez-0E; Thu, 12 Dec 2024 09:10:42 -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 1tLjtn-0003eg-M5 for qemu-devel@nongnu.org; Thu, 12 Dec 2024 09:10:40 -0500 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 1tLjtk-0002fH-NZ for qemu-devel@nongnu.org; Thu, 12 Dec 2024 09:10:38 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-385df53e559so539260f8f.3 for ; Thu, 12 Dec 2024 06:10:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734012635; x=1734617435; 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=yrZRzKLnqM0xHROTlyJJVw5HS0SnJ0v+L1SXG1iynS0=; b=HWEb2DjliFW7Bi6Z+4NhB3XktL43dR70ohq4xDUWhVJkCFGdmVdcV94Z49fztcZTME 9tsWJ+eJjdgWC5DLJq3FLS2zoWyc5aIrV10fRLW3Bvgb78m1UBwiQk+QJs3q53dEw6ru dYumw555xcC9w9uNJtzyjVcfBmBE+RkJQITc6LtO2H+bC+E8qv5jtLZby3jAkBlm5OST d3yZkpCkxEf3xb1bh5vI3i4Ik+bJwlcRgqMIQwYggbuRtp7bvdyLI9tsCqQM9pwryBO9 nUfTGZu7/3/Ch8AWBEoLFaHgTNUjx2nuVIUBPDRFI4hJ9TvPa6b1ukIYEaNAsfkGJoIG H5sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734012635; x=1734617435; 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=yrZRzKLnqM0xHROTlyJJVw5HS0SnJ0v+L1SXG1iynS0=; b=YLDZWJ5h0z6dgsNzYjsGlfhfag5EYWdTHzjH03ptYGtCxxP8aKyST0Qiv96PvCI5jz VanCT1DwCFTRz/Xwo3zkgFlEVJ6KwjH9k3squQuBdbQJ8Hc8hygTf9RQS8SVWy5W+3j5 7jWtJmgEy47FY+zl37L3vdAC9lOJb/CNLOymntOAJz016oTjE+X25f/TygHLsP9iwMof Xza3aYwxlqq3dWCnpfUwNsU+5PEddM6u4E8E7XlsdzjNQc3eq3ZJyYqlsE+hu2J9dJlr Fnf2WDuCpTgyGnWjMuDi1RH6ABl/8xpY5EUYugQrQG/RnCX01L+Xw/Q8GzcZufrUGZSZ D2cQ== X-Gm-Message-State: AOJu0Yw67v4RWo8GOQ5QryzbHREkX4tfTi/3dfbo5a7plDsV8Oeuqj9+ iWhg0Av35P6sAGImnWW9EIzwiP389vrOSgY9hZN1Ls2cSNx7DJb9NfDVcO3PLi6195n+oymxN77 Q X-Gm-Gg: ASbGncsbHxrzYwRrVlk7mlis6Vq43+g1ih42arUg0HaDM2I+VypKBDnINN1aUtHD68q l37p960oNmM8thB99skvIY36kKMLI6tLH5NQB5nBexFaOlwevo7hPW/KBlFs6a0xZCyCazsc4xx G8KDFw3ykIfDZxdQHd+5VyfAebOqOgbIF/e75x5Nd2mlcjJ7W7Cx4+lxV6W0I3dA1Zx1+QBp5MP 4AsfLb7py8rVmmcHrRoOd5Zq3v5m7JhnRPPFaPHbzqwGWQyOSi8lOiEtX88GiqnNuJsS4i/a0hW KyAj4C/fFom6AUztCtY9zzdKpT4ro3c= X-Received: by 2002:a05:6000:1543:b0:386:1cd3:8a08 with SMTP id ffacd0b85a97d-38787685025mr3415528f8f.5.1734012633693; Thu, 12 Dec 2024 06:10:33 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38782514c11sm4172749f8f.76.2024.12.12.06.10.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 12 Dec 2024 06:10:33 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 2/3] qemu/atomic: Rename atomic128-ldst.h headers using .h.inc suffix Date: Thu, 12 Dec 2024 15:10:17 +0100 Message-ID: <20241212141018.59428-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241212141018.59428-1-philmd@linaro.org> References: <20241212141018.59428-1-philmd@linaro.org> MIME-Version: 1.0 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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented in the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore rename 'atomic128-ldst.h' as 'atomic128-ldst.h.inc'. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/atomic128.h | 2 +- .../aarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} | 0 .../generic/host/{atomic128-ldst.h => atomic128-ldst.h.inc} | 0 .../loongarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} | 0 .../x86_64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} | 2 +- host/include/x86_64/host/load-extract-al16-al8.h.inc | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename host/include/aarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%) rename host/include/generic/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%) rename host/include/loongarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%) rename host/include/x86_64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (96%) diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h index 03c27022f0c..448fb644799 100644 --- a/include/qemu/atomic128.h +++ b/include/qemu/atomic128.h @@ -59,6 +59,6 @@ */ #include "host/atomic128-cas.h.inc" -#include "host/atomic128-ldst.h" +#include "host/atomic128-ldst.h.inc" #endif /* QEMU_ATOMIC128_H */ diff --git a/host/include/aarch64/host/atomic128-ldst.h b/host/include/aarch64/host/atomic128-ldst.h.inc similarity index 100% rename from host/include/aarch64/host/atomic128-ldst.h rename to host/include/aarch64/host/atomic128-ldst.h.inc diff --git a/host/include/generic/host/atomic128-ldst.h b/host/include/generic/host/atomic128-ldst.h.inc similarity index 100% rename from host/include/generic/host/atomic128-ldst.h rename to host/include/generic/host/atomic128-ldst.h.inc diff --git a/host/include/loongarch64/host/atomic128-ldst.h b/host/include/loongarch64/host/atomic128-ldst.h.inc similarity index 100% rename from host/include/loongarch64/host/atomic128-ldst.h rename to host/include/loongarch64/host/atomic128-ldst.h.inc diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h.inc similarity index 96% rename from host/include/x86_64/host/atomic128-ldst.h rename to host/include/x86_64/host/atomic128-ldst.h.inc index 8d6f909d3c9..4c698e3246f 100644 --- a/host/include/x86_64/host/atomic128-ldst.h +++ b/host/include/x86_64/host/atomic128-ldst.h.inc @@ -69,7 +69,7 @@ static inline void atomic16_set(Int128 *ptr, Int128 val) } #else /* Provide QEMU_ERROR stubs. */ -#include "host/include/generic/host/atomic128-ldst.h" +#include "host/include/generic/host/atomic128-ldst.h.inc" #endif #endif /* X86_64_ATOMIC128_LDST_H */ diff --git a/host/include/x86_64/host/load-extract-al16-al8.h.inc b/host/include/x86_64/host/load-extract-al16-al8.h.inc index baa506b7b5b..b837c378684 100644 --- a/host/include/x86_64/host/load-extract-al16-al8.h.inc +++ b/host/include/x86_64/host/load-extract-al16-al8.h.inc @@ -9,7 +9,7 @@ #define X86_64_LOAD_EXTRACT_AL16_AL8_H #ifdef CONFIG_INT128_TYPE -#include "host/atomic128-ldst.h" +#include "host/atomic128-ldst.h.inc" /** * load_atom_extract_al16_or_al8: From patchwork Thu Dec 12 14:10:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 849727 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:2c4:b0:385:e875:8a9e with SMTP id o4csp946922wry; Thu, 12 Dec 2024 06:11:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWm8x+LcThGHGJoI/oDUc6DP9ihuuU1wPs+5BMlg7cC3qIGIVqAJn6xgzOQoA0/89vSow6ikA==@linaro.org X-Google-Smtp-Source: AGHT+IEY3JuBJ+QWNHF370rOyTgClD1IhgVoYXubGjAriOBskm1ogqT9SVZ2v6cuELqv8a2EPeHI X-Received: by 2002:a05:6214:c28:b0:6d3:7a47:2034 with SMTP id 6a1803df08f44-6db0f70e5bcmr5754446d6.3.1734012678078; Thu, 12 Dec 2024 06:11:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734012678; cv=none; d=google.com; s=arc-20240605; b=WtukAbBINMsVeSKy/NdtUmguZ996WC/Y7cJf0yHBnJxRE9ZUFTUO5e6RsS4rBQYwuB Iwy7VJ2oObwHvEBE5qY/ZU3tfIifXT2CzfpcQGNivksgwEj83c08f8Ea/fiXC3Z0cBu2 eREzwl6Mb1pAg9f3ulM9XYav8i4z4d77ez/nfeU3Xv6iam9tIpgrM3kTSqHEe8d0+Eo5 tFbthAMDR03OHnhA56s7Iuj/Su+mPDzFWGf+wINWqSfalEqRrsJOhAg96TqtGar9obx7 BBfSYLBDtcRYB/8eDxZkwCVnF+IRLX/RauNH3Y9+GQ/+4DDUn5vao4p3UsoLrjwHIoZN pjUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MaGVoGgymsYq6sy3eZaaquvyYzqgHMU5IlSKupTJhl4=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=WbD3auzJuV+2o+l7EfPQ2QRWZyQff6HewBbc2NN7CiP6IK0BoMZhTd/IXMOBCv1mys 2SjL3zq3SBvreT2FdDc9PqErQZW4z/kdyZ67MPDsHOxB+PuArW7NwthW26dsoBe2waAf n8p/Wf67xC6UVRZeVoqwTb9HmQ12snWE0MXZyx1r75Z6xWQFzsODNWlW9LJq5ZAREMTN 1Pz3gtsFHYf7ZJE2PBz+IKJO9PTqcutVKfBXidcXkB+THc/ef9/WUe2uCYwk3oGZL4VU LTpi3gllI74YD6XXcVk1+f5vc2j01GnUYU9cUt3hKuopdqx7gkgxIWuSvvYPRxAprCXp Mfcw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fEI1pXOD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d8dac43e99si191227836d6.545.2024.12.12.06.11.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Dec 2024 06:11:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fEI1pXOD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLjtt-0003fp-Ti; Thu, 12 Dec 2024 09:10:45 -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 1tLjtr-0003fP-1x for qemu-devel@nongnu.org; Thu, 12 Dec 2024 09:10:43 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tLjtp-0002fk-HC for qemu-devel@nongnu.org; Thu, 12 Dec 2024 09:10:42 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-434a852bb6eso6603145e9.3 for ; Thu, 12 Dec 2024 06:10:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734012639; x=1734617439; 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=MaGVoGgymsYq6sy3eZaaquvyYzqgHMU5IlSKupTJhl4=; b=fEI1pXOD5R4ulSOKWT2Y73StOnc6F2ANel1YiMw5kVTHEJrH+l3umkinvckI+t8v2K 0IdevsOFCdtSeN1jpYIznaRz1FVXErog/xdwgXLrtzBovKsQVJj3YQnPxTasMitW1G7Y 9uRrTS4kpYU5sBtLyx73/PZXZE+i0UaruS34B+vs1cMXeAOBGnsalsVbsjmPT+uW+G/O rlFPnSKvF3HA2x5r/kSnzLi2IREBrS74l5i2Wy5ra70iFRL24BuxmKqZT1PvGWbcRgU3 AE64dJR7Y48mvIZ9kzXXtRC39mRojTAa4BSXMj1zebTHOInylDLD27FvUqS+3nxgvv9t Yxew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734012639; x=1734617439; 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=MaGVoGgymsYq6sy3eZaaquvyYzqgHMU5IlSKupTJhl4=; b=QvHzUuq61kP8ejvNxBthMjTDvZB86Su6aR5k4sYv6YHsgfTs+r3jgNnGijPNShCje+ 51NG+ZbpInD8sv57isFWDuVQI7UmW1UvmBCRqNMT/0+HIBp9jgePE6GOlyS4uDpoSAGw H8vlLR3FZQcSH8xL2ZBxAwABmp0rB8kVlp6+oe5rg/VowLelzrBjtsw60lMWKMOzhdvm q+ShNARkcD7rNxE3r5p2xNmTViw9nbjzYpukGrDWRIuoq6KDD1YNmLRVpZpBHACAa9Ss 8TsEhkHaMI+WgKkj3P9DHdy9z8BQQmpTHZ4xwWmwRcgATCheiZSAljtQt4/7k9a0rI2n bRPg== X-Gm-Message-State: AOJu0YztQHaB4u86lWPR6SJy38bDAgIh0RhVjgoc1+dPtcSPL1/68iOG VEHuJCzz4C8lr2Wwa4CyGcAO//k76AKorX2iX7GfmoaRQ9PvTYazPwpSJe/cmFwJWczJesh+6ih c X-Gm-Gg: ASbGnct9pag67WT+FihLQOE/P0c37xpf2MzRSOaKYVU2Berg+jymwWP4pvKHWkaR2Xy G+jQ/QK3BD5P8Mlx+R37K1oL86kk7UVaYC8NF8lT7IvGCgNC3HWY9yHkFTtrPJJid6zRyJ9MMV7 RUNy5puUObnvrp2n6eL0EOqvZR59sYRt5QhglSxj3pk0GXILZ8IXgfx7tRozu2N6eubIj8Z8zDy /MH3Nb74qiqwpU+wXNXHI/FkeYaaBk7RUuMwzqvZQAIA8vtW8Turhn8D2umw0A1qNeNcr7tXulb +JOb+F/mtBdtL+aN9O2PRi5TCPLv2uI= X-Received: by 2002:a05:600c:3acf:b0:434:f8a0:9dd8 with SMTP id 5b1f17b1804b1-4361c345006mr55413915e9.1.1734012639097; Thu, 12 Dec 2024 06:10:39 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436256b7c62sm17778065e9.34.2024.12.12.06.10.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 12 Dec 2024 06:10:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 3/3] qemu/atomic128: Include missing 'qemu/atomic.h' header Date: Thu, 12 Dec 2024 15:10:18 +0100 Message-ID: <20241212141018.59428-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241212141018.59428-1-philmd@linaro.org> References: <20241212141018.59428-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org qatomic_cmpxchg__nocheck() is declared in "qemu/atomic.h". Include it in order to avoid when refactoring unrelated headers: In file included from ../../accel/tcg/tcg-runtime-gvec.c:22: In file included from include/exec/helper-proto-common.h:10: In file included from include/qemu/atomic128.h:61: host/include/generic/host/atomic128-cas.h.inc:23:11: error: call to undeclared function 'qatomic_cmpxchg__nocheck'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 23 | r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i); | ^ 1 error generated. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/qemu/atomic128.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h index 448fb644799..31e5c48d8fa 100644 --- a/include/qemu/atomic128.h +++ b/include/qemu/atomic128.h @@ -13,6 +13,7 @@ #ifndef QEMU_ATOMIC128_H #define QEMU_ATOMIC128_H +#include "qemu/atomic.h" #include "qemu/int128.h" /*