From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwV0C-0008SV-Vb for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:09:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwV08-0004zG-TS for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:09:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40931) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwV07-0004xY-LW for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:09:24 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7P89MIT021875 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 25 Aug 2011 04:09:23 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p7P89Lhu016974 for ; Thu, 25 Aug 2011 04:09:22 -0400 From: Avi Kivity Date: Thu, 25 Aug 2011 11:09:16 +0300 Message-Id: <1314259758-5198-18-git-send-email-avi@redhat.com> In-Reply-To: <1314259758-5198-1-git-send-email-avi@redhat.com> References: <1314259758-5198-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 17/19] serial: Convert serial_isa_initfn to MemoryRegion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Richard Henderson The serial_mm_init path is as yet unconverted. Signed-off-by: Richard Henderson Signed-off-by: Avi Kivity --- hw/serial.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index ed7fd0a..2e6d212 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -157,6 +157,7 @@ struct SerialState { typedef struct ISASerialState { ISADevice dev; + MemoryRegion io; uint32_t index; uint32_t iobase; uint32_t isairq; @@ -755,6 +756,15 @@ void serial_set_frequency(SerialState *s, uint32_t frequency) static const int isa_serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; static const int isa_serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; +static const MemoryRegionPortio serial_portio[] = { + { 0, 8, 1, .read = serial_ioport_read, .write = serial_ioport_write }, + PORTIO_END_OF_LIST() +}; + +static const MemoryRegionOps serial_io_ops = { + .old_portio = serial_portio +}; + static int serial_isa_initfn(ISADevice *dev) { static int index; @@ -776,9 +786,8 @@ static int serial_isa_initfn(ISADevice *dev) serial_init_core(s); qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3); - register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s); - register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s); - isa_init_ioport_range(dev, isa->iobase, 8); + memory_region_init_io(&isa->io, &serial_io_ops, s, "serial", 8); + isa_register_ioport(dev, &isa->io, isa->iobase); return 0; } -- 1.7.5.3