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;