[v1] hw/ppc: Clean up includes

[PATCH 4/4] include/hw/ppc include/hw/pci-host: Drop extra typedefs

Posted by Markus Armbruster 3 years, 2 months ago

PnvChip is typedef'ed in five places, and PnvPhb4PecState in two.
Keep one, drop the others.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/pci-host/pnv_phb.h          | 1 -
 include/hw/pci-host/pnv_phb3.h | 1 -
 include/hw/pci-host/pnv_phb4.h | 2 --
 include/hw/ppc/pnv_core.h      | 3 +--
 include/hw/ppc/pnv_homer.h     | 2 +-
 include/hw/ppc/pnv_lpc.h       | 8 ++------
 include/hw/ppc/pnv_xive.h      | 7 +++----
 7 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hw/pci-host/pnv_phb.h b/hw/pci-host/pnv_phb.h
index 202de8796c..eb429d529f 100644
--- a/hw/pci-host/pnv_phb.h
+++ b/hw/pci-host/pnv_phb.h
@@ -15,7 +15,6 @@
 #include "hw/ppc/pnv.h"
 #include "qom/object.h"
 
-typedef struct PnvChip PnvChip;
 typedef struct PnvPhb4PecState PnvPhb4PecState;
 
 struct PnvPHB {
diff --git a/include/hw/pci-host/pnv_phb3.h b/include/hw/pci-host/pnv_phb3.h
index f791ebda9b..d62b3091ac 100644
--- a/include/hw/pci-host/pnv_phb3.h
+++ b/include/hw/pci-host/pnv_phb3.h
@@ -15,7 +15,6 @@
 #include "hw/pci-host/pnv_phb.h"
 
 typedef struct PnvPHB3 PnvPHB3;
-typedef struct PnvChip PnvChip;
 
 /*
  * PHB3 XICS Source for MSIs
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index b4f2b29fb5..1f3237c9d5 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -16,10 +16,8 @@
 #include "hw/ppc/xive.h"
 #include "qom/object.h"
 
-typedef struct PnvPhb4PecState PnvPhb4PecState;
 typedef struct PnvPhb4PecStack PnvPhb4PecStack;
 typedef struct PnvPHB4 PnvPHB4;
-typedef struct PnvChip PnvChip;
 
 /*
  * We have one such address space wrapper per possible device under
diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h
index c22eab2e1f..3d75706e95 100644
--- a/include/hw/ppc/pnv_core.h
+++ b/include/hw/ppc/pnv_core.h
@@ -22,14 +22,13 @@
 
 #include "hw/cpu/core.h"
 #include "target/ppc/cpu.h"
+#include "hw/ppc/pnv.h"
 #include "qom/object.h"
 
 #define TYPE_PNV_CORE "powernv-cpu-core"
 OBJECT_DECLARE_TYPE(PnvCore, PnvCoreClass,
                     PNV_CORE)
 
-typedef struct PnvChip PnvChip;
-
 struct PnvCore {
     /*< private >*/
     CPUCore parent_obj;
diff --git a/include/hw/ppc/pnv_homer.h b/include/hw/ppc/pnv_homer.h
index 07e8b19311..b1c5d498dc 100644
--- a/include/hw/ppc/pnv_homer.h
+++ b/include/hw/ppc/pnv_homer.h
@@ -39,7 +39,7 @@ DECLARE_INSTANCE_CHECKER(PnvHomer, PNV10_HOMER,
 struct PnvHomer {
     DeviceState parent;
 
-    struct PnvChip *chip;
+    PnvChip *chip;
     MemoryRegion pba_regs;
     MemoryRegion regs;
 };
diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
index 001eee27d7..5d22c45570 100644
--- a/include/hw/ppc/pnv_lpc.h
+++ b/include/hw/ppc/pnv_lpc.h
@@ -21,6 +21,7 @@
 #define PPC_PNV_LPC_H
 
 #include "exec/memory.h"
+#include "hw/ppc/pnv.h"
 #include "hw/qdev-core.h"
 
 #define TYPE_PNV_LPC "pnv-lpc"
@@ -93,13 +94,8 @@ struct PnvLpcClass {
     DeviceRealize parent_realize;
 };
 
-/*
- * Old compilers error on typdef forward declarations. Keep them happy.
- */
-struct PnvChip;
-
 ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp);
-int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset,
+int pnv_dt_lpc(PnvChip *chip, void *fdt, int root_offset,
                uint64_t lpcm_addr, uint64_t lpcm_size);
 
 #endif /* PPC_PNV_LPC_H */
diff --git a/include/hw/ppc/pnv_xive.h b/include/hw/ppc/pnv_xive.h
index b5d91505e5..9c48430ee4 100644
--- a/include/hw/ppc/pnv_xive.h
+++ b/include/hw/ppc/pnv_xive.h
@@ -10,12 +10,11 @@
 #ifndef PPC_PNV_XIVE_H
 #define PPC_PNV_XIVE_H
 
+#include "hw/ppc/pnv.h"
 #include "hw/ppc/xive.h"
 #include "qom/object.h"
 #include "hw/ppc/xive2.h"
 
-struct PnvChip;
-
 #define TYPE_PNV_XIVE "pnv-xive"
 OBJECT_DECLARE_TYPE(PnvXive, PnvXiveClass,
                     PNV_XIVE)
@@ -31,7 +30,7 @@ struct PnvXive {
     XiveRouter    parent_obj;
 
     /* Owning chip */
-    struct PnvChip *chip;
+    PnvChip *chip;
 
     /* XSCOM addresses giving access to the controller registers */
     MemoryRegion  xscom_regs;
@@ -106,7 +105,7 @@ typedef struct PnvXive2 {
     Xive2Router   parent_obj;
 
     /* Owning chip */
-    struct PnvChip *chip;
+    PnvChip *chip;
 
     /* XSCOM addresses giving access to the controller registers */
     MemoryRegion  xscom_regs;
-- 
2.37.3

Re: [PATCH 4/4] include/hw/ppc include/hw/pci-host: Drop extra typedefs

Posted by Cédric Le Goater 3 years, 2 months ago

On 12/10/22 12:21, Markus Armbruster wrote:
> PnvChip is typedef'ed in five places, and PnvPhb4PecState in two.
> Keep one, drop the others.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.


> ---
>   hw/pci-host/pnv_phb.h          | 1 -
>   include/hw/pci-host/pnv_phb3.h | 1 -
>   include/hw/pci-host/pnv_phb4.h | 2 --
>   include/hw/ppc/pnv_core.h      | 3 +--
>   include/hw/ppc/pnv_homer.h     | 2 +-
>   include/hw/ppc/pnv_lpc.h       | 8 ++------
>   include/hw/ppc/pnv_xive.h      | 7 +++----
>   7 files changed, 7 insertions(+), 17 deletions(-)
> 
> diff --git a/hw/pci-host/pnv_phb.h b/hw/pci-host/pnv_phb.h
> index 202de8796c..eb429d529f 100644
> --- a/hw/pci-host/pnv_phb.h
> +++ b/hw/pci-host/pnv_phb.h
> @@ -15,7 +15,6 @@
>   #include "hw/ppc/pnv.h"
>   #include "qom/object.h"
>   
> -typedef struct PnvChip PnvChip;
>   typedef struct PnvPhb4PecState PnvPhb4PecState;
>   
>   struct PnvPHB {
> diff --git a/include/hw/pci-host/pnv_phb3.h b/include/hw/pci-host/pnv_phb3.h
> index f791ebda9b..d62b3091ac 100644
> --- a/include/hw/pci-host/pnv_phb3.h
> +++ b/include/hw/pci-host/pnv_phb3.h
> @@ -15,7 +15,6 @@
>   #include "hw/pci-host/pnv_phb.h"
>   
>   typedef struct PnvPHB3 PnvPHB3;
> -typedef struct PnvChip PnvChip;
>   
>   /*
>    * PHB3 XICS Source for MSIs
> diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
> index b4f2b29fb5..1f3237c9d5 100644
> --- a/include/hw/pci-host/pnv_phb4.h
> +++ b/include/hw/pci-host/pnv_phb4.h
> @@ -16,10 +16,8 @@
>   #include "hw/ppc/xive.h"
>   #include "qom/object.h"
>   
> -typedef struct PnvPhb4PecState PnvPhb4PecState;
>   typedef struct PnvPhb4PecStack PnvPhb4PecStack;
>   typedef struct PnvPHB4 PnvPHB4;
> -typedef struct PnvChip PnvChip;
>   
>   /*
>    * We have one such address space wrapper per possible device under
> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h
> index c22eab2e1f..3d75706e95 100644
> --- a/include/hw/ppc/pnv_core.h
> +++ b/include/hw/ppc/pnv_core.h
> @@ -22,14 +22,13 @@
>   
>   #include "hw/cpu/core.h"
>   #include "target/ppc/cpu.h"
> +#include "hw/ppc/pnv.h"
>   #include "qom/object.h"
>   
>   #define TYPE_PNV_CORE "powernv-cpu-core"
>   OBJECT_DECLARE_TYPE(PnvCore, PnvCoreClass,
>                       PNV_CORE)
>   
> -typedef struct PnvChip PnvChip;
> -
>   struct PnvCore {
>       /*< private >*/
>       CPUCore parent_obj;
> diff --git a/include/hw/ppc/pnv_homer.h b/include/hw/ppc/pnv_homer.h
> index 07e8b19311..b1c5d498dc 100644
> --- a/include/hw/ppc/pnv_homer.h
> +++ b/include/hw/ppc/pnv_homer.h
> @@ -39,7 +39,7 @@ DECLARE_INSTANCE_CHECKER(PnvHomer, PNV10_HOMER,
>   struct PnvHomer {
>       DeviceState parent;
>   
> -    struct PnvChip *chip;
> +    PnvChip *chip;
>       MemoryRegion pba_regs;
>       MemoryRegion regs;
>   };
> diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
> index 001eee27d7..5d22c45570 100644
> --- a/include/hw/ppc/pnv_lpc.h
> +++ b/include/hw/ppc/pnv_lpc.h
> @@ -21,6 +21,7 @@
>   #define PPC_PNV_LPC_H
>   
>   #include "exec/memory.h"
> +#include "hw/ppc/pnv.h"
>   #include "hw/qdev-core.h"
>   
>   #define TYPE_PNV_LPC "pnv-lpc"
> @@ -93,13 +94,8 @@ struct PnvLpcClass {
>       DeviceRealize parent_realize;
>   };
>   
> -/*
> - * Old compilers error on typdef forward declarations. Keep them happy.
> - */
> -struct PnvChip;
> -
>   ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp);
> -int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset,
> +int pnv_dt_lpc(PnvChip *chip, void *fdt, int root_offset,
>                  uint64_t lpcm_addr, uint64_t lpcm_size);
>   
>   #endif /* PPC_PNV_LPC_H */
> diff --git a/include/hw/ppc/pnv_xive.h b/include/hw/ppc/pnv_xive.h
> index b5d91505e5..9c48430ee4 100644
> --- a/include/hw/ppc/pnv_xive.h
> +++ b/include/hw/ppc/pnv_xive.h
> @@ -10,12 +10,11 @@
>   #ifndef PPC_PNV_XIVE_H
>   #define PPC_PNV_XIVE_H
>   
> +#include "hw/ppc/pnv.h"
>   #include "hw/ppc/xive.h"
>   #include "qom/object.h"
>   #include "hw/ppc/xive2.h"
>   
> -struct PnvChip;
> -
>   #define TYPE_PNV_XIVE "pnv-xive"
>   OBJECT_DECLARE_TYPE(PnvXive, PnvXiveClass,
>                       PNV_XIVE)
> @@ -31,7 +30,7 @@ struct PnvXive {
>       XiveRouter    parent_obj;
>   
>       /* Owning chip */
> -    struct PnvChip *chip;
> +    PnvChip *chip;
>   
>       /* XSCOM addresses giving access to the controller registers */
>       MemoryRegion  xscom_regs;
> @@ -106,7 +105,7 @@ typedef struct PnvXive2 {
>       Xive2Router   parent_obj;
>   
>       /* Owning chip */
> -    struct PnvChip *chip;
> +    PnvChip *chip;
>   
>       /* XSCOM addresses giving access to the controller registers */
>       MemoryRegion  xscom_regs;

Re: [PATCH 4/4] include/hw/ppc include/hw/pci-host: Drop extra typedefs

Posted by Philippe Mathieu-Daudé 3 years, 2 months ago

On 10/12/22 12:21, Markus Armbruster wrote:
> PnvChip is typedef'ed in five places, and PnvPhb4PecState in two.
> Keep one, drop the others.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   hw/pci-host/pnv_phb.h          | 1 -
>   include/hw/pci-host/pnv_phb3.h | 1 -
>   include/hw/pci-host/pnv_phb4.h | 2 --
>   include/hw/ppc/pnv_core.h      | 3 +--
>   include/hw/ppc/pnv_homer.h     | 2 +-
>   include/hw/ppc/pnv_lpc.h       | 8 ++------
>   include/hw/ppc/pnv_xive.h      | 7 +++----
>   7 files changed, 7 insertions(+), 17 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 1/4] include/hw/ppc: Split pnv_chip.h off pnv.h
[PATCH 2/4] include/hw/ppc: Supply a few missing includes
[PATCH 3/4] include/hw/ppc: Don't include hw/pci-host/pnv_phb.h from pnv.h
[PATCH 4/4] include/hw/ppc include/hw/pci-host: Drop extra typedefs