Re: [Qemu-devel] [PATCH 3/8] sun4m: remove include/hw/sparc/sun4m.h and all references to it

[Philippe Mathieu-Daudé]

On 11/26/2017 10:35 AM, Mark Cave-Ayland wrote:
> With the previous commit there is now nothing left in sun4m.h so it can be
> removed, along with all remaining references to it.

Nice!

> 
> Signed-off-by: Mark Cave-Ayland <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  hw/dma/sparc32_dma.c     |    1 -
>  hw/intc/slavio_intctl.c  |    1 -
>  hw/net/lance.c           |    2 +-
>  hw/sparc/sun4m.c         |    1 -
>  hw/sparc/sun4m_iommu.c   |    1 -
>  hw/timer/slavio_timer.c  |    1 -
>  include/hw/sparc/sun4m.h |   14 --------------
>  7 files changed, 1 insertion(+), 20 deletions(-)
>  delete mode 100644 include/hw/sparc/sun4m.h
> 
> diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
> index c04ad79..7b00a27 100644
> --- a/hw/dma/sparc32_dma.c
> +++ b/hw/dma/sparc32_dma.c
> @@ -28,7 +28,6 @@
>  #include "qemu/osdep.h"
>  #include "hw/hw.h"
>  #include "hw/sparc/sparc32_dma.h"
> -#include "hw/sparc/sun4m.h"
>  #include "hw/sparc/sun4m_iommu.h"
>  #include "hw/sysbus.h"
>  #include "sysemu/dma.h"
> diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c
> index 84e0bee..817e026 100644
> --- a/hw/intc/slavio_intctl.c
> +++ b/hw/intc/slavio_intctl.c
> @@ -23,7 +23,6 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "hw/sparc/sun4m.h"
>  #include "monitor/monitor.h"
>  #include "hw/sysbus.h"
>  #include "hw/intc/intc.h"
> diff --git a/hw/net/lance.c b/hw/net/lance.c
> index 23929fd..0028bc5 100644
> --- a/hw/net/lance.c
> +++ b/hw/net/lance.c
> @@ -40,7 +40,7 @@
>  #include "net/net.h"
>  #include "qemu/timer.h"
>  #include "qemu/sockets.h"
> -#include "hw/sparc/sun4m.h"
> +#include "hw/sparc/sparc32_dma.h"
>  #include "hw/net/lance.h"
>  #include "trace.h"
>  #include "sysemu/sysemu.h"
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index a3ba92f..9723d6f 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -28,7 +28,6 @@
>  #include "hw/sysbus.h"
>  #include "qemu/error-report.h"
>  #include "qemu/timer.h"
> -#include "hw/sparc/sun4m.h"
>  #include "hw/sparc/sun4m_iommu.h"
>  #include "hw/timer/m48t59.h"
>  #include "hw/sparc/sparc32_dma.h"
> diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
> index 311c82d..b677601 100644
> --- a/hw/sparc/sun4m_iommu.c
> +++ b/hw/sparc/sun4m_iommu.c
> @@ -23,7 +23,6 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "hw/sparc/sun4m.h"
>  #include "hw/sparc/sun4m_iommu.h"
>  #include "hw/sysbus.h"
>  #include "exec/address-spaces.h"
> diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
> index a8cc9c0..4694b65 100644
> --- a/hw/timer/slavio_timer.c
> +++ b/hw/timer/slavio_timer.c
> @@ -23,7 +23,6 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "hw/sparc/sun4m.h"
>  #include "qemu/timer.h"
>  #include "hw/ptimer.h"
>  #include "hw/sysbus.h"
> diff --git a/include/hw/sparc/sun4m.h b/include/hw/sparc/sun4m.h
> deleted file mode 100644
> index 9e06467..0000000
> --- a/include/hw/sparc/sun4m.h
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -#ifndef SUN4M_H
> -#define SUN4M_H
> -
> -#include "qemu-common.h"
> -#include "exec/hwaddr.h"
> -#include "qapi/qmp/types.h"
> -#include "hw/sysbus.h"
> -
> -/* Devices used by sparc32 system.  */
> -
> -/* sparc32_dma.c */
> -#include "hw/sparc/sparc32_dma.h"
> -
> -#endif
>