Skip to contentSkip to conversation

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

PATCH Superseded Philippe Mathieu-Daudé 6 participants 26 messages Nov 3, 2020 – Nov 5, 2020 Arm/Amlogic Meson SoC support

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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.

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

Philippe Mathieu-Daudé (2):
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                   | 11 +++++++++++
 .travis.yml                      |  8 --------
 hw/s390x/meson.build             |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/3 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 2/3 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

/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

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
.gitlab-ci.yml +11 -0
index 3b15ae5c302..6ee098ec53c 100644
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build
+
 build-clang:
   <<: *native_build_job_definition
   variables:
Signature · 1 line
2.26.2
#3 lore raw

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

Quoted 11 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

Quoted 6 lines

/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

Surely this is a build bug we need to fix rather than ignore in CI ?

Regards,
Daniel

Signature · 3 lines
|: 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 :|
#4 lore raw

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

Quoted 12 lines · Daniel P. Berrangé
Quoted 11 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

Quoted 8 lines
Quoted 6 lines

/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

Surely this is a build bug we need to fix rather than ignore in CI ?

Well it predates this series, so nobody really cared (thus I wonder if it makes sense to invest resources there).

Anyway I can have a look after 5.2-rc1.

#5 lore raw

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

I forgot to Cc the 9pfs & Xen maintainers, doing it now ;)

Quoted 28 lines · Philippe Mathieu-Daudé
Quoted 12 lines · Daniel P. Berrangé
Quoted 11 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

Quoted 8 lines
Quoted 6 lines

/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

Surely this is a build bug we need to fix rather than ignore in CI ?

Well it predates this series, so nobody really cared (thus I wonder if it makes sense to invest resources there).

Anyway I can have a look after 5.2-rc1.

#6 lore raw

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

Quoted 30 lines · Philippe Mathieu-Daudé

I forgot to Cc the 9pfs & Xen maintainers, doing it now ;)

Quoted 27 lines · Philippe Mathieu-Daudé
Quoted 12 lines · Daniel P. Berrangé
Quoted 11 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

Quoted 8 lines
Quoted 6 lines

/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

Surely this is a build bug we need to fix rather than ignore in CI ?

Well it predates this series, so nobody really cared (thus I wonder if it makes sense to invest resources there).

Anyway I can have a look after 5.2-rc1.

Actually I care about Xen and 9pfs support, it is one of the few combinations that I use regularly and it is even enabled in the Xilinx product I look after. But admittedly I don't test QEMU master as much as I should. With the recent changes to the build system it is not very suprising that there are some issues. It would be great to have a Xen and 9pfs test in the gitlab CI-loop.

FYI I tried to build the latest QEMU on Alpine Linux 3.12 ARM64 and I get:

ninja: unknown tool 'query'

Even after rebuilding ninja master by hand. Any ideas? I don't know much about ninja.

So I gave up on that and I spinned up a Debian Buster x86 container for this build. That one got past the "ninja: unknown tool 'query'" error. The build completed without problems to the end.

Either way I can't reproduce the build error above.

#7 lore raw

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

On 04/11/2020 03.27, Stefano Stabellini wrote:
[...]

Quoted 17 lines

Actually I care about Xen and 9pfs support, it is one of the few combinations that I use regularly and it is even enabled in the Xilinx product I look after. But admittedly I don't test QEMU master as much as I should. With the recent changes to the build system it is not very suprising that there are some issues. It would be great to have a Xen and 9pfs test in the gitlab CI-loop.

FYI I tried to build the latest QEMU on Alpine Linux 3.12 ARM64 and I get:

ninja: unknown tool 'query'

Even after rebuilding ninja master by hand. Any ideas? I don't know much about ninja.

Quoted 5 lines

So I gave up on that and I spinned up a Debian Buster x86 container for this build. That one got past the "ninja: unknown tool 'query'" error. The build completed without problems to the end.

Either way I can't reproduce the build error above.

Did you run "configure" with "--without-default-devices" ?

Thomas

#8 lore raw

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

Quoted 19 lines · Thomas Huth

On 04/11/2020 03.27, Stefano Stabellini wrote:
[...]

Quoted 17 lines

Actually I care about Xen and 9pfs support, it is one of the few combinations that I use regularly and it is even enabled in the Xilinx product I look after. But admittedly I don't test QEMU master as much as I should. With the recent changes to the build system it is not very suprising that there are some issues. It would be great to have a Xen and 9pfs test in the gitlab CI-loop.

FYI I tried to build the latest QEMU on Alpine Linux 3.12 ARM64 and I get:

ninja: unknown tool 'query'

Even after rebuilding ninja master by hand. Any ideas? I don't know much about ninja.

Quoted 7 lines
Quoted 5 lines

