1. Patchew
  2. QEMU
  3. [PATCH 0/5] misc: Enforce .[ch].inc extension for re-included .c/.h files
  4. View patch

[PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc

Philippe Mathieu-Daudé posted 5 patches 2 years, 8 months ago
Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Michael Rolnik <mrolnik@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Brian Cain <bcain@quicinc.com>, Eduardo Habkost <eduardo@habkost.net>, Song Gao <gaosong@loongson.cn>, Xiaojuan Yang <yangxiaojuan@loongson.cn>, Laurent Vivier <laurent@vivier.eu>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Chris Wulff <crwulff@gmail.com>, Marek Vasut <marex@denx.de>, Stafford Horne <shorne@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liweiwei@iscas.ac.cn>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Filippov <jcmvbkbc@gmail.com>
There is a newer version of this series
[PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc
Posted by Philippe Mathieu-Daudé 2 years, 8 months ago 
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 as 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 the included 'elfcore.c' as 'elfcore.c.inc'.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 bsd-user/elfload.c                    | 2 +-
 bsd-user/{elfcore.c => elfcore.c.inc} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename bsd-user/{elfcore.c => elfcore.c.inc} (100%)

diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 1f650bdde8..d2dced3d7e 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -121,7 +121,7 @@ static void bswap_note(struct elf_note *en) { }
 
 #endif /* ! BSWAP_NEEDED */
 
-#include "elfcore.c"
+#include "elfcore.c.inc"
 
 /*
  * 'copy_elf_strings()' copies argument/envelope strings from user
diff --git a/bsd-user/elfcore.c b/bsd-user/elfcore.c.inc
similarity index 100%
rename from bsd-user/elfcore.c
rename to bsd-user/elfcore.c.inc
-- 
2.38.1
Re: [PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc
Posted by Richard Henderson 2 years, 8 months ago 
On 6/6/23 07:12, Philippe Mathieu-Daudé wrote:
> 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 as 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 the included 'elfcore.c' as 'elfcore.c.inc'.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   bsd-user/elfload.c                    | 2 +-
>   bsd-user/{elfcore.c => elfcore.c.inc} | 0
>   2 files changed, 1 insertion(+), 1 deletion(-)
>   rename bsd-user/{elfcore.c => elfcore.c.inc} (100%)

Assuming Warner doesn't simply want to merge this small file, or compile it separately. It 
isn't actually included more than once.


r~
Re: [PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc
Posted by Warner Losh 2 years, 8 months ago 
On Tue, Jun 6, 2023 at 8:29 AM Richard Henderson <
richard.henderson@linaro.org> wrote:

> On 6/6/23 07:12, Philippe Mathieu-Daudé wrote:
> > 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 as 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 the included 'elfcore.c' as 'elfcore.c.inc'.
> >
> > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> > ---
> >   bsd-user/elfload.c                    | 2 +-
> >   bsd-user/{elfcore.c => elfcore.c.inc} | 0
> >   2 files changed, 1 insertion(+), 1 deletion(-)
> >   rename bsd-user/{elfcore.c => elfcore.c.inc} (100%)
>
> Assuming Warner doesn't simply want to merge this small file, or compile
> it separately. It
> isn't actually included more than once.
>

I'd much rather inline it in elfload.c I did the include trick as a
short-term
hack so I didn't have to upstream ALL of the core dump support to get
progress on other things in elfload.c.

So rather than rename it (which will cause some grief to me when I merge
things, but not a huge amount), it would be better to just inline what's
upstream now and I'll reconcile that when I upstream core dump support.

Warner
Re: [PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc
Posted by Philippe Mathieu-Daudé 2 years, 8 months ago 
On 6/6/23 20:08, Warner Losh wrote:
> On Tue, Jun 6, 2023 at 8:29 AM Richard Henderson 
> <richard.henderson@linaro.org <mailto:richard.henderson@linaro.org>> wrote:
> 
>     On 6/6/23 07:12, Philippe Mathieu-Daudé wrote:
>      > 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 as 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 the included 'elfcore.c' as 'elfcore.c.inc'.
>      >
>      > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org
>     <mailto:philmd@linaro.org>>
>      > ---
>      >   bsd-user/elfload.c                    | 2 +-
>      >   bsd-user/{elfcore.c => elfcore.c.inc} | 0
>      >   2 files changed, 1 insertion(+), 1 deletion(-)
>      >   rename bsd-user/{elfcore.c => elfcore.c.inc} (100%)
> 
>     Assuming Warner doesn't simply want to merge this small file, or
>     compile it separately. It
>     isn't actually included more than once.
> 
> 
> I'd much rather inline it in elfload.c I did the include trick as a 
> short-term
> hack so I didn't have to upstream ALL of the core dump support to get
> progress on other things in elfload.c.
> 
> So rather than rename it (which will cause some grief to me when I merge
> things, but not a huge amount), it would be better to just inline what's
> upstream now and I'll reconcile that when I upstream core dump support.

I'll just drop it in favor of yours.

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.