Remove inclusion of hw/hw.h from files that don't need it

[PATCH] Remove inclusion of hw/hw.h from files that don't need it

Posted by Thomas Huth 10 months, 1 week ago

hw/hw.h only contains the prototype of hw_error() nowadays, so
files that don't use this function don't need to include this
header.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 include/hw/misc/xlnx-cfi-if.h | 1 -
 hw/misc/edu.c                 | 1 -
 hw/vfio/container.c           | 1 -
 3 files changed, 3 deletions(-)

diff --git a/include/hw/misc/xlnx-cfi-if.h b/include/hw/misc/xlnx-cfi-if.h
index f9bd12292d..5010401517 100644
--- a/include/hw/misc/xlnx-cfi-if.h
+++ b/include/hw/misc/xlnx-cfi-if.h
@@ -11,7 +11,6 @@
 #define XLNX_CFI_IF_H 1
 
 #include "qemu/help-texts.h"
-#include "hw/hw.h"
 #include "qom/object.h"
 
 #define TYPE_XLNX_CFI_IF "xlnx-cfi-if"
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index fa052c44db..504178b4a2 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -26,7 +26,6 @@
 #include "qemu/log.h"
 #include "qemu/units.h"
 #include "hw/pci/pci.h"
-#include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 2e7ecdf10e..88ede913d6 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -26,7 +26,6 @@
 #include "exec/address-spaces.h"
 #include "exec/memory.h"
 #include "exec/ram_addr.h"
-#include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "qemu/range.h"
 #include "sysemu/reset.h"
-- 
2.45.2

Re: [PATCH] Remove inclusion of hw/hw.h from files that don't need it

Posted by Philippe Mathieu-Daudé 10 months, 1 week ago

On 1/7/24 15:26, Thomas Huth wrote:
> hw/hw.h only contains the prototype of hw_error() nowadays, so
> files that don't use this function don't need to include this
> header.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   include/hw/misc/xlnx-cfi-if.h | 1 -
>   hw/misc/edu.c                 | 1 -
>   hw/vfio/container.c           | 1 -
>   3 files changed, 3 deletions(-)

Thanks, patch queued.

Re: [PATCH] Remove inclusion of hw/hw.h from files that don't need it

Posted by Cédric Le Goater 10 months, 1 week ago

On 7/1/24 3:26 PM, Thomas Huth wrote:
> hw/hw.h only contains the prototype of hw_error() nowadays, so
> files that don't use this function don't need to include this
> header.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   include/hw/misc/xlnx-cfi-if.h | 1 -
>   hw/misc/edu.c                 | 1 -
>   hw/vfio/container.c           | 1 -
>   3 files changed, 3 deletions(-)
> 
> diff --git a/include/hw/misc/xlnx-cfi-if.h b/include/hw/misc/xlnx-cfi-if.h
> index f9bd12292d..5010401517 100644
> --- a/include/hw/misc/xlnx-cfi-if.h
> +++ b/include/hw/misc/xlnx-cfi-if.h
> @@ -11,7 +11,6 @@
>   #define XLNX_CFI_IF_H 1
>   
>   #include "qemu/help-texts.h"
> -#include "hw/hw.h"
>   #include "qom/object.h"
>   
>   #define TYPE_XLNX_CFI_IF "xlnx-cfi-if"
> diff --git a/hw/misc/edu.c b/hw/misc/edu.c
> index fa052c44db..504178b4a2 100644
> --- a/hw/misc/edu.c
> +++ b/hw/misc/edu.c
> @@ -26,7 +26,6 @@
>   #include "qemu/log.h"
>   #include "qemu/units.h"
>   #include "hw/pci/pci.h"
> -#include "hw/hw.h"
>   #include "hw/pci/msi.h"
>   #include "qemu/timer.h"
>   #include "qom/object.h"
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 2e7ecdf10e..88ede913d6 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -26,7 +26,6 @@
>   #include "exec/address-spaces.h"
>   #include "exec/memory.h"
>   #include "exec/ram_addr.h"
> -#include "hw/hw.h"
>   #include "qemu/error-report.h"
>   #include "qemu/range.h"
>   #include "sysemu/reset.h"



Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.

Re: [PATCH] Remove inclusion of hw/hw.h from files that don't need it

Posted by Peter Maydell 10 months, 1 week ago

On Mon, 1 Jul 2024 at 14:27, Thomas Huth <thuth@redhat.com> wrote:
>
> hw/hw.h only contains the prototype of hw_error() nowadays, so
> files that don't use this function don't need to include this
> header.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM