From patchwork Sat Apr 29 10:49:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 9705763 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 33F60602BF for ; Sat, 29 Apr 2017 10:56:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12E4428449 for ; Sat, 29 Apr 2017 10:56:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E96432868E; Sat, 29 Apr 2017 10:56:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 8903D28449 for ; Sat, 29 Apr 2017 10:56:25 +0000 (UTC) Received: from localhost ([::1]:40599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q36-0006VO-Jj for patchwork-qemu-devel@patchwork.kernel.org; Sat, 29 Apr 2017 06:56:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Aw-K6 for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003ho-Jk for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003dY-VS for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=FZc1vJW7yY3ZU+LvVu xPD5PeWb/kVTBDBhXJorjYfPI=; b=L3koRCDnPYpK+PyNN0L4+X7g8L5MYhjRN2 LiAg0noBNHw7c1kgqZFz1A/gPiOWQNScQagAlD2mt3nd4FOklWSkBEnf46eW9LJn j5YjyDyde3JGadELsfEO+ypehAgvnLiAxJdI3+Yq3oIXJ24LxMigD1jZALTyqAdD Z1F16cstg= Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowACXrJjCbwRZpVZtBA--.23413S4; Sat, 29 Apr 2017 18:49:49 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:30 +0800 Message-Id: <20170429104937.31341-3-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowACXrJjCbwRZpVZtBA--.23413S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rtr4UtFWDtrWUAr45trb_yoW8trykpF 93uFs5Wry5KFZrGr13Xan2gF1kJwnYk3yS9rW3Jrn2qFsrWr15tFyvyrySyr909rZ7ZF1F ga95Jw45ur1UCw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jW2NZUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFg3IxlWBVt7uZwAAsA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 2/9] hw/dma: QOM'ify sparc32_dma.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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, pbonzini@redhat.com, atar4qemu@gmail.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop the old SysBus init function and use instance_init and an realize function Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daudé --- hw/dma/sparc32_dma.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 9d545e412e..ef4c6a93c8 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -270,23 +270,28 @@ static const VMStateDescription vmstate_dma = { } }; -static int sparc32_dma_init1(SysBusDevice *sbd) +static void sparc32_dma_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - DMAState *s = SPARC32_DMA(dev); - int reg_size; + DeviceState *dev = DEVICE(obj); + DMAState *s = SPARC32_DMA(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); sysbus_init_irq(sbd, &s->irq); - reg_size = s->is_ledma ? DMA_ETH_SIZE : DMA_SIZE; - memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, - "dma", reg_size); sysbus_init_mmio(sbd, &s->iomem); qdev_init_gpio_in(dev, dma_set_irq, 1); qdev_init_gpio_out(dev, s->gpio, 2); +} - return 0; +static void sparc32_dma_realize(DeviceState *dev, Error **errp) +{ + DMAState *s = SPARC32_DMA(dev); + int reg_size; + + reg_size = s->is_ledma ? DMA_ETH_SIZE : DMA_SIZE; + memory_region_init_io(&s->iomem, OBJECT(dev), &dma_mem_ops, s, + "dma", reg_size); } static Property sparc32_dma_properties[] = { @@ -298,12 +303,11 @@ static Property sparc32_dma_properties[] = { static void sparc32_dma_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = sparc32_dma_init1; dc->reset = dma_reset; dc->vmsd = &vmstate_dma; dc->props = sparc32_dma_properties; + dc->realize = sparc32_dma_realize; /* Reason: pointer property "iommu_opaque" */ dc->cannot_instantiate_with_device_add_yet = true; } @@ -312,6 +316,7 @@ static const TypeInfo sparc32_dma_info = { .name = TYPE_SPARC32_DMA, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(DMAState), + .instance_init = sparc32_dma_init, .class_init = sparc32_dma_class_init, };