From patchwork Mon Mar 7 07:05:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 592782 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8BAFF1400CB for ; Mon, 7 Mar 2016 18:08:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=Dp+lsYcO; dkim-atps=neutral Received: from localhost ([::1]:53996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acpHB-00048S-PM for incoming@patchwork.ozlabs.org; Mon, 07 Mar 2016 02:08:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acpGc-00033f-TV for qemu-devel@nongnu.org; Mon, 07 Mar 2016 02:07:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acpGZ-0004FJ-Lh for qemu-devel@nongnu.org; Mon, 07 Mar 2016 02:07:46 -0500 Received: from m12-15.163.com ([220.181.12.15]:47936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acpGY-0004DI-HW; Mon, 07 Mar 2016 02:07:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=5onmxGlGcpNz/rmgDB 8Fcfo3OCZk4KI3WQ4gzMJ1EZw=; b=Dp+lsYcOZVu2MbxUHzZSw6DnYb3KRjRfrT 1LV8BP0/PzV6SBXx/ixkUlJ3dwS4YSLblxlkU0rJKorqUvS8Gr0RRpnLJse+panl uH6kyvDC46hCl4nq4kBipzgh1JJlGiy+uJtdSayQeWPM+MUzAPCvEKKW54RMEvEP puEU1+Xrk= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp11 (Coremail) with SMTP id D8CowED5XEaRKN1WjMdtAA--.46751S11; Mon, 07 Mar 2016 15:07:09 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 7 Mar 2016 15:05:50 +0800 Message-Id: <1457334350-5675-10-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1457334350-5675-1-git-send-email-zxq_yx_007@163.com> References: <1457334350-5675-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: D8CowED5XEaRKN1WjMdtAA--.46751S11 X-Coremail-Antispam: 1Uf129KBjvJXoW7AF4xGF4DAry3JF13WFy3urg_yoW8ArWDpF yxuFn29r45WFs7Jr97twsrWF15K3s7C340g3Z7tws2y3ZF9ryYyFsrG34ayrWDKrWIya1Y grWrXas7uF4Utw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jxucNUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0h4lxlUL91wjiAAAsx X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.15 Cc: robh@kernel.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 9/9] hw/arm: QOM'ify versatilepb.c 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 Drop the use of old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Peter Maydell --- hw/arm/versatilepb.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index d061f0f..a2411e3 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -150,10 +150,11 @@ static const MemoryRegionOps vpb_sic_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int vpb_sic_init(SysBusDevice *sbd) +static void vpb_sic_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - vpb_sic_state *s = VERSATILE_PB_SIC(dev); + DeviceState *dev = DEVICE(obj); + vpb_sic_state *s = VERSATILE_PB_SIC(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); int i; qdev_init_gpio_in(dev, vpb_sic_set_irq, 32); @@ -161,10 +162,9 @@ static int vpb_sic_init(SysBusDevice *sbd) sysbus_init_irq(sbd, &s->parent[i]); } s->irq = 31; - memory_region_init_io(&s->iomem, OBJECT(s), &vpb_sic_ops, s, + memory_region_init_io(&s->iomem, obj, &vpb_sic_ops, s, "vpb-sic", 0x1000); sysbus_init_mmio(sbd, &s->iomem); - return 0; } /* Board init. */ @@ -424,9 +424,7 @@ machine_init(versatile_machine_init) static void vpb_sic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = vpb_sic_init; dc->vmsd = &vmstate_vpb_sic; } @@ -434,6 +432,7 @@ static const TypeInfo vpb_sic_info = { .name = TYPE_VERSATILE_PB_SIC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(vpb_sic_state), + .instance_init = vpb_sic_init, .class_init = vpb_sic_class_init, };