From patchwork Tue Mar 29 07:47:21 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: 8683571 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 E7F159FDCC for ; Tue, 29 Mar 2016 07:49:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5FE1201BC for ; Tue, 29 Mar 2016 07:49:29 +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 ADA6920109 for ; Tue, 29 Mar 2016 07:49:28 +0000 (UTC) Received: from localhost ([::1]:44949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akoP2-0007zm-59 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 03:49:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akoOn-0007zH-Qn for qemu-devel@nongnu.org; Tue, 29 Mar 2016 03:49:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akoOm-0000Pd-NA for qemu-devel@nongnu.org; Tue, 29 Mar 2016 03:49:13 -0400 Received: from m12-18.163.com ([220.181.12.18]:48197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akoOl-0000MX-Sy for qemu-devel@nongnu.org; Tue, 29 Mar 2016 03:49:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=QM43A8xHYi8mXbwpln nh8hwcloM5xDBK4m62G2OMq/U=; b=PCaHPg4tDtLDqMuCuu/S7HxmS+udAhnVMD ouTbOaQq6pSwo40h4qykRTDWgCw9jEGl4UljvsNnwk5AEdZyE5S/SFyQ7DO4AKJK BqZk9skpI/TWK7TZq1klBFLUcK6Lleg05a9sbqKvhGJYU3J/PlN/SpbnHIzzpIuD +NGDZ9wqk= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp14 (Coremail) with SMTP id EsCowEA5HERdM_pWCG9bAA--.33092S4; Tue, 29 Mar 2016 15:48:58 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Tue, 29 Mar 2016 15:47:21 +0800 Message-Id: <1459237645-17227-3-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459237645-17227-1-git-send-email-zxq_yx_007@163.com> References: <1459237645-17227-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EsCowEA5HERdM_pWCG9bAA--.33092S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45uw43uw18ZryxZFy3CFg_yoW8Ww13pr Z7GFsrCr4DtFs8Jw17KF4kWF15W3Z7C34Sk34xJw4fKw13CFWDtFn8Aa4av34DWrZ5ZF1Y v3y8A347A3W0yr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jgfHUUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiTAs7xlSIOMxBVgAAsF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.18 Cc: cornelia.huck@de.ibm.com, pbonzini@redhat.com, michael@walle.cc, agraf@suse.de, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v2 2/6] hw/char: QOM'ify etraxfs_ser.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/char/etraxfs_ser.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 146b387..ede7024 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -209,12 +209,13 @@ static void etraxfs_ser_reset(DeviceState *d) } -static int etraxfs_ser_init(SysBusDevice *dev) +static void etraxfs_ser_init(Object *obj) { - ETRAXSerial *s = ETRAX_SERIAL(dev); + ETRAXSerial *s = ETRAX_SERIAL(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); sysbus_init_irq(dev, &s->irq); - memory_region_init_io(&s->mmio, OBJECT(s), &ser_ops, s, + memory_region_init_io(&s->mmio, obj, &ser_ops, s, "etraxfs-serial", R_MAX * 4); sysbus_init_mmio(dev, &s->mmio); @@ -225,15 +226,12 @@ static int etraxfs_ser_init(SysBusDevice *dev) serial_can_receive, serial_receive, serial_event, s); } - return 0; } static void etraxfs_ser_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = etraxfs_ser_init; dc->reset = etraxfs_ser_reset; /* Reason: init() method uses qemu_char_get_next_serial() */ dc->cannot_instantiate_with_device_add_yet = true; @@ -243,6 +241,7 @@ static const TypeInfo etraxfs_ser_info = { .name = TYPE_ETRAX_FS_SERIAL, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ETRAXSerial), + .instance_init = etraxfs_ser_init, .class_init = etraxfs_ser_class_init, };