From nobody Tue Feb 10 11:58:00 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.zohomail.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 1543571178383466.9062483715255; Fri, 30 Nov 2018 01:46:18 -0800 (PST) Received: from localhost ([::1]:59000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSfNJ-00043y-5a for importer@patchew.org; Fri, 30 Nov 2018 04:46:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSfGj-0006B1-Oa for qemu-devel@nongnu.org; Fri, 30 Nov 2018 04:39:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSfGg-0002T1-94 for qemu-devel@nongnu.org; Fri, 30 Nov 2018 04:39:29 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:33834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSfGf-0002N0-CT for qemu-devel@nongnu.org; Fri, 30 Nov 2018 04:39:26 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app03-12003 (RichMail) with SMTP id 2ee35c01053e5d2-a2237; Fri, 30 Nov 2018 17:39:10 +0800 (CST) Received: from maozy-host.lan (unknown[112.25.154.148]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75c01052eaec-48593; Fri, 30 Nov 2018 17:39:10 +0800 (CST) X-RM-TRANSID: 2ee35c01053e5d2-a2237 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee75c01052eaec-48593 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2018 17:38:39 +0800 Message-Id: <20181130093852.20739-9-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181130093852.20739-1-maozhongyi@cmss.chinamobile.com> References: <20181130093852.20739-1-maozhongyi@cmss.chinamobile.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH v3 08/21] milkymist-softusb: Convert sysbus init function to realize function 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: michael@walle.cc, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Use DeviceClass rather than SysBusDeviceClass in milkymist_softusb_class_init(). Cc: michael@walle.cc Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/input/milkymist-softusb.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index ef8f47cd83..8766a17d9e 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -245,32 +245,31 @@ static void milkymist_softusb_reset(DeviceState *d) s->regs[R_CTRL] =3D CTRL_RESET; } =20 -static int milkymist_softusb_init(SysBusDevice *dev) +static void milkymist_softusb_realize(DeviceState *dev, Error **errp) { MilkymistSoftUsbState *s =3D MILKYMIST_SOFTUSB(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sbd, &s->irq); =20 memory_region_init_io(&s->regs_region, OBJECT(s), &softusb_mmio_ops, s, "milkymist-softusb", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); + sysbus_init_mmio(sbd, &s->regs_region); =20 /* register pmem and dmem */ memory_region_init_ram_nomigrate(&s->pmem, OBJECT(s), "milkymist-softu= sb.pmem", s->pmem_size, &error_fatal); vmstate_register_ram_global(&s->pmem); s->pmem_ptr =3D memory_region_get_ram_ptr(&s->pmem); - sysbus_init_mmio(dev, &s->pmem); + sysbus_init_mmio(sbd, &s->pmem); memory_region_init_ram_nomigrate(&s->dmem, OBJECT(s), "milkymist-softu= sb.dmem", s->dmem_size, &error_fatal); vmstate_register_ram_global(&s->dmem); s->dmem_ptr =3D memory_region_get_ram_ptr(&s->dmem); - sysbus_init_mmio(dev, &s->dmem); + sysbus_init_mmio(sbd, &s->dmem); =20 hid_init(&s->hid_kbd, HID_KEYBOARD, softusb_kbd_hid_datain); hid_init(&s->hid_mouse, HID_MOUSE, softusb_mouse_hid_datain); - - return 0; } =20 static const VMStateDescription vmstate_milkymist_softusb =3D { @@ -296,9 +295,8 @@ static Property milkymist_softusb_properties[] =3D { static void milkymist_softusb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D milkymist_softusb_init; + dc->realize =3D milkymist_softusb_realize; dc->reset =3D milkymist_softusb_reset; dc->vmsd =3D &vmstate_milkymist_softusb; dc->props =3D milkymist_softusb_properties; --=20 2.17.1