From nobody Tue Feb 10 17:14:06 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629982378541.288691695479; Mon, 19 Nov 2018 04:19:42 -0800 (PST) Received: from localhost ([::1]:55597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiWf-0002aJ-Du for importer@patchew.org; Mon, 19 Nov 2018 07:19:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMR-0001mp-B7 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMO-0002xz-4m for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:24225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMN-0002r9-6g for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app04-12004 (RichMail) with SMTP id 2ee45bf2a7cc01d-91a57; Mon, 19 Nov 2018 20:08:45 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10532; Mon, 19 Nov 2018 20:08:45 +0800 (CST) X-RM-TRANSID: 2ee45bf2a7cc01d-91a57 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10532 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:12 +0800 Message-Id: <20181119120820.29878-15-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 14/22] nvram/ds1225y: 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: pbonzini@redhat.com, Zhang Shengju , Mao Zhongyi , marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in nvram_sysbus_class_init(). Cc: pbonzini@redhat.com Cc: marcandre.lureau@redhat.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvram/ds1225y.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index ad7345f288..b6ef463db0 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "trace.h" +#include "qemu/error-report.h" =20 typedef struct { MemoryRegion iomem; @@ -113,7 +114,7 @@ typedef struct { NvRamState nvram; } SysBusNvRamState; =20 -static int nvram_sysbus_initfn(SysBusDevice *dev) +static void nvram_sysbus_realize(DeviceState *dev, Error **errp) { SysBusNvRamState *sys =3D DS1225Y(dev); NvRamState *s =3D &sys->nvram; @@ -123,20 +124,18 @@ static int nvram_sysbus_initfn(SysBusDevice *dev) =20 memory_region_init_io(&s->iomem, OBJECT(s), &nvram_ops, s, "nvram", s->chip_size); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); =20 /* Read current file */ file =3D s->filename ? fopen(s->filename, "rb") : NULL; if (file) { /* Read nvram contents */ if (fread(s->contents, s->chip_size, 1, file) !=3D 1) { - printf("nvram_sysbus_initfn: short read\n"); + error_report("nvram_sysbus_realize: short read"); } fclose(file); } nvram_post_load(s, 0); - - return 0; } =20 static Property nvram_sysbus_properties[] =3D { @@ -148,9 +147,8 @@ static Property nvram_sysbus_properties[] =3D { static void nvram_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D nvram_sysbus_initfn; + dc->realize =3D nvram_sysbus_realize; dc->vmsd =3D &vmstate_nvram; dc->props =3D nvram_sysbus_properties; } --=20 2.17.1