From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, qemu-arm@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Warner Losh" <imp@bsdimp.com>, "Kyle Evans" <kevans@freebsd.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 15/22] hw/elf_ops: Rename elf_ops.h -> elf_ops.h.inc
Date: Thu, 25 Apr 2024 13:01:48 +0200 [thread overview]
Message-ID: <20240425110157.20328-16-philmd@linaro.org> (raw)
In-Reply-To: <20240425110157.20328-1-philmd@linaro.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é <philmd@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240424173333.96148-2-philmd@linaro.org>
---
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 f4a0b78c75..a0999dac15 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3572,7 +3572,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;
--
2.41.0
next prev parent reply other threads:[~2024-04-25 11:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 11:01 [PULL 00/22] Misc HW patches for 2024-04-25 Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 01/22] qom: add default value Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 02/22] qmp: add dump machine type compatibility properties Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 03/22] python/qemu/machine: add method to retrieve QEMUMachine::binary field Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 04/22] scripts: add script to compare compatibility properties Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 05/22] hw/core: Remove check on NEED_CPU_H in tcg-cpu-ops.h Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 06/22] target/i386: Move APIC related code to cpu-apic.c Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 07/22] hw/misc/applesmc: Simplify DeviceReset handler Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 08/22] hw/misc/imx: Replace sprintf() by snprintf() Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 09/22] hw/riscv/virt: Replace sprintf by g_strdup_printf Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 10/22] hw: Fix problem with the A*MPCORE switches in the Kconfig files Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 11/22] hw: Add a Kconfig switch for the TYPE_CPU_CLUSTER device Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 12/22] hw/cxl/cxl-cdat: Make ct3_load_cdat() return boolean Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 13/22] hw/cxl/cxl-cdat: Make ct3_build_cdat() " Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 14/22] hw/cxl/cxl-cdat: Make cxl_doe_cdat_init() " Philippe Mathieu-Daudé
2024-04-25 11:01 ` Philippe Mathieu-Daudé [this message]
2024-04-25 11:01 ` [PULL 16/22] hw/xtensa: Include missing 'exec/cpu-common.h' in 'bootparam.h' Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 17/22] hw/misc : Correct 5 spaces indents in stm32l4x5_exti Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 18/22] hw/i386/pc_sysfw: Remove unused parameter from pc_isa_bios_init() Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 19/22] hw/core/machine: Introduce the module as a CPU topology level Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 20/22] hw/core/machine: Support modules in -smp Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 21/22] hw/core: Introduce module-id as the topology subindex Philippe Mathieu-Daudé
2024-04-25 11:01 ` [PULL 22/22] hw/core: Support module-id in numa configuration Philippe Mathieu-Daudé
2024-04-26 2:40 ` [PULL 00/22] Misc HW patches for 2024-04-25 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425110157.20328-16-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).