summaryrefslogtreecommitdiffstats
path: root/hw/alpha
diff options
context:
space:
mode:
authorRichard Henderson2013-07-16 15:45:57 +0200
committerRichard Henderson2013-07-18 15:44:55 +0200
commit19e0cbb82ffab7220cdbcc78ab2c1dac823ce4e3 (patch)
treeb3c8ca6e9341d07c740a962ab17e92914301a448 /hw/alpha
parentMerge remote-tracking branch 'quintela/migration.next' into staging (diff)
downloadqemu-19e0cbb82ffab7220cdbcc78ab2c1dac823ce4e3.tar.gz
qemu-19e0cbb82ffab7220cdbcc78ab2c1dac823ce4e3.tar.xz
qemu-19e0cbb82ffab7220cdbcc78ab2c1dac823ce4e3.zip
target-alpha: Move alarm to vm_clock
Basing the alarm off the rtc_clock was silly. It leads to horrible spinning in the guest after being suspended and resumed, as it tries to catch up with lost ticks. This requires adding an accessor for reading the vm_clock too. Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'hw/alpha')
-rw-r--r--hw/alpha/typhoon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 3d7a1cd8e8..b7fb04406c 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -693,7 +693,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
AlphaCPU *cpu = cpus[i];
s->cchip.cpu[i] = cpu;
if (cpu != NULL) {
- cpu->alarm_timer = qemu_new_timer_ns(rtc_clock,
+ cpu->alarm_timer = qemu_new_timer_ns(vm_clock,
typhoon_alarm_timer,
(void *)((uintptr_t)s + i));
}