mbox

[PULL,00/17] Kraxel 20220610 patches

Message ID 20220610092043.1874654-1-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

git://git.kraxel.org/qemu tags/kraxel-20220610-pull-request

Message

Gerd Hoffmann June 10, 2022, 9:20 a.m. UTC
The following changes since commit 9cc1bf1ebca550f8d90f967ccd2b6d2e00e81387:

  Merge tag 'pull-xen-20220609' of https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging (2022-06-09 08:25:17 -0700)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/kraxel-20220610-pull-request

for you to fetch changes up to 02319a4d67d3f19039127b8dc9ca9478b6d6ccd8:

  virtio-gpu: Respect UI refresh rate for EDID (2022-06-10 11:11:44 +0200)

----------------------------------------------------------------
usb: add CanoKey device, fixes for ehci + redir
ui: fixes for gtk and cocoa, move keymaps, rework refresh rate
virtio-gpu: scanout flush fix

----------------------------------------------------------------

Akihiko Odaki (4):
  ui/cocoa: Fix poweroff request code
  ui/console: Do not return a value with ui_info
  ui: Deliver refresh rate via QemuUIInfo
  virtio-gpu: Respect UI refresh rate for EDID

Arnout Engelen (1):
  hw/usb/hcd-ehci: fix writeback order

Bernhard Beschow (1):
  hw/audio/cs4231a: Const'ify global tables

Daniel P. Berrangé (1):
  ui: move 'pc-bios/keymaps' to 'ui/keymaps'

Dongwon Kim (1):
  virtio-gpu: update done only on the scanout associated with rect

Hongren (Zenithal) Zheng (6):
  hw/usb: Add CanoKey Implementation
  hw/usb/canokey: Add trace events
  meson: Add CanoKey
  docs: Add CanoKey documentation
  docs/system/devices/usb: Add CanoKey to USB devices examples
  MAINTAINERS: add myself as CanoKey maintainer

Joelle van Dyne (1):
  usbredir: avoid queuing hello packet on snapshot restore

