[Qemu-commits] [qemu/qemu] da566a: virtio-gpu: tweak scanout disable.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: da566a18a7799e5a655cd9f87e222b672cc93e7b
      
https://github.com/qemu/qemu/commit/da566a18a7799e5a655cd9f87e222b672cc93e7b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M hw/display/virtio-gpu.c

  Log Message:
  -----------
  virtio-gpu: tweak scanout disable.

- Factor out the code to virtio_gpu_disable_scanout().
- Allow disable scanout 0, show a message then.
- Clear scanout->resource_id.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden


  Commit: c806cfa036a7ec991170eb9899f3a676bfcc3253
      
https://github.com/qemu/qemu/commit/c806cfa036a7ec991170eb9899f3a676bfcc3253
  Author: Gerd Hoffmann <address@hidden>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M hw/display/virtio-gpu.c

  Log Message:
  -----------
  virtio-gpu: update old resource too.

When switching scanout from one resource to another we must update the
scanout_bitmask field for both new (set bit) and old (clear bit)
resource.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden


  Commit: 1fccd7c5a9a722a9cbf1bc91693f4618034f01ac
      
https://github.com/qemu/qemu/commit/1fccd7c5a9a722a9cbf1bc91693f4618034f01ac
  Author: Gerd Hoffmann <address@hidden>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M hw/display/virtio-gpu.c

  Log Message:
  -----------
  virtio-gpu: disable scanout when backing resource is destroyed

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden


  Commit: 1fcfdc435a3e25ab9037f6f7b8ab4bdf89ba1269
      
https://github.com/qemu/qemu/commit/1fcfdc435a3e25ab9037f6f7b8ab4bdf89ba1269
  Author: Gerd Hoffmann <address@hidden>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M hw/display/cirrus_vga.c
    M hw/display/qxl.c
    M hw/display/vga-isa-mm.c
    M hw/display/vga-isa.c
    M hw/display/vga-pci.c
    M hw/display/vga.c
    M hw/display/vga_int.h
    M hw/display/virtio-vga.c
    M hw/display/vmware_vga.c
    M include/hw/compat.h

  Log Message:
  -----------
  vga: disable global_vmstate for 3.0+ machine types

Move global_vmstate from vga_common_init() parameter to VGACommonState
field.  Set global_vmstate to true for isa vga devices, so nothing
changes here.  virtio-vga and secondary-vga already set global_vmstate
to false so no change here either.  All other pci vga devices get a new
global-vmstate property, defaulting to false.  A compat property flips
it to true for older machine types.

With this in place you don't get a vmstate section naming conflict any
more when adding multiple pci vga devices to your vm.

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-Id: <address@hidden>


  Commit: 79c2b203a932db5882a3f328db53e5a448cd47f9
      
https://github.com/qemu/qemu/commit/79c2b203a932db5882a3f328db53e5a448cd47f9
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M hw/display/cirrus_vga.c
    M hw/display/qxl.c
    M hw/display/vga-isa-mm.c
    M hw/display/vga-isa.c
    M hw/display/vga-pci.c
    M hw/display/vga.c
    M hw/display/vga_int.h
    M hw/display/virtio-gpu.c
    M hw/display/virtio-vga.c
    M hw/display/vmware_vga.c
    M include/hw/compat.h

  Log Message:
  -----------
  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) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# 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 <address@hidden>

# Conflicts:
#       hw/display/qxl.c
#       hw/display/vga-isa-mm.c


Compare: https://github.com/qemu/qemu/compare/5be2a500896f...79c2b203a932
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.