qemu-timer: do not include sysemu/cpus.h from util/qemu-timer.h

This dependency is the wrong way, and we will need util/qemu-timer.h from
sysemu/cpus.h in the next patch.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/cpu-exec.c b/cpu-exec.c
index d04dd91ebd2390cfd8e40ef13acc3139906ddd0d..748cb66bca0e38bae44beb71fe72687d674d8a6f 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -33,6 +33,7 @@
 #if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
 #include "hw/i386/apic.h"
 #endif
+#include "sysemu/cpus.h"
 #include "sysemu/replay.h"
 
 /* -icount align implementation. */

diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 59ccb0055080f488c1df870e6cdaf5c8f845e2e9..7221c68a984e8b9e2480286d8f9da70e4f1021ec 100644 (file)
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -13,6 +13,7 @@
 #include "sysemu/replay.h"
 #include "sysemu/qtest.h"
 #include "block/aio.h"
+#include "sysemu/cpus.h"
 
 #define DELTA_ADJUST     1
 #define DELTA_NO_ADJUST -1

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 09f0d22defb8fda18969cb7764cddd12d89b3aa0..3fa722af82e60255b3748107788a4d27657dace5 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/numa.h"
+#include "sysemu/cpus.h"
 #include "hw/hw.h"
 #include "target/ppc/cpu.h"
 #include "qemu/log.h"

diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 26e628584c30762f804c6c59ceab0d482a8d478d..91cd8c8a84b6940d24a47d933ccc628fa0663763 100644 (file)
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -4,7 +4,6 @@
 #include "qemu-common.h"
 #include "qemu/notify.h"
 #include "qemu/host-utils.h"
-#include "sysemu/cpus.h"
 
 #define NANOSECONDS_PER_SECOND 1000000000LL
 

diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
index a73b5d4bce4687f9c02ff6461fba5a3c30da6714..e521a91661312885b79262856b2224e9cd190309 100644 (file)
--- a/include/sysemu/cpus.h
+++ b/include/sysemu/cpus.h
@@ -1,6 +1,8 @@
 #ifndef QEMU_CPUS_H
 #define QEMU_CPUS_H
 
+#include "qemu/timer.h"
+
 /* cpus.c */
 bool qemu_in_vcpu_thread(void);
 void qemu_init_cpu_loop(void);

diff --git a/kvm-all.c b/kvm-all.c
index 9040bd50a40345730ac34eed63aaa7db0efc4f08..90b8573656a2bfec72bb17b91c751e3a2d3df6f6 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -29,6 +29,7 @@
 #include "hw/s390x/adapter.h"
 #include "exec/gdbstub.h"
 #include "sysemu/kvm_int.h"
+#include "sysemu/cpus.h"
 #include "qemu/bswap.h"
 #include "exec/memory.h"
 #include "exec/ram_addr.h"

diff --git a/monitor.c b/monitor.c
index f11893e1c3be9133f174854c4cd8d064be0bec9b..be282ecb80fbcc44555bce60c0a2f072f7b3a581 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -77,6 +77,7 @@
 #include "qapi-event.h"
 #include "qmp-introspect.h"
 #include "sysemu/qtest.h"
+#include "sysemu/cpus.h"
 #include "qemu/cutils.h"
 #include "qapi/qmp/dispatch.h"
 

diff --git a/replay/replay.c b/replay/replay.c
index 1835b9902e952c5615311a00c63118e7dbaea92e..78e2a7e570472638284d816d2233445182a2b158 100644 (file)
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -16,6 +16,7 @@
 #include "replay-internal.h"
 #include "qemu/timer.h"
 #include "qemu/main-loop.h"
+#include "sysemu/cpus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 

diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index 055286a7b8ddb31f9372a381b0a1570eb2283a5b..df5d695344d060711662d2473ff56382edeb4314 100644 (file)
--- a/target/alpha/translate.c
+++ b/target/alpha/translate.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "sysemu/cpus.h"
 #include "disas/disas.h"
 #include "qemu/host-utils.h"
 #include "exec/exec-all.h"

diff --git a/translate-all.c b/translate-all.c
index 34480aebba5a7a404e1387146db644e4d614acaf..b3ee876526a814458ae6293f46c618df27e2ae41 100644 (file)
--- a/translate-all.c
+++ b/translate-all.c
@@ -57,6 +57,7 @@
 #include "qemu/timer.h"
 #include "qemu/main-loop.h"
 #include "exec/log.h"
+#include "sysemu/cpus.h"
 
 /* #define DEBUG_TB_INVALIDATE */
 /* #define DEBUG_TB_FLUSH */

diff --git a/util/main-loop.c b/util/main-loop.c
index ca7bb072f94f09947cfa4b5385203313a05f5d90..7efc229e3dfb47ca3a7f5ccbbd2df78dcc5341e7 100644 (file)
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -28,6 +28,7 @@
 #include "qemu/timer.h"
 #include "qemu/sockets.h"      // struct in_addr needed for libslirp.h
 #include "sysemu/qtest.h"
+#include "sysemu/cpus.h"
 #include "slirp/libslirp.h"
 #include "qemu/main-loop.h"
 #include "block/aio.h"

diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index 2f201512dff30772637f7196a6374b09fa27f7df..ac993403aba533536c7ac1fcffb2d78aade8babf 100644 (file)
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -27,6 +27,7 @@
 #include "qemu/timer.h"
 #include "sysemu/replay.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
 
 #ifdef CONFIG_POSIX
 #include <pthread.h>