From: Peter Maydell <peter.maydell@linaro.org>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: qemu-arm <qemu-arm@nongnu.org>, Luc Michel <luc@lmichel.fr>,
QEMU Developers <qemu-devel@nongnu.org>,
Andrew Baumann <Andrew.Baumann@microsoft.com>
Subject: Re: [PATCH] hw/misc/bcm2835_cprman: Make cprman_internals an included source file
Date: Mon, 19 Oct 2020 16:53:03 +0100 [thread overview]
Message-ID: <CAFEAcA92ah6O3uTESb98GF2F98ASmiQy9UqyNMOOLZPZaX40zg@mail.gmail.com> (raw)
In-Reply-To: <20201019112628.1653550-1-f4bug@amsat.org>
On Mon, 19 Oct 2020 at 12:26, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> bcm2835_cprman_internals.h is only include by bcm2835_cprman.c
> and contains various static array definitions. Make it an
> included source file (using the .c.inc extension).
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> I'm sending this on top of:
> [PATCH v3 00/15] raspi: add the bcm2835 cprman clock manager
> to avoid a respin before soft freeze.
>
> This patch can be queued or squashed on top of patch #08/15:
> "bcm2835_cprman: add a PLL channel skeleton implementation"
>
> Based-on: <20201010135759.437903-1-luc@lmichel.fr>
> ---
> hw/misc/bcm2835_cprman.c | 2 +-
> .../misc/bcm2835_cprman_internals.c.inc | 0
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename include/hw/misc/bcm2835_cprman_internals.h => hw/misc/bcm2835_cprman_internals.c.inc (100%)
>
> diff --git a/hw/misc/bcm2835_cprman.c b/hw/misc/bcm2835_cprman.c
> index 7e415a017c9..9d4c0ee6c73 100644
> --- a/hw/misc/bcm2835_cprman.c
> +++ b/hw/misc/bcm2835_cprman.c
> @@ -48,7 +48,7 @@
> #include "migration/vmstate.h"
> #include "hw/qdev-properties.h"
> #include "hw/misc/bcm2835_cprman.h"
> -#include "hw/misc/bcm2835_cprman_internals.h"
> +#include "bcm2835_cprman_internals.c.inc"
> #include "trace.h"
I guess so, though usually we only use .c.inc files
where we actually need to multiply-include them (eg
with different #defines to control how they expand).
I suppose there's softfloat-specialize.c.inc which
only gets included once.
Applied to target-arm.next (not going to try to
squash it as it would make applying the following
patches in the series a bit awkward).
I am going to move the #include line down so it's
not in with all the includes for the .h files.
thanks
-- PMM
next prev parent reply other threads:[~2020-10-19 15:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 11:26 [PATCH] hw/misc/bcm2835_cprman: Make cprman_internals an included source file Philippe Mathieu-Daudé
2020-10-19 15:53 ` Peter Maydell [this message]
2020-10-19 15:55 ` Philippe Mathieu-Daudé
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=CAFEAcA92ah6O3uTESb98GF2F98ASmiQy9UqyNMOOLZPZaX40zg@mail.gmail.com \
--to=peter.maydell@linaro.org \
--cc=Andrew.Baumann@microsoft.com \
--cc=f4bug@amsat.org \
--cc=luc@lmichel.fr \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.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).