diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-03-03 12:01:16 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-03-14 13:28:18 +0100 |
| commit | d2528bdc19988db73056be75dd9bf52eeee620f5 (patch) | |
| tree | c6669e8d626fe613a883672a9615bfafb073881a | |
| parent | 33bef0b9948b85000221d32c758d9d4a9276aaaf (diff) | |
| download | qemu-d2528bdc19988db73056be75dd9bf52eeee620f5.zip qemu-d2528bdc19988db73056be75dd9bf52eeee620f5.tar.gz qemu-d2528bdc19988db73056be75dd9bf52eeee620f5.tar.bz2 | |
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>
| -rw-r--r-- | cpu-exec.c | 1 | ||||
| -rw-r--r-- | hw/core/ptimer.c | 1 | ||||
| -rw-r--r-- | hw/ppc/pnv.c | 1 | ||||
| -rw-r--r-- | include/qemu/timer.h | 1 | ||||
| -rw-r--r-- | include/sysemu/cpus.h | 2 | ||||
| -rw-r--r-- | kvm-all.c | 1 | ||||
| -rw-r--r-- | monitor.c | 1 | ||||
| -rw-r--r-- | replay/replay.c | 1 | ||||
| -rw-r--r-- | target/alpha/translate.c | 1 | ||||
| -rw-r--r-- | translate-all.c | 1 | ||||
| -rw-r--r-- | util/main-loop.c | 1 | ||||
| -rw-r--r-- | util/qemu-timer.c | 1 |
12 files changed, 12 insertions, 1 deletions
@@ -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 59ccb00..7221c68 100644 --- 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 09f0d22..3fa722a 100644 --- 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 26e6285..91cd8c8 100644 --- 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 a73b5d4..e521a91 100644 --- 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); @@ -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" @@ -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 1835b99..78e2a7e 100644 --- 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 055286a..df5d695 100644 --- 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 34480ae..b3ee876 100644 --- 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 ca7bb07..7efc229 100644 --- 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 2f20151..ac99340 100644 --- 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> |