So I gave up on that and I spinned up a Debian Buster x86 container for this build. That one got past the "ninja: unknown tool 'query'" error. The build completed without problems to the end.

Either way I can't reproduce the build error above.

Did you run "configure" with "--without-default-devices" ?

Yes, and still I can't repro the issue, strange. Anyway, I saw that Philippe managed to find and fix the issue with "hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen", so all sorted :)

#9 lore raw

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

Le jeu. 5 nov. 2020 05:28, Stefano Stabellini <[email protected]> a écrit :

Quoted 26 lines · Thomas Huth
Quoted 5 lines · Stefano Stabellini

[...]

Quoted 3 lines

Actually I care about Xen and 9pfs support, it is one of the few combinations that I use regularly and it is even enabled in the Xilinx product I look after. But admittedly I don't test QEMU master as much

as

Quoted 11 lines
Quoted 11 lines

I should. With the recent changes to the build system it is not very suprising that there are some issues. It would be great to have a Xen and 9pfs test in the gitlab CI-loop.

FYI I tried to build the latest QEMU on Alpine Linux 3.12 ARM64 and I get:

ninja: unknown tool 'query'

Even after rebuilding ninja master by hand. Any ideas? I don't know

much

Quoted 7 lines
Quoted 7 lines

about ninja.

So I gave up on that and I spinned up a Debian Buster x86 container for this build. That one got past the "ninja: unknown tool 'query'" error. The build completed without problems to the end.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Either way I can't reproduce the build error above.

Did you run "configure" with "--without-default-devices" ?

Yes, and still I can't repro the issue, strange. Anyway, I saw that Philippe managed to find and fix the issue with "hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen", so all sorted :)

Paolo figured the problem and sent a diff, I just forwarded it as a formal patch ;)

Quoted 1 line
#10 lore raw

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

In reply to Stefano Stabellini

Il mer 4 nov 2020, 03:27 Stefano Stabellini <[email protected]> ha scritto:

Quoted 8 lines

FYI I tried to build the latest QEMU on Alpine Linux 3.12 ARM64 and I get:

ninja: unknown tool 'query'

Even after rebuilding ninja master by hand. Any ideas? I don't know much about ninja.

Are you sure you have ninja installed and not its clone samurai (yes, I am serious)? I have contributed query support to samurai but it hasn't made it to a release yet.

What is the output of "ninja -t list"?

Paolo

Quoted 6 lines

So I gave up on that and I spinned up a Debian Buster x86 container for this build. That one got past the "ninja: unknown tool 'query'" error. The build completed without problems to the end.

Either way I can't reproduce the build error above.

#11 lore raw

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

Quoted 6 lines · Paolo Bonzini

Il mer 4 nov 2020, 03:27 Stefano Stabellini <[email protected]> ha scritto:
FYI I tried to build the latest QEMU on Alpine Linux 3.12 ARM64 and I get:

  ninja: unknown tool 'query'

Quoted 8 lines

Even after rebuilding ninja master by hand. Any ideas? I don't know much about ninja.

Are you sure you have ninja installed and not its clone samurai (yes, I am serious)? I have contributed query support to samurai but it hasn't made it to a release yet.

What is the output of "ninja -t list"?

I repeated all the steps to make sure. The first time I was using Samurai because Alpine Linux comes with it and not Ninja. Then, I removed Samurai and built and installed Ninja by hand from
https://github.com/ninja-build/ninja and that actually works. Yesterday it was late and I was distracted by global events -- I must have failed to update Ninja appropriately. Sorry for the confusion.

#12 lore raw

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

Quoted 6 lines · Stefano Stabellini

I repeated all the steps to make sure. The first time I was using Samurai because Alpine Linux comes with it and not Ninja. Then, I removed Samurai and built and installed Ninja by hand from
https://github.com/ninja-build/ninja and that actually works. Yesterday it was late and I was distracted by global events -- I must have failed to update Ninja appropriately. Sorry for the confusion.

FWIW I sent an Alpine merge request to support "ninja -t query". We should add an Alpine container and pipeline once it's merged.

Paolo

#13 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 20 lines · Philippe Mathieu-Daudé
Quoted 19 lines · Daniel P. Berrangé
Quoted 17 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

/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 7 lines
Quoted 1 line

Surely this is a build bug we need to fix rather than ignore in CI ?

Well it predates this series, so nobody really cared (thus I wonder if it makes sense to invest resources there).

Anyway I can have a look after 5.2-rc1.

Can you just put a comment in the .gitlab-ci.yml file stating that the --disable-xen arg is a short term workaround that needs to be fixed properly

Regards,
Daniel

Signature · 3 lines
|: 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 :|
#14 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 11 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Daniel P. Berrangé
Quoted 9 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.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

