1. Patchew
  2. QEMU
  3. [PATCH 0/4] hw/ppc: Clean up includes
  4. View patch

[PATCH 2/4] include/hw/ppc: Supply a few missing includes

Markus Armbruster posted 4 patches 3 years, 2 months ago
Maintainers: "Cédric Le Goater" <clg@kaod.org>
There is a newer version of this series
[PATCH 2/4] include/hw/ppc: Supply a few missing includes
Posted by Markus Armbruster 3 years, 2 months ago 
A few headers neglect to include headers they need.  They compile only
if something else includes the required header(s) first.  Fix that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/hw/ppc/pnv_lpc.h    | 3 ++-
 include/hw/ppc/pnv_occ.h    | 3 ++-
 include/hw/ppc/pnv_pnor.h   | 2 +-
 include/hw/ppc/pnv_sbe.h    | 3 ++-
 include/hw/ppc/pnv_xscom.h  | 3 ++-
 include/hw/ppc/xive2.h      | 2 ++
 include/hw/ppc/xive2_regs.h | 2 ++
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
index 8a8d1a3d42..001eee27d7 100644
--- a/include/hw/ppc/pnv_lpc.h
+++ b/include/hw/ppc/pnv_lpc.h
@@ -20,7 +20,8 @@
 #ifndef PPC_PNV_LPC_H
 #define PPC_PNV_LPC_H
 
-#include "qom/object.h"
+#include "exec/memory.h"
+#include "hw/qdev-core.h"
 
 #define TYPE_PNV_LPC "pnv-lpc"
 typedef struct PnvLpcClass PnvLpcClass;
diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h
index 90a81dae2b..df321244e3 100644
--- a/include/hw/ppc/pnv_occ.h
+++ b/include/hw/ppc/pnv_occ.h
@@ -20,7 +20,8 @@
 #ifndef PPC_PNV_OCC_H
 #define PPC_PNV_OCC_H
 
-#include "qom/object.h"
+#include "exec/memory.h"
+#include "hw/qdev-core.h"
 
 #define TYPE_PNV_OCC "pnv-occ"
 OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass,
diff --git a/include/hw/ppc/pnv_pnor.h b/include/hw/ppc/pnv_pnor.h
index bab2f79844..2e37ac88bf 100644
--- a/include/hw/ppc/pnv_pnor.h
+++ b/include/hw/ppc/pnv_pnor.h
@@ -10,7 +10,7 @@
 #ifndef PPC_PNV_PNOR_H
 #define PPC_PNV_PNOR_H
 
