ui/gtk-gl-area.c | 11 ++++++++ ui/gtk.c | 52 ++++++++++++++++++------------------- ui/spice-input.c | 2 ++ ui/vnc-auth-sasl.c | 1 + pc-bios/keymaps/meson.build | 28 +++++++++++++------- 5 files changed, 59 insertions(+), 35 deletions(-)
The following changes since commit 39335fab59e11cfda9b7cf63929825db2dd3a3e0: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-= request' into staging (2020-08-28 22:30:11 +0100) are available in the Git repository at: git://git.kraxel.org/qemu tags/ui-20200831-pull-request for you to fetch changes up to e54635710f1cf667191a0a1d9df9a37d1c9b0ad0: ui/gtk: Update refresh interval after widget is realized (2020-08-31 10:41:= 43 +0200) ---------------------------------------------------------------- ui: memleak fixes. gtk: refresh interval fix. keymaps: don't require qemu-keymap (fix gitlab ci). spice: add mouse buttons. ---------------------------------------------------------------- Frediano Ziglio (1): ui: Add more mouse buttons to SPICE Gerd Hoffmann (1): meson: fix keymaps witout qemu-keymap Pan Nengyuan (2): ui/gtk-gl-area: Plug memleak in gd_gl_area_create_context() vnc-auth-sasl: Plug memleak in vnc_socket_ip_addr_string Philippe Mathieu-Daud=C3=A9 (1): ui/gtk: Update refresh interval after widget is realized ui/gtk-gl-area.c | 11 ++++++++ ui/gtk.c | 52 ++++++++++++++++++------------------- ui/spice-input.c | 2 ++ ui/vnc-auth-sasl.c | 1 + pc-bios/keymaps/meson.build | 28 +++++++++++++------- 5 files changed, 59 insertions(+), 35 deletions(-) --=20 2.27.0
On Mon, 31 Aug 2020 at 12:05, Gerd Hoffmann <kraxel@redhat.com> wrote: > > The following changes since commit 39335fab59e11cfda9b7cf63929825db2dd3a3e0: > > Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-= > request' into staging (2020-08-28 22:30:11 +0100) > > are available in the Git repository at: > > git://git.kraxel.org/qemu tags/ui-20200831-pull-request > > for you to fetch changes up to e54635710f1cf667191a0a1d9df9a37d1c9b0ad0: > > ui/gtk: Update refresh interval after widget is realized (2020-08-31 10:41:= > 43 +0200) > > ---------------------------------------------------------------- > ui: memleak fixes. > gtk: refresh interval fix. > keymaps: don't require qemu-keymap (fix gitlab ci). > spice: add mouse buttons. > > ---------------------------------------------------------------- > > Frediano Ziglio (1): > ui: Add more mouse buttons to SPICE > > Gerd Hoffmann (1): > meson: fix keymaps witout qemu-keymap > > Pan Nengyuan (2): > ui/gtk-gl-area: Plug memleak in gd_gl_area_create_context() > vnc-auth-sasl: Plug memleak in vnc_socket_ip_addr_string > > Philippe Mathieu-Daud=C3=A9 (1): > ui/gtk: Update refresh interval after widget is realized NB: something in your cover letter creation process is mangling UTF-8. Fails to build, windows crossbuild: ./ninjatool -t ninja2make --omit clean dist uninstall < build.ninja > Makefile.ninja make[1]: Entering directory '/home/petmay01/qemu-for-merges/slirp' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory '/home/petmay01/qemu-for-merges/slirp' Generating qemu-version.h with a meson_exe.py custom command Generating ar with a custom command cp: '../../pc-bios/keymaps/ar' and 'pc-bios/keymaps/ar' are the same file Generating bepo with a custom command cp: '../../pc-bios/keymaps/bepo' and 'pc-bios/keymaps/bepo' are the same file Makefile.ninja:5172: recipe for target 'pc-bios/keymaps/ar.stamp' failed make: *** [pc-bios/keymaps/ar.stamp] Error 1 make: *** Waiting for unfinished jobs.... Makefile.ninja:5174: recipe for target 'pc-bios/keymaps/bepo.stamp' failed make: *** [pc-bios/keymaps/bepo.stamp] Error 1 Generating cz with a custom command cp: '../../pc-bios/keymaps/cz' and 'pc-bios/keymaps/cz' are the same file Makefile.ninja:5176: recipe for target 'pc-bios/keymaps/cz.stamp' failed make: *** [pc-bios/keymaps/cz.stamp] Error 1 make: Leaving directory '/home/petmay01/qemu-for-merges/build/w64' Fails to build, x86: [...] Configuring 50-edk2-i386-secure.json using configuration Configuring 50-edk2-x86_64-secure.json using configuration Configuring 60-edk2-aarch64.json using configuration Configuring 60-edk2-arm.json using configuration Configuring 60-edk2-i386.json using configuration Configuring 60-edk2-x86_64.json using configuration Program qemu-keymap found: NO ../../pc-bios/keymaps/meson.build:58: WARNING: Custom target input 'ar' can't be converted to File object(s). This will become a hard error in the future. ../../pc-bios/keymaps/meson.build:58: WARNING: Custom target input 'bepo' can't be converted to File object(s). This will become a hard error in the future. ../../pc-bios/keymaps/meson.build:58: WARNING: Custom target input 'cz' can't be converted to File object(s). This will become a hard error in the future. ../../pc-bios/keymaps/meson.build:58: WARNING: Custom target input 'da' can't be converted to File object(s). This will become a hard error in the future. ../../pc-bios/keymaps/meson.build:58: WARNING: Custom target input 'de' can't be converted to File object(s). This will become a hard error in the future. [...] Command line for building ['libcommon.fa'] is long, using a response file Command line for building ['libqemu-aarch64-softmmu.fa'] is long, using a response file Command line for building ['qemu-system-aarch64'] is long, using a response file Command line for building ['qemu-system-arm'] is long, using a response file make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/all' make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/all' /usr/bin/python3 -B /home/petmay01/linaro/qemu-for-merges/meson/meson.py introspect --tests | /usr/bin/python3 -B scripts/mtest2make.py > Makefile.mtest make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/all' make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/all' ./ninjatool -t ninja2make --omit clean dist uninstall < build.ninja > Makefile.ninja make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/all' make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/all' GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 meson dtc capstone slirp make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/all' make[1]: Nothing to be done for 'all'. make: *** No rule to make target '../../pc-bios/keymaps/ar', needed by 'pc-bios/keymaps/ar.stamp'. Stop. make: *** Waiting for unfinished jobs.... thanks -- PMM
Hi, > Generating ar with a custom command > cp: '../../pc-bios/keymaps/ar' and 'pc-bios/keymaps/ar' are the same file Hmm, strange. No failures in gitlab ci: https://gitlab.com/kraxel/qemu/-/pipelines/183769485 Any chance this is an old build tree? Specifically created before commit ddcf607fa3d6 ("meson: drop keymaps symlink") was merged, and the symlink is present still? thanks, Gerd
On Tue, 1 Sep 2020 at 15:16, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Hi, > > > Generating ar with a custom command > > cp: '../../pc-bios/keymaps/ar' and 'pc-bios/keymaps/ar' are the same file > > Hmm, strange. No failures in gitlab ci: > https://gitlab.com/kraxel/qemu/-/pipelines/183769485 > > Any chance this is an old build tree? Specifically created before > commit ddcf607fa3d6 ("meson: drop keymaps symlink") was merged, and the > symlink is present still? Yeah, mostly my build trees don't get regenerated. We like incremental builds to continue to work. thanks -- PMM
On Tue, Sep 01, 2020 at 03:54:29PM +0100, Peter Maydell wrote: > On Tue, 1 Sep 2020 at 15:16, Gerd Hoffmann <kraxel@redhat.com> wrote: > > > > Hi, > > > > > Generating ar with a custom command > > > cp: '../../pc-bios/keymaps/ar' and 'pc-bios/keymaps/ar' are the same file > > > > Hmm, strange. No failures in gitlab ci: > > https://gitlab.com/kraxel/qemu/-/pipelines/183769485 > > > > Any chance this is an old build tree? Specifically created before > > commit ddcf607fa3d6 ("meson: drop keymaps symlink") was merged, and the > > symlink is present still? > > Yeah, mostly my build trees don't get regenerated. We like > incremental builds to continue to work. So just not creating the symlink isn't enough, i.e. configure must remove it if present? Or is requiring fresh build trees ok if announced in the cover letter / pull request? thanks, Gerd
© 2016 - 2024 Red Hat, Inc.