[Qemu-commits] [qemu/qemu] a223b4: ati-vga: fix tracing

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a223b478cb5bb940481b16be891e4b51279b642c
      
https://github.com/qemu/qemu/commit/a223b478cb5bb940481b16be891e4b51279b642c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

  Changed paths:
    M hw/display/trace-events

  Log Message:
  -----------
  ati-vga: fix tracing

HWADDR_PRIx can't be used in tracing, use PRIx64 instead.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden


  Commit: 9032e3d71c9950e48a204dd15b8d2e24254ffd7c
      
https://github.com/qemu/qemu/commit/9032e3d71c9950e48a204dd15b8d2e24254ffd7c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

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

  Log Message:
  -----------
  virtio-gpu: delay virglrenderer reset when blocked.

If renderer_blocked is set do not call virtio_gpu_virgl_reset().
Instead set a flag indicating that virglrenderer needs a reset.
When renderer_blocked gets cleared do the actual reset call.

Without this we can trigger an assert in spice due to calling
spice_qxl_gl_scanout() while another operation is still running:

spice_qxl_gl_scanout: condition `qxl_state->gl_draw_cookie == 
GL_DRAW_COOKIE_INVALID' failed

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


  Commit: dc84ed5b57cc6d06955e2f49ade9dca277e92cd4
      
https://github.com/qemu/qemu/commit/dc84ed5b57cc6d06955e2f49ade9dca277e92cd4
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

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

  Log Message:
  -----------
  virtio-gpu: clear command and fence queues on reset

It was never correct to not clear them.  Due to commit "3912e66a3feb
virtio-vga: fix reset." this became more obvious though.  The virtio
rings get properly reset now, and trying to process the stale commands
will trigger an assert in the virtio core.

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


  Commit: e5b670c9f84a394a127f73d77400e52146f219ac
      
https://github.com/qemu/qemu/commit/e5b670c9f84a394a127f73d77400e52146f219ac
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-18 (Mon, 18 Mar 2019)

  Changed paths:
    M hw/display/trace-events
    M hw/display/virtio-gpu.c
    M include/hw/virtio/virtio-gpu.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190318-pull-request' 
into staging

vga: fixes for 4.0 (ati trace, virtio-gpu reset).

# gpg: Signature made Mon 18 Mar 2019 13:25:54 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20190318-pull-request:
  virtio-gpu: clear command and fence queues on reset
  virtio-gpu: delay virglrenderer reset when blocked.
  ati-vga: fix tracing

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/3c18a08cf387...e5b670c9f84a