diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-12-22 11:46:27 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2023-01-20 07:25:18 +0100 |
| commit | c0a5a477f148d8cb8e47dda36601032a3f5aa991 (patch) | |
| tree | cc9b694f4ac3ad2415fa66ad74d4d0b84e672fa0 | |
| parent | 14f11a204cdc2ccb44d82ebb6f9646becca0178a (diff) | |
| download | qemu-c0a5a477f148d8cb8e47dda36601032a3f5aa991.zip qemu-c0a5a477f148d8cb8e47dda36601032a3f5aa991.tar.gz qemu-c0a5a477f148d8cb8e47dda36601032a3f5aa991.tar.bz2 | |
include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h
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>
| -rw-r--r-- | hw/ppc/pnv_psi.c | 1 | ||||
| -rw-r--r-- | include/hw/pci-host/pnv_phb4.h | 3 | ||||
| -rw-r--r-- | include/hw/ppc/pnv.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 98045ed..8aa09ab 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" diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h index d9cea3f..b4f2b29 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 ca49e42..96fb850 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; |