From patchwork Wed Mar 30 10:09:44 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: 8695191 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5B2659F39A for ; Wed, 30 Mar 2016 10:15:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B43C220361 for ; Wed, 30 Mar 2016 10:15:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 531AF20364 for ; Wed, 30 Mar 2016 10:15:10 +0000 (UTC) Received: from localhost ([::1]:52949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD9Z-0003VL-KW for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Mar 2016 06:15:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6u-0007OD-3S for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:12:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alD6q-00068E-SC for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:12:24 -0400 Received: from m12-12.163.com ([220.181.12.12]:41052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6q-00064X-6E for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:12:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=fn7WPPxdQI7IPMbVRS VfzFIcdeH0dOlt/QVV+B3YcxM=; b=DJzcLdxEp8tv2yarz7YTfJCWkIGXGp44kn Za7vOhGaKWNRa6YDNp0ZH0nLEepFgRhbwHYrG92Fr8bHDtbn/rKRCL5nR9kKNrmE 9SMUTOd/PuqBkaaF4oMDZCB85BJvcJ899yJY679vV+WBgetIRRhSnf5TbVsfDAVM 1lNxm6M7I= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp8 (Coremail) with SMTP id DMCowAAnIV84pvtWicgFBw--.798S3; Wed, 30 Mar 2016 18:11:34 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Wed, 30 Mar 2016 18:09:44 +0800 Message-Id: <1459332586-13693-2-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459332586-13693-1-git-send-email-zxq_yx_007@163.com> References: <1459332586-13693-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DMCowAAnIV84pvtWicgFBw--.798S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rXFWrJryDXF1rZw13Arb_yoW8CF43pF y3WFn8Zr9IyF4DJr4xXr1DGr40gwn3u343CrsFkF97CrnxCFyDAwn8JFyfArWxW3ykCF1a q3yrG39rWa1UGw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jSyxiUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiMxc8xlXlfaf66AAAsm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.12 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 7/9] hw/intc: QOM'ify slavio_intctl.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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao --- hw/intc/slavio_intctl.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index c9486ed..e82e893 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -418,15 +418,16 @@ static void slavio_intctl_reset(DeviceState *d) slavio_check_interrupts(s, 0); } -static int slavio_intctl_init1(SysBusDevice *sbd) +static void slavio_intctl_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - SLAVIO_INTCTLState *s = SLAVIO_INTCTL(dev); + DeviceState *dev = DEVICE(obj); + SLAVIO_INTCTLState *s = SLAVIO_INTCTL(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); unsigned int i, j; char slave_name[45]; qdev_init_gpio_in(dev, slavio_set_irq_all, 32 + MAX_CPUS); - memory_region_init_io(&s->iomem, OBJECT(s), &slavio_intctlm_mem_ops, s, + memory_region_init_io(&s->iomem, obj, &slavio_intctlm_mem_ops, s, "master-interrupt-controller", INTCTLM_SIZE); sysbus_init_mmio(sbd, &s->iomem); @@ -443,16 +444,12 @@ static int slavio_intctl_init1(SysBusDevice *sbd) s->slaves[i].cpu = i; s->slaves[i].master = s; } - - return 0; } static void slavio_intctl_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = slavio_intctl_init1; dc->reset = slavio_intctl_reset; dc->vmsd = &vmstate_intctl; } @@ -461,6 +458,7 @@ static const TypeInfo slavio_intctl_info = { .name = TYPE_SLAVIO_INTCTL, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(SLAVIO_INTCTLState), + .instance_init = slavio_intctl_init, .class_init = slavio_intctl_class_init, };