Volker Rümelin (2):
  ui/gtk-gl-area: implement GL context destruction
  ui/gtk-gl-area: create the requested GL context version

 meson_options.txt                   |   2 +
 hw/usb/canokey.h                    |  69 ++++++
 include/hw/virtio/virtio-gpu.h      |   1 +
 include/ui/console.h                |   4 +-
 include/ui/gtk.h                    |   2 +-
 hw/audio/cs4231a.c                  |   8 +-
 hw/display/virtio-gpu-base.c        |   7 +-
 hw/display/virtio-gpu.c             |   4 +
 hw/display/virtio-vga.c             |   5 +-
 hw/display/xenfb.c                  |  14 +-
 hw/usb/canokey.c                    | 313 ++++++++++++++++++++++++++++
 hw/usb/hcd-ehci.c                   |   5 +-
 hw/usb/redirect.c                   |   3 +-
 hw/vfio/display.c                   |   8 +-
 ui/console.c                        |   6 -
 ui/gtk-egl.c                        |   4 +-
 ui/gtk-gl-area.c                    |  42 +++-
 ui/gtk.c                            |  45 ++--
 MAINTAINERS                         |   8 +
 docs/system/device-emulation.rst    |   1 +
 docs/system/devices/canokey.rst     | 168 +++++++++++++++
 docs/system/devices/usb.rst         |   4 +
 hw/usb/Kconfig                      |   5 +
 hw/usb/meson.build                  |   5 +
 hw/usb/trace-events                 |  16 ++
 meson.build                         |   6 +
 pc-bios/meson.build                 |   1 -
 scripts/meson-buildoptions.sh       |   3 +
 ui/cocoa.m                          |   6 +-
 {pc-bios => ui}/keymaps/ar          |   0
 {pc-bios => ui}/keymaps/bepo        |   0
 {pc-bios => ui}/keymaps/cz          |   0
 {pc-bios => ui}/keymaps/da          |   0
 {pc-bios => ui}/keymaps/de          |   0
 {pc-bios => ui}/keymaps/de-ch       |   0
 {pc-bios => ui}/keymaps/en-gb       |   0
 {pc-bios => ui}/keymaps/en-us       |   0
 {pc-bios => ui}/keymaps/es          |   0
 {pc-bios => ui}/keymaps/et          |   0
 {pc-bios => ui}/keymaps/fi          |   0
 {pc-bios => ui}/keymaps/fo          |   0
 {pc-bios => ui}/keymaps/fr          |   0
 {pc-bios => ui}/keymaps/fr-be       |   0
 {pc-bios => ui}/keymaps/fr-ca       |   0
 {pc-bios => ui}/keymaps/fr-ch       |   0
 {pc-bios => ui}/keymaps/hr          |   0
 {pc-bios => ui}/keymaps/hu          |   0
 {pc-bios => ui}/keymaps/is          |   0
 {pc-bios => ui}/keymaps/it          |   0
 {pc-bios => ui}/keymaps/ja          |   0
 {pc-bios => ui}/keymaps/lt          |   0
 {pc-bios => ui}/keymaps/lv          |   0
 {pc-bios => ui}/keymaps/meson.build |   0
 {pc-bios => ui}/keymaps/mk          |   0
 {pc-bios => ui}/keymaps/nl          |   0
 {pc-bios => ui}/keymaps/no          |   0
 {pc-bios => ui}/keymaps/pl          |   0
 {pc-bios => ui}/keymaps/pt          |   0
 {pc-bios => ui}/keymaps/pt-br       |   0
 {pc-bios => ui}/keymaps/ru          |   0
 {pc-bios => ui}/keymaps/sl          |   0
 {pc-bios => ui}/keymaps/sv          |   0
 {pc-bios => ui}/keymaps/th          |   0
 {pc-bios => ui}/keymaps/tr          |   0
 ui/meson.build                      |   1 +
 ui/trace-events                     |   2 +
 66 files changed, 712 insertions(+), 56 deletions(-)
 create mode 100644 hw/usb/canokey.h
 create mode 100644 hw/usb/canokey.c
 create mode 100644 docs/system/devices/canokey.rst
 rename {pc-bios => ui}/keymaps/ar (100%)
 rename {pc-bios => ui}/keymaps/bepo (100%)
 rename {pc-bios => ui}/keymaps/cz (100%)
 rename {pc-bios => ui}/keymaps/da (100%)
 rename {pc-bios => ui}/keymaps/de (100%)
 rename {pc-bios => ui}/keymaps/de-ch (100%)
 rename {pc-bios => ui}/keymaps/en-gb (100%)
 rename {pc-bios => ui}/keymaps/en-us (100%)
 rename {pc-bios => ui}/keymaps/es (100%)
 rename {pc-bios => ui}/keymaps/et (100%)
 rename {pc-bios => ui}/keymaps/fi (100%)
 rename {pc-bios => ui}/keymaps/fo (100%)
 rename {pc-bios => ui}/keymaps/fr (100%)
 rename {pc-bios => ui}/keymaps/fr-be (100%)
 rename {pc-bios => ui}/keymaps/fr-ca (100%)
 rename {pc-bios => ui}/keymaps/fr-ch (100%)
 rename {pc-bios => ui}/keymaps/hr (100%)
 rename {pc-bios => ui}/keymaps/hu (100%)
 rename {pc-bios => ui}/keymaps/is (100%)
 rename {pc-bios => ui}/keymaps/it (100%)
 rename {pc-bios => ui}/keymaps/ja (100%)
 rename {pc-bios => ui}/keymaps/lt (100%)
 rename {pc-bios => ui}/keymaps/lv (100%)
 rename {pc-bios => ui}/keymaps/meson.build (100%)
 rename {pc-bios => ui}/keymaps/mk (100%)
 rename {pc-bios => ui}/keymaps/nl (100%)
 rename {pc-bios => ui}/keymaps/no (100%)
 rename {pc-bios => ui}/keymaps/pl (100%)
 rename {pc-bios => ui}/keymaps/pt (100%)
 rename {pc-bios => ui}/keymaps/pt-br (100%)
 rename {pc-bios => ui}/keymaps/ru (100%)
 rename {pc-bios => ui}/keymaps/sl (100%)
 rename {pc-bios => ui}/keymaps/sv (100%)
 rename {pc-bios => ui}/keymaps/th (100%)
 rename {pc-bios => ui}/keymaps/tr (100%)

