vga: pass owner to vga_init_vbe

Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 695c128cb7689ff32e638dab1565bbf2120b9fc5..8b514cc39ddc8312ea02f3cb09f0cb859bdbaebc 100644 (file)
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -137,6 +137,6 @@ int isa_vga_mm_init(hwaddr vram_base,
 
     s->vga.con = graphic_console_init(NULL, s->vga.hw_ops, s);
 
-    vga_init_vbe(&s->vga, address_space);
+    vga_init_vbe(&s->vga, NULL, address_space);
     return 0;
 }

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index fbf6db57652d41c48903f2ef47e161d0850c9cfd..5f253a9a49de76a0d467e3b00629ece8d2862e59 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -69,7 +69,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
     memory_region_set_coalescing(vga_io_memory);
     s->con = graphic_console_init(DEVICE(dev), s->hw_ops, s);
 
-    vga_init_vbe(s, isa_address_space(isadev));
+    vga_init_vbe(s, OBJECT(dev), isa_address_space(isadev));
     /* ROM BIOS */
     rom_add_vga(VGABIOS_FILENAME);
 }

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 62652bd477cc5927826800592a50a0f0568b144c..3e150abe8deba921018798693de4235ec434ad1c 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -173,7 +173,7 @@ static int pci_std_vga_initfn(PCIDevice *dev)
 
     if (!dev->rom_bar) {
         /* compatibility with pc-0.13 and older */
-        vga_init_vbe(s, pci_address_space(dev));
+        vga_init_vbe(s, OBJECT(dev), pci_address_space(dev));
     }
 
     return 0;

diff --git a/hw/display/vga.c b/hw/display/vga.c
index d3e0f330665d043c245adcc963bd311d5e76166c..ce3ca7ea9c50ea01bd2ade3746ae6ed1877493dc 100644 (file)
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2380,12 +2380,12 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
     }
 }
 
-void vga_init_vbe(VGACommonState *s, MemoryRegion *system_memory)
+void vga_init_vbe(VGACommonState *s, Object *obj, MemoryRegion *system_memory)
 {
     /* With pc-0.12 and below we map both the PCI BAR and the fixed VBE region,
      * so use an alias to avoid double-mapping the same region.
      */
-    memory_region_init_alias(&s->vram_vbe, NULL, "vram.vbe",
+    memory_region_init_alias(&s->vram_vbe, obj, "vram.vbe",
                              &s->vram, 0, memory_region_size(&s->vram));
     /* XXX: use optimized standard vga accesses */
     memory_region_add_subregion(system_memory,

diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index bac366cfd7c78607bb2c61cd8de51d2a3a1ccc87..5121a35a275c3eb28187404369d5a0e51817d234 100644 (file)
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -198,7 +198,7 @@ void vga_invalidate_scanlines(VGACommonState *s, int y1, int y2);
 
 int vga_ioport_invalid(VGACommonState *s, uint32_t addr);
 
-void vga_init_vbe(VGACommonState *s, MemoryRegion *address_space);
+void vga_init_vbe(VGACommonState *s, Object *obj, MemoryRegion *address_space);
 uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr);
 void vbe_ioport_write_index(void *opaque, uint32_t addr, uint32_t val);
 void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val);

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index ce97870c178a5a42ae2d330a0e8b2e3f9f3d0564..714908f44c03b64761bda49083f562807e84060e 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -1272,7 +1272,7 @@ static int pci_vmsvga_initfn(PCIDevice *dev)
 
     if (!dev->rom_bar) {
         /* compatibility with pc-0.13 and older */
-        vga_init_vbe(&s->chip.vga, pci_address_space(dev));
+        vga_init_vbe(&s->chip.vga, OBJECT(dev), pci_address_space(dev));
     }
 
     return 0;