[Qemu-commits] [qemu/qemu] 0f5a15: virtio-input: free event queue when finalizing

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0f5a15e40ad1512c70d1323a73c7b073e32e17ee
      
https://github.com/qemu/qemu/commit/0f5a15e40ad1512c70d1323a73c7b073e32e17ee
  Author: Ladi Prosek <address@hidden>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M hw/input/virtio-input.c

  Log Message:
  -----------
  virtio-input: free event queue when finalizing

VirtIOInput.queue was never freed. This commit adds an explicit
g_free to virtio_input_finalize and switches the allocation
function from realloc to g_realloc in virtio_input_send.

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


  Commit: 57094547dfea4ce784923b8abb53ac3ab4e3961a
      
https://github.com/qemu/qemu/commit/57094547dfea4ce784923b8abb53ac3ab4e3961a
  Author: Ladi Prosek <address@hidden>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

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

  Log Message:
  -----------
  virtio-input: fix eventq batching

virtio_input_send buffers input events until it sees a SYNC. Then it
either sends or drops the entire batch, depending on whether eventq
has enough space available. The case to avoid here is partial sends
where only part of the batch would get to the guest.

Using virtqueue_get_avail_bytes to check the state of eventq was not
correct. The queue may have a smaller number of larger buffers
available so bytes may be enough but the batch would still not be
possible to send, leading to the "Huh?  No vq elem available" error.

Instead of checking available bytes, this patch optimistically pops
buffers from the queue and puts them back in case it runs out of
space and the batch needs to be dropped.

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


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

  Changed paths:
    M hw/display/cirrus_vga_rop2.h

  Log Message:
  -----------
  cirrus: fix PUTPIXEL macro

Should be "c" not "col".  The macro is used with "col" as third parameter
everywhere, so this tyops doesn't break something.

Fixes: 026aeffcb4752054830ba203020ed6eb05bcaba8
Reported-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-id: address@hidden


  Commit: 8bce03e39328f0b3a6700efb9edb8b7d7aef629b
      
https://github.com/qemu/qemu/commit/8bce03e39328f0b3a6700efb9edb8b7d7aef629b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M ui/egl-helpers.c

  Log Message:
  -----------
  ui/egl-helpers: fix egl 1.5 display init

Unfortunaly switching to getPlatformDisplayEXT isn't as easy as
implemented by 0ea1523fb6703aa0dcd65e66b59e96fec028e60a.  See the
longish comment for the complete story.

Cc: Frediano Ziglio <address@hidden>
Suggested-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


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

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: fix reverse mode

vnc server in reverse mode (qemu -vnc localhost:$nr,reverse) interprets
$nr as display number (i.e. with 5900 offset) in recent qemu versions.
Historical and documented behavior is interpreting $nr as port number
though. So we should bring code and documentation in line.

Given that default listening port for viewers is 5500 the 5900 offset is
pretty inconvinient, because it is simply impossible to connect to port
5500.  So, lets fix the code not the docs.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden


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

  Changed paths:
    M hw/display/cirrus_vga_rop2.h
    M hw/input/virtio-input.c
    M include/hw/virtio/virtio-input.h
    M ui/egl-helpers.c
    M ui/vnc.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170327-1' into 
staging

fixes for 2.9: vga, egl, cirrus, virtio-input.

# gpg: Signature made Mon 27 Mar 2017 14:19:45 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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/pull-fixes-20170327-1:
  vnc: fix reverse mode
  ui/egl-helpers: fix egl 1.5 display init
  cirrus: fix PUTPIXEL macro
  virtio-input: fix eventq batching
  virtio-input: free event queue when finalizing

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


Compare: https://github.com/qemu/qemu/compare/ea2afcf5b672...a001631cb8ee