| Message ID | 20220613113655.3693872-1-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 6/13/22 04:36, Gerd Hoffmann wrote: > The following changes since commit dcb40541ebca7ec98a14d461593b3cd7282b4fac: > > Merge tag 'mips-20220611' of https://github.com/philmd/qemu into staging (2022-06-11 21:13:27 -0700) > > are available in the Git repository at: > > git://git.kraxel.org/qemu tags/kraxel-20220613-pull-request > > for you to fetch changes up to 23b87f7a3a13e93e248eef8a4b7257548855a620: > > ui: move 'pc-bios/keymaps' to 'ui/keymaps' (2022-06-13 10:59:25 +0200) > > ---------------------------------------------------------------- > usb: add CanoKey device, fixes for ehci + redir > ui: fixes for gtk and cocoa, move keymaps (v2), rework refresh rate > virtio-gpu: scanout flush fix This doesn't even configure: ../src/ui/keymaps/meson.build:55:4: ERROR: File ar does not exist. r~
On 6/13/22 08:52, Richard Henderson wrote: > On 6/13/22 04:36, Gerd Hoffmann wrote: >> The following changes since commit dcb40541ebca7ec98a14d461593b3cd7282b4fac: >> >> Merge tag 'mips-20220611' of https://github.com/philmd/qemu into staging (2022-06-11 >> 21:13:27 -0700) >> >> are available in the Git repository at: >> >> git://git.kraxel.org/qemu tags/kraxel-20220613-pull-request >> >> for you to fetch changes up to 23b87f7a3a13e93e248eef8a4b7257548855a620: >> >> ui: move 'pc-bios/keymaps' to 'ui/keymaps' (2022-06-13 10:59:25 +0200) >> >> ---------------------------------------------------------------- >> usb: add CanoKey device, fixes for ehci + redir >> ui: fixes for gtk and cocoa, move keymaps (v2), rework refresh rate >> virtio-gpu: scanout flush fix > > This doesn't even configure: > > ../src/ui/keymaps/meson.build:55:4: ERROR: File ar does not exist. ... or, rather, corrupts the source tree on the first configure, so that any retry fails: deleted: ui/keymaps/ar deleted: ui/keymaps/bepo deleted: ui/keymaps/cz deleted: ui/keymaps/da deleted: ui/keymaps/de deleted: ui/keymaps/de-ch deleted: ui/keymaps/en-gb deleted: ui/keymaps/en-us deleted: ui/keymaps/es deleted: ui/keymaps/et deleted: ui/keymaps/fi deleted: ui/keymaps/fo deleted: ui/keymaps/fr deleted: ui/keymaps/fr-be deleted: ui/keymaps/fr-ca deleted: ui/keymaps/fr-ch deleted: ui/keymaps/hr deleted: ui/keymaps/hu deleted: ui/keymaps/is deleted: ui/keymaps/it deleted: ui/keymaps/ja deleted: ui/keymaps/lt deleted: ui/keymaps/lv deleted: ui/keymaps/mk deleted: ui/keymaps/nl deleted: ui/keymaps/no deleted: ui/keymaps/pl deleted: ui/keymaps/pt deleted: ui/keymaps/pt-br deleted: ui/keymaps/ru deleted: ui/keymaps/th deleted: ui/keymaps/tr r~
On Mon, Jun 13, 2022 at 08:52:21AM -0700, Richard Henderson wrote: > On 6/13/22 04:36, Gerd Hoffmann wrote: > > The following changes since commit dcb40541ebca7ec98a14d461593b3cd7282b4fac: > > > > Merge tag 'mips-20220611' of https://github.com/philmd/qemu into staging (2022-06-11 21:13:27 -0700) > > > > are available in the Git repository at: > > > > git://git.kraxel.org/qemu tags/kraxel-20220613-pull-request > > > > for you to fetch changes up to 23b87f7a3a13e93e248eef8a4b7257548855a620: > > > > ui: move 'pc-bios/keymaps' to 'ui/keymaps' (2022-06-13 10:59:25 +0200) > > > > ---------------------------------------------------------------- > > usb: add CanoKey device, fixes for ehci + redir > > ui: fixes for gtk and cocoa, move keymaps (v2), rework refresh rate > > virtio-gpu: scanout flush fix > > This doesn't even configure: > > ../src/ui/keymaps/meson.build:55:4: ERROR: File ar does not exist. Hmm, build worked here and CI passed too. I think this is one of those cases where the build directory must be deleted because one subdirectory is replaced by a compatibility symlink. Or we drop the symlink idea and update the keymap loading code to check both old and new location. Daniel? take care, Gerd
On Tue, Jun 14, 2022 at 11:40:38AM +0200, Gerd Hoffmann wrote: > On Mon, Jun 13, 2022 at 08:52:21AM -0700, Richard Henderson wrote: > > On 6/13/22 04:36, Gerd Hoffmann wrote: > > > The following changes since commit dcb40541ebca7ec98a14d461593b3cd7282b4fac: > > > > > > Merge tag 'mips-20220611' of https://github.com/philmd/qemu into staging (2022-06-11 21:13:27 -0700) > > > > > > are available in the Git repository at: > > > > > > git://git.kraxel.org/qemu tags/kraxel-20220613-pull-request > > > > > > for you to fetch changes up to 23b87f7a3a13e93e248eef8a4b7257548855a620: > > > > > > ui: move 'pc-bios/keymaps' to 'ui/keymaps' (2022-06-13 10:59:25 +0200) > > > > > > ---------------------------------------------------------------- > > > usb: add CanoKey device, fixes for ehci + redir > > > ui: fixes for gtk and cocoa, move keymaps (v2), rework refresh rate > > > virtio-gpu: scanout flush fix > > > > This doesn't even configure: > > > > ../src/ui/keymaps/meson.build:55:4: ERROR: File ar does not exist. > > Hmm, build worked here and CI passed too. > > I think this is one of those cases where the build directory must be > deleted because one subdirectory is replaced by a compatibility > symlink. Except 'configure' deals with that, as it explicitly rm -rf's the symlink target: symlink() { rm -rf "$2" mkdir -p "$(dirname "$2")" ln -s "$1" "$2" } so i'm pretty confused as to what's going wrong here still With regards, Daniel
> > Hmm, build worked here and CI passed too. > > > > I think this is one of those cases where the build directory must be > > deleted because one subdirectory is replaced by a compatibility > > symlink. > > Except 'configure' deals with that, as it explicitly rm -rf's the > symlink target: > > symlink() { > rm -rf "$2" > mkdir -p "$(dirname "$2")" > ln -s "$1" "$2" > } > > so i'm pretty confused as to what's going wrong here still 'git rebase -x ./make.sh master queue/kraxel' not working (where make.sh is a script effectively doing 'make -C build/$name' for multiple build trees with different configurations). 'git status' lists ui/keymaps/* as deleted. 'git reset --hard' fixes it. take care, Gerd
On Mon, Jun 13, 2022 at 08:52:21AM -0700, Richard Henderson wrote: > On 6/13/22 04:36, Gerd Hoffmann wrote: > > The following changes since commit dcb40541ebca7ec98a14d461593b3cd7282b4fac: > > > > Merge tag 'mips-20220611' of https://github.com/philmd/qemu into staging (2022-06-11 21:13:27 -0700) > > > > are available in the Git repository at: > > > > git://git.kraxel.org/qemu tags/kraxel-20220613-pull-request > > > > for you to fetch changes up to 23b87f7a3a13e93e248eef8a4b7257548855a620: > > > > ui: move 'pc-bios/keymaps' to 'ui/keymaps' (2022-06-13 10:59:25 +0200) > > > > ---------------------------------------------------------------- > > usb: add CanoKey device, fixes for ehci + redir > > ui: fixes for gtk and cocoa, move keymaps (v2), rework refresh rate > > virtio-gpu: scanout flush fix > > This doesn't even configure: > > ../src/ui/keymaps/meson.build:55:4: ERROR: File ar does not exist. dropped keymaps patch for now, new version sent. take care, Gerd
The following changes since commit dcb40541ebca7ec98a14d461593b3cd7282b4fac: Merge tag 'mips-20220611' of https://github.com/philmd/qemu into staging (2022-06-11 21:13:27 -0700) are available in the Git repository at: git://git.kraxel.org/qemu tags/kraxel-20220613-pull-request for you to fetch changes up to 23b87f7a3a13e93e248eef8a4b7257548855a620: ui: move 'pc-bios/keymaps' to 'ui/keymaps' (2022-06-13 10:59:25 +0200) ---------------------------------------------------------------- usb: add CanoKey device, fixes for ehci + redir ui: fixes for gtk and cocoa, move keymaps (v2), 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 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 configure | 4 + 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/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(+), 52 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%)