commit 77d58b1e47c8d1c661f98f12b47ab519d3561488
author Gerd Hoffmann <kraxel@redhat.com> Thu Nov 22 12:12:30 2012 +0100
committer Gerd Hoffmann <kraxel@redhat.com> Tue Dec 04 13:52:42 2012 +0100
tree c4bd95e2af7f7c6c4dc41e4753e08e260cb855d7
parent a29028214c1d5d3571b27e6745f14534e6d8a662

apci: switch timer to memory api

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

hw/vt82c686.c

diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index 3fc6063..219cfae 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -252,14 +252,10 @@
 
 static uint32_t pm_ioport_readl(void *opaque, uint32_t addr)
 {
-    VT686PMState *s = opaque;
     uint32_t val;
 
     addr &= 0x0f;
     switch (addr) {
-    case 0x08:
-        val = acpi_pm_tmr_get(&s->ar);
-        break;
     default:
         val = 0;
         break;
@@ -446,7 +442,7 @@
     memory_region_set_enabled(&s->io, false);
     memory_region_add_subregion(get_system_io(), 0, &s->io);
 
-    acpi_pm_tmr_init(&s->ar, pm_tmr_timer);
+    acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io);
     acpi_pm1_cnt_init(&s->ar);
 
     pm_smbus_init(&s->dev.qdev, &s->smb);