[PULL 0/3] Fixes 20200825 patches

[PULL 0/3] Fixes 20200825 patches

[Gerd Hoffmann]

The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1:

  Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200812' into staging (2020-08-24 16:39:53 +0100)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/fixes-20200825-pull-request

for you to fetch changes up to 9755c94a50c8b845ad133a6e660f55ca131b9c7a:

  meson: avoid compiling qemu-keymap by default (2020-08-25 08:12:19 +0200)

----------------------------------------------------------------
meson: keymap fixes

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

Gerd Hoffmann (1):
  meson: drop keymaps symlink

Laurent Vivier (2):
  meson: move xkbcommon to meson
  meson: avoid compiling qemu-keymap by default

 configure         | 31 +++++--------------------------
 meson_options.txt |  1 +
 meson.build       | 16 +++++++++++-----
 ui/meson.build    |  2 +-
 4 files changed, 18 insertions(+), 32 deletions(-)

-- 
2.27.0

[PULL 1/3] meson: drop keymaps symlink

[Gerd Hoffmann]

We are building the keymaps by default now.  Drop the keymaps symlink
so the generated files are actually written to the build tree not the
source tree.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Tested-by: Klaus Jensen <k.jensen@samsung.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
Message-id: 20200824074057.3673-1-kraxel@redhat.com
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b8f5b81a6719..377aafa2acd5 100755
--- a/configure
+++ b/configure
@@ -8120,7 +8120,7 @@ DIRS="$DIRS roms/seabios"
 LINKS="Makefile"
 LINKS="$LINKS tests/tcg/lm32/Makefile"
 LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
 LINKS="$LINKS pc-bios/s390-ccw/Makefile"
 LINKS="$LINKS roms/seabios/Makefile"
 LINKS="$LINKS pc-bios/qemu-icon.bmp"
-- 
2.27.0

[PULL 2/3] meson: move xkbcommon to meson

[Gerd Hoffmann]

From: Laurent Vivier <laurent@vivier.eu>

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-2-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure         | 29 ++++-------------------------
 meson_options.txt |  1 +
 meson.build       | 11 ++++++-----
 ui/meson.build    |  2 +-
 4 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/configure b/configure
index 377aafa2acd5..b1e11397a827 100755
--- a/configure
+++ b/configure
@@ -432,7 +432,7 @@ vde=""
 vnc_sasl="auto"
 vnc_jpeg="auto"
 vnc_png="auto"
-xkbcommon=""
+xkbcommon="auto"
 xen=""
 xen_ctrl_version=""
 xen_pci_passthrough=""
@@ -1631,9 +1631,9 @@ for opt do
   ;;
   --disable-libpmem) libpmem=no
   ;;
-  --enable-xkbcommon) xkbcommon=yes
+  --enable-xkbcommon) xkbcommon="enabled"
   ;;
-  --disable-xkbcommon) xkbcommon=no
+  --disable-xkbcommon) xkbcommon="disabled"
   ;;
   --enable-plugins) plugins="yes"
   ;;
@@ -3446,22 +3446,6 @@ EOF
     fi
 fi
 
-##########################################
-# xkbcommon probe
-if test "$xkbcommon" != "no" ; then
-  if $pkg_config xkbcommon --exists; then
-    xkbcommon_cflags=$($pkg_config xkbcommon --cflags)
-    xkbcommon_libs=$($pkg_config xkbcommon --libs)
-    xkbcommon=yes
-  else
-    if test "$xkbcommon" = "yes" ; then
-      feature_not_found "xkbcommon" "Install libxkbcommon-devel"
-    fi
-    xkbcommon=no
-  fi
-fi
-
-
 ##########################################
 # xfsctl() probe, used for file-posix.c
 if test "$xfs" != "no" ; then
@@ -6827,11 +6811,6 @@ if test "$audio_win_int" = "yes" ; then
 fi
 echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
 echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
-if test "$xkbcommon" = "yes" ; then
-  echo "CONFIG_XKBCOMMON=y" >> $config_host_mak
-  echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak
-  echo "XKBCOMMON_LIBS=$xkbcommon_libs" >> $config_host_mak
-fi
 if test "$xfs" = "yes" ; then
   echo "CONFIG_XFS=y" >> $config_host_mak
 fi
@@ -8251,7 +8230,7 @@ NINJA=$PWD/ninjatool $meson setup \
         -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
 	-Dsdl=$sdl -Dsdl_image=$sdl_image \
 	-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
-	-Dgettext=$gettext \
+	-Dgettext=$gettext -Dxkbcommon=$xkbcommon \
         $cross_arg \
         "$PWD" "$source_path"
 
diff --git a/meson_options.txt b/meson_options.txt
index e5f45243ce78..c55f9cd94cb2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,3 +5,4 @@ option('vnc', type : 'feature', value : 'enabled')
 option('vnc_jpeg', type : 'feature', value : 'auto')
 option('vnc_png', type : 'feature', value : 'auto')
 option('vnc_sasl', type : 'feature', value : 'auto')
