Skip to contentSkip to conversation

Update Travis from Xenial to Bionic and Focal

PATCH In review Thomas Huth 4 participants 17 messages Sep 18, 2020 – Sep 22, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover Update Travis from Xenial to Bionic and Focal

According to our support policy, we do not support Xenial anymore. Time to switch the Travis jobs to Focal or Bionic instead now.

Paolo Bonzini (2):
meson: move libudev test
meson: move libmpathpersist test

Thomas Huth (4):
migration: Silence compiler warning in global_state_store_running() travis.yml: Drop the default softmmu builds
travis.yml: Update Travis to use Bionic and Focal instead of Xenial travis.yml: Drop the superfluous Python 3.6 build

 .travis.yml              | 46 ++++++--------------
 configure                | 91 ++--------------------------------------
 meson.build              | 85 +++++++++++++++++++++++++++++++++----
 meson_options.txt        |  2 +
 migration/global_state.c |  4 +-
 5 files changed, 97 insertions(+), 131 deletions(-)
Signature · 1 line
2.18.2
#1 lore raw

PATCH 1/6 meson: move libudev test

From: Paolo Bonzini <[email protected]>

Message-Id: <[email protected]>

---
 configure   | 14 --------------
 meson.build |  7 ++++---
 2 files changed, 4 insertions(+), 17 deletions(-)
configure +0 -14
index 7564479008..d8bd6829b3 100755
@@ -908,7 +908,6 @@ Linux)
   linux_user="yes"
   kvm="yes"
   QEMU_INCLUDES="-isystem ${source_path}/linux-headers -Ilinux-headers $QEMU_INCLUDES"
-  libudev="yes"
 ;;
 esac
 
@@ -6283,15 +6282,6 @@ if test "$libnfs" != "no" ; then
 fi
 
 ##########################################
-# Do we have libudev
-if test "$libudev" != "no" ; then
-  if $pkg_config libudev && test "$static" != "yes"; then
-    libudev="yes"
-    libudev_libs=$($pkg_config --libs libudev)
-  else
-    libudev="no"
-  fi
-fi
 
 # Exclude --warn-common with TSan to suppress warnings from the TSan libraries.
 if test "$solaris" = "no" && test "$tsan" = "no"; then
@@ -7460,10 +7450,6 @@ if test "$gcov" = "yes" ; then
   echo "CONFIG_GCOV=y" >> $config_host_mak
 fi
 
-if test "$libudev" != "no"; then
-    echo "CONFIG_LIBUDEV=y" >> $config_host_mak
-    echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak
-fi
 if test "$fuzzing" != "no"; then
     echo "CONFIG_FUZZ=y" >> $config_host_mak
 fi
meson.build +4 -3
index f4d1ab1096..4872498897 100644
@@ -252,8 +252,8 @@ if 'CONFIG_CURL' in config_host
                             link_args: config_host['CURL_LIBS'].split())
 endif
 libudev = not_found
-if 'CONFIG_LIBUDEV' in config_host
-  libudev = declare_dependency(link_args: config_host['LIBUDEV_LIBS'].split())
+if target_os == 'linux'
+  libudev = dependency('libudev', static: enable_static)
 endif
 brlapi = not_found
 if 'CONFIG_BRLAPI' in config_host
@@ -435,6 +435,7 @@ has_gettid = cc.has_function('gettid')
 
 # Create config-host.h
 
+config_host_data.set('CONFIG_LIBUDEV', libudev.found())
 config_host_data.set('CONFIG_SDL', sdl.found())
 config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
 config_host_data.set('CONFIG_VNC', vnc.found())
@@ -1515,7 +1516,7 @@ summary_info += {'sheepdog support':  config_host.has_key('CONFIG_SHEEPDOG')}
 summary_info += {'capstone':          config_host.has_key('CONFIG_CAPSTONE')}
 summary_info += {'libpmem support':   config_host.has_key('CONFIG_LIBPMEM')}
 summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
