From nobody Tue Feb 10 20:24:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486302268519698.6908630787482; Sun, 5 Feb 2017 05:44:28 -0800 (PST) Received: from localhost ([::1]:43305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN7D-0004pd-2z for importer@patchew.org; Sun, 05 Feb 2017 08:44:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Av-5H for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN18-0003IS-QY for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Ep-CK for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:10 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowACnVrepKpdYyVK9Ig--.30409S5; Sun, 05 Feb 2017 21:37:47 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Nm/x+9F6HAneVAs5qQ FuyGPRx/xXLNy3Qq+sNDpulfU=; b=YN3Ahw3He1E1FHqBN+zA6jwnNviP6UmaSi awCb1eXvvOs7r5Ejh7z6tUbHKkFCbHjatT+vpDM/h76pMBIz98EWcZi6ihTXpXZV WP4UynmNhOB8Tnk4XyHYkOKyKipq6P2gzTf2c3o6Yi2ks2hs9LqxDSrxqYHEw2pd aXqtb21ZA= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:25 +0800 Message-Id: <20170205133727.23424-8-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowACnVrepKpdYyVK9Ig--.30409S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF18KF45GFyfZw1UKw4Uurg_yoW8ur1DpF WxWF9rArnFyr4Dtw4xJF1DWFW8XFn7CF45Cw4ktws7AFn7W3WDJ3WUJrZ7tFWxJFWv9Fy3 A3yrWF13Zr45Jw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bUdgZUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0gt1xlUMCmuL-AAAsl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 7/9] hw/timer: QOM'ify slavio_timer 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" rename slavio_timer_init1 to slavio_timer_init and assign it to slavio_timer_info.instance_init, then we drop the SysBusDeviceClass::init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/slavio_timer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index bfee1f3027..a8cc9c0148 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -373,9 +373,10 @@ static void slavio_timer_reset(DeviceState *d) s->cputimer_mode =3D 0; } =20 -static int slavio_timer_init1(SysBusDevice *dev) +static void slavio_timer_init(Object *obj) { - SLAVIO_TIMERState *s =3D SLAVIO_TIMER(dev); + SLAVIO_TIMERState *s =3D SLAVIO_TIMER(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); QEMUBH *bh; unsigned int i; TimerContext *tc; @@ -394,14 +395,12 @@ static int slavio_timer_init1(SysBusDevice *dev) =20 size =3D i =3D=3D 0 ? SYS_TIMER_SIZE : CPU_TIMER_SIZE; snprintf(timer_name, sizeof(timer_name), "timer-%i", i); - memory_region_init_io(&tc->iomem, OBJECT(s), &slavio_timer_mem_ops= , tc, + memory_region_init_io(&tc->iomem, obj, &slavio_timer_mem_ops, tc, timer_name, size); sysbus_init_mmio(dev, &tc->iomem); =20 sysbus_init_irq(dev, &s->cputimer[i].irq); } - - return 0; } =20 static Property slavio_timer_properties[] =3D { @@ -412,9 +411,7 @@ static Property slavio_timer_properties[] =3D { static void slavio_timer_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D slavio_timer_init1; dc->reset =3D slavio_timer_reset; dc->vmsd =3D &vmstate_slavio_timer; dc->props =3D slavio_timer_properties; @@ -424,6 +421,7 @@ static const TypeInfo slavio_timer_info =3D { .name =3D TYPE_SLAVIO_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SLAVIO_TIMERState), + .instance_init =3D slavio_timer_init, .class_init =3D slavio_timer_class_init, }; =20 --=20 2.11.0