From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP7Jo-0004WI-Ad for qemu-devel@nongnu.org; Tue, 20 Nov 2018 09:48:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP7Jn-0000Fj-7L for qemu-devel@nongnu.org; Tue, 20 Nov 2018 09:48:00 -0500 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:37325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gP7Jn-0000FV-2y for qemu-devel@nongnu.org; Tue, 20 Nov 2018 09:47:59 -0500 Received: by mail-oi1-x243.google.com with SMTP id y23so1684096oia.4 for ; Tue, 20 Nov 2018 06:47:59 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20181119120820.29878-12-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> <20181119120820.29878-12-maozhongyi@cmss.chinamobile.com> From: Peter Maydell Date: Tue, 20 Nov 2018 14:47:38 +0000 Message-ID: Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [PATCH 11/22] milkymist-hpdmc: Convert sysbus init function to realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mao Zhongyi Cc: QEMU Developers , Michael Walle , Guan Xuetao , Zhang Shengju On 19 November 2018 at 12:08, Mao Zhongyi wrote: > Use DeviceClass rather than SysBusDeviceClass in > milkymist_hpdmc_class_init(). > > Cc: gxt@mprc.pku.edu.cn > Cc: michael@walle.cc > > Signed-off-by: Mao Zhongyi > Signed-off-by: Zhang Shengju > --- > hw/intc/puv3_intc.c | 1 + > hw/misc/milkymist-hpdmc.c | 9 +++------ > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c > index dfef505c47..a3ca6d466b 100644 > --- a/hw/intc/puv3_intc.c > +++ b/hw/intc/puv3_intc.c > @@ -119,6 +119,7 @@ static void puv3_intc_realize(DeviceState *dev, Error **errp) > static void puv3_intc_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > + > dc->realize = puv3_intc_realize; > } Stray change to the wrong file ? > diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c > index e6140eec6b..44dc0698ec 100644 > --- a/hw/misc/milkymist-hpdmc.c > +++ b/hw/misc/milkymist-hpdmc.c > @@ -129,15 +129,13 @@ static void milkymist_hpdmc_reset(DeviceState *d) > | IODELAY_PLL2_LOCKED; > } > > -static int milkymist_hpdmc_init(SysBusDevice *dev) > +static void milkymist_hpdmc_realize(DeviceState *dev, Error **errp) > { > MilkymistHpdmcState *s = MILKYMIST_HPDMC(dev); > > memory_region_init_io(&s->regs_region, OBJECT(dev), &hpdmc_mmio_ops, s, > "milkymist-hpdmc", R_MAX * 4); > - sysbus_init_mmio(dev, &s->regs_region); > - > - return 0; > + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->regs_region); > } > > static const VMStateDescription vmstate_milkymist_hpdmc = { > @@ -153,9 +151,8 @@ static const VMStateDescription vmstate_milkymist_hpdmc = { > static void milkymist_hpdmc_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > > - k->init = milkymist_hpdmc_init; > + dc->realize = milkymist_hpdmc_realize; > dc->reset = milkymist_hpdmc_reset; > dc->vmsd = &vmstate_milkymist_hpdmc; > } thanks -- PMM