From patchwork Wed Aug 10 22:28:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C89EB6F18 for ; Thu, 11 Aug 2011 09:51:13 +1000 (EST) Received: from localhost ([::1]:51888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHw-0006Ka-JP for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 18:30:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHM-0004dn-UA for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrHHL-0006Pg-Mp for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:36 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:44730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHL-0006Kk-IQ for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:35 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so1164337wyf.4 for ; Wed, 10 Aug 2011 15:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=IkrtYV6ed7oZ8H0SC9n4BovocRp7BRRm+CwD0jbSIps=; b=g1uFR3cr3++Ku+G8nmsNNh0qau1oZRGvXigSyjx8oVJzUcciyxbJiATfi747QjXS+0 FERHn4vHmnknvFMPX984fAxDcRwPAfJldE3a0VoiuSbApCt5RD+duKyFQ4QnI6muSwRF r9fvFkJ9xjDuJbLfmEhDfZ/Gu34q1t7ljP9iA= Received: by 10.216.164.149 with SMTP id c21mr1021663wel.98.1313015375156; Wed, 10 Aug 2011 15:29:35 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id m38sm880619weq.21.2011.08.10.15.29.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 15:29:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 10 Aug 2011 15:28:18 -0700 Message-Id: <1313015300-23920-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313015300-23920-1-git-send-email-rth@twiddle.net> References: <1313015300-23920-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 09/11] serial: Convert serial_isa_initfn to MemoryRegion. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The serial_mm_init path is as yet unconverted. Signed-off-by: Richard Henderson --- hw/serial.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 0ee61dd..466de21 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; }