[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] apci: assign memory regions to ich9 lpc device
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/8] apci: assign memory regions to ich9 lpc device |
Date: |
Wed, 19 Dec 2012 09:46:06 +0100 |
Get rid of get_system_io() usage.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi_ich9.c | 6 ++++--
hw/acpi_ich9.h | 4 +++-
hw/lpc_ich9.c | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
index c5978d3..b895422 100644
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -201,11 +201,13 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
acpi_pm1_evt_power_down(&pm->acpi_regs);
}
-void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3)
+void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
+ qemu_irq sci_irq, qemu_irq cmos_s3)
{
memory_region_init(&pm->io, "ich9-pm", ICH9_PMIO_SIZE);
memory_region_set_enabled(&pm->io, false);
- memory_region_add_subregion(get_system_io(), 0, &pm->io);
+ memory_region_add_subregion(pci_address_space_io(lpc_pci),
+ 0, &pm->io);
acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);
acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);
diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h
index bc221d3..ecb82ab 100644
--- a/hw/acpi_ich9.h
+++ b/hw/acpi_ich9.h
@@ -30,9 +30,11 @@ typedef struct ICH9LPCPMRegs {
* PM1a_CNT_BLK = 2 in FADT so it is defined as uint16_t.
*/
ACPIREGS acpi_regs;
+
MemoryRegion io;
MemoryRegion io_gpe;
MemoryRegion io_smi;
+
uint32_t smi_en;
uint32_t smi_sts;
@@ -42,7 +44,7 @@ typedef struct ICH9LPCPMRegs {
Notifier powerdown_notifier;
} ICH9LPCPMRegs;
-void ich9_pm_init(ICH9LPCPMRegs *pm,
+void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
qemu_irq sci_irq, qemu_irq cmos_s3_resume);
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
extern const VMStateDescription vmstate_ich9_pm;
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index 878a43e..dd67b61 100644
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -352,7 +352,7 @@ void ich9_lpc_pm_init(PCIDevice *lpc_pci, qemu_irq cmos_s3)
qemu_irq *sci_irq;
sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1);
- ich9_pm_init(&lpc->pm, sci_irq[0], cmos_s3);
+ ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0], cmos_s3);
ich9_lpc_reset(&lpc->d.qdev);
}
--
1.7.1
- [Qemu-devel] [PATCH 0/8] misc acpi updates and test devices, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 4/8] apci: assign memory regions to ich9 lpc device,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 3/8] apci: assign memory regions to piix4 acpi device, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 8/8] pc: remove bochs bios debug ports, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 5/8] switch debugcon to memory api, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 2/8] acpi: autoload dsdt, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 7/8] hw: Add test device for unittests execution, Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 6/8] add isa-debug-exit device., Gerd Hoffmann, 2012/12/19
- [Qemu-devel] [PATCH 1/8] configure: also symlink *.aml files, Gerd Hoffmann, 2012/12/19