diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-22 10:13:27 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-22 10:13:27 -0500 |
| commit | 293706dd682f578b457d052988cf3c20b4eab82d (patch) | |
| tree | 1471026276e0d29d2161b80551924b3394d8c38e /hw | |
| parent | 90c66f587c8d020a642d3c9376f9102c16f2234e (diff) | |
| parent | b957a1b03cfd56134519ebc01ba8fe1b166c0c84 (diff) | |
| download | qemu-293706dd682f578b457d052988cf3c20b4eab82d.zip qemu-293706dd682f578b457d052988cf3c20b4eab82d.tar.gz qemu-293706dd682f578b457d052988cf3c20b4eab82d.tar.bz2 | |
Merge remote-tracking branch 'rth/axp-next' into staging
# By Richard Henderson
# Via Richard Henderson
* rth/axp-next:
pc-bios: Update palcode-clipper
target-alpha: Move alarm to vm_clock
Message-id: 1374161033-11449-1-git-send-email-rth@twiddle.net
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/alpha/typhoon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 3d7a1cd..b7fb044 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)); } |