From nobody Mon Mar 2 10:51:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772399055972272.62036485863393; Sun, 1 Mar 2026 13:04:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vwnwf-0004Tm-Kw; Sun, 01 Mar 2026 16:03:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vwnwe-0004Sk-2P for qemu-devel@nongnu.org; Sun, 01 Mar 2026 16:03:20 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vwnwa-0002Gi-JA for qemu-devel@nongnu.org; Sun, 01 Mar 2026 16:03:19 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id A91EC597396; Sun, 01 Mar 2026 22:03:14 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id RcBcspr93gUL; Sun, 1 Mar 2026 22:03:12 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id A0FB959738E; Sun, 01 Mar 2026 22:03:12 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: <8959f94344869a59d57a35b4abefabd0dcb6746d.1772397447.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v5 3/8] sun4m,sun4u,tcx: Do not use memory_region_init_ram_nomigrate() MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Mark Cave-Ayland , Gerd Hoffmann , Max Filippov , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sun, 01 Mar 2026 22:03:12 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.012, RCVD_IN_VALIDITY_RPBL_BLOCKED=1.188, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1772399057797158501 Content-Type: text/plain; charset="utf-8" Convert to use memory_region_init_{ram,rom} instead. This breaks migration but these machines have no migration compatibility guarantee and this removes most remaining usages of this nomigrate variant. Signed-off-by: BALATON Zoltan --- hw/display/tcx.c | 3 +-- hw/sparc/sun4m.c | 19 +++++-------------- hw/sparc64/sun4u.c | 10 +++------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 16114b9bb8..c8a4ac21ca 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -815,9 +815,8 @@ static void tcx_realizefn(DeviceState *dev, Error **err= p) uint8_t *vram_base; char *fcode_filename; =20 - memory_region_init_ram_nomigrate(&s->vram_mem, OBJECT(s), "tcx.vram", + memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram", s->vram_size * (1 + 4 + 4), &error_fatal); - vmstate_register_ram_global(&s->vram_mem); memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA); vram_base =3D memory_region_get_ram_ptr(&s->vram_mem); =20 diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a17bdb3692..47853e3f76 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -587,13 +587,10 @@ static void idreg_realize(DeviceState *ds, Error **er= rp) IDRegState *s =3D MACIO_ID_REGISTER(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idre= g", - sizeof(idreg_data), errp)) { + if (!memory_region_init_rom(&s->mem, OBJECT(ds), "sun4m.idreg", + sizeof(idreg_data), errp)) { return; } - - vmstate_register_ram_global(&s->mem); - memory_region_set_readonly(&s->mem, true); sysbus_init_mmio(dev, &s->mem); } =20 @@ -638,12 +635,9 @@ static void afx_realize(DeviceState *ds, Error **errp) AFXState *s =3D TCX_AFX(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx", - 4, errp)) { + if (!memory_region_init_ram(&s->mem, OBJECT(ds), "sun4m.afx", 4, errp)= ) { return; } - - vmstate_register_ram_global(&s->mem); sysbus_init_mmio(dev, &s->mem); } =20 @@ -719,13 +713,10 @@ static void prom_realize(DeviceState *ds, Error **err= p) PROMState *s =3D OPENPROM(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.pro= m", - PROM_SIZE_MAX, errp)) { + if (!memory_region_init_rom(&s->prom, OBJECT(ds), "sun4m.prom", + PROM_SIZE_MAX, errp)) { return; } - - vmstate_register_ram_global(&s->prom); - memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); } =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b8bda1eb81..2e41785b78 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -455,13 +455,10 @@ static void prom_realize(DeviceState *ds, Error **err= p) PROMState *s =3D OPENPROM(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.pro= m", - PROM_SIZE_MAX, errp)) { + if (!memory_region_init_rom(&s->prom, OBJECT(ds), "sun4u.prom", + PROM_SIZE_MAX, errp)) { return; } - - vmstate_register_ram_global(&s->prom); - memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); } =20 @@ -498,9 +495,8 @@ static void ram_realize(DeviceState *dev, Error **errp) RamDevice *d =3D SUN4U_RAM(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - memory_region_init_ram_nomigrate(&d->ram, OBJECT(d), "sun4u.ram", d->s= ize, + memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size, &error_fatal); - vmstate_register_ram_global(&d->ram); sysbus_init_mmio(sbd, &d->ram); } =20 --=20 2.41.3