+option('xkbcommon', type : 'feature', value : 'auto')
diff --git a/meson.build b/meson.build
index df5bf728b57a..f6e346af1a69 100644
--- a/meson.build
+++ b/meson.build
@@ -152,10 +152,10 @@ libcap_ng = not_found
 if 'CONFIG_LIBCAP_NG' in config_host
   libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
 endif
-xkbcommon = not_found
-if 'CONFIG_XKBCOMMON' in config_host
-  xkbcommon = declare_dependency(compile_args: config_host['XKBCOMMON_CFLAGS'].split(),
-                                 link_args: config_host['XKBCOMMON_LIBS'].split())
+xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'), static: enable_static,
+                       include_type: 'system')
+if xkbcommon.found()
+  xkbcommon = declare_dependency(dependencies: xkbcommon)
 endif
 slirp = not_found
 if config_host.has_key('CONFIG_SLIRP')
@@ -389,6 +389,7 @@ config_host_data.set('CONFIG_VNC', vnc.found())
 config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
 config_host_data.set('CONFIG_VNC_PNG', png.found())
 config_host_data.set('CONFIG_VNC_SASL', sasl.found())
+config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
 config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
 config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0])
 config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
@@ -1062,7 +1063,7 @@ if 'CONFIG_GUEST_AGENT' in config_host
   subdir('qga')
 endif
 
-if 'CONFIG_XKBCOMMON' in config_host
+if xkbcommon.found()
   # used for the update-keymaps target, so include rules even if !have_tools
   qemu_keymap = executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c') + genh,
                            dependencies: [qemuutil, xkbcommon], install: have_tools)
diff --git a/ui/meson.build b/ui/meson.build
index 81fd393432a4..018c5698bf66 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -95,7 +95,7 @@ keymaps = [
   ['osx', 'qcode'],
 ]
 
