diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
| commit | 4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c (patch) | |
| tree | a764e6ea07f06acf51df4d62790cdf9ae922d55d /hw/acpi_piix4.c | |
| parent | 475363176c80feedb8feb5e335ba64de68c7b055 (diff) | |
| parent | 582299336879504353e60c7937fbc70fea93f3da (diff) | |
| download | hqemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.zip hqemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.tar.gz | |
Merge branch 'memory-ioport' of git://github.com/afaerber/qemu-cpu
* 'memory-ioport' of git://github.com/afaerber/qemu-cpu:
hw/dma.c: Replace register_ioport_*
hw/pc.c: Replace register_ioport_*
serial: Replace register_ioport_*
hw/cirrus_vga.c: Replace register_ioport_*
hw/apm.c: Replace register_ioport_*
isa: Add isa_address_space_io()
Diffstat (limited to 'hw/acpi_piix4.c')
| -rw-r--r-- | hw/acpi_piix4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 519269a..dbddde1 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -438,7 +438,7 @@ static int piix4_pm_initfn(PCIDevice *dev) pci_conf[0x3d] = 0x01; // interrupt pin 1 /* APM */ - apm_init(&s->apm, apm_ctrl_changed, s); + apm_init(dev, &s->apm, apm_ctrl_changed, s); register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s); |