-summary_info += {'libudev':           config_host.has_key('CONFIG_LIBUDEV')}
+summary_info += {'libudev':           libudev.found()}
 summary_info += {'default devices':   config_host['CONFIG_MINIKCONF_MODE'] == '--defconfig'}
 summary_info += {'plugin support':    config_host.has_key('CONFIG_PLUGIN')}
 summary_info += {'fuzzing support':   config_host.has_key('CONFIG_FUZZ')}
Signature · 1 line
2.18.2
#2 lore raw

PATCH 2/6 meson: move libmpathpersist test

In reply to Thomas Huth

From: Paolo Bonzini <[email protected]>

This is the first compiler/linker test that has been moved to Meson. Add more section headings to keep things clearer.

[thuth: Add check for mpathpersist.found() before showing mpathpersist_new_api]
---
 configure         | 77 +++-----------------------------------------
 meson.build       | 82 ++++++++++++++++++++++++++++++++++++++++++-----
 meson_options.txt |  2 ++
 3 files changed, 80 insertions(+), 81 deletions(-)
configure +4 -73
index d8bd6829b3..df36ce6ab8 100755
@@ -403,7 +403,7 @@ netmap="no"
 sdl="auto"
 sdl_image="auto"
 virtfs=""
-mpath=""
+mpath="auto"
 vnc="enabled"
 sparse="no"
 vde=""
@@ -1116,9 +1116,9 @@ for opt do
   ;;
   --enable-virtfs) virtfs="yes"
   ;;
-  --disable-mpath) mpath="no"
+  --disable-mpath) mpath="disabled"
   ;;
-  --enable-mpath) mpath="yes"
+  --enable-mpath) mpath="enabled"
   ;;
   --disable-vnc) vnc="disabled"
   ;;
@@ -3848,57 +3848,6 @@ if test "$modules" = yes; then
     fi
 fi
 
-##########################################
-# libmpathpersist probe
-
-if test "$mpath" != "no" ; then
-  # probe for the new API
-  cat > $TMPC <<EOF
-#include <libudev.h>
-#include <mpath_persist.h>
-unsigned mpath_mx_alloc_len = 1024;
-int logsink;
-static struct config *multipath_conf;
-extern struct udev *udev;
-extern struct config *get_multipath_config(void);
-extern void put_multipath_config(struct config *conf);
-struct udev *udev;
-struct config *get_multipath_config(void) { return multipath_conf; }
-void put_multipath_config(struct config *conf) { }
-
-int main(void) {
-    udev = udev_new();
-    multipath_conf = mpath_lib_init();
-    return 0;
-}
-EOF
-  if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
-    mpathpersist=yes
-    mpathpersist_new_api=yes
-  else
-    # probe for the old API
-    cat > $TMPC <<EOF
-#include <libudev.h>
-#include <mpath_persist.h>
-unsigned mpath_mx_alloc_len = 1024;
-int logsink;
-int main(void) {
-    struct udev *udev = udev_new();
-    mpath_lib_init(udev);
-    return 0;
-}
-EOF
-    if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
-      mpathpersist=yes
-      mpathpersist_new_api=no
-    else
-      mpathpersist=no
-    fi
-  fi
-else
-  mpathpersist=no
-fi
-
 ##########################################
 # pthread probe
 PTHREADLIBS_LIST="-pthread -lpthread -lpthreadGC2"
@@ -6340,23 +6289,11 @@ if test "$softmmu" = yes ; then
       fi
       virtfs=no
     fi
-    if test "$mpath" != no && test "$mpathpersist" = yes ; then
-      mpath=yes
-    else
-      if test "$mpath" = yes; then
-        error_exit "Multipath requires libmpathpersist devel"
-      fi
-      mpath=no
-    fi
   else
     if test "$virtfs" = yes; then
       error_exit "VirtFS is supported only on Linux"
     fi
     virtfs=no
-    if test "$mpath" = yes; then
-      error_exit "Multipath is supported only on Linux"
-    fi
-    mpath=no
   fi
 fi
 
@@ -6897,12 +6834,6 @@ fi
 if test "$virtfs" = "yes" ; then
   echo "CONFIG_VIRTFS=y" >> $config_host_mak
 fi
