From patchwork Wed May 25 06:39:02 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: 9134879 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 7D86C60221 for ; Wed, 25 May 2016 06:49:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7192D282AC for ; Wed, 25 May 2016 06:49:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 664D4282CF; Wed, 25 May 2016 06:49:24 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 0408A282AC for ; Wed, 25 May 2016 06:49:24 +0000 (UTC) Received: from localhost ([::1]:57735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5Sd9-0007Ao-6v for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 May 2016 02:49:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5STz-0008NV-QT for qemu-devel@nongnu.org; Wed, 25 May 2016 02:40:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5STr-0000K7-B9 for qemu-devel@nongnu.org; Wed, 25 May 2016 02:39:54 -0400 Received: from m12-11.163.com ([220.181.12.11]:40377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5STq-0000J6-Vf for qemu-devel@nongnu.org; Wed, 25 May 2016 02:39:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=5Joa7qyiaKLXAhCXyt 5gxfc/uINEJYzzmuJezLJkvvc=; b=eRj6ENuzEBAPz4JNelZWvWzDPgMvCw22T5 OBbfjgnNqB8ec1Ht8YMjCcHERHfaDwTk7JY0oBkWLExjj2yDSCL1ySeA28P2YA8z 8bFK6+mgm/8C2IgeLSxj4ohDaET3U4YN6ASFoMgX7naVyc65JtgxLSBN/ketd30J PaHQocRbk= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp7 (Coremail) with SMTP id C8CowAC34niLSEVXFUNKEA--.11746S5; Wed, 25 May 2016 14:39:16 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Wed, 25 May 2016 14:39:02 +0800 Message-Id: <1464158344-12266-4-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464158344-12266-1-git-send-email-zxq_yx_007@163.com> References: <1464158344-12266-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: C8CowAC34niLSEVXFUNKEA--.11746S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxXF45JrW8uw17KrWUJrWxXrb_yoWrGF48pF WkXFsIkF45Kwn7XrW7Gr17GF1qyrn5G3Zrt34xGwn2vay7GryYqrn0gayIkFWUJFWkZF9x Z3WUJr17ta1Sy3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6YLkUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFhV0xlWBRBryAQAAsI X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.11 Subject: [Qemu-devel] [PATCH v6 3/5] hw/char: QOM'ify lm32_juart.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, agraf@suse.de, armbru@redhat.com, michael@walle.cc, edgar.iglesias@gmail.com, pbonzini@redhat.com 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 * Call qemu_chr_add_handlers in the realize callback * Use qdev chardev prop instead of qemu_char_get_next_serial Signed-off-by: xiaoqiang zhao Tested-by: Michael Walle Acked-by: Michael Walle --- hw/char/lm32_juart.c | 17 ++++++++--------- hw/lm32/lm32.h | 3 ++- hw/lm32/lm32_boards.c | 5 +++-- hw/lm32/milkymist.c | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 5bf8acf..28c2cf7 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -114,17 +114,13 @@ static void juart_reset(DeviceState *d) s->jrx = 0; } -static int lm32_juart_init(SysBusDevice *dev) +static void lm32_juart_realize(DeviceState *dev, Error **errp) { LM32JuartState *s = LM32_JUART(dev); - /* 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 = { @@ -138,16 +134,19 @@ static const VMStateDescription vmstate_lm32_juart = { } }; +static Property lm32_juart_properties[] = { + DEFINE_PROP_CHR("chardev", LM32JuartState, chr), + DEFINE_PROP_END_OF_LIST(), +}; + 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() */ - dc->cannot_instantiate_with_device_add_yet = true; + dc->props = lm32_juart_properties; + dc->realize = lm32_juart_realize; } static const TypeInfo lm32_juart_info = { diff --git a/hw/lm32/lm32.h b/hw/lm32/lm32.h index 18aa6fd..a993f00 100644 --- a/hw/lm32/lm32.h +++ b/hw/lm32/lm32.h @@ -16,11 +16,12 @@ static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq) return dev; } -static inline DeviceState *lm32_juart_init(void) +static inline DeviceState *lm32_juart_init(CharDriverState *chr) { DeviceState *dev; dev = qdev_create(NULL, TYPE_LM32_JUART); + qdev_prop_set_chr(dev, "chardev", chr); qdev_init_nofail(dev); return dev; diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index c029056..2ae6555 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -31,6 +31,7 @@ #include "lm32_hwsetup.h" #include "lm32.h" #include "exec/address-spaces.h" +#include "sysemu/sysemu.h" typedef struct { LM32CPU *cpu; @@ -136,7 +137,7 @@ static void lm32_evr_init(MachineState *machine) sysbus_create_simple("lm32-timer", timer1_base, irq[timer1_irq]); /* make sure juart isn't the first chardev */ - env->juart_state = lm32_juart_init(); + env->juart_state = lm32_juart_init(serial_hds[1]); reset_info->bootstrap_pc = flash_base; @@ -238,7 +239,7 @@ static void lm32_uclinux_init(MachineState *machine) sysbus_create_simple("lm32-timer", timer2_base, irq[timer2_irq]); /* make sure juart isn't the first chardev */ - env->juart_state = lm32_juart_init(); + env->juart_state = lm32_juart_init(serial_hds[1]); reset_info->bootstrap_pc = flash_base; diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 1abdf6e..ebd8a3c 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -175,7 +175,7 @@ milkymist_init(MachineState *machine) 0x20000000, 0x1000, 0x20020000, 0x2000); /* make sure juart isn't the first chardev */ - env->juart_state = lm32_juart_init(); + env->juart_state = lm32_juart_init(serial_hds[1]); if (kernel_filename) { uint64_t entry;