From patchwork Thu Jul 4 15:13:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 256979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1F51F2C007C for ; Fri, 5 Jul 2013 03:02:26 +1000 (EST) Received: from localhost ([::1]:52849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulJs-0007NE-55 for incoming@patchwork.ozlabs.org; Thu, 04 Jul 2013 11:19:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulEq-0007yx-GA for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UulEp-0004sa-1A for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:14:28 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:62039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UulEo-0004sP-Qw for qemu-devel@nongnu.org; Thu, 04 Jul 2013 11:14:26 -0400 Received: by mail-wi0-f176.google.com with SMTP id ey16so6428159wid.3 for ; Thu, 04 Jul 2013 08:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=lvxAV5YwUkEz5Taxs33yfOqt9NoUMt/7HKi/m2R69xQ=; b=TZaZ+8bcdKJ0E8okTdwodWGh3wIa5zm6m0HpD44lhe/9oE7D3vBB39NK288u0Zm253 mc73AKf78wiZjKG8NmpKw1hynHCA6WdioFnmYEv0HODQZH9xnPQtvP8g2qriOw1WTh6l dVsXZyyyQffOnKqzQfwt3Jmo7kmcBe5xUE/FF2Mu+5w+FSr/rfqEPpNPzi4Ro4rqL8Nf Z6st6CskYvh70Fnr/wAEBE5ffS9x1QeY8eO9AEp70KmYqgpzb/W4OJTE9UXzYoGy2643 et2UOHHkDIEuYepBgxV+UFP17JfrQFmMK+Oj3+2YkcEfsm57UJRspC0SUP5TlmRU8zmv 2blg== X-Received: by 10.194.170.168 with SMTP id an8mr3767562wjc.72.1372950866135; Thu, 04 Jul 2013 08:14:26 -0700 (PDT) Received: from playground.station (net-37-117-148-210.cust.dsl.vodafone.it. [37.117.148.210]) by mx.google.com with ESMTPSA id d8sm4212546wiz.0.2013.07.04.08.14.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jul 2013 08:14:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Jul 2013 17:13:03 +0200 Message-Id: <1372950842-32422-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> References: <1372950842-32422-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 Cc: Jan Kiszka Subject: [Qemu-devel] [PATCH 07/66] i82374: replace register_ioport* 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 From: Jan Kiszka Convert over to memory regions to obsolete register_ioport*. Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini --- hw/dma/i82374.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 6192780..ecda5cb 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -124,16 +124,24 @@ static const VMStateDescription vmstate_isa_i82374 = { }, }; +static const MemoryRegionPortio i82374_portio_list[] = { + { 0x0A, 1, 1, .read = i82374_read_isr, }, + { 0x10, 8, 1, .write = i82374_write_command, }, + { 0x18, 8, 1, .read = i82374_read_status, }, + { 0x20, 0x20, 1, + .write = i82374_write_descriptor, .read = i82374_read_descriptor, }, + PORTIO_END_OF_LIST(), +}; + static void i82374_isa_realize(DeviceState *dev, Error **errp) { ISAi82374State *isa = I82374(dev); I82374State *s = &isa->state; + PortioList *port_list = g_new(PortioList, 1); - register_ioport_read(isa->iobase + 0x0A, 1, 1, i82374_read_isr, s); - register_ioport_write(isa->iobase + 0x10, 8, 1, i82374_write_command, s); - register_ioport_read(isa->iobase + 0x18, 8, 1, i82374_read_status, s); - register_ioport_write(isa->iobase + 0x20, 0x20, 1, i82374_write_descriptor, s); - register_ioport_read(isa->iobase + 0x20, 0x20, 1, i82374_read_descriptor, s); + portio_list_init(port_list, i82374_portio_list, s, "i82374"); + portio_list_add(port_list, isa_address_space_io(&isa->parent_obj), + isa->iobase); i82374_realize(s, errp);