summaryrefslogtreecommitdiff
path: root/hw/acpi_piix4.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2012-11-22 12:12:30 +0100
committerGerd Hoffmann <kraxel@redhat.com>2012-12-04 13:52:42 +0100
commit77d58b1e47c8d1c661f98f12b47ab519d3561488 (patch)
treec4bd95e2af7f7c6c4dc41e4753e08e260cb855d7 /hw/acpi_piix4.c
parenta29028214c1d5d3571b27e6745f14534e6d8a662 (diff)
downloadqemu-77d58b1e47c8d1c661f98f12b47ab519d3561488.tar.gz
apci: switch timer to memory api
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/acpi_piix4.c')
-rw-r--r--hw/acpi_piix4.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 320e045938..75761a08a7 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -154,9 +154,6 @@ static uint64_t pm_ioport_read(void *opaque, hwaddr addr, unsigned width)
case 0x04:
val = s->ar.pm1.cnt.cnt;
break;
- case 0x08:
- val = acpi_pm_tmr_get(&s->ar);
- break;
default:
val = 0;
break;
@@ -463,7 +460,7 @@ static int piix4_pm_initfn(PCIDevice *dev)
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_gpe_init(&s->ar, GPE_LEN);
s->powerdown_notifier.notify = piix4_pm_powerdown_req;