From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPFDg-0000kO-Ge for qemu-devel@nongnu.org; Tue, 20 Nov 2018 18:14:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPFDd-0005jD-Bq for qemu-devel@nongnu.org; Tue, 20 Nov 2018 18:14:12 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPFDd-0005fN-5e for qemu-devel@nongnu.org; Tue, 20 Nov 2018 18:14:09 -0500 Received: by mail-wr1-f66.google.com with SMTP id b13so3723602wrx.6 for ; Tue, 20 Nov 2018 15:14:05 -0800 (PST) References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> <20181119120820.29878-15-maozhongyi@cmss.chinamobile.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Wed, 21 Nov 2018 00:14:03 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 14/22] nvram/ds1225y: Convert sysbus init function to realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , Mao Zhongyi , =?UTF-8?Q?Herv=c3=a9_Poussineau?= Cc: Paolo Bonzini , QEMU Developers , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Zhang Shengju Hi Peter, On 20/11/18 15:51, Peter Maydell wrote: > On 19 November 2018 at 12:08, Mao Zhongyi > wrote: >> 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 >> --- >> 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" >> >> typedef struct { >> MemoryRegion iomem; >> @@ -113,7 +114,7 @@ typedef struct { >> NvRamState nvram; >> } SysBusNvRamState; >> >> -static int nvram_sysbus_initfn(SysBusDevice *dev) >> +static void nvram_sysbus_realize(DeviceState *dev, Error **errp) >> { >> SysBusNvRamState *sys = DS1225Y(dev); >> NvRamState *s = &sys->nvram; >> @@ -123,20 +124,18 @@ static int nvram_sysbus_initfn(SysBusDevice *dev) >> >> 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); >> >> /* Read current file */ >> file = s->filename ? fopen(s->filename, "rb") : NULL; >> if (file) { >> /* Read nvram contents */ >> if (fread(s->contents, s->chip_size, 1, file) != 1) { >> - printf("nvram_sysbus_initfn: short read\n"); >> + error_report("nvram_sysbus_realize: short read"); > > It seems a bit odd that we don't make this cause the > device to fail its realize method, though I suppose > it was not previously. I think the case where the file length is <= chip_size is OK, since the contents buffer is zero-allocated. Now for the other case when length > chip_size, you are right we shouldn't ignore it and throw an error. However this is not related to this patch and should be addressed in a different patch, so for this patch: Reviewed-by: Philippe Mathieu-Daudé This file is named ds1225y but is rather a generic way to byte-access a file (except the default chip_size which is 8kB for the DS1225Y). Is there a more up-to-date way to do that nowaday? > >> } >> fclose(file); >> } >> nvram_post_load(s, 0); >> - >> - return 0; >> } >> >> static Property nvram_sysbus_properties[] = { >> @@ -148,9 +147,8 @@ static Property nvram_sysbus_properties[] = { >> static void nvram_sysbus_class_init(ObjectClass *klass, void *data) >> { >> DeviceClass *dc = DEVICE_CLASS(klass); >> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); >> >> - k->init = nvram_sysbus_initfn; >> + dc->realize = nvram_sysbus_realize; >> dc->vmsd = &vmstate_nvram; >> dc->props = nvram_sysbus_properties; >> } >> -- >> 2.17.1 >> > > thanks > -- PMM >