From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f47jP-0005Cr-NX for qemu-devel@nongnu.org; Thu, 05 Apr 2018 12:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f47jL-0003tW-NL for qemu-devel@nongnu.org; Thu, 05 Apr 2018 12:27:23 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:38936) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f47jL-0003tP-Hk for qemu-devel@nongnu.org; Thu, 05 Apr 2018 12:27:19 -0400 Received: by mail-qk0-x241.google.com with SMTP id j73so26954443qke.6 for ; Thu, 05 Apr 2018 09:27:19 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= References: <1522920750-11020-1-git-send-email-thuth@redhat.com> <8a8d49e3-478f-0d9d-80d1-f11101fd18bb@amsat.org> Message-ID: <7ab77e4d-ea50-19e3-d1f4-5e1219c368a4@amsat.org> Date: Thu, 5 Apr 2018 13:27:16 -0300 MIME-Version: 1.0 In-Reply-To: <8a8d49e3-478f-0d9d-80d1-f11101fd18bb@amsat.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] hw/sparc64/sun4u: Fix introspection by converting prom instance_init to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-devel@nongnu.org, Mark Cave-Ayland Cc: Artyom Tarasenko On 04/05/2018 01:22 PM, Philippe Mathieu-Daudé wrote: > On 04/05/2018 06:32 AM, Thomas Huth wrote: >> The instance_init function of devices should always succeed to be able >> to introspect the device. However, the instance_init function of the >> "openprom" device can currently fail, for example like this: >> >> $ echo "{'execute':'qmp_capabilities'}"\ >> "{'execute':'device-list-properties',"\ >> " 'arguments':{'typename':'openprom'}}" \ >> | sparc64-softmmu/qemu-system-sparc64 -M sun4v,accel=qtest -qmp stdio >> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2}, >> "package": "build-all"}, "capabilities": []}} >> {"return": {}} >> RAMBlock "sun4u.prom" already registered, abort! >> Aborted (core dumped) >> >> This should not happen. Fix this problem by moving the affected code from >> instance_init into a realize function instead. >> >> Signed-off-by: Thomas Huth >> --- >> hw/sparc64/sun4u.c | 18 ++++++++++++------ >> 1 file changed, 12 insertions(+), 6 deletions(-) >> >> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c >> index 2044a52..d62f5a2 100644 >> --- a/hw/sparc64/sun4u.c >> +++ b/hw/sparc64/sun4u.c >> @@ -425,13 +425,19 @@ static void prom_init(hwaddr addr, const char *bios_name) >> } >> } >> >> -static void prom_init1(Object *obj) >> +static void prom_realize(DeviceState *ds, Error **errp) >> { >> - PROMState *s = OPENPROM(obj); >> - SysBusDevice *dev = SYS_BUS_DEVICE(obj); >> + PROMState *s = OPENPROM(ds); >> + SysBusDevice *dev = SYS_BUS_DEVICE(ds); >> + Error *local_err = NULL; >> + >> + memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.prom", >> + PROM_SIZE_MAX, &local_err); > > This looks the memory_region_init_ram() pattern... > >> + if (local_err) { >> + error_propagate(errp, local_err); >> + return; >> + } >> >> - memory_region_init_ram_nomigrate(&s->prom, obj, "sun4u.prom", PROM_SIZE_MAX, >> - &error_fatal); >> vmstate_register_ram_global(&s->prom); > > ... ^ > > Reviewed-by: Philippe Mathieu-Daudé > >> memory_region_set_readonly(&s->prom, true); Maybe memory_region_init_rom_nomigrate() even? >> sysbus_init_mmio(dev, &s->prom); >> @@ -446,6 +452,7 @@ static void prom_class_init(ObjectClass *klass, void *data) >> DeviceClass *dc = DEVICE_CLASS(klass); >> >> dc->props = prom_properties; >> + dc->realize = prom_realize; >> } >> >> static const TypeInfo prom_info = { >> @@ -453,7 +460,6 @@ static const TypeInfo prom_info = { >> .parent = TYPE_SYS_BUS_DEVICE, >> .instance_size = sizeof(PROMState), >> .class_init = prom_class_init, >> - .instance_init = prom_init1, >> }; >> >> >>