/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'

All these symbols are defined in hw/9pfs/meson.build's fs_ss, which is conditional on CONFIG_9PFS. So:

accel/Kconfig +1 -0
index 2ad94a3839..d24664d736 100644
@@ -7,3 +7,4 @@ config KVM
 config XEN
     bool
     select FSDEV_9P if VIRTFS
+    select 9PFS if VIRTFS

or alternatively (and I think better):

hw/9pfs/Kconfig +0 -4
index d3ebd73730..3ae5749661 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 cc09426212..99be5d9119 100644
@@ -15,6 +15,6 @@ fs_ss.add(files(
   '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'))

Paolo

#15 lore raw

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

Quoted 26 lines · Paolo Bonzini
Quoted 11 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Daniel P. Berrangé
Quoted 9 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.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

/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'

All these symbols are defined in hw/9pfs/meson.build's fs_ss, which is conditional on CONFIG_9PFS. So:

accel/Kconfig +0 -0
index 2ad94a3839..d24664d736 100644

accel/Kconfig config KVM · line 10

Quoted 4 lines
accel/Kconfig +1 -0
@@ -7,3 +7,4 @@ config KVM
 config XEN
     bool
     select FSDEV_9P if VIRTFS
+    select 9PFS if VIRTFS

Without this line ^ it works! Thanks :*

Can you reply with your S-o-b? :)

Quoted 35 lines

or alternatively (and I think better):

hw/9pfs/Kconfig +0 -4
index d3ebd73730..3ae5749661 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 cc09426212..99be5d9119 100644
@@ -15,6 +15,6 @@ fs_ss.add(files(
   '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'))

Paolo

#16 lore raw

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

Quoted 10 lines · Philippe Mathieu-Daudé

accel/Kconfig config KVM · line 10

Quoted 9 lines
accel/Kconfig +1 -0
index 2ad94a3839..d24664d736 100644
@@ -7,3 +7,4 @@ config KVM
  config XEN
      bool
      select FSDEV_9P if VIRTFS
+    select 9PFS if VIRTFS

Without this line ^ it works! Thanks :*

Without which line?

(Also if both work I prefer the other one).

Paolo

#17 lore raw

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

Quoted 12 lines · Paolo Bonzini
Quoted 10 lines · Philippe Mathieu-Daudé
Quoted 9 lines
accel/Kconfig +0 -0
index 2ad94a3839..d24664d736 100644
@@ -7,3 +7,4 @@ config KVM

  config XEN
      bool
      select FSDEV_9P if VIRTFS
+    select 9PFS if VIRTFS

Without this line ^ it works! Thanks :*

Quoted 1 line

Without which line?

Not adding "select 9PFS if VIRTFS" (keeping
the current "select FSDEV_9P if VIRTFS").

Quoted 5 lines

(Also if both work I prefer the other one).

Paolo

#18 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 28 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

/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

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
.gitlab-ci.yml +0 -0
index 3b15ae5c302..6ee098ec53c 100644

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

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build

The part below is pointless, as no job consume these artifacts. I'll remove it in the next iteration.

Quoted 9 lines
.gitlab-ci.yml +5 -0
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build
+
 build-clang:
   <<: *native_build_job_definition
   variables:
#19 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 28 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

/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

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
.gitlab-ci.yml +0 -0
index 3b15ae5c302..6ee098ec53c 100644

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

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build

AFAIK "check-build" is pretty much a no-op since the convertion to meson ... could you maybe replace with a set of qtest targets that work, to make sure that we do not regress here? E.g.:

MAKE_CHECK_ARGS: check-qtest-avr check-qtestcris check-qtest-m68k check-qtest-microblaze check-qtest-mipsel check-qtest-moxie ...

Thomas

#20 lore raw

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

Quoted 43 lines · Thomas Huth
Quoted 28 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.

As we prefer to use GitLab-CI, add the equivalent job there.

One minor difference: the GitLab Ubuntu docker image has the Xen devel packages installed. As it is automatically selected, we need to disable it with the --disable-xen option, else the build fails:

/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

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
.gitlab-ci.yml +0 -0
index 3b15ae5c302..6ee098ec53c 100644

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

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build

AFAIK "check-build" is pretty much a no-op since the convertion to meson ... could you maybe replace with a set of qtest targets that work, to make sure that we do not regress here? E.g.:

Quoted 2 lines

MAKE_CHECK_ARGS: check-qtest-avr check-qtestcris check-qtest-m68k check-qtest-microblaze check-qtest-mipsel check-qtest-moxie ...

qtests don't work with --without-default-devices, as we don't check for (un-)available devices.

I'll try check-unit.

Thanks,

Phil.

#21 lore raw

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

