From patchwork Wed Apr 24 17:33:30 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: 791526 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp960268wrq; Wed, 24 Apr 2024 10:34:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDyS5w4tkJWMZyU4+KGYwAJexCG3U2AtYhF9lEA6LxD5EIike9+Yt2xMbaJZhRz2B6vgE7QkdMT0Y6j9cHKO40 X-Google-Smtp-Source: AGHT+IG/vnQWJfpshDIBkxjS06EwtHEi9vEySbkGESp2nSodv+Nx6rZSwSrmAEpXtzJWIckHkBUP X-Received: by 2002:a05:622a:144d:b0:439:b4fe:5a3e with SMTP id v13-20020a05622a144d00b00439b4fe5a3emr3573252qtx.18.1713980084013; Wed, 24 Apr 2024 10:34:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713980083; cv=none; d=google.com; s=arc-20160816; b=Kf9BwksGaBMIWgLrdLQ6/3IPsU1Sv84/QNxDeJPzRFWG25I88mBG1VQa39LQ/63F0J YZEkxze5yIV1lq/3wOJJQZitwzyGOSVKCkhFZMn5Dg7Ptp8VdtVp74QjO8TVrwUrpxG7 eybR8YX+rC1MAFXNR/rvoH7Ct6HGgwqyPhkgCkNWbC0Bb2g/s9XxgsNC8CDbtW/IYTSE TUkCmmy//ujZ6p6lXNRUhpAUvGc+XZbvEGIX2hwQPSAjZUY2rXnmp9YOdG4agZDCAnMQ GyQ7cQA1wkLfqNrGaCvyRLpaQ5NYcWEyc7cZRgV9cQZq3abPVQpRjaMntRF8QSkI9pWB x3eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=TWf9rL1cSEDkz+YpJv977X8fZ+y5L+MRJ6Wf+vNPaVI=; fh=EAOpE7tWfoH179ynUe2xdzGjXHEvp+8KL6j75jcUfF8=; b=PiRdwpzlF6TFT4ZfwAc94ttD+5jb7GJGwNrbLnfjJ4bdSLkFz1eo8H8pUQIA705Qtv ygM82Rvvltjc9RzT4ARPCoyGd22/RHFA+CE2u2jFptaWNJOuqK9E8TT7Q753mIM7690W K6J4ZztnNqmRI+5YI4P0tGek8Ernc191uWCRCtHehSFVedwokLHvkkPdLJ4AbemFpbLf /HfYpyVjd/QJ4hYTCfCrE0cICuNMbmDd+RXwukMSQcYAJMfBv/jyR25mH+zW5a3WWBYI iaV4dic72JXm0J0Oy5Q8SKpKkpGJ0D/dbF/c7/J/rfBkEP1t6P4at5+2gIyOi9sR/pmI AUNA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dqQ2OXdE; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k16-20020a05622a03d000b004377121c1dfsi15405028qtx.382.2024.04.24.10.34.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 10:34:43 -0700 (PDT) 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=dqQ2OXdE; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzgV8-0005xH-H1; Wed, 24 Apr 2024 13:33: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 1rzgV6-0005ww-SD for qemu-devel@nongnu.org; Wed, 24 Apr 2024 13:33:44 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzgV4-0002ze-L0 for qemu-devel@nongnu.org; Wed, 24 Apr 2024 13:33:44 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-34a4772d5easo60859f8f.0 for ; Wed, 24 Apr 2024 10:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713980021; x=1714584821; 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=TWf9rL1cSEDkz+YpJv977X8fZ+y5L+MRJ6Wf+vNPaVI=; b=dqQ2OXdELLoA8gpENqgom1k8NNHbgsNNuf2qNqX3qSXBTGEzCaxFSIVyqR+0+f9eyq fTsD9bjsdtBoDLJb2JFX0ETVfyuaOLwzyp873ZOaGlMMs1v0gU0FtyHrBINZ7Ivl07oN pGPRcde5MsjchrRzBVA3x5nsduhPKxgO1/ymjPlaJ4BCaXxq2qoJn7ocoW12IVAXCjPy BzYgGmJEvz1nsMweDfT5AexhAKi6Cy/rvpc7pyoYZvQ2tqTQ/pkgfmR6PXGDEA4wXypO CPCgA8UK4wIqrf/EZoCFh2itiSKtv/n9TR2W3cgdBDtm0wh146b3WCdGt1RlRdaDg0kc xG6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713980021; x=1714584821; 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=TWf9rL1cSEDkz+YpJv977X8fZ+y5L+MRJ6Wf+vNPaVI=; b=M90gmOy+a9bslyJH8mkkonOoMvOg5M9+I3Tx8SkeZ3yCw75IEDp8s8U6sEU8ltfxFU OzI0BLnajzt/Z1j9kGuCoqjl0zB1zDmqRXEelOvuuoy+OrgBkqUj2smTFxEKx6GoOu2F kmk3gby0vTEnhLFJuUA/59s+5iveVdZCfjizmGJ9Eslw0HIH5g3+e3Ta3BG9uTSd/kkh BXEHkd7e+nRvTKz8l0ir6oJam/ECxHnB+ia3e4cktgR++wCeBpNG8GAgqLQ/XoL5/bgf 5/pQTaNK3VLe4wjhclfKXHJZZ57JOnto16NWKNrGr0v/nIfGoCRNL6NBZCJ4RTai4q3C XLhQ== X-Gm-Message-State: AOJu0YwjFpDYM4I2+JC5brJX2sgyM7ZTlTQhU8FP52FVsjT6fYfrrrZx 0sreW1PzlC+oevCIpvtTdT4no5E3a3pfmS2YmrjhkjVpQgOSKr6AdePo7nJETsZYyLUTtWC+2Aj h X-Received: by 2002:adf:f90e:0:b0:349:eeaf:3a01 with SMTP id b14-20020adff90e000000b00349eeaf3a01mr2325604wrr.22.1713980020828; Wed, 24 Apr 2024 10:33:40 -0700 (PDT) Received: from localhost.localdomain (mon75-h03-176-184-51-42.dsl.sta.abo.bbox.fr. [176.184.51.42]) by smtp.gmail.com with ESMTPSA id b7-20020adff907000000b0034b3394f0e1sm7195874wrr.10.2024.04.24.10.33.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Apr 2024 10:33:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Warner Losh , Kyle Evans , Laurent Vivier Subject: [PATCH v2 1/3] hw/elf_ops: Rename elf_ops.h -> elf_ops.h.inc Date: Wed, 24 Apr 2024 19:33:30 +0200 Message-ID: <20240424173333.96148-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240424173333.96148-1-philmd@linaro.org> References: <20240424173333.96148-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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 "hw/elf_ops.h" as "hw/elf_ops.h.inc". Signed-off-by: Philippe Mathieu-Daudé --- include/hw/{elf_ops.h => elf_ops.h.inc} | 0 bsd-user/elfload.c | 2 +- hw/core/loader.c | 4 ++-- linux-user/elfload.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename include/hw/{elf_ops.h => elf_ops.h.inc} (100%) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h.inc similarity index 100% rename from include/hw/elf_ops.h rename to include/hw/elf_ops.h.inc diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index baf2f63d2f..833fa3bd05 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -383,7 +383,7 @@ static const char *lookup_symbolxx(struct syminfo *s, uint64_t orig_addr) return ""; } -/* FIXME: This should use elf_ops.h */ +/* FIXME: This should use elf_ops.h.inc */ static int symcmp(const void *s0, const void *s1) { struct elf_sym *sym0 = (struct elf_sym *)s0; diff --git a/hw/core/loader.c b/hw/core/loader.c index b8e52f3fb0..2f8105d7de 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -305,7 +305,7 @@ static void *load_at(int fd, off_t offset, size_t size) #define elf_word uint32_t #define elf_sword int32_t #define bswapSZs bswap32s -#include "hw/elf_ops.h" +#include "hw/elf_ops.h.inc" #undef elfhdr #undef elf_phdr @@ -327,7 +327,7 @@ static void *load_at(int fd, off_t offset, size_t size) #define elf_sword int64_t #define bswapSZs bswap64s #define SZ 64 -#include "hw/elf_ops.h" +#include "hw/elf_ops.h.inc" const char *load_elf_strerror(ssize_t error) { diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 60cf55b36c..0c3ddce971 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3671,7 +3671,7 @@ static const char *lookup_symbolxx(struct syminfo *s, uint64_t orig_addr) return ""; } -/* FIXME: This should use elf_ops.h */ +/* FIXME: This should use elf_ops.h.inc */ static int symcmp(const void *s0, const void *s1) { struct elf_sym *sym0 = (struct elf_sym *)s0; From patchwork Wed Apr 24 17:33:31 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: 791525 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp960213wrq; Wed, 24 Apr 2024 10:34:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1KWErKyOJ5BB5AfMv9XGgVXtxl/0lbbz4MpjV7FFiGvIlhA2OsbncxAzl6KvfWAV2n+MFV9n5Fatrzek8uqsB X-Google-Smtp-Source: AGHT+IGA9W4cWusraW7g+rkuUPkU6f6TCN49zgilSm90D/aa9NyvRvNBBhxO1Hc981mIF2LWRlXF X-Received: by 2002:ac8:5984:0:b0:439:6d7a:4b24 with SMTP id e4-20020ac85984000000b004396d7a4b24mr3434870qte.3.1713980078817; Wed, 24 Apr 2024 10:34:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713980078; cv=none; d=google.com; s=arc-20160816; b=zT2lndCDKI+Efn0JhIC8VBp+ftTHr1EfgkpkuWbX1mTv0HjszjBrLvoMgwSj3ARDxa qZnU+wi/5ygwIIMGFLncUExpDLlTvDF5K3WoxBKNWWE+zyM6nax4GbdBmRyD45ev5NCr d+r+9fZ7iTQLxB3qooa/BcHsYv2gIyptpfgO3KJxYwfY2D+WCBHisgasF2kIRP2SopeJ 6YfuZNukH+CmRbFCWsF/NG4rMPxoDlceteEyPSCvfqDhxGy1WCWBo7uhpMVQNoDZlPh9 D5cwnod9NP0UdU1iWJyYvssNP/abWwXswUOTd8A1cfDlnHFd9aMRko4Te7vdTHvCIqNx Efew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=RC3I7eEuU1Vrf2ad1mlMtTC053sX+mHPqI7q34t9+Ao=; fh=fz3DJMUXEzejNv0JWYQ+xa02BmrDN+/I7HIv5ot61VY=; b=SXis2bu4Nky48rvpdf9VAePXVCpXkRqyir6buLLGv7O2P5Igoya5DIH5JeRqqs7Toj sUdsGTCVdTEeMdtnPzNtsYhsgXRq5p69JvOsL7kk5tKbvmsRbIJXGtAUhzwdn2ZYgvrc Gs7snmZcBmnuMTMwKRNsZRLgSPAz72Meyt6YW8n2ZkU5tPzYyZqVHMzHgL09SBs5O77v aMPJ/uDgqj2sZhnND8zVkSHZJM7Nczj0AfxLWBp4kBEqYfJ9s2mn1GnX2NPjFJqnOjrF /0RO8tNeXDCZJc6Gine6nnxB9y5i5OpXjF24d51/X3lHQ66RGWN+EleAqUHJhBm6gQ/9 UCHw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rn1DLcmo; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h15-20020ac85e0f000000b004399b0a33acsi8589115qtx.375.2024.04.24.10.34.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 10:34:38 -0700 (PDT) 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=rn1DLcmo; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzgVD-0005yA-4r; Wed, 24 Apr 2024 13:33:51 -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 1rzgVB-0005xt-NR for qemu-devel@nongnu.org; Wed, 24 Apr 2024 13:33:49 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzgV9-00030c-U3 for qemu-devel@nongnu.org; Wed, 24 Apr 2024 13:33:49 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-34b029296f5so44975f8f.2 for ; Wed, 24 Apr 2024 10:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713980026; x=1714584826; 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=RC3I7eEuU1Vrf2ad1mlMtTC053sX+mHPqI7q34t9+Ao=; b=rn1DLcmo5ijKpH8qjcbRGo8MKtllfDSTlNvNZX0hqByVmkETd1aOvEOhlDavaACMbT 6VGgBJj7k3LwDGJu6RWN87exvLKrbT1/PtahXRKmo7oU1lRolvAmKQ7lu17M80cR+8xj sS88G9nCqocHH/7lwxITSDTGa5vrvhR01jPkFuOZAzODyAAChMVxgW2Ayab3GAF7wEWC wcAGXO5unYLVm/gDqMiX5dQBhBcfprGeZRFaD6FqEegG83akzeGY0xgW/ZIppOah0dNZ TNKmjaryp3vBbkChodXqN43gsj6ufY+/xyHXgJVZWraIOh02nLtEUm4fGWyWO36VrAPZ 2zxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713980026; x=1714584826; 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=RC3I7eEuU1Vrf2ad1mlMtTC053sX+mHPqI7q34t9+Ao=; b=DQ2vq9Y7tSIBHJdqswofHn6w0sLD/0J5FPl3hOh3QNRB4ChlQmdUcRn91vb8xe0PRa wtPQ6+1VQkXQtE22Or60K9OFMd+hZYaE0V0QtoDvV9zMnBCgoohpfjCzUaj8wT9kO5hv LZG1jd2AsUlEjJGgG0r7+9ixsHeGdnBov5O+BMUiQyArH+xygnHbr4Vg6/zGtpO9mJfT wz3VYNHshQsQIgOKjFUtrjRXhatZ0/3BMbdk0K1cbOi3hA71c1EQDPELHEt1SpTos785 XNE/bk/jA1E1dQa8KWo/5ZIbOlkP25FTCLoMjk1rbN9v7SGy08oqFGuic6ow7V+ZVgQc yvDA== X-Gm-Message-State: AOJu0YxjaVltXAc2VudbARauvPXV1cewkc3+Rr25FvSz5r15HSqvQaGh aiIPHWUJ3rEN2qw/GWv8glCwEnEI3P9DXKu9kf6gjuia5KN9WgaWjvJE3CgaR+SRzXP1ER5HcF9 T X-Received: by 2002:a5d:6b90:0:b0:34a:2b3f:262f with SMTP id n16-20020a5d6b90000000b0034a2b3f262fmr2680321wrx.32.1713980026045; Wed, 24 Apr 2024 10:33:46 -0700 (PDT) Received: from localhost.localdomain (mon75-h03-176-184-51-42.dsl.sta.abo.bbox.fr. [176.184.51.42]) by smtp.gmail.com with ESMTPSA id r11-20020a056000014b00b0034ab4cb8af1sm11782180wrx.29.2024.04.24.10.33.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Apr 2024 10:33:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 2/3] accel/tcg: Rename load-extract/store-insert headers using .h.inc suffix Date: Wed, 24 Apr 2024 19:33:31 +0200 Message-ID: <20240424173333.96148-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240424173333.96148-1-philmd@linaro.org> References: <20240424173333.96148-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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 'store-insert-al16.h' as 'store-insert-al16.h.inc' and 'load-extract-al16-al8.h' as 'load-extract-al16-al8.h.inc'. Signed-off-by: Philippe Mathieu-Daudé --- .../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0 .../host/{store-insert-al16.h => store-insert-al16.h.inc} | 0 .../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0 .../host/{store-insert-al16.h => store-insert-al16.h.inc} | 0 .../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0 .../host/{store-insert-al16.h => store-insert-al16.h.inc} | 0 .../{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} | 0 accel/tcg/ldst_atomicity.c.inc | 4 ++-- 8 files changed, 2 insertions(+), 2 deletions(-) rename host/include/aarch64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%) rename host/include/aarch64/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%) rename host/include/generic/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%) rename host/include/generic/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%) rename host/include/loongarch64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%) rename host/include/loongarch64/host/{store-insert-al16.h => store-insert-al16.h.inc} (100%) rename host/include/x86_64/host/{load-extract-al16-al8.h => load-extract-al16-al8.h.inc} (100%) diff --git a/host/include/aarch64/host/load-extract-al16-al8.h b/host/include/aarch64/host/load-extract-al16-al8.h.inc similarity index 100% rename from host/include/aarch64/host/load-extract-al16-al8.h rename to host/include/aarch64/host/load-extract-al16-al8.h.inc diff --git a/host/include/aarch64/host/store-insert-al16.h b/host/include/aarch64/host/store-insert-al16.h.inc similarity index 100% rename from host/include/aarch64/host/store-insert-al16.h rename to host/include/aarch64/host/store-insert-al16.h.inc diff --git a/host/include/generic/host/load-extract-al16-al8.h b/host/include/generic/host/load-extract-al16-al8.h.inc similarity index 100% rename from host/include/generic/host/load-extract-al16-al8.h rename to host/include/generic/host/load-extract-al16-al8.h.inc diff --git a/host/include/generic/host/store-insert-al16.h b/host/include/generic/host/store-insert-al16.h.inc similarity index 100% rename from host/include/generic/host/store-insert-al16.h rename to host/include/generic/host/store-insert-al16.h.inc diff --git a/host/include/loongarch64/host/load-extract-al16-al8.h b/host/include/loongarch64/host/load-extract-al16-al8.h.inc similarity index 100% rename from host/include/loongarch64/host/load-extract-al16-al8.h rename to host/include/loongarch64/host/load-extract-al16-al8.h.inc diff --git a/host/include/loongarch64/host/store-insert-al16.h b/host/include/loongarch64/host/store-insert-al16.h.inc similarity index 100% rename from host/include/loongarch64/host/store-insert-al16.h rename to host/include/loongarch64/host/store-insert-al16.h.inc diff --git a/host/include/x86_64/host/load-extract-al16-al8.h b/host/include/x86_64/host/load-extract-al16-al8.h.inc similarity index 100% rename from host/include/x86_64/host/load-extract-al16-al8.h rename to host/include/x86_64/host/load-extract-al16-al8.h.inc diff --git a/accel/tcg/ldst_atomicity.c.inc b/accel/tcg/ldst_atomicity.c.inc index 97dae70d53..134da3c1da 100644 --- a/accel/tcg/ldst_atomicity.c.inc +++ b/accel/tcg/ldst_atomicity.c.inc @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#include "host/load-extract-al16-al8.h" -#include "host/store-insert-al16.h" +#include "host/load-extract-al16-al8.h.inc" +#include "host/store-insert-al16.h.inc" #ifdef CONFIG_ATOMIC64 # define HAVE_al8 true From patchwork Wed Apr 24 17:33:32 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: 791524 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp960128wrq; Wed, 24 Apr 2024 10:34:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU+X+VxzzOs4w2liom2Q31n1uP4TuAZcfGpzOeVTJFXpL3ATf8flhXJvUFdNFtWpyxxzB08Vv6ylOLlYFh7biYK X-Google-Smtp-Source: AGHT+IGTx/LbG2dmwvgc7TOPSgC3AjUgG+73KqpIEtm9qRGdXZ+mVvFhkgf+JgJ10LYrJjpE6QP0 X-Received: by 2002:a05:620a:c81:b0:790:7d78:1c0f with SMTP id q1-20020a05620a0c8100b007907d781c0fmr3272920qki.8.1713980063276; Wed, 24 Apr 2024 10:34:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713980063; cv=none; d=google.com; s=arc-20160816; b=xn7Am5dquGGS5EMgsqF54gVF8gL/01xilOgJEuru2vrzl/yIOwDrK3Kf8vwDi/euCb v8lfrR+DTd3ycGDZ8qlHGyBfxXPNh4LcEsxN30ZoBheItEMQ+MxR0S5iQgPuRwPc79OL ZP6TO+MJAwZlJuuPUWszb7zlux8L49h3G/8sArCfndeH+xVGHN0F6a9BcbHC5TYHHAVZ 70zth4Yy5vOuiHPK8mckxx3B8FIW/G5rqGJvJ8iBMvo01bn8hWPUNMZzn/FIaU24FROH KSpp79GZWR3wPpT3XA9rl64yiS9WMu/g1zrnUWdCnMcKbMWBg2lTPeVGVlEiPtLEqq2u lmOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=dMR8Lg1die3szcUXTAk2tB7zWo4TcVDOEobhVyTAJrQ=; fh=fz3DJMUXEzejNv0JWYQ+xa02BmrDN+/I7HIv5ot61VY=; b=d0Ey+uBMRyPCgFAEciXjE5FGoBDYirnQBH4ox1f4GgV9CO16288rS+epRc37EAKaoM gr9tDArtAfBZ3GcZcqUXooJX8T3payRVpCA4beK3xc5pt79L+ctDyU9z65VMGSUN5hk6 NOnOVyTdk+epu1VkdEdi+vsdp8E/gh5Xz1qQB4HdQ8/lguCIEv6Y5H9dQISIbbBSfmZI czP0WNXf77X1wYG0fdHDk4GoU1RzbVOK5zCg4uDSrVKZeL3L8G4o64jHDd19Gx+S7qfM AsiRWBX0CZ3BaeQILE/YraTB091KLzZTwJwK9V5G8/HJ38kA3kntefVtcww4txpfOlCP prAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iYG8Hs3I; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j3-20020a37c243000000b00789e5d56f71si15518448qkm.628.2024.04.24.10.34.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 10:34:23 -0700 (PDT) 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=iYG8Hs3I; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzgVI-0005z8-T2; Wed, 24 Apr 2024 13:33: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 1rzgVH-0005yV-Fj for qemu-devel@nongnu.org; Wed, 24 Apr 2024 13:33:55 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzgVF-00031O-7N for qemu-devel@nongnu.org; Wed, 24 Apr 2024 13:33:55 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-41b09fb205dso981105e9.0 for ; Wed, 24 Apr 2024 10:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713980031; x=1714584831; 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=dMR8Lg1die3szcUXTAk2tB7zWo4TcVDOEobhVyTAJrQ=; b=iYG8Hs3I+mh/WLFpOm0rr7ASw3vKwyBL4h1atFfMkJodKRGuK+7qdQfLz3YoT9ZHbH 7AnvwY0042e9IpXtIBwNp/a7ZTvC77V2gwqHBl6bPCRinYa0UBSpDzRnLroTTZbpd2Pi zq6mN20jfVLzVP4oQ2xonYZVEBPt8fFnoLlZ9h7yogNeDQZMLEgFrTcZFLMjnRMimtL2 zq1OMn8FLdVrMViAoTt8azJrEFkGynZz1eW86RS+4YJeQO0zRFLMdWhJoRROpOO7yo6L SzWgmnY0sq96Kigg4p/O/FlRTb9zaA3qLDmBPvk3qFElazAPejClsxMBv6tykbUq2DxB 1B7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713980031; x=1714584831; 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=dMR8Lg1die3szcUXTAk2tB7zWo4TcVDOEobhVyTAJrQ=; b=vxhIHuUrZQCFz4+A6bvNgP8m1Fx4/Bklv8I83hGSdVYlXtPpDPLx1FwC72CK3RiTVa RpEzpwP92uwGdyEtBohNsBk6JnXUdCBEntJ93szQ9B2WUwJr3V4qhBZ6Q9A9Pbcl15BI lADA+dHQCbpuJNQTe31RBmDdu1aQDAULlRim6MYnWLFcnUuPjccnKFdautYhUy1LzBsx hVYTYBFinkq8I+/Z/WpLre8KHTNgB8qMVoJXX4xEsCRa6hqjyFiZdChwdpbA6JO9QUbu rDy4Dpk06ice5dtGSyrP3oeodBFzZm2+2OjU4C7pF8vD8cVd4nJsk3ZLXKH48nMNU5QA Ay4w== X-Gm-Message-State: AOJu0YxK4xVSYHrSFKq8F5/Xcydbko7qmCyCoKtGcSycxQmRLqXJcaV3 t7Mc3U7OBGUYRr12COKGQX3KfMbgPEC75LgJ8/+uhJ5K+ovuO/Wn9d8CGAeaPt3gkufPbs3RFr4 j X-Received: by 2002:a05:600c:3c9f:b0:419:ec97:1cf1 with SMTP id bg31-20020a05600c3c9f00b00419ec971cf1mr1881854wmb.20.1713980031432; Wed, 24 Apr 2024 10:33:51 -0700 (PDT) Received: from localhost.localdomain (mon75-h03-176-184-51-42.dsl.sta.abo.bbox.fr. [176.184.51.42]) by smtp.gmail.com with ESMTPSA id bd25-20020a05600c1f1900b00419f7d6879dsm16252468wmb.8.2024.04.24.10.33.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Apr 2024 10:33:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 3/3] accel/tcg: Rename helper-head.h -> helper-head.h.inc Date: Wed, 24 Apr 2024 19:33:32 +0200 Message-ID: <20240424173333.96148-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240424173333.96148-1-philmd@linaro.org> References: <20240424173333.96148-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 "exec/helper-head.h" as "exec/helper-head.h.inc". Signed-off-by: Philippe Mathieu-Daudé --- include/exec/helper-gen.h.inc | 2 +- include/exec/{helper-head.h => helper-head.h.inc} | 0 include/exec/helper-proto.h.inc | 2 +- include/exec/helper-info.c.inc | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename include/exec/{helper-head.h => helper-head.h.inc} (100%) diff --git a/include/exec/helper-gen.h.inc b/include/exec/helper-gen.h.inc index c009641517..d9fd3ed72a 100644 --- a/include/exec/helper-gen.h.inc +++ b/include/exec/helper-gen.h.inc @@ -8,7 +8,7 @@ #include "tcg/tcg.h" #include "tcg/helper-info.h" -#include "exec/helper-head.h" +#include "exec/helper-head.h.inc" #define DEF_HELPER_FLAGS_0(name, flags, ret) \ extern TCGHelperInfo glue(helper_info_, name); \ diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h.inc similarity index 100% rename from include/exec/helper-head.h rename to include/exec/helper-head.h.inc diff --git a/include/exec/helper-proto.h.inc b/include/exec/helper-proto.h.inc index c3aa666929..f8e57e43ce 100644 --- a/include/exec/helper-proto.h.inc +++ b/include/exec/helper-proto.h.inc @@ -5,7 +5,7 @@ * Define HELPER_H for the header file to be expanded. */ -#include "exec/helper-head.h" +#include "exec/helper-head.h.inc" /* * Work around an issue with --enable-lto, in which GCC's ipa-split pass diff --git a/include/exec/helper-info.c.inc b/include/exec/helper-info.c.inc index 530d2e6d35..c551736d49 100644 --- a/include/exec/helper-info.c.inc +++ b/include/exec/helper-info.c.inc @@ -7,7 +7,7 @@ #include "tcg/tcg.h" #include "tcg/helper-info.h" -#include "exec/helper-head.h" +#include "exec/helper-head.h.inc" /* * Need one more level of indirection before stringification