proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-14 10:44:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vga: pass owner to vga_init_io

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-06-06 21:21:13 -04:00
parent 8311832773
commit c84b28eeea
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/display/vga-isa.c
View File

@ -58,7 +58,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
vga_common_init(s, OBJECT(dev)); vga_common_init(s, OBJECT(dev));
s->legacy_address_space = isa_address_space(isadev); s->legacy_address_space = isa_address_space(isadev);
vga_io_memory = vga_init_io(s, &vga_ports, &vbe_ports); vga_io_memory = vga_init_io(s, OBJECT(dev), &vga_ports, &vbe_ports);
isa_register_portio_list(isadev, 0x3b0, vga_ports, s, "vga"); isa_register_portio_list(isadev, 0x3b0, vga_ports, s, "vga");
if (vbe_ports) { if (vbe_ports) {
isa_register_portio_list(isadev, 0x1ce, vbe_ports, s, "vbe"); isa_register_portio_list(isadev, 0x1ce, vbe_ports, s, "vbe");

6
hw/display/vga.c
View File

@ -2333,7 +2333,7 @@ static const MemoryRegionPortio vbe_portio_list[] = {
}; };
/* Used by both ISA and PCI */ /* Used by both ISA and PCI */
MemoryRegion *vga_init_io(VGACommonState *s, MemoryRegion *vga_init_io(VGACommonState *s, Object *obj,
const MemoryRegionPortio **vga_ports, const MemoryRegionPortio **vga_ports,
const MemoryRegionPortio **vbe_ports) const MemoryRegionPortio **vbe_ports)
{ {
@ -2343,7 +2343,7 @@ MemoryRegion *vga_init_io(VGACommonState *s,
*vbe_ports = vbe_portio_list; *vbe_ports = vbe_portio_list;
vga_mem = g_malloc(sizeof(*vga_mem)); vga_mem = g_malloc(sizeof(*vga_mem));
memory_region_init_io(vga_mem, NULL, &vga_mem_ops, s, memory_region_init_io(vga_mem, obj, &vga_mem_ops, s,
"vga-lowmem", 0x20000); "vga-lowmem", 0x20000);
memory_region_set_flush_coalesced(vga_mem); memory_region_set_flush_coalesced(vga_mem);
@ -2364,7 +2364,7 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
s->legacy_address_space = address_space; s->legacy_address_space = address_space;
vga_io_memory = vga_init_io(s, &vga_ports, &vbe_ports); vga_io_memory = vga_init_io(s, obj, &vga_ports, &vbe_ports);
memory_region_add_subregion_overlap(address_space, memory_region_add_subregion_overlap(address_space,
isa_mem_base + 0x000a0000, isa_mem_base + 0x000a0000,
vga_io_memory, vga_io_memory,

2
hw/display/vga_int.h
View File

@ -180,7 +180,7 @@ static inline int c6_to_8(int v)
void vga_common_init(VGACommonState *s, Object *obj); void vga_common_init(VGACommonState *s, Object *obj);
void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
MemoryRegion *address_space_io, bool init_vga_ports); MemoryRegion *address_space_io, bool init_vga_ports);
MemoryRegion *vga_init_io(VGACommonState *s, MemoryRegion *vga_init_io(VGACommonState *s, Object *obj,
const MemoryRegionPortio **vga_ports, const MemoryRegionPortio **vga_ports,
const MemoryRegionPortio **vbe_ports); const MemoryRegionPortio **vbe_ports);
void vga_common_reset(VGACommonState *s); void vga_common_reset(VGACommonState *s);