From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP7KN-0004r1-SL for qemu-devel@nongnu.org; Tue, 20 Nov 2018 09:48:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP7KN-0000Qj-6c for qemu-devel@nongnu.org; Tue, 20 Nov 2018 09:48:35 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:43513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gP7KN-0000Qd-2h for qemu-devel@nongnu.org; Tue, 20 Nov 2018 09:48:35 -0500 Received: by mail-ot1-x344.google.com with SMTP id a11so1849970otr.10 for ; Tue, 20 Nov 2018 06:48:35 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20181119120820.29878-5-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> <20181119120820.29878-5-maozhongyi@cmss.chinamobile.com> From: Peter Maydell Date: Tue, 20 Nov 2018 14:48:13 +0000 Message-ID: Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [PATCH 04/22] core/empty_slot: 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 , Zhang Shengju On 19 November 2018 at 12:08, Mao Zhongyi wrote: > Use DeviceClass rather than SysBusDeviceClass in > empty_slot_class_init(). > > Signed-off-by: Mao Zhongyi > Signed-off-by: Zhang Shengju > --- > hw/core/empty_slot.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c > index c1b9c2b104..239f78e2a7 100644 > --- a/hw/core/empty_slot.c > +++ b/hw/core/empty_slot.c > @@ -71,21 +71,20 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) > } > } > > -static int empty_slot_init1(SysBusDevice *dev) > +static void empty_slot_realize(DeviceState *dev, Error **errp) > { > EmptySlot *s = EMPTY_SLOT(dev); > > memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, > "empty-slot", s->size); > - sysbus_init_mmio(dev, &s->iomem); > - return 0; > + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); > } > > static void empty_slot_class_init(ObjectClass *klass, void *data) > { > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > - k->init = empty_slot_init1; > + dc->realize = empty_slot_realize; > } > > static const TypeInfo empty_slot_info = { Reviewed-by: Peter Maydell thanks -- PMM