Skip to contentSkip to conversation

ci: Move --without-default-devices job from Travis to GitLab

PATCH Superseded Philippe Mathieu-Daudé 4 participants 9 messages Nov 4, 2020 Arm/Amlogic Meson SoC support

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover ci: Move --without-default-devices job from Travis to GitLab

We have a job covering the --without-default-devices configure option on Travis-CI, but recommend the community to use GitLab, so build failures are missed.

We need help to move the jobs to GitLab (we will keep the s390x and ppc64 containerized jobs on Travis as there is no similar offer on GitLab). Start with this single job.

Since v1:
- Fix Xen+9pfs config (Paolo)
- Run AVR qtests (Thomas)

Cornelia Huck (1):
s390x: fix build for --without-default-devices

Philippe Mathieu-Daudé (3):
hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
gitlab-ci: Add a job to cover the --without-default-devices config
travis-ci: Remove the --without-default-devices job

 include/hw/s390x/s390-pci-vfio.h | 3 ++-
 .gitlab-ci.yml                   | 7 +++++++
 .travis.yml                      | 8 --------
 hw/9pfs/Kconfig                  | 4 ----
 hw/9pfs/meson.build              | 2 +-
 hw/s390x/meson.build             | 2 +-
 6 files changed, 11 insertions(+), 15 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/4 s390x: fix build for --without-default-devices

From: Cornelia Huck <[email protected]>

s390-pci-vfio.c calls into the vfio code, so we need it to be built conditionally on vfio (which implies CONFIG_LINUX).

Fixes cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")

Message-Id: <[email protected]>

---
 include/hw/s390x/s390-pci-vfio.h | 3 ++-
 hw/s390x/meson.build             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
include/hw/s390x/s390-pci-vfio.h +2 -1
index c7984905b3b..ff708aef500 100644
@@ -13,8 +13,9 @@
 #define HW_S390_PCI_VFIO_H
 
 #include "hw/s390x/s390-pci-bus.h"
+#include CONFIG_DEVICES
 
-#ifdef CONFIG_LINUX
+#ifdef CONFIG_VFIO
 bool s390_pci_update_dma_avail(int fd, unsigned int *avail);
 S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s,
                                           S390PCIBusDevice *pbdev);
hw/s390x/meson.build +1 -1
index f4663a83551..2a7818d94b9 100644
@@ -27,7 +27,7 @@
 ))
 s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
 s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
-s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c'))
+s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
 
 virtio_ss = ss.source_set()
 virtio_ss.add(files('virtio-ccw.c'))
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/4 hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen

In reply to Philippe Mathieu-Daudé

Fixes './configure --without-default-devices --enable-xen' build:

/usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function `xen_be_register_common':
hw/xen/xen-legacy-backend.c:754: undefined reference to `xen_9pfs_ops'
/usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x8): undefined reference to local_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x20): undefined reference to synth_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x38): undefined reference to `proxy_ops'
collect2: error: ld returned 1 exit status

Fixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")

---
I'm not sure b2c00bce54c is the real culprit

Cc Stefano Stabellini <[email protected]>
Cc Anthony Perard <[email protected]>
Cc Paul Durrant <[email protected]>
Cc Greg Kurz <[email protected]>
Cc Christian Schoenebeck <[email protected]>
---
 hw/9pfs/Kconfig     | 4 ----
 hw/9pfs/meson.build | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)
hw/9pfs/Kconfig +0 -4
index d3ebd737301..3ae57496613 100644
@@ -2,12 +2,8 @@ config FSDEV_9P
     bool
     depends on VIRTFS
 
-config 9PFS
-    bool
-
 config VIRTIO_9P
     bool
     default y
     depends on VIRTFS && VIRTIO
     select FSDEV_9P
-    select 9PFS
hw/9pfs/meson.build +1 -1
index cc094262122..99be5d91196 100644
@@ -15,6 +15,6 @@
   'coxattr.c',
 ))
 fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c'))
-softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss)
+softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
 
 specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c'))
Signature · 1 line
2.26.2
Acked-by Tested-by on v2 2/4
#3 lore raw

Re: [PATCH-for-5.2 v2 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen

Quoted 9 lines · On Wed, 4 Nov 2020 09:43:25 +0100 Philippe Mathieu-Daudé <[email protected]>…

Fixes './configure --without-default-devices --enable-xen' build:

/usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function `xen_be_register_common':
hw/xen/xen-legacy-backend.c:754: undefined reference to `xen_9pfs_ops'
/usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x8): undefined reference to local_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x20): undefined reference to synth_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x38): undefined reference to `proxy_ops'
collect2: error: ld returned 1 exit status

Quoted 6 lines
Fixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")

---
I'm not sure b2c00bce54c is the real culprit

FWIW this commit introduced the 9PFS config which isn't used anywhere. Backends depend on FSDEV_9P which itself depends on VIRTFS. So I tend to think b2c00bce54c is the culprit but _of couse_ I could be wrong :)

Anyway, this patch (+ patch 1) fix the build break mentioned in the changelog so:

Quoted 40 lines
Cc Stefano Stabellini <[email protected]>
Cc Anthony Perard <[email protected]>
Cc Paul Durrant <[email protected]>
Cc Greg Kurz <[email protected]>
Cc Christian Schoenebeck <[email protected]>
---
 hw/9pfs/Kconfig     | 4 ----
 hw/9pfs/meson.build | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)
hw/9pfs/Kconfig +0 -4
index d3ebd737301..3ae57496613 100644
@@ -2,12 +2,8 @@ config FSDEV_9P
     bool
     depends on VIRTFS
 
-config 9PFS
-    bool
-
 config VIRTIO_9P
     bool
     default y
     depends on VIRTFS && VIRTIO
     select FSDEV_9P