-if test "$mpath" = "yes" ; then
-  echo "CONFIG_MPATH=y" >> $config_host_mak
-  if test "$mpathpersist_new_api" = "yes"; then
-    echo "CONFIG_MPATH_NEW_API=y" >> $config_host_mak
-  fi
-fi
 if test "$vhost_scsi" = "yes" ; then
   echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
 fi
@@ -7992,7 +7923,7 @@ NINJA=${ninja:-$PWD/ninjatool} $meson setup \
         -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
         -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
         -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
-	-Dsdl=$sdl -Dsdl_image=$sdl_image \
+	-Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \
 	-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
 	-Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f\
         $cross_arg \
meson.build +74 -8

125 lines not on this page · raw message

meson_options.txt +2 -0
index 543cf70043..b38a6ae92a 100644
@@ -6,6 +6,8 @@ option('docdir', type : 'string', value : 'doc',
 option('gettext', type : 'boolean', value : true,
        description: 'Localization of the GTK+ user interface')
 
+option('mpath', type : 'feature', value : 'auto',
+       description: 'Multipath persistent reservation passthrough')
 option('sdl', type : 'feature', value : 'auto',
        description: 'SDL user interface')
 option('sdl_image', type : 'feature', value : 'auto',
Signature · 1 line
2.18.2
#3 lore raw

PATCH 3/6 migration: Silence compiler warning in global_state_store_running()

In reply to Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:

In function ‘strncpy’,
inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]

  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do a strncpy here - the size is already checked with the assert() statement right in front of it. To silence the warning, simply replace it with our strpadcpy() function.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +2 -2
index 25311479a4..a33947ca32 100644
@@ -44,8 +44,8 @@ void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate),
+              state, '\0');
 }
 
 bool global_state_received(void)
Signature · 1 line
2.18.2
#4 lore raw

Re: [PATCH 3/6] migration: Silence compiler warning in global_state_store_running()

Quoted 42 lines · Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:

In function ‘strncpy’,
inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]

  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do a strncpy here - the size is already checked with the assert() statement right in front of it. To silence the warning, simply replace it with our strpadcpy() function.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +2 -2
index 25311479a4..a33947ca32 100644
@@ -44,8 +44,8 @@ void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate),
+              state, '\0');
 }
 
 bool global_state_received(void)
Signature · 1 line
2.18.2

Hi Thomas,

FIY, I couldn't reproduce the complaint from GCC. I've tested it on focal, "gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0", with QEMU 5df6c87e8.

After a succesfull "configure --target-list=x86_64-softmmu && meson compile" build, I tried to manually enable meson's "werror" option, and found no difference.

Then, I manually ran gcc, with a couple of "-Werror" variations, such as:

cc -Ilibcommon.fa.p -I. -I../../src/qemu -Iqapi -Itrace -Iui \
-Iui/shader -I/usr/include/libpng16 -I/usr/include/libmount \
-I/usr/include/blkid -I/usr/include/glib-2.0 \
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
-I/usr/include/gio-unix-2.0 -I/root/src/qemu/slirp/src -Islirp/src \
-I/usr/include/pixman-1 -I/usr/include/gtk-3.0 \
-I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 \
-I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include \
-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/fribidi \
-I/usr/include/harfbuzz -I/usr/include/atk-1.0 -I/usr/include/uuid \
-I/usr/include/freetype2 -I/usr/include/gdk-pixbuf-2.0 -Ilinux-headers \
-fdiagnostics-color=auto -pipe -Wall -Winvalid-pch -Werror \
-Werror=stringop-truncation -std=gnu99 -O2 -g -U_FORTIFY_SOURCE \
-D_FORTIFY_SOURCE=2 -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef \
-Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common \
-fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits \
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers \
-Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined \
-Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi \
-fstack-protector-strong -iquote /root/src/qemu/tcg/i386 -isystem \
/root/src/qemu/linux-headers -iquote . -iquote /root/src/qemu -iquote \
/root/src/qemu/accel/tcg -iquote /root/src/qemu/include -iquote \
/root/src/qemu/disas/libvixl -pthread -fPIC -MD -MQ \
libcommon.fa.p/migration_global_state.c.o -MF \
libcommon.fa.p/migration_global_state.c.o.d -o \
libcommon.fa.p/migration_global_state.c.o -c \
../../src/qemu/migration/global_state.c

