From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Cédric Le Goater" <clg@kaod.org>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>
Subject: [PULL 11/12] include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h
Date: Fri, 20 Jan 2023 08:01:21 +0100 [thread overview]
Message-ID: <20230120070122.3982588-12-armbru@redhat.com> (raw)
In-Reply-To: <20230120070122.3982588-1-armbru@redhat.com>
The next commit needs to include hw/ppc/pnv.h from
hw/pci-host/pnv_phb.h. Avoid an inclusion loop.
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-4-armbru@redhat.com>
---
include/hw/pci-host/pnv_phb4.h | 3 ++-
include/hw/ppc/pnv.h | 3 ++-
hw/ppc/pnv_psi.c | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index d9cea3f952..b4f2b29fb5 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -10,14 +10,15 @@
#ifndef PCI_HOST_PNV_PHB4_H
#define PCI_HOST_PNV_PHB4_H
+#include "hw/pci-host/pnv_phb.h"
#include "hw/pci/pci_bus.h"
+#include "hw/ppc/pnv.h"
#include "hw/ppc/xive.h"
#include "qom/object.h"
typedef struct PnvPhb4PecState PnvPhb4PecState;
typedef struct PnvPhb4PecStack PnvPhb4PecStack;
typedef struct PnvPHB4 PnvPHB4;
-typedef struct PnvPHB PnvPHB;
typedef struct PnvChip PnvChip;
/*
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index ca49e4281d..96fb850419 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -25,7 +25,6 @@
#include "hw/sysbus.h"
#include "hw/ipmi/ipmi.h"
#include "hw/ppc/pnv_pnor.h"
-#include "hw/pci-host/pnv_phb.h"
#define TYPE_PNV_CHIP "pnv-chip"
@@ -59,6 +58,8 @@ DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER10,
PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir);
+typedef struct PnvPHB PnvPHB;
+
#define TYPE_PNV_MACHINE MACHINE_TYPE_NAME("powernv")
typedef struct PnvMachineClass PnvMachineClass;
typedef struct PnvMachineState PnvMachineState;
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 98045ed3d2..8aa09ab26b 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "exec/address-spaces.h"
#include "hw/irq.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
--
2.39.0
next prev parent reply other threads:[~2023-01-20 7:04 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é
2023-01-20 7:01 ` [PULL 10/12] include/hw/ppc: Supply a few missing includes Markus Armbruster
2023-01-20 7:01 ` Markus Armbruster [this message]
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=20230120070122.3982588-12-armbru@redhat.com \
--to=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).