Comments

Richard Henderson June 10, 2022, 8:16 p.m. UTC | #1
On 6/10/22 02:20, Gerd Hoffmann wrote:
> The following changes since commit 9cc1bf1ebca550f8d90f967ccd2b6d2e00e81387:
> 
>    Merge tag 'pull-xen-20220609' of https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging (2022-06-09 08:25:17 -0700)
> 
> are available in the Git repository at:
> 
>    git://git.kraxel.org/qemu tags/kraxel-20220610-pull-request
> 
> for you to fetch changes up to 02319a4d67d3f19039127b8dc9ca9478b6d6ccd8:
> 
>    virtio-gpu: Respect UI refresh rate for EDID (2022-06-10 11:11:44 +0200)
> 
> ----------------------------------------------------------------
> usb: add CanoKey device, fixes for ehci + redir
> ui: fixes for gtk and cocoa, move keymaps, rework refresh rate
> virtio-gpu: scanout flush fix

This introduces regressions:

https://gitlab.com/qemu-project/qemu/-/jobs/2576157660
https://gitlab.com/qemu-project/qemu/-/jobs/2576151565
https://gitlab.com/qemu-project/qemu/-/jobs/2576154539
https://gitlab.com/qemu-project/qemu/-/jobs/2575867208


  (27/43) tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password:  ERROR: 
ConnectError: Failed to establish session: EOFError\n	Exit code: 1\n	Command: 
./qemu-system-x86_64 -display none -vga none -chardev 
socket,id=mon,path=/var/tmp/avo_qemu_sock_4nrz0r37/qemu-2912538-7f732e94e0f0-monitor.sock 
-mon chardev=mon,mode=control -node... (0.09 s)
  (28/43) tests/avocado/vnc.py:Vnc.test_change_password:  ERROR: ConnectError: Failed to 
establish session: EOFError\n	Exit code: 1\n	Command: ./qemu-system-x86_64 -display none 
-vga none -chardev 
socket,id=mon,path=/var/tmp/avo_qemu_sock_yhpzy5c3/qemu-2912543-7f732e94b438-monitor.sock 
-mon chardev=mon,mode=control -node... (0.09 s)
  (29/43) tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password:  ERROR: 
ConnectError: Failed to establish session: EOFError\n	Exit code: 1\n	Command: 
./qemu-system-x86_64 -display none -vga none -chardev 
socket,id=mon,path=/var/tmp/avo_qemu_sock_tk3pfmt2/qemu-2912548-7f732e93d7b8-monitor.sock 
-mon chardev=mon,mode=control -node... (0.09 s)


r~
Volker Rümelin June 11, 2022, 4:34 p.m. UTC | #2
Am 10.06.22 um 22:16 schrieb Richard Henderson:
> On 6/10/22 02:20, Gerd Hoffmann wrote:
>> The following changes since commit 
>> 9cc1bf1ebca550f8d90f967ccd2b6d2e00e81387:
>>
>>    Merge tag 'pull-xen-20220609' of 
>> https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging 
>> (2022-06-09 08:25:17 -0700)
>>
>> are available in the Git repository at:
>>
>>    git://git.kraxel.org/qemu tags/kraxel-20220610-pull-request
>>
>> for you to fetch changes up to 02319a4d67d3f19039127b8dc9ca9478b6d6ccd8:
>>
>>    virtio-gpu: Respect UI refresh rate for EDID (2022-06-10 11:11:44 
>> +0200)
>>
>> ----------------------------------------------------------------
>> usb: add CanoKey device, fixes for ehci + redir
>> ui: fixes for gtk and cocoa, move keymaps, rework refresh rate
>> virtio-gpu: scanout flush fix
>
> This introduces regressions:
>
> https://gitlab.com/qemu-project/qemu/-/jobs/2576157660
> https://gitlab.com/qemu-project/qemu/-/jobs/2576151565
> https://gitlab.com/qemu-project/qemu/-/jobs/2576154539
> https://gitlab.com/qemu-project/qemu/-/jobs/2575867208
>
>
>  (27/43) 
> tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password: 
> ERROR: ConnectError: Failed to establish session: EOFError\n Exit 
> code: 1\n    Command: ./qemu-system-x86_64 -display none -vga none 
> -chardev 
> socket,id=mon,path=/var/tmp/avo_qemu_sock_4nrz0r37/qemu-2912538-7f732e94e0f0-monitor.sock 
> -mon chardev=mon,mode=control -node... (0.09 s)
>  (28/43) tests/avocado/vnc.py:Vnc.test_change_password:  ERROR: 
> ConnectError: Failed to establish session: EOFError\n    Exit code: 
> 1\n    Command: ./qemu-system-x86_64 -display none -vga none -chardev 
> socket,id=mon,path=/var/tmp/avo_qemu_sock_yhpzy5c3/qemu-2912543-7f732e94b438-monitor.sock 
> -mon chardev=mon,mode=control -node... (0.09 s)
>  (29/43) 
> tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password: 
> ERROR: ConnectError: Failed to establish session: EOFError\n Exit 
> code: 1\n    Command: ./qemu-system-x86_64 -display none -vga none 
> -chardev 
> socket,id=mon,path=/var/tmp/avo_qemu_sock_tk3pfmt2/qemu-2912548-7f732e93d7b8-monitor.sock 
> -mon chardev=mon,mode=control -node... (0.09 s)
>
>
> r~
>

