[PATCH 0/2] Cleanup unused included header in core.c & cluster.c

[PATCH 0/2] Cleanup unused included header in core.c & cluster.c

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Remove unused header in core.c and cluster.c, and reorder the remaining
header files (except qemu/osdep.h) in alphabetical order.

Tested by "./configure" and then "make".

---
Zhao Liu (2):
  hw/cpu/core: Cleanup unused included header in core.c
  hw/cpu/cluster: Cleanup unused included header in cluster.c

 hw/cpu/cluster.c | 5 ++---
 hw/cpu/core.c    | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

-- 
2.34.1

[PATCH 1/2] hw/cpu/core: Cleanup unused included header in core.c

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Remove unused header (qemu/module.h and sysemu/cpus.h) in core.c,
and reorder the remaining header files (except qemu/osdep.h) in
alphabetical order.

Tested by "./configure" and then "make".

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/cpu/core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/cpu/core.c b/hw/cpu/core.c
index 987607515574..495a5c30ffe1 100644
--- a/hw/cpu/core.c
+++ b/hw/cpu/core.c
@@ -8,12 +8,11 @@
  */
 
 #include "qemu/osdep.h"
+
+#include "hw/boards.h"
 #include "hw/cpu/core.h"
-#include "qapi/visitor.h"
-#include "qemu/module.h"
 #include "qapi/error.h"
-#include "sysemu/cpus.h"
-#include "hw/boards.h"
+#include "qapi/visitor.h"
 
 static void core_prop_get_core_id(Object *obj, Visitor *v, const char *name,
                                   void *opaque, Error **errp)
-- 
2.34.1

Re: [PATCH 1/2] hw/cpu/core: Cleanup unused included header in core.c

[Philippe Mathieu-Daudé]

On 27/11/23 15:56, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Remove unused header (qemu/module.h and sysemu/cpus.h) in core.c,
> and reorder the remaining header files (except qemu/osdep.h) in
> alphabetical order.
> 
> Tested by "./configure" and then "make".
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/cpu/core.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)

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

[PATCH 2/2] hw/cpu/cluster: Cleanup unused included header in cluster.c

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Remove unused header (qemu/module.h and qemu/cutils.h) in cluster.c,
and reorder the remaining header files (except qemu/osdep.h) in
alphabetical order.

Tested by "./configure" and then "make".

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/cpu/cluster.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index e444b7c29d1b..61289a840d46 100644
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -19,12 +19,11 @@
  */
 
 #include "qemu/osdep.h"
+
+#include "hw/core/cpu.h"
 #include "hw/cpu/cluster.h"
 #include "hw/qdev-properties.h"
-#include "hw/core/cpu.h"
 #include "qapi/error.h"
-#include "qemu/module.h"
-#include "qemu/cutils.h"
 
 static Property cpu_cluster_properties[] = {
     DEFINE_PROP_UINT32("cluster-id", CPUClusterState, cluster_id, 0),
-- 
2.34.1

Re: [PATCH 2/2] hw/cpu/cluster: Cleanup unused included header in cluster.c

[Philippe Mathieu-Daudé]

On 27/11/23 15:56, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Remove unused header (qemu/module.h and qemu/cutils.h) in cluster.c,
> and reorder the remaining header files (except qemu/osdep.h) in
> alphabetical order.
> 
> Tested by "./configure" and then "make".
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/cpu/cluster.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)

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

Re: [PATCH 2/2] hw/cpu/cluster: Cleanup unused included header in cluster.c

[Zhao Liu]

On Tue, Nov 28, 2023 at 11:02:00AM +0100, Philippe Mathieu-Daudé wrote:
> Date: Tue, 28 Nov 2023 11:02:00 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: Re: [PATCH 2/2] hw/cpu/cluster: Cleanup unused included header in
>  cluster.c
> 
> On 27/11/23 15:56, Zhao Liu wrote:
> > From: Zhao Liu <zhao1.liu@intel.com>
> > 
> > Remove unused header (qemu/module.h and qemu/cutils.h) in cluster.c,
> > and reorder the remaining header files (except qemu/osdep.h) in
> > alphabetical order.
> > 
> > Tested by "./configure" and then "make".
> > 
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> >   hw/cpu/cluster.c | 5 ++---
> >   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>

Thanks Philippe!

BTW, could these two patches be merged into your next tree?

I also find these 2 headers are included in many cases, maybe I can go
further and do a more thorough cleaning.

Regards,
Zhao