From patchwork Tue Mar 29 07:47:22 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: 8683611 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 E144F9F30C for ; Tue, 29 Mar 2016 07:52:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 483F62015A for ; Tue, 29 Mar 2016 07:52:27 +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 7BAEF20109 for ; Tue, 29 Mar 2016 07:52:26 +0000 (UTC) Received: from localhost ([::1]:44985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akoRu-0004zh-0I for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 03:52:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akoOy-0008Gw-6V for qemu-devel@nongnu.org; Tue, 29 Mar 2016 03:49:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akoOt-0000Ry-6m for qemu-devel@nongnu.org; Tue, 29 Mar 2016 03:49:24 -0400 Received: from m12-18.163.com ([220.181.12.18]:48639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akoOr-0000Ph-6G for qemu-devel@nongnu.org; Tue, 29 Mar 2016 03:49:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=nRutcUovckrPoKJ51k abVtZZ/jdmDBd4CRKlUIvI2t8=; b=LyHdmwAd8Zw4zIyV15EN7l23NsKW7RoEAk hHjqOJIyZvQYYbzXi+jPLTJDO8b0mpUdeEDHT9vdXAgv/JjmAsjPFZIBsTh1an4h LXgAr/FymaEUvrMdFtz6eWpbZl9oct8fqIMw8vtNvqCt4TggdRaQBNrLfOU8GvDf PH5xdxB6s= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp14 (Coremail) with SMTP id EsCowEA5HERdM_pWCG9bAA--.33092S5; Tue, 29 Mar 2016 15:48:58 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Tue, 29 Mar 2016 15:47:22 +0800 Message-Id: <1459237645-17227-4-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--.33092S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45Jw15Gr4DZw4rKryDKFg_yoW8Wr1xpr 97AFn0krnxKrsrXFWxGw1xWF15trn5XrnFq34DJws29a43Gr1rtFn0v3ya9FWDXaykZFyf Z3W8try7Aa1DAaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6OJ5UUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFgs7xlWBP7pqrQAAs2 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 3/6] hw/char: QOM'ify lm32_juart.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 Acked-by: Michael Walle Tested-by: Michael Walle --- hw/char/lm32_juart.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 5bf8acf..cd8d0ee 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -114,17 +114,15 @@ static void juart_reset(DeviceState *d) s->jrx = 0; } -static int lm32_juart_init(SysBusDevice *dev) +static void lm32_juart_init(Object *obj) { - LM32JuartState *s = LM32_JUART(dev); + LM32JuartState *s = LM32_JUART(obj); /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */ s->chr = qemu_char_get_next_serial(); if (s->chr) { qemu_chr_add_handlers(s->chr, juart_can_rx, juart_rx, juart_event, s); } - - return 0; } static const VMStateDescription vmstate_lm32_juart = { @@ -141,9 +139,7 @@ static const VMStateDescription vmstate_lm32_juart = { static void lm32_juart_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = lm32_juart_init; dc->reset = juart_reset; dc->vmsd = &vmstate_lm32_juart; /* Reason: init() method uses qemu_char_get_next_serial() */ @@ -154,6 +150,7 @@ static const TypeInfo lm32_juart_info = { .name = TYPE_LM32_JUART, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(LM32JuartState), + .instance_init = lm32_juart_init, .class_init = lm32_juart_class_init, };