But I could not trigger the warning (and thus error). The change here looks good, but I thought I should let you know, and maybe I'm missing something obvious.

Thanks,
- Cleber.

#5 lore raw

Re: [PATCH 3/6] migration: Silence compiler warning in global_state_store_running()

Quoted 46 lines · Cleber Rosa
Quoted 42 lines · Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:

In function ‘strncpy’,
inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]

  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do a strncpy here - the size is already checked with the assert() statement right in front of it. To silence the warning, simply replace it with our strpadcpy() function.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +2 -2
index 25311479a4..a33947ca32 100644
@@ -44,8 +44,8 @@ void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate),
+              state, '\0');
 }
 
 bool global_state_received(void)
Signature · 1 line
2.18.2

Hi Thomas,

Quoted 2 lines

FIY, I couldn't reproduce the complaint from GCC. I've tested it on focal, "gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0", with QEMU 5df6c87e8.

Hi Cleber,

I've hit the error here:

https://travis-ci.com/github/huth/qemu/jobs/385871010#L2930

It seems to use the very same compiler version as you did, so that's kind of weird... Maybe it's related to the other compiler flags, either --enable-gprof, --enable-gcov or --disable-pie ?

Thomas

#6 lore raw

PATCH 4/6 travis.yml: Drop the default softmmu builds

In reply to Thomas Huth

The total runtime of all Travis jobs is very long and we are testing all softmmu targets in the gitlab-CI already - so we can speed up the Travis testing a little bit by not testing the softmmu targets here anymore.

---
 .travis.yml | 14 --------------
 1 file changed, 14 deletions(-)
.travis.yml +0 -14
index c75221dca3..1fc49b0746 100644
@@ -123,20 +123,6 @@ jobs:
         - CONFIG="--disable-system --static"
         - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
 
-
-    # we split the system builds as it takes a while to build them all
-    - name: "GCC (main-softmmu)"
-      env:
-        - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-
-
-    - name: "GCC (other-softmmu)"
-      env:
-       - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-
-
     # Just build tools and run minimal unit and softfloat checks
     - name: "GCC check-unit and check-softfloat"
       env:
Signature · 1 line
2.18.2
Reviewed-by on v1 4/6
#7 lore raw

Re: [PATCH 4/6] travis.yml: Drop the default softmmu builds

Quoted 5 lines · Thomas Huth

The total runtime of all Travis jobs is very long and we are testing all softmmu targets in the gitlab-CI already - so we can speed up the Travis testing a little bit by not testing the softmmu targets here anymore.

Quoted 8 lines
---
 .travis.yml | 14 --------------
 1 file changed, 14 deletions(-)
#8 lore raw

PATCH 5/6 travis.yml: Update Travis to use Bionic and Focal instead of Xenial

In reply to Thomas Huth

