Commit e2bbfc8e authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

vga: allow non-global vmstate 



Need a way to opt-out from vga.vram being global vmstate, for
secondary vga cards.  Add a bool parameter to vga_common_init
to support this.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 411f491e

hw/display/cirrus_vga.c

+2 −2
Original line number Diff line number Diff line
@@ -2913,7 +2913,7 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp) 
    ISACirrusVGAState *d = ISA_CIRRUS_VGA(dev);

    VGACommonState *s = &d->cirrus_vga.vga;



    vga_common_init(s, OBJECT(dev));

    vga_common_init(s, OBJECT(dev), true);

    cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430, 0,

                       isa_address_space(isadev),

                       isa_address_space_io(isadev));
@@ -2960,7 +2960,7 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) 
     int16_t device_id = pc->device_id;



     /* setup VGA */

     vga_common_init(&s->vga, OBJECT(dev));

     vga_common_init(&s->vga, OBJECT(dev), true);

     cirrus_init_common(s, OBJECT(dev), device_id, 1, pci_address_space(dev),

                        pci_address_space_io(dev));

     s->vga.con = graphic_console_init(DEVICE(dev), 0, s->vga.hw_ops, &s->vga);

hw/display/qxl.c

+1 −1
Original line number Diff line number Diff line
@@ -2061,7 +2061,7 @@ static int qxl_init_primary(PCIDevice *dev) 
    qxl->id = 0;

    qxl_init_ramsize(qxl);

    vga->vram_size_mb = qxl->vga.vram_size >> 20;

    vga_common_init(vga, OBJECT(dev));

    vga_common_init(vga, OBJECT(dev), true);

    vga_init(vga, OBJECT(dev),

             pci_address_space(dev), pci_address_space_io(dev), false);

    portio_list_init(qxl_vga_port_list, OBJECT(dev), qxl_vga_portio_list,

hw/display/vga-isa-mm.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ int isa_vga_mm_init(hwaddr vram_base, 
    s = g_malloc0(sizeof(*s));



    s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;

    vga_common_init(&s->vga, NULL);

    vga_common_init(&s->vga, NULL, true);

    vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space);



    s->vga.con = graphic_console_init(NULL, 0, s->vga.hw_ops, s);

hw/display/vga-isa.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) 
    MemoryRegion *vga_io_memory;

    const MemoryRegionPortio *vga_ports, *vbe_ports;



    vga_common_init(s, OBJECT(dev));

    vga_common_init(s, OBJECT(dev), true);

    s->legacy_address_space = isa_address_space(isadev);

    vga_io_memory = vga_init_io(s, OBJECT(dev), &vga_ports, &vbe_ports);

    isa_register_portio_list(isadev, 0x3b0, vga_ports, s, "vga");

hw/display/vga-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int pci_std_vga_initfn(PCIDevice *dev) 
    VGACommonState *s = &d->vga;



    /* vga + console init */

    vga_common_init(s, OBJECT(dev));

    vga_common_init(s, OBJECT(dev), true);

    vga_init(s, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev),

             true);