From patchwork Thu May 5 10:28:52 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: 618909 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 3r0rnc3VW2z9t3q for ; Thu, 5 May 2016 20:32:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=dJy2wwjq; dkim-atps=neutral Received: from localhost ([::1]:53000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayGZq-0001Jf-SH for incoming@patchwork.ozlabs.org; Thu, 05 May 2016 06:32:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayGZA-0008Sk-PT for qemu-devel@nongnu.org; Thu, 05 May 2016 06:31:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayGYz-0000S8-7I for qemu-devel@nongnu.org; Thu, 05 May 2016 06:31:27 -0400 Received: from m12-18.163.com ([220.181.12.18]:33985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayGYw-0000O3-Rd for qemu-devel@nongnu.org; Thu, 05 May 2016 06:31:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=iEQSDhNsp+bXMGtZyu 7qiee6/Xt78XcXqrgV/CyICuc=; b=dJy2wwjqbGJ4cOx0f0aTXAC6YU1DSRphTa ZtPSd01B1pmrHG9LySYeQNnrbcU4hAF6Io5FiRJPv/0YZyOnIgBYicJsD1F/LqO6 ToYLH2IZBtM3SueKGiP2PUMGIHyX7CuhDTbPprQp9avHMZsLwGke+cV2J8izXe+C sAnZ7BiFE= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp14 (Coremail) with SMTP id EsCowEAZp0qIICtX8b8wAA--.6320S7; Thu, 05 May 2016 18:30:12 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 5 May 2016 18:28:52 +0800 Message-Id: <1462444132-18541-6-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462444132-18541-1-git-send-email-zxq_yx_007@163.com> References: <1462444132-18541-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EsCowEAZp0qIICtX8b8wAA--.6320S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45CrWfKr47Xr1kuF48JFb_yoW8Xr18pF yDZFnIkFs8GF4kZrZ7Xr1qgFn8Wrs5u3s3Jw43K34Sv3W3tryFqr1DA3yrAFs8JaykZa4Y vF4xKFy8tw4UGw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j7pnQUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEBZgxlUL8QEpnQAAs6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.18 Subject: [Qemu-devel] [PATCH v1 5/9] hw/intc: QOM'ify lm32_pic.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, i.mitsyanko@gmail.com, chouteau@adacore.com, blauwirbel@gmail.com, michael@walle.cc, peter.chubb@nicta.com.au, edgar.iglesias@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao --- hw/intc/lm32_pic.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index edc08f1..3dad01c 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -152,17 +152,16 @@ static void pic_reset(DeviceState *d) } } -static int lm32_pic_init(SysBusDevice *sbd) +static void lm32_pic_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - LM32PicState *s = LM32_PIC(dev); + DeviceState *dev = DEVICE(obj); + LM32PicState *s = LM32_PIC(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); qdev_init_gpio_in(dev, irq_handler, 32); sysbus_init_irq(sbd, &s->parent_irq); pic = s; - - return 0; } static const VMStateDescription vmstate_lm32_pic = { @@ -181,9 +180,7 @@ static const VMStateDescription vmstate_lm32_pic = { static void lm32_pic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = lm32_pic_init; dc->reset = pic_reset; dc->vmsd = &vmstate_lm32_pic; } @@ -192,6 +189,7 @@ static const TypeInfo lm32_pic_info = { .name = TYPE_LM32_PIC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(LM32PicState), + .instance_init = lm32_pic_init, .class_init = lm32_pic_class_init, };