According to our support policy, we do not support Xenial anymore. Time to switch the bigger parts of the builds to Focal instead. Some few jobs have to be updated to Bionic instead, since they are currently still failing on Focal otherwise. Also "--disable-pie" is causing linker problems with newer versions of Ubuntu ... so remove that switch from the jobs now (we still test it in a gitlab CI job, so we don't lose much test coverage here).

---
 .travis.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
.travis.yml +13 -11
index 1fc49b0746..80da4ebc8e 100644
@@ -2,7 +2,7 @@
 # Additional builds with specific requirements for a full VM need to
 # be added as additional matrix: entries later on
 os: linux
-dist: xenial
+dist: focal
 language: c
 compiler:
   - gcc
@@ -10,7 +10,7 @@ cache:
   # There is one cache per branch and compiler version.
   # characteristics of each job are used to identify the cache:
   # - OS name (currently only linux)
-  # - OS distribution (for Linux, xenial, trusty, or precise)
+  # - OS distribution (for Linux, bionic or focal)
   # - Names and values of visible environment variables set in .travis.yml or Settings panel
   timeout: 1200
   ccache: true
@@ -27,7 +27,7 @@ addons:
       - libattr1-dev
       - libbrlapi-dev
       - libcap-ng-dev
-      - libgcc-4.8-dev
+      - libgcc-7-dev
       - libgnutls28-dev
       - libgtk-3-dev
       - libiscsi-dev
@@ -211,8 +211,10 @@ jobs:
 
     # gprof/gcov are GCC features
     - name: "GCC gprof/gcov"
+      dist: bionic
       env:
-        - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=${MAIN_SOFTMMU_TARGETS}"
+        - CONFIG="--enable-gprof --enable-gcov --disable-libssh
+                  --target-list=${MAIN_SOFTMMU_TARGETS}"
       after_success:
         - ${SRC_DIR}/scripts/travis/coverage-summary.sh
 
@@ -271,6 +273,7 @@ jobs:
 
     # Using newer GCC with sanitizers
     - name: "GCC9 with sanitizers (softmmu)"
+      dist: bionic
       addons:
         apt:
           update: true
@@ -286,7 +289,7 @@ jobs:
             - libattr1-dev
             - libbrlapi-dev
             - libcap-ng-dev
-            - libgnutls-dev
+            - libgnutls28-dev
             - libgtk-3-dev
             - libiscsi-dev
             - liblttng-ust-dev
@@ -294,14 +297,13 @@ jobs:
             - libncurses5-dev
             - libnss3-dev
             - libpixman-1-dev
-            - libpng12-dev
+            - libpng-dev
             - librados-dev
             - libsdl2-dev
             - libsdl2-image-dev
             - libseccomp-dev
             - libspice-protocol-dev
             - libspice-server-dev
-            - libssh-dev
             - liburcu-dev
             - libusb-1.0-0-dev
             - libvte-2.91-dev
@@ -311,11 +313,11 @@ jobs:
       compiler: none
       env:
         - COMPILER_NAME=gcc CXX=g++-9 CC=gcc-9
-        - CONFIG="--cc=gcc-9 --cxx=g++-9 --disable-pie --disable-linux-user"
+        - CONFIG="--cc=gcc-9 --cxx=g++-9 --disable-linux-user"
         - TEST_CMD=""
       before_script:
         - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
-        - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -Wno-error=stringop-truncation -fsanitize=thread" --extra-ldflags="-fuse-ld=gold" || { cat config.log && exit 1; }
+        - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log && exit 1; }
 
 
     # Run check-tcg against linux-user
@@ -357,7 +359,7 @@ jobs:
 
     - name: "[aarch64] GCC check-tcg"
       arch: arm64
-      dist: xenial
+      dist: focal
       addons:
         apt_packages:
           - libaio-dev
@@ -390,7 +392,7 @@ jobs:
 
     - name: "[ppc64] GCC check-tcg"
       arch: ppc64le
-      dist: xenial
+      dist: focal
       addons:
         apt_packages:
           - libaio-dev
Signature · 1 line
2.18.2
Reviewed-by Tested-by on v1 5/6
#9 lore raw

Re: [PATCH 5/6] travis.yml: Update Travis to use Bionic and Focal instead of Xenial

Quoted 45 lines · Thomas Huth

