Skip to content

Commit 3b10b56

Browse files
mcaylandvivier
authored andcommitted
macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer
Currently macfb_common_realize() defines the framebuffer RAM memory region as being non-migrateable but then immediately registers it for migration. Replace memory_region_init_ram_nomigrate() with memory_region_init_ram() which is clearer and does exactly the same thing. Signed-off-by: Mark Cave-Ayland <[email protected]> Reviewed-by: BALATON Zoltan <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Laurent Vivier <[email protected]> Message-Id: <[email protected]> Signed-off-by: Laurent Vivier <[email protected]>
1 parent 14d0ddf commit 3b10b56

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

hw/display/macfb.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,11 +367,10 @@ static bool macfb_common_realize(DeviceState *dev, MacfbState *s, Error **errp)
367367
memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &macfb_ctrl_ops, s,
368368
"macfb-ctrl", 0x1000);
369369

370-
memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(dev), "macfb-vram",
371-
MACFB_VRAM_SIZE, &error_abort);
370+
memory_region_init_ram(&s->mem_vram, OBJECT(dev), "macfb-vram",
371+
MACFB_VRAM_SIZE, &error_abort);
372372
s->vram = memory_region_get_ram_ptr(&s->mem_vram);
373373
s->vram_bit_mask = MACFB_VRAM_SIZE - 1;
374-
vmstate_register_ram(&s->mem_vram, dev);
375374
memory_region_set_coalescing(&s->mem_vram);
376375

377376
return true;

0 commit comments

Comments
 (0)