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

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: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	hw/display/qxl.c
#	hw/display/vga-isa-mm.c

diff --cc hw/display/cirrus_vga.c
Simple merge

diff --cc hw/display/qxl.c
index b09a03997a9fef1d4c3568ee4806c0956a44b6fe,3f740d7aa35c51c48c0d514fdc4ab556d18ba40c..830c392c53ab313ae920905dffaf306ed0625c45
--- 1/hw/display/qxl.c
--- 2/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@@ -2167,8 -2167,8 +2167,8 @@@ static void qxl_realize_primary(PCIDevi
      qxl->id = 0;
      qxl_init_ramsize(qxl);
      vga->vbe_size = qxl->vgamem_size;
 -    vga->vram_size_mb = qxl->vga.vram_size >> 20;
 +    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,

diff --cc hw/display/vga-isa-mm.c
index bd58141117e7940b3dc9bb699ba10f22bf2f0e52,d2d6b32abfd914f9a699185e88b52627504b900b..232216cad0aaa74e7577001bb0b4af3f6ab6c723
--- 1/hw/display/vga-isa-mm.c
--- 2/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@@ -131,8 -130,9 +131,9 @@@ int isa_vga_mm_init(hwaddr vram_base
  
      s = g_malloc0(sizeof(*s));
  
 -    s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;
 +    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);

diff --cc hw/display/vga.c
Simple merge

diff --cc hw/display/virtio-gpu.c
Simple merge

diff --cc hw/display/vmware_vga.c
Simple merge