From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org,
"Cédric Le Goater" <clg@kaod.org>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>
Subject: Re: [PULL 09/12] include/hw/ppc: Split pnv_chip.h off pnv.h
Date: Mon, 23 Jan 2023 13:10:35 +0100 [thread overview]
Message-ID: <5128572f-1bfe-6fad-3afd-efd3fd0e1908@linaro.org> (raw)
In-Reply-To: <87y1ptbm32.fsf@pond.sub.org>
On 23/1/23 11:07, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@linaro.org> writes:
>
>> Hi Markus,
>>
>> On 20/1/23 08:01, Markus Armbruster wrote:
>>> PnvChipClass, PnvChip, Pnv8Chip, Pnv9Chip, and Pnv10Chip are defined
>>> in pnv.h. Many users of the header don't actually need them. One
>>> instance is this inclusion loop: hw/ppc/pnv_homer.h includes
>>> hw/ppc/pnv.h for typedef PnvChip, and vice versa for struct PnvHomer.
>>> Similar structs live in their own headers: PnvHomerClass and PnvHomer
>>> in pnv_homer.h, PnvLpcClass and PnvLpcController in pci_lpc.h,
>>> PnvPsiClass, PnvPsi, Pnv8Psi, Pnv9Psi, Pnv10Psi in pnv_psi.h, ...
>>> Move PnvChipClass, PnvChip, Pnv8Chip, Pnv9Chip, and Pnv10Chip to new
>>> pnv_chip.h, and adjust include directives. This breaks the inclusion
>>> loop mentioned above.
>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>> Reviewed-by: Cédric Le Goater <clg@kaod.org>
>>> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
>>> Message-Id: <20221222104628.659681-2-armbru@redhat.com>
>>> ---
>>> include/hw/ppc/pnv.h | 143 +-----------------------------------
>>> include/hw/ppc/pnv_chip.h | 147 +++++++++++++++++++++++++++++++++++++
>>> hw/intc/pnv_xive.c | 1 +
>>> hw/intc/pnv_xive2.c | 1 +
>>> hw/pci-host/pnv_phb3.c | 1 +
>>> hw/pci-host/pnv_phb4_pec.c | 1 +
>>> hw/ppc/pnv.c | 3 +
>>> hw/ppc/pnv_core.c | 1 +
>>> hw/ppc/pnv_homer.c | 1 +
>>> hw/ppc/pnv_lpc.c | 1 +
>>> hw/ppc/pnv_xscom.c | 1 +
>>> 11 files changed, 160 insertions(+), 141 deletions(-)
>>> create mode 100644 include/hw/ppc/pnv_chip.h
>>> diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
>>> index 9ef7e2d0dc..ca49e4281d 100644
>>> --- a/include/hw/ppc/pnv.h
>>> +++ b/include/hw/ppc/pnv.h
>>> @@ -20,158 +20,19 @@
>>> #ifndef PPC_PNV_H
>>> #define PPC_PNV_H
>>> +#include "cpu.h"
>>
>> Why is "cpu.h" required here? For pnv_chip_find_cpu()?
>
> Yes:
>
> ../include/hw/ppc/pnv.h:58:1: error: unknown type name ‘PowerPCCPU’
> 58 | PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir);
> | ^~~~~~~~~~
>
>> Isn't "target/ppc/cpu-qom.h" enough?
>
> Seems to suffice. Would you like to post a followup?
Good.
First I need to finish the ARM part and deal with this comment:
https://lore.kernel.org/qemu-devel/325310d0-aad6-fc39-748a-80762d644dd8@linaro.org/
Then this change will be included in the PPC equivalent series.
Thanks,
Phil.
next prev parent reply other threads:[~2023-01-23 12:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 7:01 [PULL 00/12] Header cleanup patches for 2023-01-20 Markus Armbruster
2023-01-20 7:01 ` [PULL 01/12] coroutine: Clean up superfluous inclusion of qemu/coroutine.h Markus Armbruster
2023-01-20 7:01 ` [PULL 02/12] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes Markus Armbruster
2023-01-20 7:01 ` [PULL 03/12] coroutine: Clean up superfluous inclusion of qemu/lockable.h Markus Armbruster
2023-01-20 7:01 ` [PULL 04/12] coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h Markus Armbruster
2023-01-20 7:01 ` [PULL 05/12] coroutine: Use Coroutine typedef name instead of structure tag Markus Armbruster
2023-01-20 7:01 ` [PULL 06/12] include/block: Untangle inclusion loops Markus Armbruster
2023-01-20 7:01 ` [PULL 07/12] hw/sparc64/niagara: Use blk_name() instead of open-coding it Markus Armbruster
2023-01-20 7:01 ` [PULL 08/12] include/hw/block: Include hw/block/block.h where needed Markus Armbruster
2023-01-20 7:01 ` [PULL 09/12] include/hw/ppc: Split pnv_chip.h off pnv.h Markus Armbruster
2023-01-23 9:44 ` Philippe Mathieu-Daudé
2023-01-23 10:07 ` Markus Armbruster
2023-01-23 12:10 ` Philippe Mathieu-Daudé [this message]
2023-01-20 7:01 ` [PULL 10/12] include/hw/ppc: Supply a few missing includes Markus Armbruster
2023-01-20 7:01 ` [PULL 11/12] include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h Markus Armbruster
2023-01-20 7:01 ` [PULL 12/12] include/hw/ppc include/hw/pci-host: Drop extra typedefs Markus Armbruster
2023-01-20 16:17 ` [PULL 00/12] Header cleanup patches for 2023-01-20 Peter Maydell
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=5128572f-1bfe-6fad-3afd-efd3fd0e1908@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=peter.maydell@linaro.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).