This is caused by [PATCH 14/17] ui: move 'pc-bios/keymaps' to 
'ui/keymaps'. After this patch QEMU no longer finds it's keymaps if 
started directly from the build directory.

With best regards,
Volker
Akihiko Odaki June 12, 2022, 1:10 a.m. UTC | #3
On 2022/06/12 1:34, Volker Rümelin wrote:
> Am 10.06.22 um 22:16 schrieb Richard Henderson:
>> On 6/10/22 02:20, Gerd Hoffmann wrote:
>>> The following changes since commit 
>>> 9cc1bf1ebca550f8d90f967ccd2b6d2e00e81387:
>>>
>>>    Merge tag 'pull-xen-20220609' of 
>>> https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging 
>>> (2022-06-09 08:25:17 -0700)
>>>
>>> are available in the Git repository at:
>>>
>>>    git://git.kraxel.org/qemu tags/kraxel-20220610-pull-request
>>>
>>> for you to fetch changes up to 02319a4d67d3f19039127b8dc9ca9478b6d6ccd8:
>>>
>>>    virtio-gpu: Respect UI refresh rate for EDID (2022-06-10 11:11:44 
>>> +0200)
>>>
>>> ----------------------------------------------------------------
>>> usb: add CanoKey device, fixes for ehci + redir
>>> ui: fixes for gtk and cocoa, move keymaps, rework refresh rate
>>> virtio-gpu: scanout flush fix
>>
>> This introduces regressions:
>>
>> https://gitlab.com/qemu-project/qemu/-/jobs/2576157660
>> https://gitlab.com/qemu-project/qemu/-/jobs/2576151565
>> https://gitlab.com/qemu-project/qemu/-/jobs/2576154539
>> https://gitlab.com/qemu-project/qemu/-/jobs/2575867208
>>
>>
>>  (27/43) 
>> tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password: 
>> ERROR: ConnectError: Failed to establish session: EOFError\n Exit 
>> code: 1\n    Command: ./qemu-system-x86_64 -display none -vga none 
>> -chardev 
>> socket,id=mon,path=/var/tmp/avo_qemu_sock_4nrz0r37/qemu-2912538-7f732e94e0f0-monitor.sock 
>> -mon chardev=mon,mode=control -node... (0.09 s)
>>  (28/43) tests/avocado/vnc.py:Vnc.test_change_password:  ERROR: 
>> ConnectError: Failed to establish session: EOFError\n    Exit code: 
>> 1\n    Command: ./qemu-system-x86_64 -display none -vga none -chardev 
>> socket,id=mon,path=/var/tmp/avo_qemu_sock_yhpzy5c3/qemu-2912543-7f732e94b438-monitor.sock 
>> -mon chardev=mon,mode=control -node... (0.09 s)
>>  (29/43) 
>> tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password: 
>> ERROR: ConnectError: Failed to establish session: EOFError\n Exit 
>> code: 1\n    Command: ./qemu-system-x86_64 -display none -vga none 
>> -chardev 
>> socket,id=mon,path=/var/tmp/avo_qemu_sock_tk3pfmt2/qemu-2912548-7f732e93d7b8-monitor.sock 
>> -mon chardev=mon,mode=control -node... (0.09 s)
>>
>>
>> r~
>>
> 
> This is caused by [PATCH 14/17] ui: move 'pc-bios/keymaps' to 
> 'ui/keymaps'. After this patch QEMU no longer finds it's keymaps if 
> started directly from the build directory.
> 
> With best regards,
> Volker
> 

I have a patch series which allow to find files not in pc-bios directory 
even if started directly from the build directory:
https://patchew.org/QEMU/20220228005710.10442-1-akihiko.odaki@gmail.com/

Regards,
Akihiko Odaki
Daniel P. Berrangé June 13, 2022, 8:45 a.m. UTC | #4
On Sat, Jun 11, 2022 at 06:34:28PM +0200, Volker Rümelin wrote:
> Am 10.06.22 um 22:16 schrieb Richard Henderson:
> > On 6/10/22 02:20, Gerd Hoffmann wrote:
> > > The following changes since commit
> > > 9cc1bf1ebca550f8d90f967ccd2b6d2e00e81387:
> > > 
> > >    Merge tag 'pull-xen-20220609' of
> > > https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging
> > > (2022-06-09 08:25:17 -0700)
> > > 
> > > are available in the Git repository at:
> > > 
> > >    git://git.kraxel.org/qemu tags/kraxel-20220610-pull-request
> > > 
> > > for you to fetch changes up to 02319a4d67d3f19039127b8dc9ca9478b6d6ccd8:
> > > 
> > >    virtio-gpu: Respect UI refresh rate for EDID (2022-06-10 11:11:44
> > > +0200)
> > > 
> > > ----------------------------------------------------------------
> > > usb: add CanoKey device, fixes for ehci + redir
> > > ui: fixes for gtk and cocoa, move keymaps, rework refresh rate
> > > virtio-gpu: scanout flush fix
> > 
> > This introduces regressions:
> > 
> > https://gitlab.com/qemu-project/qemu/-/jobs/2576157660
> > https://gitlab.com/qemu-project/qemu/-/jobs/2576151565
> > https://gitlab.com/qemu-project/qemu/-/jobs/2576154539
> > https://gitlab.com/qemu-project/qemu/-/jobs/2575867208
> > 
> > 
> >  (27/43)
> > tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password:
> > ERROR: ConnectError: Failed to establish session: EOFError\n Exit code:
> > 1\n    Command: ./qemu-system-x86_64 -display none -vga none -chardev socket,id=mon,path=/var/tmp/avo_qemu_sock_4nrz0r37/qemu-2912538-7f732e94e0f0-monitor.sock
> > -mon chardev=mon,mode=control -node... (0.09 s)
> >  (28/43) tests/avocado/vnc.py:Vnc.test_change_password:  ERROR:
> > ConnectError: Failed to establish session: EOFError\n    Exit code:
> > 1\n    Command: ./qemu-system-x86_64 -display none -vga none -chardev socket,id=mon,path=/var/tmp/avo_qemu_sock_yhpzy5c3/qemu-2912543-7f732e94b438-monitor.sock
> > -mon chardev=mon,mode=control -node... (0.09 s)
> >  (29/43)
> > tests/avocado/vnc.py:Vnc.test_change_password_requires_a_password:
> > ERROR: ConnectError: Failed to establish session: EOFError\n Exit code:
> > 1\n    Command: ./qemu-system-x86_64 -display none -vga none -chardev socket,id=mon,path=/var/tmp/avo_qemu_sock_tk3pfmt2/qemu-2912548-7f732e93d7b8-monitor.sock
> > -mon chardev=mon,mode=control -node... (0.09 s)
> > 
> > 
> > r~
> > 
> 
> This is caused by [PATCH 14/17] ui: move 'pc-bios/keymaps' to 'ui/keymaps'.
> After this patch QEMU no longer finds it's keymaps if started directly from
> the build directory.

I just sent Gerd an update version which adds a symlink from the source
tree to the build dir to solve this problem, along with updated commit
message to reflect this need

With regards,
Daniel