include/hw: Do not include "hw/registerfields.h" in headers that don't need it

[PATCH] include/hw: Do not include "hw/registerfields.h" in headers that don't need it

Posted by Thomas Huth 1 year, 2 months ago

Include "hw/registerfields.h" in the .c files instead (if needed).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 include/hw/arm/smmuv3.h        | 1 -
 include/hw/char/ibex_uart.h    | 1 -
 include/hw/ssi/ibex_spi_host.h | 1 -
 hw/char/ibex_uart.c            | 1 +
 hw/ssi/ibex_spi_host.c         | 1 +
 5 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/hw/arm/smmuv3.h b/include/hw/arm/smmuv3.h
index f1921fdf9e..b6dd087526 100644
--- a/include/hw/arm/smmuv3.h
+++ b/include/hw/arm/smmuv3.h
@@ -20,7 +20,6 @@
 #define HW_ARM_SMMUV3_H
 
 #include "hw/arm/smmu-common.h"
-#include "hw/registerfields.h"
 #include "qom/object.h"
 
 #define TYPE_SMMUV3_IOMMU_MEMORY_REGION "smmuv3-iommu-memory-region"
diff --git a/include/hw/char/ibex_uart.h b/include/hw/char/ibex_uart.h
index a39985516a..9deadf223b 100644
--- a/include/hw/char/ibex_uart.h
+++ b/include/hw/char/ibex_uart.h
@@ -26,7 +26,6 @@
 #define HW_IBEX_UART_H
 
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
 #include "chardev/char-fe.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
diff --git a/include/hw/ssi/ibex_spi_host.h b/include/hw/ssi/ibex_spi_host.h
index 1f6d077766..8089cc1c31 100644
--- a/include/hw/ssi/ibex_spi_host.h
+++ b/include/hw/ssi/ibex_spi_host.h
@@ -32,7 +32,6 @@
 #include "hw/ssi/ssi.h"
 #include "qemu/fifo8.h"
 #include "qom/object.h"
-#include "hw/registerfields.h"
 #include "qemu/timer.h"
 
 #define TYPE_IBEX_SPI_HOST "ibex-spi"
diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c
index e58181fcf4..f70adb5308 100644
--- a/hw/char/ibex_uart.c
+++ b/hw/char/ibex_uart.c
@@ -31,6 +31,7 @@
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
+#include "hw/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c
index 57df462e3c..1ee7d88c22 100644
--- a/hw/ssi/ibex_spi_host.c
+++ b/hw/ssi/ibex_spi_host.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
+#include "hw/registerfields.h"
 #include "hw/ssi/ibex_spi_host.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
-- 
2.31.1

Re: [PATCH] include/hw: Do not include "hw/registerfields.h" in headers that don't need it

Posted by Philippe Mathieu-Daudé 1 year, 2 months ago

On 10/2/23 12:23, Thomas Huth wrote:
> Include "hw/registerfields.h" in the .c files instead (if needed).
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   include/hw/arm/smmuv3.h        | 1 -
>   include/hw/char/ibex_uart.h    | 1 -
>   include/hw/ssi/ibex_spi_host.h | 1 -
>   hw/char/ibex_uart.c            | 1 +
>   hw/ssi/ibex_spi_host.c         | 1 +
>   5 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/include/hw/arm/smmuv3.h b/include/hw/arm/smmuv3.h
> index f1921fdf9e..b6dd087526 100644
> --- a/include/hw/arm/smmuv3.h
> +++ b/include/hw/arm/smmuv3.h
> @@ -20,7 +20,6 @@
>   #define HW_ARM_SMMUV3_H
>   
>   #include "hw/arm/smmu-common.h"
> -#include "hw/registerfields.h"

Never required.

>   #define TYPE_SMMUV3_IOMMU_MEMORY_REGION "smmuv3-iommu-memory-region"
> diff --git a/include/hw/char/ibex_uart.h b/include/hw/char/ibex_uart.h
> index a39985516a..9deadf223b 100644
> --- a/include/hw/char/ibex_uart.h
> +++ b/include/hw/char/ibex_uart.h
> @@ -26,7 +26,6 @@
>   #define HW_IBEX_UART_H
>   
>   #include "hw/sysbus.h"
> -#include "hw/registerfields.h"

Missed in bdc36ce649 ("hw/char/ibex_uart: Make the register layout 
private").

>   #include "chardev/char-fe.h"
>   #include "qemu/timer.h"
>   #include "qom/object.h"
> diff --git a/include/hw/ssi/ibex_spi_host.h b/include/hw/ssi/ibex_spi_host.h
> index 1f6d077766..8089cc1c31 100644
> --- a/include/hw/ssi/ibex_spi_host.h
> +++ b/include/hw/ssi/ibex_spi_host.h
> @@ -32,7 +32,6 @@
>   #include "hw/ssi/ssi.h"
>   #include "qemu/fifo8.h"
>   #include "qom/object.h"
> -#include "hw/registerfields.h"

Never required.

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