Commit 79c2b203 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180703-pull-request' into staging 



vga: disable global_vmstate, virtio-gpu scanout tracking fixes.

# gpg: Signature made Tue 03 Jul 2018 10:44:56 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20180703-pull-request:
  vga: disable global_vmstate for 3.0+ machine types
  virtio-gpu: disable scanout when backing resource is destroyed
  virtio-gpu: update old resource too.
  virtio-gpu: tweak scanout disable.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	hw/display/qxl.c
#	hw/display/vga-isa-mm.c
parents 5be2a500 1fcfdc43

hw/display/cirrus_vga.c

+6 −3
Original line number Diff line number Diff line
@@ -3048,7 +3048,8 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp) 
                   s->vram_size_mb);

        return;

    }

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

    s->global_vmstate = true;

    vga_common_init(s, OBJECT(dev));

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

                       isa_address_space(isadev),

                       isa_address_space_io(isadev));
@@ -3105,7 +3106,7 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp) 
         return;

     }

     /* setup VGA */

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

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

     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);
@@ -3134,6 +3135,8 @@ static Property pci_vga_cirrus_properties[] = { 
                       cirrus_vga.vga.vram_size_mb, 4),

    DEFINE_PROP_BOOL("blitter", struct PCICirrusVGAState,

                     cirrus_vga.enable_blitter, true),

    DEFINE_PROP_BOOL("global-vmstate", struct PCICirrusVGAState,

                     cirrus_vga.vga.global_vmstate, false),

    DEFINE_PROP_END_OF_LIST(),

};

hw/display/qxl.c

+2 −1
Original line number Diff line number Diff line
@@ -2168,7 +2168,7 @@ static void qxl_realize_primary(PCIDevice *dev, Error **errp) 
    qxl_init_ramsize(qxl);

    vga->vbe_size = qxl->vgamem_size;

    vga->vram_size_mb = qxl->vga.vram_size / MiB;

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

    vga_common_init(vga, OBJECT(dev));

    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,
@@ -2408,6 +2408,7 @@ static Property qxl_properties[] = { 
#endif

        DEFINE_PROP_UINT32("xres", PCIQXLDevice, xres, 0),

        DEFINE_PROP_UINT32("yres", PCIQXLDevice, yres, 0),

        DEFINE_PROP_BOOL("global-vmstate", PCIQXLDevice, vga.global_vmstate, false),

        DEFINE_PROP_END_OF_LIST(),

};

hw/display/vga-isa-mm.c

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



    s->vga.vram_size_mb = VGA_RAM_SIZE / MiB;

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

    s->vga.global_vmstate = true;

    vga_common_init(&s->vga, NULL);

    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

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ 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), true);

    s->global_vmstate = true;

    vga_common_init(s, OBJECT(dev));

    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, &d->portio_vga,

hw/display/vga-pci.c

+3 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void pci_std_vga_realize(PCIDevice *dev, Error **errp) 
    bool qext = false;



    /* vga + console init */

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

    vga_common_init(s, OBJECT(dev));

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

             true);
@@ -265,7 +265,7 @@ static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp) 
    bool qext = false;



    /* vga + console init */

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

    vga_common_init(s, OBJECT(dev));

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



    /* mmio bar */
@@ -308,6 +308,7 @@ static Property vga_pci_properties[] = { 
    DEFINE_PROP_BIT("mmio", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_MMIO, true),

    DEFINE_PROP_BIT("qemu-extended-regs",

                    PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true),

    DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, false),

    DEFINE_PROP_END_OF_LIST(),

};