diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-04-17 10:21:27 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-25 14:45:46 -0500 |
| commit | aa2beaa1f57ca329cfceece08cc19d52368e6a8f (patch) | |
| tree | 6d8e5b3e63351cfd751b994c5b973f84be437e4a /hw/display/vmware_vga.c | |
| parent | 95be0669a353d7f4093876a8fe94474e39c7af9d (diff) | |
| download | qemu-aa2beaa1f57ca329cfceece08cc19d52368e6a8f.zip qemu-aa2beaa1f57ca329cfceece08cc19d52368e6a8f.tar.gz qemu-aa2beaa1f57ca329cfceece08cc19d52368e6a8f.tar.bz2 | |
console: add device link to QemuConsoles
So it is possible to figure which qemu console displays which device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display/vmware_vga.c')
| -rw-r--r-- | hw/display/vmware_vga.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 263bf09..fd3569d 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1185,13 +1185,13 @@ static const GraphicHwOps vmsvga_ops = { .text_update = vmsvga_text_update, }; -static void vmsvga_init(struct vmsvga_state_s *s, +static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, MemoryRegion *address_space, MemoryRegion *io) { s->scratch_size = SVGA_SCRATCH_SIZE; s->scratch = g_malloc(s->scratch_size * 4); - s->vga.con = graphic_console_init(&vmsvga_ops, s); + s->vga.con = graphic_console_init(dev, &vmsvga_ops, s); s->fifo_size = SVGA_FIFO_SIZE; memory_region_init_ram(&s->fifo_ram, "vmsvga.fifo", s->fifo_size); @@ -1258,7 +1258,8 @@ static int pci_vmsvga_initfn(PCIDevice *dev) memory_region_set_flush_coalesced(&s->io_bar); pci_register_bar(&s->card, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar); - vmsvga_init(&s->chip, pci_address_space(dev), pci_address_space_io(dev)); + vmsvga_init(DEVICE(dev), &s->chip, + pci_address_space(dev), pci_address_space_io(dev)); pci_register_bar(&s->card, 1, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->chip.vga.vram); |