-#include "qom/object.h"
+#include "hw/sysbus.h"
 
 /*
  * PNOR offset on the LPC FW address space
diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h
index f54a3ae9ba..b6b378ad14 100644
--- a/include/hw/ppc/pnv_sbe.h
+++ b/include/hw/ppc/pnv_sbe.h
@@ -20,7 +20,8 @@
 #ifndef PPC_PNV_SBE_H
 #define PPC_PNV_SBE_H
 
-#include "qom/object.h"
+#include "exec/memory.h"
+#include "hw/qdev-core.h"
 
 #define TYPE_PNV_SBE "pnv-sbe"
 OBJECT_DECLARE_TYPE(PnvSBE, PnvSBEClass, PNV_SBE)
diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
index c6e9ef8dd2..cbe848d27b 100644
--- a/include/hw/ppc/pnv_xscom.h
+++ b/include/hw/ppc/pnv_xscom.h
@@ -20,7 +20,8 @@
 #ifndef PPC_PNV_XSCOM_H
 #define PPC_PNV_XSCOM_H
 
-#include "qom/object.h"
+#include "exec/memory.h"
+#include "hw/ppc/pnv.h"
 
 typedef struct PnvXScomInterface PnvXScomInterface;
 
diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h
index e9e3ea135e..ab68f8d157 100644
--- a/include/hw/ppc/xive2.h
+++ b/include/hw/ppc/xive2.h
@@ -11,7 +11,9 @@
 #ifndef PPC_XIVE2_H
 #define PPC_XIVE2_H
 
+#include "hw/ppc/xive.h"
 #include "hw/ppc/xive2_regs.h"
+#include "hw/sysbus.h"
 
 /*
  * XIVE2 Router (POWER10)
diff --git a/include/hw/ppc/xive2_regs.h b/include/hw/ppc/xive2_regs.h
index 14605bd458..b7adbdb7b9 100644
--- a/include/hw/ppc/xive2_regs.h
+++ b/include/hw/ppc/xive2_regs.h
@@ -10,6 +10,8 @@
 #ifndef PPC_XIVE2_REGS_H
 #define PPC_XIVE2_REGS_H
 
+#include "cpu.h"
+
 /*
  * Thread Interrupt Management Area (TIMA)
  *
-- 
2.37.3
Re: [PATCH 2/4] include/hw/ppc: Supply a few missing includes
Posted by Cédric Le Goater 3 years, 2 months ago 
On 12/10/22 12:21, Markus Armbruster wrote:
> A few headers neglect to include headers they need.  They compile only
> if something else includes the required header(s) first.  Fix that.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>


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

Thanks,

C.

> ---
>   include/hw/ppc/pnv_lpc.h    | 3 ++-
>   include/hw/ppc/pnv_occ.h    | 3 ++-
>   include/hw/ppc/pnv_pnor.h   | 2 +-
>   include/hw/ppc/pnv_sbe.h    | 3 ++-
>   include/hw/ppc/pnv_xscom.h  | 3 ++-
>   include/hw/ppc/xive2.h      | 2 ++
>   include/hw/ppc/xive2_regs.h | 2 ++
>   7 files changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
> index 8a8d1a3d42..001eee27d7 100644
> --- a/include/hw/ppc/pnv_lpc.h
> +++ b/include/hw/ppc/pnv_lpc.h
> @@ -20,7 +20,8 @@
>   #ifndef PPC_PNV_LPC_H
>   #define PPC_PNV_LPC_H
>   
> -#include "qom/object.h"
> +#include "exec/memory.h"
> +#include "hw/qdev-core.h"
>   
>   #define TYPE_PNV_LPC "pnv-lpc"
>   typedef struct PnvLpcClass PnvLpcClass;
> diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h
> index 90a81dae2b..df321244e3 100644
> --- a/include/hw/ppc/pnv_occ.h
> +++ b/include/hw/ppc/pnv_occ.h
> @@ -20,7 +20,8 @@
>   #ifndef PPC_PNV_OCC_H
>   #define PPC_PNV_OCC_H
>   
> -#include "qom/object.h"
> +#include "exec/memory.h"
> +#include "hw/qdev-core.h"
>   
>   #define TYPE_PNV_OCC "pnv-occ"
>   OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass,
> diff --git a/include/hw/ppc/pnv_pnor.h b/include/hw/ppc/pnv_pnor.h
> index bab2f79844..2e37ac88bf 100644
> --- a/include/hw/ppc/pnv_pnor.h
> +++ b/include/hw/ppc/pnv_pnor.h
> @@ -10,7 +10,7 @@
>   #ifndef PPC_PNV_PNOR_H
>   #define PPC_PNV_PNOR_H
>   
> -#include "qom/object.h"
> +#include "hw/sysbus.h"
>   
>   /*
>    * PNOR offset on the LPC FW address space
> diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h
> index f54a3ae9ba..b6b378ad14 100644
> --- a/include/hw/ppc/pnv_sbe.h
> +++ b/include/hw/ppc/pnv_sbe.h
> @@ -20,7 +20,8 @@
>   #ifndef PPC_PNV_SBE_H
>   #define PPC_PNV_SBE_H
>   
> -#include "qom/object.h"
> +#include "exec/memory.h"
> +#include "hw/qdev-core.h"
>   
>   #define TYPE_PNV_SBE "pnv-sbe"
>   OBJECT_DECLARE_TYPE(PnvSBE, PnvSBEClass, PNV_SBE)
> diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
> index c6e9ef8dd2..cbe848d27b 100644
> --- a/include/hw/ppc/pnv_xscom.h
> +++ b/include/hw/ppc/pnv_xscom.h
> @@ -20,7 +20,8 @@
>   #ifndef PPC_PNV_XSCOM_H
>   #define PPC_PNV_XSCOM_H
>   
> -#include "qom/object.h"
> +#include "exec/memory.h"
> +#include "hw/ppc/pnv.h"
>   
>   typedef struct PnvXScomInterface PnvXScomInterface;
>   
> diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h
> index e9e3ea135e..ab68f8d157 100644
> --- a/include/hw/ppc/xive2.h
> +++ b/include/hw/ppc/xive2.h
> @@ -11,7 +11,9 @@
>   #ifndef PPC_XIVE2_H
>   #define PPC_XIVE2_H
>   
> +#include "hw/ppc/xive.h"
>   #include "hw/ppc/xive2_regs.h"
> +#include "hw/sysbus.h"
>   
>   /*
>    * XIVE2 Router (POWER10)
> diff --git a/include/hw/ppc/xive2_regs.h b/include/hw/ppc/xive2_regs.h
> index 14605bd458..b7adbdb7b9 100644
> --- a/include/hw/ppc/xive2_regs.h
> +++ b/include/hw/ppc/xive2_regs.h
> @@ -10,6 +10,8 @@
>   #ifndef PPC_XIVE2_REGS_H
>   #define PPC_XIVE2_REGS_H
>   
> +#include "cpu.h"
> +
>   /*
>    * Thread Interrupt Management Area (TIMA)
>    *

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.