-if have_system or 'CONFIG_XKBCOMMON' in config_host
+if have_system or xkbcommon.found()
   foreach e : keymaps
     output = 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1])
     genh += custom_target(output,
-- 
2.27.0

[PULL 3/3] meson: avoid compiling qemu-keymap by default

[Gerd Hoffmann]

From: Laurent Vivier <laurent@vivier.eu>

qemu-keymap is not needed with linux-user, so disable it by default if
tools and system are disabled (tools are disabled by default with linux-user).

Avoid this error with statically linked binaries:

    Linking target qemu-keymap
    /usr/bin/ld: cannot find -lxkbcommon

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-3-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 meson.build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meson.build b/meson.build
index f6e346af1a69..f0fe5f8799e0 100644
--- a/meson.build
+++ b/meson.build
@@ -1063,6 +1063,11 @@ if 'CONFIG_GUEST_AGENT' in config_host
   subdir('qga')
 endif
 
+# Don't build qemu-keymap if xkbcommon is not explicitly enabled
+# when we don't build tools or system
+if get_option('xkbcommon').auto() and not have_system and not have_tools
+  xkbcommon = not_found
+endif
 if xkbcommon.found()
   # used for the update-keymaps target, so include rules even if !have_tools
   qemu_keymap = executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c') + genh,
-- 
2.27.0

Re: [PULL 0/3] Fixes 20200825 patches

[Peter Maydell]

On Tue, 25 Aug 2020 at 07:22, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1:
>
>   Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200812' into staging (2020-08-24 16:39:53 +0100)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/fixes-20200825-pull-request
>
> for you to fetch changes up to 9755c94a50c8b845ad133a6e660f55ca131b9c7a:
>
>   meson: avoid compiling qemu-keymap by default (2020-08-25 08:12:19 +0200)
>
> ----------------------------------------------------------------
> meson: keymap fixes
>
> ----------------------------------------------------------------



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM

Re: [PULL 0/3] Fixes 20200825 patches

[Thomas Huth]

On 25/08/2020 08.20, Gerd Hoffmann wrote:
> The following changes since commit 30aa19446d82358a30eac3b556b4d6641e00b7c1:
> 
>   Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200812' into staging (2020-08-24 16:39:53 +0100)
> 
> are available in the Git repository at:
> 
>   git://git.kraxel.org/qemu tags/fixes-20200825-pull-request
> 
> for you to fetch changes up to 9755c94a50c8b845ad133a6e660f55ca131b9c7a:
> 
>   meson: avoid compiling qemu-keymap by default (2020-08-25 08:12:19 +0200)
> 
> ----------------------------------------------------------------
> meson: keymap fixes
> 
> ----------------------------------------------------------------

 Hi Gerd,

if I've got that right, something in this pull request broke the gitlab
CI, see:

 https://gitlab.com/qemu-project/qemu/-/jobs/702680909

216 (33/45)
tests/acceptance/vnc.py:Vnc.test_change_password_requires_a_password:
ERROR: Unexpected empty reply from server (0.08 s)
217 (34/45) tests/acceptance/vnc.py:Vnc.test_change_password:  ERROR:
Unexpected empty reply from server (0.06 s)

Peter, what is still missing that you could use the gitlab CI as gating
tests, too?

 Thomas

Re: [PULL 0/3] Fixes 20200825 patches

[Gerd Hoffmann]

> if I've got that right, something in this pull request broke the gitlab
> CI, see:
> 
>  https://gitlab.com/qemu-project/qemu/-/jobs/702680909
> 
> 216 (33/45)
> tests/acceptance/vnc.py:Vnc.test_change_password_requires_a_password:
> ERROR: Unexpected empty reply from server (0.08 s)
> 217 (34/45) tests/acceptance/vnc.py:Vnc.test_change_password:  ERROR:
> Unexpected empty reply from server (0.06 s)

Yep, qemu is upset b/c the en-us keymap isn't there.

Seems we handle the 'no qemu-keymap present + start from build
directory' case not correctly.  I guess with the symlink being
gone now we should just copy the files from the source tree.

https://gitlab.com/kraxel/qemu/-/commit/1e29c4518e7b69d09bb22e071376ddeb151d0970
https://gitlab.com/kraxel/qemu/-/pipelines/182575761

lets see how it is going ...

take care,
  Gerd

Re: [PULL 0/3] Fixes 20200825 patches

[Peter Maydell]

On Thu, 27 Aug 2020 at 08:20, Thomas Huth <thuth@redhat.com> wrote:
> Peter, what is still missing that you could use the gitlab CI as gating
> tests, too?

I think we're waiting on a respin of the scripts from
Cleber, aren't we?

Also we need figure out how to handle the conflict between
"gitlab's git repo is mirrored (by perodic push?) from
git.qemu.org" and "test by pushing to the gitlab staging
branch", because the former overwrites the changes that
the latter makes.

thanks
-- PMM

Re: [PULL 0/3] Fixes 20200825 patches

[Gerd Hoffmann]

On Thu, Aug 27, 2020 at 11:23:58AM +0100, Peter Maydell wrote:
> On Thu, 27 Aug 2020 at 08:20, Thomas Huth <thuth@redhat.com> wrote:
> > Peter, what is still missing that you could use the gitlab CI as gating
> > tests, too?
> 
> I think we're waiting on a respin of the scripts from
> Cleber, aren't we?
> 
> Also we need figure out how to handle the conflict between
> "gitlab's git repo is mirrored (by perodic push?) from
> git.qemu.org" and "test by pushing to the gitlab staging
> branch", because the former overwrites the changes that
> the latter makes.

Pushing to a qemu fork runs CI too, so the staging branch doesn't have
to live in the official qemu-project repo.

take care,
  Gerd

Re: [PULL 0/3] Fixes 20200825 patches

[Peter Maydell]

On Fri, 28 Aug 2020 at 06:13, Gerd Hoffmann <kraxel@redhat.com> wrote:
> On Thu, Aug 27, 2020 at 11:23:58AM +0100, Peter Maydell wrote:
> >
> > Also we need figure out how to handle the conflict between
> > "gitlab's git repo is mirrored (by perodic push?) from
> > git.qemu.org" and "test by pushing to the gitlab staging
> > branch", because the former overwrites the changes that
> > the latter makes.
>
> Pushing to a qemu fork runs CI too, so the staging branch doesn't have
> to live in the official qemu-project repo.

We aren't going to let the project's gitlab runners (the aarch64,
s390x, etc systems) run just anybody's CI jobs, because they're
a very limited resource: they will only run for things pushed
to the official repo.

thanks
-- PMM

Re: [PULL 0/3] Fixes 20200825 patches

[Daniel P. Berrangé]

On Fri, Aug 28, 2020 at 05:29:44PM +0100, Peter Maydell wrote:
> On Fri, 28 Aug 2020 at 06:13, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > On Thu, Aug 27, 2020 at 11:23:58AM +0100, Peter Maydell wrote:
> > >
> > > Also we need figure out how to handle the conflict between
> > > "gitlab's git repo is mirrored (by perodic push?) from
> > > git.qemu.org" and "test by pushing to the gitlab staging
> > > branch", because the former overwrites the changes that
> > > the latter makes.
> >
> > Pushing to a qemu fork runs CI too, so the staging branch doesn't have
> > to live in the official qemu-project repo.
> 
> We aren't going to let the project's gitlab runners (the aarch64,
> s390x, etc systems) run just anybody's CI jobs, because they're
> a very limited resource: they will only run for things pushed
> to the official repo.

Runners are registered to the project, so we could create a separate
gitlab.com/qemu-project/qemu-staging  repo just for purpose of CI
and that would have access to the runners.

I don't know how the mirroring is setup currently, but if we use
GitLab's own pull based mirroring, you can configure it to only
mirror protected branches.  We could thus mark "master" and any
stable branches as protected.  GitLab should then mirror those,
without overwriting any other branches you have. So that ought
to let you create a staging branch in the main repo.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|