| Message ID | 20170303131113.25898-3-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Mar 03, 2017 at 02:11:10PM +0100, Paolo Bonzini wrote: > This dependency is the wrong way, and we will need util/qemu-timer.h from sysemu/cpus.h > in the next patch. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > cpu-exec.c | 1 + > hw/core/ptimer.c | 1 + > include/qemu/timer.h | 1 - > include/sysemu/cpus.h | 2 ++ > kvm-all.c | 1 + > monitor.c | 1 + > replay/replay.c | 1 + > translate-all.c | 1 + > util/main-loop.c | 1 + > util/qemu-timer.c | 1 + > 10 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/cpu-exec.c b/cpu-exec.c > index 1a5ad48..6dbb4da 100644 > --- 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 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/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); > diff --git a/kvm-all.c b/kvm-all.c > index 0c94637..0fd6655 100644 > --- 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 b68944d..d8fba78 100644 > --- 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 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/translate-all.c b/translate-all.c > index 956d54b..63b8f56 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 ad10bca..0b2d8c0 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> > -- > 2.9.3 > > >
Paolo Bonzini <pbonzini@redhat.com> writes: > This dependency is the wrong way, and we will need util/qemu-timer.h from sysemu/cpus.h > in the next patch. This shuffling breaks a couple of targets: make -k -j9 CHK version_gen.h CC alpha-softmmu/target/alpha/translate.o /home/alex/lsrc/qemu/qemu.git/target/alpha/translate.c: In function ‘gen_mfpr’: /home/alex/lsrc/qemu/qemu.git/target/alpha/translate.c:1321:13: error: ‘use_icount’ undeclared (first use in this function) if (use_icount) { ^ /home/alex/lsrc/qemu/qemu.git/target/alpha/translate.c:1321:13: note: each undeclared identifier is reported only once for each function it appears in /home/alex/lsrc/qemu/qemu.git/rules.mak:69: recipe for target 'target/alpha/translate.o' failed make[1]: *** [target/alpha/translate.o] Error 1 make[1]: Target 'all' not remade because of errors. Makefile:322: recipe for target 'subdir-alpha-softmmu' failed make: *** [subdir-alpha-softmmu] Error 2 CC ppc64-softmmu/hw/ppc/pnv.o /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c: In function ‘ppc_powernv_init’: /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c:446:39: error: ‘smp_cores’ undeclared (first use in this function) object_property_set_int(chip, smp_cores, "nr-cores", &error_fatal); ^ /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c:446:39: note: each undeclared identifier is reported only once for each function it appears in /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c: In function ‘pnv_chip_realize’: /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c:686:57: error: ‘smp_threads’ undeclared (first use in this function) object_property_set_int(OBJECT(pnv_core), smp_threads, "nr-threads", ^ /home/alex/lsrc/qemu/qemu.git/rules.mak:69: recipe for target 'hw/ppc/pnv.o' failed make[1]: *** [hw/ppc/pnv.o] Error 1 make[1]: Target 'all' not remade because of errors. Makefile:322: recipe for target 'subdir-ppc64-softmmu' failed make: *** [subdir-ppc64-softmmu] Error 2 make: Target 'all' not remade because of errors. Compilation exited abnormally with code 2 at Fri Mar 3 14:49:30 > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > cpu-exec.c | 1 + > hw/core/ptimer.c | 1 + > include/qemu/timer.h | 1 - > include/sysemu/cpus.h | 2 ++ > kvm-all.c | 1 + > monitor.c | 1 + > replay/replay.c | 1 + > translate-all.c | 1 + > util/main-loop.c | 1 + > util/qemu-timer.c | 1 + > 10 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/cpu-exec.c b/cpu-exec.c > index 1a5ad48..6dbb4da 100644 > --- 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 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/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); > diff --git a/kvm-all.c b/kvm-all.c > index 0c94637..0fd6655 100644 > --- 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 b68944d..d8fba78 100644 > --- 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 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/translate-all.c b/translate-all.c > index 956d54b..63b8f56 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 ad10bca..0b2d8c0 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> -- Alex Bennée
On 03/03/2017 15:50, Alex Bennée wrote: > > Paolo Bonzini <pbonzini@redhat.com> writes: > >> This dependency is the wrong way, and we will need util/qemu-timer.h from sysemu/cpus.h >> in the next patch. > > This shuffling breaks a couple of targets: Oops. I only tested x86 and aarch64 before. This will have to wait for after soft freeze. Paolo > make -k -j9 > CHK version_gen.h > CC alpha-softmmu/target/alpha/translate.o > /home/alex/lsrc/qemu/qemu.git/target/alpha/translate.c: In function ‘gen_mfpr’: > /home/alex/lsrc/qemu/qemu.git/target/alpha/translate.c:1321:13: error: ‘use_icount’ undeclared (first use in this function) > if (use_icount) { > ^ > /home/alex/lsrc/qemu/qemu.git/target/alpha/translate.c:1321:13: note: each undeclared identifier is reported only once for each function it appears in > /home/alex/lsrc/qemu/qemu.git/rules.mak:69: recipe for target 'target/alpha/translate.o' failed > make[1]: *** [target/alpha/translate.o] Error 1 > make[1]: Target 'all' not remade because of errors. > Makefile:322: recipe for target 'subdir-alpha-softmmu' failed > make: *** [subdir-alpha-softmmu] Error 2 > CC ppc64-softmmu/hw/ppc/pnv.o > /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c: In function ‘ppc_powernv_init’: > /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c:446:39: error: ‘smp_cores’ undeclared (first use in this function) > object_property_set_int(chip, smp_cores, "nr-cores", &error_fatal); > ^ > /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c:446:39: note: each undeclared identifier is reported only once for each function it appears in > /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c: In function ‘pnv_chip_realize’: > /home/alex/lsrc/qemu/qemu.git/hw/ppc/pnv.c:686:57: error: ‘smp_threads’ undeclared (first use in this function) > object_property_set_int(OBJECT(pnv_core), smp_threads, "nr-threads", > ^ > /home/alex/lsrc/qemu/qemu.git/rules.mak:69: recipe for target 'hw/ppc/pnv.o' failed > make[1]: *** [hw/ppc/pnv.o] Error 1 > make[1]: Target 'all' not remade because of errors. > Makefile:322: recipe for target 'subdir-ppc64-softmmu' failed > make: *** [subdir-ppc64-softmmu] Error 2 > make: Target 'all' not remade because of errors. > > Compilation exited abnormally with code 2 at Fri Mar 3 14:49:30 > > >> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- >> cpu-exec.c | 1 + >> hw/core/ptimer.c | 1 + >> include/qemu/timer.h | 1 - >> include/sysemu/cpus.h | 2 ++ >> kvm-all.c | 1 + >> monitor.c | 1 + >> replay/replay.c | 1 + >> translate-all.c | 1 + >> util/main-loop.c | 1 + >> util/qemu-timer.c | 1 + >> 10 files changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/cpu-exec.c b/cpu-exec.c >> index 1a5ad48..6dbb4da 100644 >> --- 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 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/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); >> diff --git a/kvm-all.c b/kvm-all.c >> index 0c94637..0fd6655 100644 >> --- 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 b68944d..d8fba78 100644 >> --- 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 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/translate-all.c b/translate-all.c >> index 956d54b..63b8f56 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 ad10bca..0b2d8c0 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> > > > -- > Alex Bennée >
Paolo Bonzini <pbonzini@redhat.com> writes: > This dependency is the wrong way, and we will need util/qemu-timer.h from sysemu/cpus.h > in the next patch. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> With the compile fixes I posted as a !fixup patch: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > cpu-exec.c | 1 + > hw/core/ptimer.c | 1 + > include/qemu/timer.h | 1 - > include/sysemu/cpus.h | 2 ++ > kvm-all.c | 1 + > monitor.c | 1 + > replay/replay.c | 1 + > translate-all.c | 1 + > util/main-loop.c | 1 + > util/qemu-timer.c | 1 + > 10 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/cpu-exec.c b/cpu-exec.c > index 1a5ad48..6dbb4da 100644 > --- 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 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/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); > diff --git a/kvm-all.c b/kvm-all.c > index 0c94637..0fd6655 100644 > --- 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 b68944d..d8fba78 100644 > --- 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 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/translate-all.c b/translate-all.c > index 956d54b..63b8f56 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 ad10bca..0b2d8c0 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> -- Alex Bennée
diff --git a/cpu-exec.c b/cpu-exec.c index 1a5ad48..6dbb4da 100644 --- 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 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/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); diff --git a/kvm-all.c b/kvm-all.c index 0c94637..0fd6655 100644 --- 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 b68944d..d8fba78 100644 --- 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 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/translate-all.c b/translate-all.c index 956d54b..63b8f56 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 ad10bca..0b2d8c0 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>
This dependency is the wrong way, and we will need util/qemu-timer.h from sysemu/cpus.h in the next patch. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- cpu-exec.c | 1 + hw/core/ptimer.c | 1 + include/qemu/timer.h | 1 - include/sysemu/cpus.h | 2 ++ kvm-all.c | 1 + monitor.c | 1 + replay/replay.c | 1 + translate-all.c | 1 + util/main-loop.c | 1 + util/qemu-timer.c | 1 + 10 files changed, 10 insertions(+), 1 deletion(-)