According to our support policy, we do not support Xenial anymore. Time to switch the bigger parts of the builds to Focal instead. Some few jobs have to be updated to Bionic instead, since they are currently still failing on Focal otherwise. Also "--disable-pie" is causing linker problems with newer versions of Ubuntu ... so remove that switch from the jobs now (we still test it in a gitlab CI job, so we don't lose much test coverage here).

---
 .travis.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
.travis.yml +3 -3
index 1fc49b0746..80da4ebc8e 100644
@@ -2,7 +2,7 @@
 # Additional builds with specific requirements for a full VM need to
 # be added as additional matrix: entries later on
 os: linux
-dist: xenial
+dist: focal
 language: c
 compiler:
   - gcc
@@ -10,7 +10,7 @@ cache:
   # There is one cache per branch and compiler version.
   # characteristics of each job are used to identify the cache:
   # - OS name (currently only linux)
-  # - OS distribution (for Linux, xenial, trusty, or precise)
+  # - OS distribution (for Linux, bionic or focal)
   # - Names and values of visible environment variables set in .travis.yml or Settings panel
   timeout: 1200
   ccache: true
@@ -27,7 +27,7 @@ addons:
       - libattr1-dev
       - libbrlapi-dev
       - libcap-ng-dev
-      - libgcc-4.8-dev
+      - libgcc-7-dev
       - libgnutls28-dev
       - libgtk-3-dev
       - libiscsi-dev

.travis.yml jobs: · line 217

Quoted 8 lines
.travis.yml +3 -1
@@ -211,8 +211,10 @@ jobs:
 
     # gprof/gcov are GCC features
     - name: "GCC gprof/gcov"
+      dist: bionic
       env:
-        - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=${MAIN_SOFTMMU_TARGETS}"
+        - CONFIG="--enable-gprof --enable-gcov --disable-libssh
+                  --target-list=${MAIN_SOFTMMU_TARGETS}"

While the commit message describes the reason for dropping '--disable-pie', it doesn't talk about why it adds '--disable-libssh'. Other than that, it's working fine, according to:

https://travis-ci.org/github/clebergnu/qemu/builds/729121964

#10 lore raw

Re: [PATCH 5/6] travis.yml: Update Travis to use Bionic and Focal instead of Xenial

Quoted 47 lines · Cleber Rosa
Quoted 46 lines · Thomas Huth

According to our support policy, we do not support Xenial anymore. Time to switch the bigger parts of the builds to Focal instead. Some few jobs have to be updated to Bionic instead, since they are currently still failing on Focal otherwise. Also "--disable-pie" is causing linker problems with newer versions of Ubuntu ... so remove that switch from the jobs now (we still test it in a gitlab CI job, so we don't lose much test coverage here).

---
 .travis.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
.travis.yml +3 -3
index 1fc49b0746..80da4ebc8e 100644
@@ -2,7 +2,7 @@
 # Additional builds with specific requirements for a full VM need to
 # be added as additional matrix: entries later on
 os: linux
-dist: xenial
+dist: focal
 language: c
 compiler:
   - gcc
@@ -10,7 +10,7 @@ cache:
   # There is one cache per branch and compiler version.
   # characteristics of each job are used to identify the cache:
   # - OS name (currently only linux)
-  # - OS distribution (for Linux, xenial, trusty, or precise)
+  # - OS distribution (for Linux, bionic or focal)
   # - Names and values of visible environment variables set in .travis.yml or Settings panel
   timeout: 1200
   ccache: true
@@ -27,7 +27,7 @@ addons:
       - libattr1-dev
       - libbrlapi-dev
       - libcap-ng-dev
-      - libgcc-4.8-dev
+      - libgcc-7-dev
       - libgnutls28-dev
       - libgtk-3-dev
       - libiscsi-dev
@@ -211,8 +211,10 @@ jobs:
 
Quoted 10 lines

.travis.yml jobs: · line 217

Quoted 7 lines
.travis.yml +3 -1
     # gprof/gcov are GCC features
     - name: "GCC gprof/gcov"
+      dist: bionic
       env:
-        - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=${MAIN_SOFTMMU_TARGETS}"
+        - CONFIG="--enable-gprof --enable-gcov --disable-libssh
+                  --target-list=${MAIN_SOFTMMU_TARGETS}"

While the commit message describes the reason for dropping '--disable-pie', it doesn't talk about why it adds '--disable-libssh'.

Ah, well, right. I should have mentioned that... but we've hit that problem in the past so often that my mind apparently sorted it into the well-known category and did not came up with the idea that it would be good to mention it ;-)

The problem is that libssh is very much broken in Bionic. Ubuntu backported some patches into that version so that QEMU's configure script thinks that it is a newer version, but they did not backport some other important patches so that compilation later fails. Since it's rather a bug in the distro and not in QEMU, we never "fixed" this issue, so libssh can not be used in Bionic. See also:

https://bugs.launchpad.net/qemu/+bug/1838763

Quoted 2 lines

Thanks!
Thomas

#11 lore raw

PATCH 6/6 travis.yml: Drop the superfluous Python 3.6 build

In reply to Thomas Huth

Python 3.6 is already the default Python in the jobs that are based on Ubuntu Bionic, so it does not make much sense to test this again separately.

---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)
.travis.yml +0 -8
index 80da4ebc8e..023fcf7119 100644
@@ -263,14 +263,6 @@ jobs:
       python: 3.5
 
 
-    - name: "GCC Python 3.6 (x86_64-softmmu)"
-      env:
-        - CONFIG="--target-list=x86_64-softmmu"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-      language: python
-      python: 3.6
-
-
     # Using newer GCC with sanitizers
     - name: "GCC9 with sanitizers (softmmu)"
       dist: bionic
Signature · 1 line
2.18.2
Reviewed-by on v1 6/6
#12 lore raw

Re: [PATCH 6/6] travis.yml: Drop the superfluous Python 3.6 build

Quoted 9 lines · Thomas Huth

Python 3.6 is already the default Python in the jobs that are based on Ubuntu Bionic, so it does not make much sense to test this again separately.

---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)
#13 lore raw
In reply to Thomas Huth
Quoted 6 lines · Thomas Huth

