From patchwork Tue Feb 16 11:10:23 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: 8324111 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 A4CDAC02AA for ; Tue, 16 Feb 2016 11:16:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F0EFC2026D for ; Tue, 16 Feb 2016 11:16:13 +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 4B3072026C for ; Tue, 16 Feb 2016 11:16:12 +0000 (UTC) Received: from localhost ([::1]:44379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVdc3-0005UV-Hy for patchwork-qemu-devel@patchwork.kernel.org; Tue, 16 Feb 2016 06:16:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVdXy-00070h-Bb for qemu-devel@nongnu.org; Tue, 16 Feb 2016 06:12:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVdXu-0006q7-9l for qemu-devel@nongnu.org; Tue, 16 Feb 2016 06:11:58 -0500 Received: from m12-12.163.com ([220.181.12.12]:35957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVdXt-0006pC-V1; Tue, 16 Feb 2016 06:11:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=hybcemMKZJUSibcMPe K+sEs/4DqHIWS6QV6WMv2Uw5c=; b=jQrQshQCjumWFGOBgl2kbkQki6QE1VF8zC 6wWMl3hgkknh1m7FFU8a57TqY7Be45nCMdEXV612GIWcd1KRRKEUVYcOEHYFwFZq XxNKX1VwwMfjt0UZvjj6kdCPd1YfugUODQ3383L3FxC6/KdldotP/V/jhDINIbkU A4dx7+7e4= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp8 (Coremail) with SMTP id DMCowABXn_PgA8NWODCxBQ--.25459S4; Tue, 16 Feb 2016 19:11:33 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Tue, 16 Feb 2016 19:10:23 +0800 Message-Id: <1455621027-13927-3-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455621027-13927-1-git-send-email-zxq_yx_007@163.com> References: <1455621027-13927-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DMCowABXn_PgA8NWODCxBQ--.25459S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kr43XFWfJr4DKFy7Jw1xuFg_yoW8AF43pF ZruF1qvF48Jrs5Z3yxKF1DWF1DGws7Ca4rGrn2y3WSk3W3Kr1rJF1kA3yayFW7trWruF45 Zry8JrWUAa18Jw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UVxRhUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiTAYRxlSINZloDgAAsL X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.12 Cc: peter.maydell@linaro.org, e.voevodin@samsung.com, xiaoqiang zhao , mark.cave-ayland@ilande.co.uk, michael@walle.cc, qemu-arm@nongnu.org, edgar.iglesias@gmail.com, gxt@mprc.pku.edu.cn, afaerber@suse.de Subject: [Qemu-devel] [PATCH v3 12/16] hw/timer: QOM'ify pl031 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 assign pl031_init to pl031_info.instance_init and drop the SysBusDeviceClass::init Reviewed-by: Peter Maydell Signed-off-by: xiaoqiang zhao --- hw/timer/pl031.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index d99d18c..3ccb2cb 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -192,12 +192,13 @@ static const MemoryRegionOps pl031_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int pl031_init(SysBusDevice *dev) +static void pl031_init(Object *obj) { - PL031State *s = PL031(dev); + PL031State *s = PL031(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); struct tm tm; - memory_region_init_io(&s->iomem, OBJECT(s), &pl031_ops, s, "pl031", 0x1000); + memory_region_init_io(&s->iomem, obj, &pl031_ops, s, "pl031", 0x1000); sysbus_init_mmio(dev, &s->iomem); sysbus_init_irq(dev, &s->irq); @@ -206,7 +207,6 @@ static int pl031_init(SysBusDevice *dev) qemu_clock_get_ns(rtc_clock) / get_ticks_per_sec(); s->timer = timer_new_ns(rtc_clock, pl031_interrupt, s); - return 0; } static void pl031_pre_save(void *opaque) @@ -249,9 +249,7 @@ static const VMStateDescription vmstate_pl031 = { static void pl031_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = pl031_init; dc->vmsd = &vmstate_pl031; } @@ -259,6 +257,7 @@ static const TypeInfo pl031_info = { .name = TYPE_PL031, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PL031State), + .instance_init = pl031_init, .class_init = pl031_class_init, };