diff options
| author | Ot ten Thije <ottenthije@google.com> | 2010-10-14 06:58:03 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-14 06:58:03 -0700 |
| commit | bd62acb45d0199940f3baecfa288a2173e4428ae (patch) | |
| tree | 50ae427c1c1f97514dd0b4032693e708aa0134a1 /hw | |
| parent | 4820ac8ec0fa1a4124d364608568c1a3f5bdc9bb (diff) | |
| parent | afb0f8ee7ecec8000aa6f6e0d80e8c8cbfddac0e (diff) | |
| download | external_qemu-bd62acb45d0199940f3baecfa288a2173e4428ae.zip external_qemu-bd62acb45d0199940f3baecfa288a2173e4428ae.tar.gz external_qemu-bd62acb45d0199940f3baecfa288a2173e4428ae.tar.bz2 | |
Merge "Permanent fix for workaround of timer issue (commit a7f114bc)."
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/goldfish_timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/goldfish_timer.c b/hw/goldfish_timer.c index ca90e0e..a714b22 100644 --- a/hw/goldfish_timer.c +++ b/hw/goldfish_timer.c @@ -66,8 +66,7 @@ static int goldfish_timer_load(QEMUFile* f, void* opaque, int version_id) if (version_id != GOLDFISH_TIMER_SAVE_VERSION) return -1; - s->now_ns = qemu_get_sbe64(f); /* using qemu_get_be64 (without 's') causes faulty code generation - in the compiler, dropping the 32 most significant bits */ + s->now_ns = qemu_get_be64(f); s->armed = qemu_get_byte(f); if (s->armed) { int64_t now_tks = qemu_get_clock(vm_clock); |