motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vga: set owner for mmio regions

Browse source 
This makes sure the regions are properly cleaned when unplugging -device
seconday-vga.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-id: 20180626060941.8326-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-06-26 08:09:41 +02:00
parent e409d9a158
commit 93abfc88bd
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/display/vga-pci.c
View file

@ -192,22 +192,23 @@ static const MemoryRegionOps pci_vga_qext_ops = {
}; };
void pci_std_vga_mmio_region_init(VGACommonState *s, void pci_std_vga_mmio_region_init(VGACommonState *s,
Object *owner,
MemoryRegion *parent, MemoryRegion *parent,
MemoryRegion *subs, MemoryRegion *subs,
bool qext) bool qext)
{ {
memory_region_init_io(&subs[0], NULL, &pci_vga_ioport_ops, s, memory_region_init_io(&subs[0], owner, &pci_vga_ioport_ops, s,
"vga ioports remapped", PCI_VGA_IOPORT_SIZE); "vga ioports remapped", PCI_VGA_IOPORT_SIZE);
memory_region_add_subregion(parent, PCI_VGA_IOPORT_OFFSET, memory_region_add_subregion(parent, PCI_VGA_IOPORT_OFFSET,
&subs[0]); &subs[0]);
memory_region_init_io(&subs[1], NULL, &pci_vga_bochs_ops, s, memory_region_init_io(&subs[1], owner, &pci_vga_bochs_ops, s,
"bochs dispi interface", PCI_VGA_BOCHS_SIZE); "bochs dispi interface", PCI_VGA_BOCHS_SIZE);
memory_region_add_subregion(parent, PCI_VGA_BOCHS_OFFSET, memory_region_add_subregion(parent, PCI_VGA_BOCHS_OFFSET,
&subs[1]); &subs[1]);
if (qext) { if (qext) {
memory_region_init_io(&subs[2], NULL, &pci_vga_qext_ops, s, memory_region_init_io(&subs[2], owner, &pci_vga_qext_ops, s,
"qemu extended regs", PCI_VGA_QEXT_SIZE); "qemu extended regs", PCI_VGA_QEXT_SIZE);
memory_region_add_subregion(parent, PCI_VGA_QEXT_OFFSET, memory_region_add_subregion(parent, PCI_VGA_QEXT_OFFSET,
&subs[2]); &subs[2]);
@ -239,7 +240,7 @@ static void pci_std_vga_realize(PCIDevice *dev, Error **errp)
qext = true; qext = true;
pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2); pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2);
} }
pci_std_vga_mmio_region_init(s, &d->mmio, d->mrs, qext); pci_std_vga_mmio_region_init(s, OBJECT(dev), &d->mmio, d->mrs, qext);
pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio); pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);
} }
@ -275,7 +276,7 @@ static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp)
qext = true; qext = true;
pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2); pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2);
} }
pci_std_vga_mmio_region_init(s, &d->mmio, d->mrs, qext); pci_std_vga_mmio_region_init(s, OBJECT(dev), &d->mmio, d->mrs, qext);
pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->vram); pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->vram);
pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio); pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);

1
hw/display/vga_int.h
View file

@ -193,6 +193,7 @@ extern const MemoryRegionOps vga_mem_ops;
/* vga-pci.c */ /* vga-pci.c */
void pci_std_vga_mmio_region_init(VGACommonState *s, void pci_std_vga_mmio_region_init(VGACommonState *s,
Object *owner,
MemoryRegion *parent, MemoryRegion *parent,
MemoryRegion *subs, MemoryRegion *subs,
bool qext); bool qext);

2
hw/display/virtio-vga.c
View file

@ -152,7 +152,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
} }
/* add stdvga mmio regions */ /* add stdvga mmio regions */
pci_std_vga_mmio_region_init(vga, &vpci_dev->modern_bar, pci_std_vga_mmio_region_init(vga, OBJECT(vvga), &vpci_dev->modern_bar,
vvga->vga_mrs, true); vvga->vga_mrs, true);
vga->con = g->scanout[0].con; vga->con = g->scanout[0].con;