[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 54/61] hw/display: Let devices own the MemoryRegion they create
From: |
Paolo Bonzini |
Subject: |
[PULL 54/61] hw/display: Let devices own the MemoryRegion they create |
Date: |
Mon, 16 Mar 2020 22:27:21 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Avoid orphan memory regions being added in the /unattached QOM
container.
This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/display/g364fb.c | 3 ++-
hw/display/macfb.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 55185c9..adcba96 100644
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -477,7 +477,8 @@ static void g364fb_init(DeviceState *dev, G364State *s)
s->con = graphic_console_init(dev, 0, &g364fb_ops, s);
- memory_region_init_io(&s->mem_ctrl, NULL, &g364fb_ctrl_ops, s, "ctrl",
0x180000);
+ memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &g364fb_ctrl_ops, s,
+ "ctrl", 0x180000);
memory_region_init_ram_ptr(&s->mem_vram, NULL, "vram",
s->vram_size, s->vram);
vmstate_register_ram(&s->mem_vram, dev);
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 8bff16d..b68faff 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -362,8 +362,8 @@ static void macfb_common_realize(DeviceState *dev,
MacfbState *s, Error **errp)
return;
}
- memory_region_init_io(&s->mem_ctrl, NULL, &macfb_ctrl_ops, s, "macfb-ctrl",
- 0x1000);
+ memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &macfb_ctrl_ops, s,
+ "macfb-ctrl", 0x1000);
memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(s), "macfb-vram",
MACFB_VRAM_SIZE, errp);
--
1.8.3.1
- [PULL 45/61] hw/pci-host: Use memory_region_init_rom() with read-only regions, (continued)
- [PULL 45/61] hw/pci-host: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 46/61] hw/ppc: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 43/61] hw/m68k: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 48/61] hw/sh4: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 50/61] scripts/cocci: Patch to detect potential use of memory_region_init_rom, Paolo Bonzini, 2020/03/16
- [PULL 47/61] hw/riscv: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 49/61] hw/sparc: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 51/61] scripts/cocci: Patch to remove unnecessary memory_region_set_readonly(), Paolo Bonzini, 2020/03/16
- [PULL 52/61] scripts/cocci: Patch to let devices own their MemoryRegions, Paolo Bonzini, 2020/03/16
- [PULL 53/61] hw/core: Let devices own the MemoryRegion they create, Paolo Bonzini, 2020/03/16
- [PULL 54/61] hw/display: Let devices own the MemoryRegion they create,
Paolo Bonzini <=
- [PULL 55/61] hw/dma: Let devices own the MemoryRegion they create, Paolo Bonzini, 2020/03/16
- [PULL 56/61] hw/riscv: Let devices own the MemoryRegion they create, Paolo Bonzini, 2020/03/16
- [PULL 57/61] hw/char: Let devices own the MemoryRegion they create, Paolo Bonzini, 2020/03/16
- [PULL 60/61] hw/arm: Remove unnecessary memory_region_set_readonly() on ROM alias, Paolo Bonzini, 2020/03/16
- [PULL 58/61] hw/arm/stm32: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 59/61] hw/ppc/ppc405: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/03/16
- [PULL 61/61] hw/arm: Let devices own the MemoryRegion they create, Paolo Bonzini, 2020/03/16
- Re: [PULL 00/61] Misc patches for soft freeze, no-reply, 2020/03/16
- Re: [PULL 00/61] Misc patches for soft freeze, no-reply, 2020/03/16