Quoted 2 lines · Philippe Mathieu-Daudé
Quoted 1 line · Thomas Huth

On 03/11/2020 17.46, Philippe Mathieu-Daudé wrote:

[...]

Quoted 19 lines
Quoted 19 lines
Quoted 5 lines
.gitlab-ci.yml +0 -0
index 3b15ae5c302..6ee098ec53c 100644

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

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build

AFAIK "check-build" is pretty much a no-op since the convertion to meson ... could you maybe replace with a set of qtest targets that work, to make sure that we do not regress here? E.g.:

Quoted 5 lines
Quoted 2 lines

MAKE_CHECK_ARGS: check-qtest-avr check-qtestcris check-qtest-m68k check-qtest-microblaze check-qtest-mipsel check-qtest-moxie ...

qtests don't work with --without-default-devices, as we don't check for (un-)available devices.

Sure, "make check-qtest" does not work, I know. But some targets work fine, e.g. "make check-qtest-avr", and that's what I've suggested. By testing those targets, we can make sure that the qtests don't regress any further with --without-default-devices.

Quoted 1 line

I'll try check-unit.

I think that does not have much benefit since it should be independent of the devices and is tested in the other pipelines already?

Thomas

#22 lore raw

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

Quoted 23 lines · Thomas Huth
Quoted 2 lines · Philippe Mathieu-Daudé
Quoted 1 line · Thomas Huth

On 03/11/2020 17.46, Philippe Mathieu-Daudé wrote:

[...]

Quoted 19 lines
Quoted 19 lines
Quoted 5 lines
.gitlab-ci.yml +0 -0
index 3b15ae5c302..6ee098ec53c 100644

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

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build

AFAIK "check-build" is pretty much a no-op since the convertion to meson ... could you maybe replace with a set of qtest targets that work, to make sure that we do not regress here? E.g.:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

MAKE_CHECK_ARGS: check-qtest-avr check-qtestcris check-qtest-m68k check-qtest-microblaze check-qtest-mipsel check-qtest-moxie ...

qtests don't work with --without-default-devices, as we don't check for (un-)available devices.

Sure, "make check-qtest" does not work, I know. But some targets work fine, e.g. "make check-qtest-avr", and that's what I've suggested.

Yes, I tested that successfully yesterday late.

Quoted 3 lines

By testing
those targets, we can make sure that the qtests don't regress any further with --without-default-devices.

Yes, but I'm being wary to use it with the sole AVR target, because I don't want this target development to be limited by unrelated technical debts (in case we add optional device on an AVR board).

Quoted 5 lines
Quoted 2 lines

I'll try check-unit.

I think that does not have much benefit since it should be independent of the devices and is tested in the other pipelines already?

Ah, good point.

Regards,

Phil.

#23 lore raw

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

Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 23 lines · Thomas Huth
Quoted 2 lines · Philippe Mathieu-Daudé
Quoted 1 line · Thomas Huth

On 03/11/2020 17.46, Philippe Mathieu-Daudé wrote:

[...]

Quoted 19 lines
Quoted 19 lines
Quoted 5 lines
.gitlab-ci.yml +0 -0
index 3b15ae5c302..6ee098ec53c 100644

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

Quoted 9 lines
.gitlab-ci.yml +6 -0
@@ -262,6 +262,17 @@ 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-xen --disable-tools --disable-docs
+    MAKE_CHECK_ARGS: check-build

AFAIK "check-build" is pretty much a no-op since the convertion to meson ... could you maybe replace with a set of qtest targets that work, to make sure that we do not regress here? E.g.:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

MAKE_CHECK_ARGS: check-qtest-avr check-qtestcris check-qtest-m68k check-qtest-microblaze check-qtest-mipsel check-qtest-moxie ...

qtests don't work with --without-default-devices, as we don't check for (un-)available devices.

Sure, "make check-qtest" does not work, I know. But some targets work fine, e.g. "make check-qtest-avr", and that's what I've suggested.

Yes, I tested that successfully yesterday late.

Quoted 7 lines
Quoted 3 lines

By testing
those targets, we can make sure that the qtests don't regress any further with --without-default-devices.

Yes, but I'm being wary to use it with the sole AVR target, because I don't want this target development to be limited by unrelated technical debts (in case we add optional device on an AVR board).

If you feel uncomfortable with check-qtest-avr, you could also use check-qtest-m68k instead - I think that's fine for me (and hopefully also Laurent).

Thomas

#24 lore raw

PATCH 3/3 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
Reviewed-by on v1 3/3
#25 lore raw

Re: [PATCH-for-5.2 3/3] travis-ci: Remove the --without-default-devices job

Quoted 18 lines · 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 -1
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

.travis.yml jobs: · line 229

Quoted 10 lines
.travis.yml +0 -7
-    - 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: