From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiiPw-00053P-6j for qemu-devel@nongnu.org; Wed, 12 Dec 2012 04:15:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiiPq-0001lo-IS for qemu-devel@nongnu.org; Wed, 12 Dec 2012 04:15:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiiPq-0001kc-9T for qemu-devel@nongnu.org; Wed, 12 Dec 2012 04:15:46 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBC9Fj2t020303 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Dec 2012 04:15:45 -0500 From: Gerd Hoffmann Date: Wed, 12 Dec 2012 10:15:41 +0100 Message-Id: <1355303742-3263-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1355303742-3263-1-git-send-email-kraxel@redhat.com> References: <1355303742-3263-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] apci: assign memory regions to ich9 lpc device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Get rid of get_system_io() usage. Signed-off-by: Gerd Hoffmann --- 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