From patchwork Thu Mar 17 09:20:25 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: 8608661 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 29269C0553 for ; Thu, 17 Mar 2016 09:25:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E2FA202E6 for ; Thu, 17 Mar 2016 09:25: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 D578820279 for ; Thu, 17 Mar 2016 09:25:28 +0000 (UTC) Received: from localhost ([::1]:33645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agUBM-0002t1-91 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 05:25:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agU8C-0005RA-Ru for qemu-devel@nongnu.org; Thu, 17 Mar 2016 05:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agU8A-0007X4-Cp for qemu-devel@nongnu.org; Thu, 17 Mar 2016 05:22:12 -0400 Received: from m12-11.163.com ([220.181.12.11]:51233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agU89-0007WD-Vi for qemu-devel@nongnu.org; Thu, 17 Mar 2016 05:22:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=CLBiGSulmbeU6jjawh v3f5MqTCY8QFZ4bidACdiAnKQ=; b=ft4JdxbfzACBeMxwqj/bZsTOni57+8rD4n mFKXCZpp4DsrhcFaxH5fKW2lFxri3uIJLgKJlXRFXZd9WnrozftQ0JtekYz0bx/K c1FnZxcfgMYIYqhdiaAhZWn7IIgKcBhjeWvX2bx8pcxHC3DziCz1ExZHGwvBDJ2+ 1+EZ7FDL8= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp7 (Coremail) with SMTP id C8CowABHoWwpd+pWo3YaAw--.26085S3; Thu, 17 Mar 2016 17:21:55 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 17 Mar 2016 17:20:25 +0800 Message-Id: <1458206430-21917-2-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458206430-21917-1-git-send-email-zxq_yx_007@163.com> References: <1458206430-21917-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: C8CowABHoWwpd+pWo3YaAw--.26085S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45AFy3Xw1UtFyDKF4Durg_yoW8Cr4DpF 9rCF1kGr48GFs2qrZ3t3WkCF18J3Z7GryfKrWxGwna93Z7Cry5tFWkZa4avFWDGFZ3Aa45 Ww4ktFy7Za18Gw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jd9N3UUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOxQvxlXlSYuUvwABse X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.11 Cc: cornelia.huck@de.ibm.com, pbonzini@redhat.com, michael@walle.cc, agraf@suse.de, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH 1/6] hw/char: QOM'ify escc.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/escc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/char/escc.c b/hw/char/escc.c index c7a24ac..370e6b1 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -983,9 +983,10 @@ void slavio_serial_ms_kbd_init(hwaddr base, qemu_irq irq, sysbus_mmio_map(s, 0, base); } -static int escc_init1(SysBusDevice *dev) +static void escc_init1(Object *obj) { - ESCCState *s = ESCC(dev); + ESCCState *s = ESCC(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); unsigned int i; s->chn[0].disabled = s->disabled; @@ -1002,7 +1003,7 @@ static int escc_init1(SysBusDevice *dev) s->chn[0].otherchn = &s->chn[1]; s->chn[1].otherchn = &s->chn[0]; - memory_region_init_io(&s->mmio, OBJECT(s), &escc_mem_ops, s, "escc", + memory_region_init_io(&s->mmio, obj, &escc_mem_ops, s, "escc", ESCC_SIZE << s->it_shift); sysbus_init_mmio(dev, &s->mmio); @@ -1014,8 +1015,6 @@ static int escc_init1(SysBusDevice *dev) s->chn[1].hs = qemu_input_handler_register((DeviceState *)(&s->chn[1]), &sunkbd_handler); } - - return 0; } static Property escc_properties[] = { @@ -1032,9 +1031,7 @@ static Property escc_properties[] = { static void escc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = escc_init1; dc->reset = escc_reset; dc->vmsd = &vmstate_escc; dc->props = escc_properties; @@ -1045,6 +1042,7 @@ static const TypeInfo escc_info = { .name = TYPE_ESCC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ESCCState), + .instance_init = escc_init1, .class_init = escc_class_init, };