According to our support policy, we do not support Xenial anymore. Time to switch the Travis jobs to Focal or Bionic instead now.

Paolo Bonzini (2):
meson: move libudev test
meson: move libmpathpersist test

Can you skip these since I'm going to send a pull request today?

Paolo

#14 lore raw
Quoted 9 lines · Paolo Bonzini
Quoted 6 lines · Thomas Huth

According to our support policy, we do not support Xenial anymore. Time to switch the Travis jobs to Focal or Bionic instead now.

Paolo Bonzini (2):
meson: move libudev test
meson: move libmpathpersist test

Can you skip these since I'm going to send a pull request today?

Sure, I don't expect my patches to be part of a pull-request very soon anyway (they need some reviews first).

Thomas

#15 lore raw
In reply to Thomas Huth
Quoted 2 lines · Thomas Huth

According to our support policy, we do not support Xenial anymore. Time to switch the Travis jobs to Focal or Bionic instead now.

Queued to testing/next, thanks.

Quoted 17 lines

Paolo Bonzini (2):
meson: move libudev test
meson: move libmpathpersist test

Thomas Huth (4):
migration: Silence compiler warning in global_state_store_running() travis.yml: Drop the default softmmu builds
travis.yml: Update Travis to use Bionic and Focal instead of Xenial travis.yml: Drop the superfluous Python 3.6 build

 .travis.yml              | 46 ++++++--------------
 configure                | 91 ++--------------------------------------
 meson.build              | 85 +++++++++++++++++++++++++++++++++----
 meson_options.txt        |  2 +
 migration/global_state.c |  4 +-
 5 files changed, 97 insertions(+), 131 deletions(-)
Signature · 1 line
Alex Bennée
#16 lore raw

[PATCH 7/6] travis.yml: Drop the Python 3.5 build

In reply to Thomas Huth

We are soon going to remove the support for Python 3.5. So remove the CI job now.

---
Sorry, I forgot to send this patch together with the others... Since we're going to remove support for Python 3.5, we have to remove the CI job for this of course, too.

 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)
.travis.yml +0 -9
index 023fcf7119..b6fee288be 100644
@@ -254,15 +254,6 @@ jobs:
         - TEST_CMD=""
 
 
-    # Python builds
-    - name: "GCC Python 3.5 (x86_64-softmmu)"
-      env:
-        - CONFIG="--target-list=x86_64-softmmu"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-      language: python
-      python: 3.5
-
-
     # Using newer GCC with sanitizers
     - name: "GCC9 with sanitizers (softmmu)"
       dist: bionic
Signature · 1 line
2.18.2