From patchwork Wed Mar 13 08:01:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 227182 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 540F32C0299 for ; Wed, 13 Mar 2013 19:08:51 +1100 (EST) Received: from localhost ([::1]:53296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFgjx-0008P6-G3 for incoming@patchwork.ozlabs.org; Wed, 13 Mar 2013 04:08:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFgeT-0007g4-JJ for qemu-devel@nongnu.org; Wed, 13 Mar 2013 04:03:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFgeK-0001p6-0a for qemu-devel@nongnu.org; Wed, 13 Mar 2013 04:03:09 -0400 Received: from [222.73.24.84] (port=2302 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFgeJ-0001jZ-Ho for qemu-devel@nongnu.org; Wed, 13 Mar 2013 04:02:59 -0400 X-IronPort-AV: E=Sophos;i="4.84,834,1355068800"; d="scan'208";a="6864302" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 13 Mar 2013 16:00:25 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r2D82hHn009974 for ; Wed, 13 Mar 2013 16:02:51 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013031316013686-831312 ; Wed, 13 Mar 2013 16:01:36 +0800 From: liguang To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2013 16:01:20 +0800 Message-Id: <1363161681-13878-14-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1363161681-13878-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1363161681-13878-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/13 16:01:36, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/13 16:01:37, Serialize complete at 2013/03/13 16:01:37 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH][RFC 13/14] parallel: refactor parallel_reset function 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 Signed-off-by: liguang --- hw/parallel.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/parallel.c b/hw/parallel.c index 3a4e06b..7dc53eb 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -427,9 +427,11 @@ static uint32_t parallel_ioport_ecp_read(void *opaque, uint32_t addr) return ret; } -static void parallel_reset(void *opaque) +static void parallel_reset(DeviceState *dev) { - ParallelState *s = opaque; + ISADevice *isadev = ISA_DEVICE(dev); + ISAParallelState *isaparal = DO_UPCAST(ISAParallelState, dev, isadev); + ParallelState *s = &isaparal->state; s->datar = ~0; s->dataw = ~0; @@ -495,7 +497,6 @@ static int parallel_isa_initfn(ISADevice *dev) base = isa->iobase; isa_init_irq(dev, &s->irq, isa->isairq); - qemu_register_reset(parallel_reset, s); if (qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_PP_READ_STATUS, &dummy) == 0) { s->hw_driver = 1; @@ -575,7 +576,6 @@ bool parallel_mm_init(MemoryRegion *address_space, s->irq = irq; s->chr = chr; s->it_shift = it_shift; - qemu_register_reset(parallel_reset, s); memory_region_init_io(&s->iomem, ¶llel_mm_ops, s, "parallel", 8 << it_shift); @@ -597,6 +597,8 @@ static void parallel_isa_class_initfn(ObjectClass *klass, void *data) ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = parallel_isa_initfn; dc->props = parallel_isa_properties; + dc->reset = parallel_reset; + dc->on = parallel_reset; } static const TypeInfo parallel_isa_info = {