-    select 9PFS
hw/9pfs/meson.build +1 -1
index cc094262122..99be5d91196 100644
@@ -15,6 +15,6 @@
   'coxattr.c',
 ))
 fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c'))
-softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss)
+softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
 
 specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c'))
#4 lore raw

Re: [PATCH-for-5.2 v2 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen

In reply to Philippe Mathieu-Daudé
Quoted 9 lines · Philippe Mathieu-Daudé

Fixes './configure --without-default-devices --enable-xen' build:

/usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function `xen_be_register_common':

   hw/xen/xen-legacy-backend.c:754: undefined reference to `xen_9pfs_ops'
   /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x8): undefined reference to `local_ops'
   /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x20): undefined reference to `synth_ops'
   /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x38): undefined reference to `proxy_ops'
   collect2: error: ld returned 1 exit status
Quoted 5 lines
Fixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")

---
I'm not sure b2c00bce54c is the real culprit

I think it is, probably a wrong conflict resolution.

Paolo

#5 lore raw

PATCH v2 3/4 gitlab-ci: Add a job to cover the --without-default-devices config

In reply to Philippe Mathieu-Daudé

We test './configure --without-default-devices' since commit 20885b5b169 (".travis.yml: test that no-default-device builds do not regress") in Travis-CI.

Since having a single CI to look at is easier, and GitLab-CI is the preferred one, add the equivalent job there.

As smoke test, run the qtests on the AVR target. Since the boards are simple SoC, there is not issue with unavailable default devices there.

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)
.gitlab-ci.yml +7 -0
index 3b15ae5c302..321cca2c216 100644
@@ -262,6 +262,13 @@ build-user-plugins:
     MAKE_CHECK_ARGS: check-tcg
   timeout: 1h 30m
 
+build-system-ubuntu-without-default-devices:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: ubuntu2004
+    CONFIGURE_ARGS: --without-default-devices --disable-user --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-qtest-avr
+
 build-clang:
   <<: *native_build_job_definition
   variables:
Signature · 1 line
2.26.2
Reviewed-by on v2 3/4
#6 lore raw

Re: [PATCH-for-5.2 v2 3/4] gitlab-ci: Add a job to cover the --without-default-devices config

Quoted 21 lines · Philippe Mathieu-Daudé

We test './configure --without-default-devices' since commit 20885b5b169 (".travis.yml: test that no-default-device builds do not regress") in Travis-CI.

Since having a single CI to look at is easier, and GitLab-CI is the preferred one, add the equivalent job there.

As smoke test, run the qtests on the AVR target. Since the boards are simple SoC, there is not issue with unavailable default devices there.

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)
.gitlab-ci.yml +0 -0
index 3b15ae5c302..321cca2c216 100644

.gitlab-ci.yml build-user-plugins: · line 270

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,13 @@ build-user-plugins:
     MAKE_CHECK_ARGS: check-tcg
   timeout: 1h 30m
 
+build-system-ubuntu-without-default-devices:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: ubuntu2004
+    CONFIGURE_ARGS: --without-default-devices --disable-user --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-qtest-avr

As mentioned in my other mail, we can also use -m68k if you prefer that instead of -avr.

.gitlab-ci.yml build-user-plugins: · line 274

Quoted 4 lines
.gitlab-ci.yml +0 -0
 build-clang:
   <<: *native_build_job_definition
   variables:
#7 lore raw

Re: [PATCH-for-5.2 v2 3/4] gitlab-ci: Add a job to cover the --without-default-devices config

Quoted 25 lines · Thomas Huth
Quoted 24 lines · Philippe Mathieu-Daudé

We test './configure --without-default-devices' since commit 20885b5b169 (".travis.yml: test that no-default-device builds do not regress") in Travis-CI.

Since having a single CI to look at is easier, and GitLab-CI is the preferred one, add the equivalent job there.

As smoke test, run the qtests on the AVR target. Since the boards are simple SoC, there is not issue with unavailable default devices there.

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)
.gitlab-ci.yml +0 -0
index 3b15ae5c302..321cca2c216 100644
@@ -262,6 +262,13 @@ build-user-plugins:
     MAKE_CHECK_ARGS: check-tcg
   timeout: 1h 30m
 
Quoted 9 lines

.gitlab-ci.yml build-user-plugins: · line 270

Quoted 6 lines
.gitlab-ci.yml +6 -0
+build-system-ubuntu-without-default-devices:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: ubuntu2004
+    CONFIGURE_ARGS: --without-default-devices --disable-user --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-qtest-avr

As mentioned in my other mail, we can also use -m68k if you prefer that instead of -avr.

I guess I send this series before reading it.
Let's use both, to support each others =)

Quoted 7 lines

.gitlab-ci.yml build-user-plugins: · line 274

Quoted 5 lines
.gitlab-ci.yml +0 -0
 build-clang:
   <<: *native_build_job_definition
   variables:

Thanks!

#8 lore raw

PATCH v2 4/4 travis-ci: Remove the --without-default-devices job

In reply to Philippe Mathieu-Daudé

We replicated the --without-default-devices job on GitLab-CI in the previous commit. We can now remove it from Travis-CI.

---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)
.travis.yml +0 -8
index a3d78171cab..15d92291358 100644
@@ -224,14 +224,6 @@ jobs:
         - ${SRC_DIR}/scripts/travis/coverage-summary.sh
 
 
-    # We manually include builds which we disable "make check" for
-    - name: "GCC without-default-devices (softmmu)"
-      env:
-        - CONFIG="--without-default-devices --disable-user"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-        - TEST_CMD=""
-
-
     # We don't need to exercise every backend with every front-end
     - name: "GCC trace log,simple,syslog (user)"
       env:
Signature · 1 line
2.26.2