Skip to content
Snippets Groups Projects
  1. Dec 14, 2020
  2. Dec 12, 2020
  3. Dec 11, 2020
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201211' into staging · a4b307b0
      Peter Maydell authored
      
      First set of 6.0 patches for s390x:
      - acceptance test for device detection
      - bugfixes
      
      # gpg: Signature made Fri 11 Dec 2020 12:21:45 GMT
      # gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
      # gpg:                issuer "cohuck@redhat.com"
      # gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
      # gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
      # gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
      # gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
      # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF
      
      * remotes/cohuck/tags/s390x-20201211:
        s390x/cpu: Use timer_free() in the finalize function to avoid memleaks
        tests/acceptance: test s390x zpci fid propagation
        tests/acceptance: verify s390x device detection
        tests/acceptance: test virtio-ccw revision handling
        tests/acceptance: add a test for devices on s390x
        hw/watchdog/wdt_diag288: Remove unnecessary includes
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      a4b307b0
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201211-pull-request' into staging · f6029bb6
      Peter Maydell authored
      
      ui/console ui_info tweaks.
      ui/vnc: alpha cursor support.
      ui/vnc: locking fixes.
      ui/sdl: add extra mouse buttons.
      
      # gpg: Signature made Fri 11 Dec 2020 09:12:39 GMT
      # gpg:                using RSA key 4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/ui-20201211-pull-request:
        sdl2: Add extra mouse buttons
        ui/vnc: Add missing lock for send_color_map
        vnc: add alpha cursor support
        vnc: add pseudo encodings
        vnc: drop unused copyrect feature
        vnc: use enum for features
        console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported
        console: drop qemu_console_get_ui_info
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      f6029bb6
    • Kevin Wolf's avatar
      block: Fix deadlock in bdrv_co_yield_to_drain() · 960d5fb3
      Kevin Wolf authored
      If bdrv_co_yield_to_drain() is called for draining a block node that
      runs in a different AioContext, it keeps that AioContext locked while it
      yields and schedules a BH in the AioContext to do the actual drain.
      
      As long as executing the BH is the very next thing that the event loop
      of the node's AioContext does, this actually happens to work, but when
      it tries to execute something else that wants to take the AioContext
      lock, it will deadlock. (In the bug report, this other thing is a
      virtio-scsi device running virtio_scsi_data_plane_handle_cmd().)
      
      Instead, always drop the AioContext lock across the yield and reacquire
      it only when the coroutine is reentered. The BH needs to unconditionally
      take the lock for itself now.
      
      This fixes the 'block_resize' QMP command on a block node that runs in
      an iothread.
      
      Cc: qemu-stable@nongnu.org
      Fixes: eb94b81a
      Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1903511
      
      
      Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
      Message-Id: <20201203172311.68232-4-kwolf@redhat.com>
      Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
      960d5fb3
    • Kevin Wolf's avatar
      block: Fix locking in qmp_block_resize() · 8089eab2
      Kevin Wolf authored
      
      The drain functions assume that we hold the AioContext lock of the
      drained block node. Make sure to actually take the lock.
      
      Cc: qemu-stable@nongnu.org
      Fixes: eb94b81a
      Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
      Message-Id: <20201203172311.68232-3-kwolf@redhat.com>
      Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
      8089eab2
Loading