From patchwork Sun Oct 24 15:34:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 69041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 03242B6F10 for ; Mon, 25 Oct 2010 02:49:20 +1100 (EST) Received: from localhost ([127.0.0.1]:49239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PA2or-000461-04 for incoming@patchwork.ozlabs.org; Sun, 24 Oct 2010 11:49:13 -0400 Received: from [140.186.70.92] (port=34122 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PA2k7-0001eV-1g for qemu-devel@nongnu.org; Sun, 24 Oct 2010 11:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PA2ag-0004z5-GX for qemu-devel@nongnu.org; Sun, 24 Oct 2010 11:34:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PA2ag-0004yk-9C for qemu-devel@nongnu.org; Sun, 24 Oct 2010 11:34:34 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9OFYVgr029127 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 24 Oct 2010 11:34:31 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9OFYUtZ023209; Sun, 24 Oct 2010 11:34:31 -0400 Received: from file.tlv.redhat.com (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 42BF0250AE7; Sun, 24 Oct 2010 17:34:30 +0200 (IST) From: Avi Kivity To: Anthony Liguori , qemu-devel@nongnu.org Date: Sun, 24 Oct 2010 17:34:29 +0200 Message-Id: <1287934469-16624-3-git-send-email-avi@redhat.com> In-Reply-To: <1287934469-16624-1-git-send-email-avi@redhat.com> References: <1287934469-16624-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 2/2] piix4 acpi: convert io BAR to type-safe ioport callbacks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Avi Kivity --- hw/acpi_piix4.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index f74f34c..5772667 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -52,6 +52,7 @@ struct pci_status { typedef struct PIIX4PMState { PCIDevice dev; + IOPort ioport; uint16_t pmsts; uint16_t pmen; uint16_t pmcntrl; @@ -128,9 +129,9 @@ static void pm_tmr_timer(void *opaque) pm_update_sci(s); } -static void pm_ioport_writew(void *opaque, uint32_t addr, uint32_t val) +static void pm_ioport_writew(IOPort *ioport, pio_addr_t addr, uint32_t val) { - PIIX4PMState *s = opaque; + PIIX4PMState *s = container_of(ioport, PIIX4PMState, ioport); addr &= 0x3f; switch(addr) { case 0x00: @@ -184,9 +185,9 @@ static void pm_ioport_writew(void *opaque, uint32_t addr, uint32_t val) PIIX4_DPRINTF("PM writew port=0x%04x val=0x%04x\n", addr, val); } -static uint32_t pm_ioport_readw(void *opaque, uint32_t addr) +static uint32_t pm_ioport_readw(IOPort *ioport, pio_addr_t addr) { - PIIX4PMState *s = opaque; + PIIX4PMState *s = container_of(ioport, PIIX4PMState, ioport); uint32_t val; addr &= 0x3f; @@ -208,15 +209,15 @@ static uint32_t pm_ioport_readw(void *opaque, uint32_t addr) return val; } -static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val) +static void pm_ioport_writel(IOPort *ioport, pio_addr_t addr, uint32_t val) { - // PIIX4PMState *s = opaque; + // PIIX4PMState *s = container_of(ioport, PIIX4PMState, ioport); PIIX4_DPRINTF("PM writel port=0x%04x val=0x%08x\n", addr & 0x3f, val); } -static uint32_t pm_ioport_readl(void *opaque, uint32_t addr) +static uint32_t pm_ioport_readl(IOPort *ioport, uint32_t addr) { - PIIX4PMState *s = opaque; + PIIX4PMState *s = container_of(ioport, PIIX4PMState, ioport); uint32_t val; addr &= 0x3f; @@ -265,10 +266,7 @@ static void pm_io_space_update(PIIX4PMState *s) /* XXX: need to improve memory and ioport allocation */ PIIX4_DPRINTF("PM: mapping to 0x%x\n", pm_io_base); - register_ioport_write(pm_io_base, 64, 2, pm_ioport_writew, s); - register_ioport_read(pm_io_base, 64, 2, pm_ioport_readw, s); - register_ioport_write(pm_io_base, 64, 4, pm_ioport_writel, s); - register_ioport_read(pm_io_base, 64, 4, pm_ioport_readl, s); + ioport_register(&s->ioport, pm_io_base, 64); } } @@ -413,6 +411,13 @@ static int piix4_pm_initfn(PCIDevice *dev) return 0; } +static IOPortOps pm_ioport_ops = { + .readw = pm_ioport_readw, + .readl = pm_ioport_readl, + .writew = pm_ioport_writew, + .writel = pm_ioport_writel, +}; + i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq cmos_s3, qemu_irq smi_irq, int kvm_enabled) @@ -424,6 +429,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); s = DO_UPCAST(PIIX4PMState, dev, dev); + s->ioport.ops = &pm_ioport_ops; s->irq = sci_irq; s->cmos_s3 = cmos_s3; s->smi_irq = smi_irq;