Clean up inclusion of exec/cpu-common.h

migration/qemu-file.h neglects to include it even though it needs
ram_addr_t.  Fix that.  Drop a few superfluous inclusions elsewhere.

Signed-off-by: Markus Armbruster <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <20190812052359[email protected]>

diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c
index 76ae461749ec531c310a6722783c51ce90064f3d..e2d23edafe04e5bbe8b9953363c58e0443445841 100644 (file)
--- a/accel/stubs/tcg-stub.c
+++ b/accel/stubs/tcg-stub.c
@@ -14,7 +14,6 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "tcg/tcg.h"
-#include "exec/cpu-common.h"
 #include "exec/exec-all.h"
 
 void tb_flush(CPUState *cpu)

diff --git a/balloon.c b/balloon.c
index 914b3662db39d6e825dbf8b19873935ff52f8af4..f104b42961b08dc5c4407178ea20f5cc382fcc51 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -26,7 +26,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/atomic.h"
-#include "exec/cpu-common.h"
 #include "sysemu/kvm.h"
 #include "sysemu/balloon.h"
 #include "trace-root.h"

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 7bcd67b098e91a0e724b77b224c12d60ef7266e9..11d476c4a2cbdabc546c02b4f076c81dba72c120 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -28,7 +28,6 @@
 #include "hw/firmware/smbios.h"
 #include "hw/loader.h"
 #include "hw/boards.h"
-#include "exec/cpu-common.h"
 #include "smbios_build.h"
 
 /* legacy structures and constants for <= 2.0 machines */

diff --git a/include/hw/hw.h b/include/hw/hw.h
index 38d2fb1f40102324df0660b6d1f713dddb10b994..86ff26b7122f905d49835bfb6603449040c0dcb4 100644 (file)
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -6,7 +6,6 @@
 #error Cannot include hw/hw.h from user emulation
 #endif
 
-#include "exec/cpu-common.h"
 #include "qom/object.h"
 #include "exec/memory.h"
 #include "migration/vmstate.h"

diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h
index 90f8866138e867ec8e72afce55cb72371e8c043d..7d822590513d224034b6e8ee34b89f875c882cfc 100644 (file)
--- a/include/hw/ppc/ppc4xx.h
+++ b/include/hw/ppc/ppc4xx.h
@@ -26,7 +26,6 @@
 #define PPC4XX_H
 
 #include "hw/ppc/ppc.h"
-#include "exec/cpu-common.h"
 #include "exec/memory.h"
 
 /* PowerPC 4xx core initialization */

diff --git a/include/migration/misc.h b/include/migration/misc.h
index 5cdbabd09404eb5fbb1d7d7174d6711853bf5f54..b9d8e787af71830a3a50ffd4bf6d279337580bee 100644 (file)
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -14,7 +14,6 @@
 #ifndef MIGRATION_MISC_H
 #define MIGRATION_MISC_H
 
-#include "exec/cpu-common.h"
 #include "qemu/notify.h"
 #include "qapi/qapi-types-net.h"
 

diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h
index 787dbc7770e6726723648d5d535c4b2c296bc588..5d341cc29ba40831cd70fd923858ad89139c271e 100644 (file)
--- a/include/sysemu/kvm_int.h
+++ b/include/sysemu/kvm_int.h
@@ -9,7 +9,6 @@
 #ifndef QEMU_KVM_INT_H
 #define QEMU_KVM_INT_H
 
-#include "exec/cpu-common.h"
 #include "exec/memory.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/accel.h"

diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
index 1b440df486fef8c22228a0d2e1fa3f318e398dc2..4b20f1a639e1a9d75b243fdb44bc018cd0bb87d2 100644 (file)
--- a/include/sysemu/memory_mapping.h
+++ b/include/sysemu/memory_mapping.h
@@ -15,7 +15,6 @@
 #define MEMORY_MAPPING_H
 
 #include "qemu/queue.h"
-#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/memory.h"
 

diff --git a/migration/migration.h b/migration/migration.h
index 1fdd7b21fd4923b87e00c84fa3c94d1f261b3607..26f01d00f6957e2f80454288c4d21719f8c24952 100644 (file)
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -16,7 +16,6 @@
 
 #include "qapi/qapi-types-migration.h"
 #include "qemu/thread.h"
-#include "exec/cpu-common.h"
 #include "qemu/coroutine_int.h"
 #include "hw/qdev.h"
 #include "io/channel.h"

diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index 8e639eb496f7cb9688145456280f09b4e04f07fb..78ef2488209dd9aed81aa510f35d15f05df89d55 100644 (file)
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-file-channel.h"
-#include "exec/cpu-common.h"
 #include "qemu-file.h"
 #include "io/channel-socket.h"
 #include "qemu/iov.h"

diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index 13baf896bd2f182bad7fc0fa96ca35930d3715c2..21f3ae4be2d099d6139fac8c1532f89d262c712e 100644 (file)
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -26,6 +26,7 @@
 #define MIGRATION_QEMU_FILE_H
 
 #include <zlib.h>
+#include "exec/cpu-common.h"
 
 /* Read a chunk of data from a file at the given position.  The pos argument
  * can be ignored if the file is only be used for streaming.  The number of

diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index 845f4649ee4a6f78ecd149a990d96a61d5b38ede..bee658a1b25680239a535f9f9fb36b328660c970 100644 (file)
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "exec/cpu-common.h"
 #include "qemu-file.h"
 #include "migration.h"
 #include "migration/vmstate.h"

diff --git a/qom/cpu.c b/qom/cpu.c
index f376f782d8395de4e2b273a72173b87a341cf82e..fdc1af8f40530702cfd20988d878852330951bd7 100644 (file)
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -25,7 +25,6 @@
 #include "qemu/notify.h"
 #include "qemu/log.h"
 #include "exec/log.h"
-#include "exec/cpu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/qemu-print.h"
 #include "sysemu/sysemu.h"

diff --git a/tcg/optimize.c b/tcg/optimize.c
index d2424de4af112b7c2a355e07ec7adb4525e21334..cee2a36a604e8f80123c3ff43ce2ce9dd9eea242 100644 (file)
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -24,7 +24,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "exec/cpu-common.h"
 #include "tcg-op.h"
 
 #define CASE_OP_32_64(x)                        \

diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
index 907d58d0f0d60dd1b502277ca3da4141f7fa53a2..97305a3efc14536e31e1cf7d06122686e8ec9d64 100644 (file)
--- a/tcg/tcg-common.c
+++ b/tcg/tcg-common.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "exec/cpu-common.h"
 #include "tcg/tcg.h"
 
 #if defined(CONFIG_TCG_INTERPRETER)

diff --git a/tcg/tcg.c b/tcg/tcg.c
index be2c33c400cf0f9a479d2a6664035948281872e3..2db83ce2e87f09197d0361e5b08ecc2b118de5b2 100644 (file)
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -42,7 +42,6 @@
 #define NO_CPU_IO_DEFS
 #include "cpu.h"
 
-#include "exec/cpu-common.h"
 #include "exec/exec-all.h"
 
 #if !defined(CONFIG_USER_ONLY)