From patchwork Wed Mar 30 10:09:23 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: 603304 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 3qZk3C2xw6z9t0s for ; Wed, 30 Mar 2016 21:12: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=bS+gVbLe; dkim-atps=neutral Received: from localhost ([::1]:52922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6r-0007Gr-5K for incoming@patchwork.ozlabs.org; Wed, 30 Mar 2016 06:12:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6P-0006Yc-3s for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alD6L-0005oc-UB for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:11:53 -0400 Received: from m12-18.163.com ([220.181.12.18]:44865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6K-0005nX-Ed for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:11:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=tvB7jmO5JccElGW1Yx AyGg3Q7biyof40j8JpSjq6azI=; b=bS+gVbLeygNQkbUWeEWuV6jnswJyK7VtCO elrqPYDWSGvFVelA+fKFEPrnKJ9e82wopwH3KGzSTm82uUCgFJ3EuTNSxdj1X17k 9N5KZJWzzvjLOby6Smw8DpChuMP1aTf9FWtTFaPIEYTTU/QzvpNj9qQYxWcIFISt B9ZFqBBV4= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp14 (Coremail) with SMTP id EsCowEAZ20YmpvtWl9EiAA--.10997S3; Wed, 30 Mar 2016 18:10:53 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Wed, 30 Mar 2016 18:09:23 +0800 Message-Id: <1459332567-13629-2-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459332567-13629-1-git-send-email-zxq_yx_007@163.com> References: <1459332567-13629-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EsCowEAZ20YmpvtWl9EiAA--.10997S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45CFyfGw47ZFW8Cw1UGFg_yoW8Cr15pF Z7WFnxuw4DtF4kJr1IgrnrGF1rJFn7u3yFy34fGrWIqw15WF93ZFn8Aw4akryUGrWkAFWY vrW8GF43ta1Utw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jSmhrUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiEA08xlWBUg-iCgAAsG X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.18 Cc: peter.maydell@linaro.org, i.mitsyanko@gmail.com, chouteau@adacore.com, michael@walle.cc, peter.chubb@nicta.com.au, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH 1/9] hw/intc: QOM'ify etraxfs_pic.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 old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao --- hw/intc/etraxfs_pic.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 48f9477..64a6f4b 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -146,19 +146,19 @@ static void irq_handler(void *opaque, int irq, int level) pic_update(fs); } -static int etraxfs_pic_init(SysBusDevice *sbd) +static void etraxfs_pic_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - struct etrax_pic *s = ETRAX_FS_PIC(dev); + DeviceState *dev = DEVICE(obj); + struct etrax_pic *s = ETRAX_FS_PIC(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); qdev_init_gpio_in(dev, irq_handler, 32); sysbus_init_irq(sbd, &s->parent_irq); sysbus_init_irq(sbd, &s->parent_nmi); - memory_region_init_io(&s->mmio, OBJECT(s), &pic_ops, s, + memory_region_init_io(&s->mmio, obj, &pic_ops, s, "etraxfs-pic", R_MAX * 4); sysbus_init_mmio(sbd, &s->mmio); - return 0; } static Property etraxfs_pic_properties[] = { @@ -169,9 +169,7 @@ static Property etraxfs_pic_properties[] = { static void etraxfs_pic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = etraxfs_pic_init; dc->props = etraxfs_pic_properties; /* * Note: pointer property "interrupt_vector" may remain null, thus @@ -183,6 +181,7 @@ static const TypeInfo etraxfs_pic_info = { .name = TYPE_ETRAX_FS_PIC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct etrax_pic), + .instance_init = etraxfs_pic_init, .class_init = etraxfs_pic_class_init, };