| dcda949f769a11b197f4784fe299a448d87e6e14 |
|
16-Feb-2014 |
David 'Digit' Turner <digit@google.com> |
qemu-timer.c: Use upstream version.
This completely modifies the implementation of timers to match upstream,
the only difference is that the oddly-placed qemu_gpoll_ns() function is
disabled (it's not used yet).
Most of the changes here (but not all), were applied through the following
sed script:
s|qemu_get_clock\s*(\s*vm_clock\s*)|qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)|g
s|qemu_get_clock\s*(\s*rt_clock\s*)|qemu_clock_get_ms(QEMU_CLOCK_REALTIME)|g
s|qemu_get_clock_ns\s*(\s*vm_clock\s*)|qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)|g
s|qemu_get_clock_ns\s*(\s*rt_clock\s*)|qemu_clock_get_ns(QEMU_CLOCK_REALTIME)|g
s|qemu_get_clock_ms\s*(\s*vm_clock\s*)|qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)|g
s|qemu_get_clock_ms\s*(\s*rt_clock\s*)|qemu_clock_get_ms(QEMU_CLOCK_REALTIME)|g
s|qemu_get_clock_ms\s*(\s*host_clock\s*)|qemu_clock_get_ms(QEMU_CLOCK_HOST)|g
s|qemu_get_clock_ms\s*(\s*SHAPER_CLOCK\s*)|qemu_clock_get_ms(SHAPER_CLOCK)|g
s|qemu_mod_timer\s*(|timer_mod(|g
s|qemu_del_timer\s*(|timer_del(|g
s|qemu_free_timer\s*(|timer_free(|g
s|qemu_new_timer_ms\s*(\s*rt_clock,|timer_new(QEMU_CLOCK_REALTIME, SCALE_MS,|g
s|qemu_new_timer_ns\s*(\s*rt_clock,|timer_new(QEMU_CLOCK_REALTIME, SCALE_NS,|g
s|qemu_new_timer_ms\s*(\s*vm_clock,|timer_new(QEMU_CLOCK_VIRTUAL, SCALE_MS,|g
s|qemu_new_timer_ns\s*(\s*vm_clock,|timer_new(QEMU_CLOCK_VIRTUAL, SCALE_NS,|g
s|qemu_new_timer_ms\s*(\s*host_clock,|timer_new(QEMU_CLOCK_HOST, SCALE_MS,|g
s|qemu_new_timer_ns\s*(\s*host_clock,|timer_new(QEMU_CLOCK_HOST, SCALE_NS,|g
s|qemu_new_timer_ms\s*(\s*SHAPER_CLOCK\s*,|timer_new(SHAPER_CLOCK, SCALE_MS,|g
s|qemu_put_timer\s*(|timer_put(|g
s|qemu_get_timer\s*(|timer_get(|g
s|qemu_timer_pending\s*(|timer_pending(|g
s|qemu_clock_next_deadline\s*(\s*vm_clock|qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL|g
s|qemu_clock_next_deadline\s*(\s*rt_clock|qemu_clock_deadline_ns_all(QEMU_CLOCK_REALTIME|g
s|qemu_clock_next_deadline\s*(\s*host_clock|qemu_clock_deadline_ns_all(QEMU_CLOCK_HOST|g
+ Disable icount-based clock warping/adjustments. It will be re-enabled in the future
after cpu emulation has been completely refactored.
Change-Id: Ifbcf4a52654eed3a08dfe59b0546a75d4627f758
/external/qemu/include/qemu/timer.h
|
| f01835519fdcb736449d64204c535cbc60f06ca6 |
|
16-Feb-2014 |
David 'Digit' Turner <digit@google.com> |
Move some cpu_xxxx() function to cpus.c
This moves the following functions from qemu-timer.c to cpus.c to match
upstream:
cpu_get_ticks
cpu_get_clock
cpu_enable_ticks
cpu_disable_ticks
timer_save
timer_load
+ Move declarations from include/qemu/timer.h to include/sysemu/sysemu.h
+ Remove obsolete declarations from include/qemu/timer.h
Change-Id: I83c84cf4c6fb83cbda6a501969e05fbffb4afd4f
/external/qemu/include/qemu/timer.h
|
| f9077a88a0b9edca081b0810dde73d108db087a6 |
|
10-Feb-2014 |
David 'Digit' Turner <digit@google.com> |
Move main loop logic to main-loop.c
This patch moves most of the logic dealing with the internal main loop
into the main-loop.c file, to match upstream. Note however that the actual
implementation is not changed, and is still _very_ different from upstream.
However, this decouples a few more things to make upcoming refactors
significantly easier. This should not affect performance in any way.
+ Move the log rotation logic, which is specific to QEMU, to
log-rotate-android.c and include/android/log-rotate.h, it's likely
that the use of SIGUSR1 will not be maintained in the future, because
upstream uses that to signal virtual CPU threads internally instead.
Change-Id: I7bc886778fa70742c165b1dfe77637564910764e
/external/qemu/include/qemu/timer.h
|
| 9b3a4b03315af9bcdf282243059e8fd1ce1c5c70 |
|
23-Jan-2014 |
David 'Digit' Turner <digit@android.com> |
qemu-common.h: Remove include of cpu.h
The "qemu-common.h" included "cpu.h" when NEED_CPU_H was defined, which
introduced some nasty circular header dependency issues that affect later
patches in this series.
This patch removes the include, and fixes all other sources to include
"cpu.h" as needed instead.
+ Move loader declarations to "hw/loader.h"
+ Move some stuff from "qemu/timer.h" to "exec/cpu-all.h"
Change-Id: Ida1a4eccd889bae450b35ee32a931273ffe1f8d8
/external/qemu/include/qemu/timer.h
|
| e2678e116c8cdb0f36b247a5bd9cfacc849362fc |
|
16-Jan-2014 |
David 'Digit' Turner <digit@android.com> |
Rename CPUState to CPUOldState.
Upstream qemu has split the cpu state into two new data structures:
CPUState -> is used to model the CPU state through the QEMU
object model.
CPUArchState -> actually a macro that aliases CPUArmState,
CPUX86State or CPUMIPSState.
Both were part of the "CPUState" in the current emulator sources.
Previous patches introduced CPUArchState, as a simple alias to the
machine-specific state. This patch renames any use of CPUState in
the current code to CPUOldState, except within target-*/ directories
where it is replaced by CPU${ARCH}State instead.
This will allow bringing the upstream CPUState definition in the
source tree, and slowly migrate everything to the right location.
Change-Id: I88b79e6e89f1f36084dc2642e1cf415135e4da09
/external/qemu/include/qemu/timer.h
|
| 7a78db75ad42aea283f5073f51891464104a9fc3 |
|
14-Dec-2013 |
David 'Digit' Turner <digit@android.com> |
Move qemu-timer.h to include/qemu/timer.h
Note: upstream still puts qemu-timer.c in the top-level
directory, so no need to move it
Change-Id: I475309d6f0040b4fd2277e52a2526825c112e91f
/external/qemu/include/qemu/timer.h
|