From patchwork Thu Mar 14 22:12:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 227818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 75F932C00D0 for ; Fri, 15 Mar 2013 09:12:00 +1100 (EST) Received: from localhost ([::1]:47969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGNS-0001c9-Jo for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2013 18:11:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGMs-0001Dg-KU for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGGMr-0004oK-Er for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:11:22 -0400 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:38634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGMq-0004nj-PC for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:11:21 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 786939401E9; Thu, 14 Mar 2013 23:11:15 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2013 23:12:05 +0100 Message-Id: <1363299128-8494-5-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363299128-8494-1-git-send-email-hpoussin@reactos.org> References: <1363299128-8494-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::10 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [RFC 4/6] m48t59: move ISA ports registration to QOM constructor 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 -device m48t59 can now be used to create a fully functional nvram, and m48t59_init_isa() becomes a much simpler helper. Signed-off-by: Hervé Poussineau --- hw/m48t59.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/m48t59.c b/hw/m48t59.c index 39a9d80..1093716 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -676,11 +676,6 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, d = DO_UPCAST(M48t59ISAState, busdev, dev); s = &d->state; - memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); - if (io_base != 0) { - isa_register_ioport(dev, &d->io, io_base); - } - return s; } @@ -703,6 +698,10 @@ static int m48t59_init_isa1(ISADevice *dev) isa_init_irq(dev, &s->IRQ, 8); m48t59_init_common(s); + memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); + if (s->io_base != 0) { + isa_register_ioport(dev, &d->io, s->io_base); + } return 0; }