[PATCH v2 0/9] hw/core: Cleanup and reorder headers

[PATCH v2 0/9] hw/core: Cleanup and reorder headers

[Zhao Liu]

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

Identify unused headers by full compilation (tested by "./configure" and
then "make") and manually checking if it is a direct inclusion.

Then reorder headers in alphabetical order.

In addition, update a file entry in MAINTAINERS file.

---
Changelog:

v1: Per Peter and Philippe's comments in v1, keep directly included
    headers to avoid implicit header inclusions [1].

[1]: https://lore.kernel.org/qemu-devel/06d4179f-76b8-42f0-b147-f4bc2d1f06bd@linaro.org/#t

---
Zhao Liu (9):
  MAINTAINERS: Update hw/core/cpu.c entry
  hw/core: Cleanup unused included headers in cpu-common.c
  hw/core: Reorder included headers in cpu-common.c
  hw/core: Reorder included headers in cpu-sysemu.c
  hw/core: Cleanup unused included header in machine-qmp-cmds.c
  hw/core: Reorder included header in machine.c
  hw/core: Reorder included headers in null-machine.c
  hw/core: Cleanup unused included headers in numa.c
  hw/core: Reorder included headers in numa.c

 MAINTAINERS                |  3 ++-
 hw/core/cpu-common.c       | 17 +++++++----------
 hw/core/cpu-sysemu.c       |  3 ++-
 hw/core/machine-qmp-cmds.c |  2 +-
 hw/core/machine.c          | 21 +++++++++++----------
 hw/core/null-machine.c     |  5 +++--
 hw/core/numa.c             | 22 ++++++++++------------
 7 files changed, 36 insertions(+), 37 deletions(-)

-- 
2.34.1

[PATCH v2 1/9] MAINTAINERS: Update hw/core/cpu.c entry

[Zhao Liu]

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

The hw/core/cpu.c was split as hw/core/cpu-common.c and
hw/core/cpu-sysemu.c in the commit df4fd7d5c8a3 ("cpu: Split as
cpu-common / cpu-sysemu").

Update the related entry.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b406fb20c059..529313eba27e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1867,7 +1867,8 @@ M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
 R: Philippe Mathieu-Daudé <philmd@linaro.org>
 R: Yanan Wang <wangyanan55@huawei.com>
 S: Supported
-F: hw/core/cpu.c
+F: hw/core/cpu-common.c
+F: hw/core/cpu-sysemu.c
 F: hw/core/machine-qmp-cmds.c
 F: hw/core/machine.c
 F: hw/core/machine-smp.c
-- 
2.34.1

[PATCH v2 2/9] hw/core: Cleanup unused included headers in cpu-common.c

[Zhao Liu]

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

Remove unused headers in cpu-common.c:
* qemu/notify.h
* exec/cpu-common.h
* qemu/error-report.h
* qemu/qemu-print.h

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

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

diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
index 3ccfe882e2c3..a27f0e4cf216 100644
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -22,13 +22,9 @@
 #include "qapi/error.h"
 #include "hw/core/cpu.h"
 #include "sysemu/hw_accel.h"
-#include "qemu/notify.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "exec/log.h"
-#include "exec/cpu-common.h"
-#include "qemu/error-report.h"
-#include "qemu/qemu-print.h"
 #include "sysemu/tcg.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
-- 
2.34.1

[PATCH v2 3/9] hw/core: Reorder included headers in cpu-common.c

[Zhao Liu]

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

Reorder the 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/core/cpu-common.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
index a27f0e4cf216..23fc58462ffd 100644
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -19,17 +19,18 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
+
+#include "exec/log.h"
+#include "hw/boards.h"
 #include "hw/core/cpu.h"
-#include "sysemu/hw_accel.h"
+#include "hw/qdev-properties.h"
+#include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
-#include "exec/log.h"
+#include "qemu/plugin.h"
+#include "sysemu/hw_accel.h"
 #include "sysemu/tcg.h"
-#include "hw/boards.h"
-#include "hw/qdev-properties.h"
 #include "trace.h"
-#include "qemu/plugin.h"
 
 CPUState *cpu_by_arch_id(int64_t id)
 {
-- 
2.34.1

[PATCH v2 4/9] hw/core: Reorder included headers in cpu-sysemu.c

[Zhao Liu]

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

Reorder the 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/core/cpu-sysemu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/core/cpu-sysemu.c b/hw/core/cpu-sysemu.c
index d0d6a910f97c..c2cb05830076 100644
--- a/hw/core/cpu-sysemu.c
+++ b/hw/core/cpu-sysemu.c
@@ -19,9 +19,10 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
+
 #include "hw/core/cpu.h"
 #include "hw/core/sysemu-cpu-ops.h"
+#include "qapi/error.h"
 
 bool cpu_paging_enabled(const CPUState *cpu)
 {
-- 
2.34.1

[PATCH v2 5/9] hw/core: Cleanup unused included header in machine-qmp-cmds.c

[Zhao Liu]

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

Remove unused header (qemu/main-loop.h) in machine-qmp-cmds.c.

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

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/core/machine-qmp-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 3860a50c3b7b..ba629379dd92 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+
 #include "hw/acpi/vmgenid.h"
 #include "hw/boards.h"
 #include "hw/intc/intc.h"
@@ -19,7 +20,6 @@
 #include "qapi/qmp/qobject.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/type-helpers.h"
-#include "qemu/main-loop.h"
 #include "qemu/uuid.h"
 #include "qom/qom-qobject.h"
 #include "sysemu/hostmem.h"
-- 
2.34.1

[PATCH v2 6/9] hw/core: Reorder included header in machine.c

[Zhao Liu]

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

Reorder the 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/core/machine.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index fb5afdcae4cc..00f2f24ee79e 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -11,26 +11,27 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/accel.h"
-#include "sysemu/replay.h"
+
+#include "audio/audio.h"
+#include "exec/confidential-guest-support.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
+#include "hw/mem/nvdimm.h"
+#include "hw/pci/pci_bridge.h"
+#include "hw/virtio/virtio-net.h"
+#include "hw/virtio/virtio-pci.h"
+#include "migration/global_state.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-machine.h"
+#include "qemu/accel.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/cpus.h"
+#include "sysemu/qtest.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/replay.h"
 #include "sysemu/reset.h"
 #include "sysemu/runstate.h"
 #include "sysemu/xen.h"
-#include "sysemu/qtest.h"
-#include "hw/pci/pci_bridge.h"
-#include "hw/mem/nvdimm.h"
-#include "migration/global_state.h"
-#include "exec/confidential-guest-support.h"
-#include "hw/virtio/virtio-pci.h"
-#include "hw/virtio/virtio-net.h"
-#include "audio/audio.h"
 
 GlobalProperty hw_compat_8_2[] = {};
 const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2);
-- 
2.34.1

[PATCH v2 7/9] hw/core: Reorder included headers in null-machine.c

[Zhao Liu]

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

Reorder the 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/core/null-machine.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index f586a4bef543..ef7e95a09ad0 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -12,10 +12,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/error-report.h"
-#include "hw/boards.h"
+
 #include "exec/address-spaces.h"
+#include "hw/boards.h"
 #include "hw/core/cpu.h"
+#include "qemu/error-report.h"
 
 static void machine_none_init(MachineState *mch)
 {
-- 
2.34.1

[PATCH v2 8/9] hw/core: Cleanup unused included headers in numa.c

[Zhao Liu]

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

Remove unused header in numa.c:
* qemu/bitmap.h
* hw/core/cpu.h
* migration/vmstate.h

Note: Though parse_numa_hmat_lb() has the variable named "bitmap_copy",
it doesn't use the normal bitmap ops so that it's safe to exclude
qemu/bitmap.h header.

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

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

diff --git a/hw/core/numa.c b/hw/core/numa.c
index f08956ddb0ff..05c5e1b8514c 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -28,15 +28,12 @@
 #include "sysemu/numa.h"
 #include "exec/cpu-common.h"
 #include "exec/ramlist.h"
-#include "qemu/bitmap.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "qapi/qapi-visit-machine.h"
 #include "sysemu/qtest.h"
-#include "hw/core/cpu.h"
 #include "hw/mem/pc-dimm.h"
-#include "migration/vmstate.h"
 #include "hw/boards.h"
 #include "hw/mem/memory-device.h"
 #include "qemu/option.h"
-- 
2.34.1

[PATCH v2 9/9] hw/core: Reorder included headers in numa.c

[Zhao Liu]

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

Reorder the 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/core/numa.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/hw/core/numa.c b/hw/core/numa.c
index 05c5e1b8514c..778d2a16d2f1 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -23,22 +23,23 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/units.h"
-#include "sysemu/hostmem.h"
-#include "sysemu/numa.h"
+
 #include "exec/cpu-common.h"
 #include "exec/ramlist.h"
-#include "qemu/error-report.h"
+#include "hw/boards.h"
+#include "hw/mem/memory-device.h"
+#include "hw/mem/pc-dimm.h"
+#include "sysemu/hostmem.h"
+#include "sysemu/numa.h"
+#include "sysemu/qtest.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "qapi/qapi-visit-machine.h"
-#include "sysemu/qtest.h"
-#include "hw/mem/pc-dimm.h"
-#include "hw/boards.h"
-#include "hw/mem/memory-device.h"
-#include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/cutils.h"
+#include "qemu/error-report.h"
+#include "qemu/option.h"
+#include "qemu/units.h"
 
 QemuOptsList qemu_numa_opts = {
     .name = "numa",
-- 
2.34.1

Re: [PATCH v2 0/9] hw/core: Cleanup and reorder headers

[Zhao Liu]

Hi Philippe,

Thanks for picking the 1st patch. Could you take time for further review
on other patches?

Thanks,
Zhao

On Tue, Jan 16, 2024 at 03:46:38PM +0800, Zhao Liu wrote:
> Date: Tue, 16 Jan 2024 15:46:38 +0800
> From: Zhao Liu <zhao1.liu@linux.intel.com>
> Subject: [PATCH v2 0/9] hw/core: Cleanup and reorder headers
> X-Mailer: git-send-email 2.34.1
> 
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Identify unused headers by full compilation (tested by "./configure" and
> then "make") and manually checking if it is a direct inclusion.
> 
> Then reorder headers in alphabetical order.
> 
> In addition, update a file entry in MAINTAINERS file.
> 
> ---
> Changelog:
> 
> v1: Per Peter and Philippe's comments in v1, keep directly included
>     headers to avoid implicit header inclusions [1].
> 
> [1]: https://lore.kernel.org/qemu-devel/06d4179f-76b8-42f0-b147-f4bc2d1f06bd@linaro.org/#t
> 
> ---
> Zhao Liu (9):
>   MAINTAINERS: Update hw/core/cpu.c entry
>   hw/core: Cleanup unused included headers in cpu-common.c
>   hw/core: Reorder included headers in cpu-common.c
>   hw/core: Reorder included headers in cpu-sysemu.c
>   hw/core: Cleanup unused included header in machine-qmp-cmds.c
>   hw/core: Reorder included header in machine.c
>   hw/core: Reorder included headers in null-machine.c
>   hw/core: Cleanup unused included headers in numa.c
>   hw/core: Reorder included headers in numa.c
> 
>  MAINTAINERS                |  3 ++-
>  hw/core/cpu-common.c       | 17 +++++++----------
>  hw/core/cpu-sysemu.c       |  3 ++-
>  hw/core/machine-qmp-cmds.c |  2 +-
>  hw/core/machine.c          | 21 +++++++++++----------
>  hw/core/null-machine.c     |  5 +++--
>  hw/core/numa.c             | 22 ++++++++++------------
>  7 files changed, 36 insertions(+), 37 deletions(-)
> 
> -- 
> 2.34.1
> 
>