ci: Move --without-default-devices job from Travis to GitLab
v3 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 v2:
- Run m68k qtests (Thomas)
- Reworded hw/9pfs description (Greg)
- Added tags
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
PATCH v3 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).
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
@@ -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
@@ -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
Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
Quoted 14 lines · On Wed, 4 Nov 2020 12:57:03 +0100 Philippe Mathieu-Daudé <[email protected]>…
From: Cornelia Huck <[email protected]>
s390-pci-vfio.ccalls into the vfio code, so we need it to be built conditionally on vfio (which impliesCONFIG_LINUX).Reported-by Philippe Mathieu-Daudé <[email protected]>Fixes cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")Signed-off-by Cornelia Huck <[email protected]>Message-Id: <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 4 lines
--- include/hw/s390x/s390-pci-vfio.h | 3 ++- hw/s390x/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
I think you're missing Matt's r-b?
Do you plan to send this, or should I include it on my s390-fixes branch?
Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
Hi Cornelia,
Quoted 22 lines · Cornelia Huck
Quoted 14 lines · On Wed, 4 Nov 2020 12:57:03 +0100 Philippe Mathieu-Daudé <[email protected]>…
From: Cornelia Huck <[email protected]>
s390-pci-vfio.ccalls into the vfio code, so we need it to be built conditionally on vfio (which impliesCONFIG_LINUX).Reported-by Philippe Mathieu-Daudé <[email protected]>Fixes cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")Signed-off-by Cornelia Huck <[email protected]>Message-Id: <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Quoted 4 lines
--- include/hw/s390x/s390-pci-vfio.h | 3 ++- hw/s390x/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
Quoted 4 lines
I think you're missing Matt's r-b?
Do you plan to send this, or should I include it on my s390-fixes branch?
I plan to send a pull request with gitlab patches (or maybe they will go via Alex's testing tree) but not soon. If you are preparing s390-fixes patches, please go ahead taking this one (I only included to have the series build succeed).
Thanks!
Phil.
Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
Quoted 27 lines · On Thu, 5 Nov 2020 12:58:01 +0100 Philippe Mathieu-Daudé <[email protected]>…
Hi Cornelia,
Quoted 24 lines · Cornelia Huck
Quoted 14 lines · On Wed, 4 Nov 2020 12:57:03 +0100 Philippe Mathieu-Daudé <[email protected]>…
From: Cornelia Huck <[email protected]>
s390-pci-vfio.ccalls into the vfio code, so we need it to be built conditionally on vfio (which impliesCONFIG_LINUX).Reported-by Philippe Mathieu-Daudé <[email protected]>Fixes cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")Signed-off-by Cornelia Huck <[email protected]>Message-Id: <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Quoted 4 lines
--- include/hw/s390x/s390-pci-vfio.h | 3 ++- hw/s390x/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)I think you're missing Matt's r-b?
Quoted 7 lines
Quoted 2 lines
Do you plan to send this, or should I include it on my s390-fixes branch?
I plan to send a pull request with gitlab patches (or maybe they will go via Alex's testing tree) but not soon. If you are preparing s390-fixes patches, please go ahead taking this one (I only included to have the series build succeed).
Thanks, I plan to prepare a pull req this week, so I'll just go ahead and include it.
Cornelia Huck
AppliedRe: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
Quoted 33 lines · On Thu, 5 Nov 2020 13:01:13 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 30 lines · On Thu, 5 Nov 2020 12:58:01 +0100 Philippe Mathieu-Daudé <[email protected]>…
Hi Cornelia,
Quoted 26 lines · Cornelia Huck
Quoted 14 lines · On Wed, 4 Nov 2020 12:57:03 +0100 Philippe Mathieu-Daudé <[email protected]>…
From: Cornelia Huck <[email protected]>
s390-pci-vfio.ccalls into the vfio code, so we need it to be built conditionally on vfio (which impliesCONFIG_LINUX).Reported-by Philippe Mathieu-Daudé <[email protected]>Fixes cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")Signed-off-by Cornelia Huck <[email protected]>Message-Id: <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Quoted 4 lines
--- include/hw/s390x/s390-pci-vfio.h | 3 ++- hw/s390x/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)I think you're missing Matt's r-b?
Do you plan to send this, or should I include it on my s390-fixes branch?
Quoted 7 lines
Quoted 4 lines
I plan to send a pull request with gitlab patches (or maybe they will go via Alex's testing tree) but not soon. If you are preparing s390-fixes patches, please go ahead taking this one (I only included to have the series build succeed).
Thanks, I plan to prepare a pull req this week, so I'll just go ahead and include it.
Queued to s390-fixes now (with Matt's r-b included).
PATCH v3 2/4 hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
In reply to Philippe Mathieu-DaudéCommit b2c00bce54c ("meson: convert hw/9pfs, cleanup") introduced CONFIG_9PFS (probably a wrong conflict resolution). This config is not used anywhere. Backends depend on CONFIG_FSDEV_9P which itself depends on CONFIG_VIRTFS.
Remove the invalid CONFIG_9PFS and use CONFIG_FSDEV_9P instead, to fix the './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
---
v2: Reworded description (Greg)
--- hw/9pfs/Kconfig | 4 ---- hw/9pfs/meson.build | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-)
hw/9pfs/Kconfig +0 -4
@@ -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
@@ -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
Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Quoted 18 lines · On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
Commit
b2c00bce54c("meson: convert hw/9pfs, cleanup") introducedCONFIG_9PFS(probably a wrong conflict resolution). This config is not used anywhere. Backends depend onCONFIG_FSDEV_9Pwhich itself depends onCONFIG_VIRTFS.Remove the invalid
CONFIG_9PFSand useCONFIG_FSDEV_9Pinstead, to fix the './configure --without-default-devices --enable-xen' build:
/usr/bin/ld:libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in functionxen_be_register_common': hw/xen/xen-legacy-backend.c:754: undefined reference toxen_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")Suggested-by Paolo Bonzini <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 43 lines
---
v2: Reworded description (Greg)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@@ -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 9PFShw/9pfs/meson.build +1
-1@@ -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:
Quoted 1 line
files('virtio-9p-device.c'))
Best regards,
Christian Schoenebeck
Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Quoted 19 lines · On Wed, 04 Nov 2020 13:18:09 +0100 Christian Schoenebeck…
Quoted 18 lines · On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
Commit
b2c00bce54c("meson: convert hw/9pfs, cleanup") introducedCONFIG_9PFS(probably a wrong conflict resolution). This config is not used anywhere. Backends depend onCONFIG_FSDEV_9Pwhich itself depends onCONFIG_VIRTFS.Remove the invalid
CONFIG_9PFSand useCONFIG_FSDEV_9Pinstead, to fix the './configure --without-default-devices --enable-xen' build:
/usr/bin/ld:libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in functionxen_be_register_common': hw/xen/xen-legacy-backend.c:754: undefined reference toxen_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 8 lines
Quoted 5 lines
Fixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")Suggested-by Paolo Bonzini <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Phil,
Same questioning as Connie. Do you intend to get this merged or should Christian or I take care of that ?
Quoted 49 lines
Quoted 43 lines
---
v2: Reworded description (Greg)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@@ -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 9PFShw/9pfs/meson.build +1
-1@@ -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:Quoted 1 line
files('virtio-9p-device.c'))
Best regards,
Christian Schoenebeck
Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Quoted 28 lines · Greg Kurz
Quoted 25 lines · On Wed, 04 Nov 2020 13:18:09 +0100 Christian Schoenebeck…
Quoted 23 lines · On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
Commit
b2c00bce54c("meson: convert hw/9pfs, cleanup") introducedCONFIG_9PFS(probably a wrong conflict resolution). This config is not used anywhere. Backends depend onCONFIG_FSDEV_9Pwhich itself depends onCONFIG_VIRTFS.Remove the invalid
CONFIG_9PFSand useCONFIG_FSDEV_9Pinstead, to fix the './configure --without-default-devices --enable-xen' build:
/usr/bin/ld:libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in functionxen_be_register_common': hw/xen/xen-legacy-backend.c:754: undefined reference toxen_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 statusFixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")Suggested-by Paolo Bonzini <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 7 lines
Quoted 2 lines
Phil,
Same questioning as Connie. Do you intend to get this merged or should Christian or I take care of that ?
Same answer too =) If you are preparing a pull request, please go ahead!
Thanks,
Phil.
Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Quoted 32 lines · On Thu, 5 Nov 2020 13:15:59 +0100 Philippe Mathieu-Daudé <[email protected]>…
Quoted 31 lines · Greg Kurz
Quoted 27 lines · On Wed, 04 Nov 2020 13:18:09 +0100 Christian Schoenebeck…
Quoted 18 lines · On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
Commit
b2c00bce54c("meson: convert hw/9pfs, cleanup") introducedCONFIG_9PFS(probably a wrong conflict resolution). This config is not used anywhere. Backends depend onCONFIG_FSDEV_9Pwhich itself depends onCONFIG_VIRTFS.Remove the invalid
CONFIG_9PFSand useCONFIG_FSDEV_9Pinstead, to fix the './configure --without-default-devices --enable-xen' build:
/usr/bin/ld:libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in functionxen_be_register_common': hw/xen/xen-legacy-backend.c:754: undefined reference toxen_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 statusQuoted 5 lines
Fixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")Suggested-by Paolo Bonzini <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 7 lines
Quoted 4 lines
Phil,
Same questioning as Connie. Do you intend to get this merged or should Christian or I take care of that ?
Same answer too =) If you are preparing a pull request, please go ahead!
Heh I've just seen your answer.
Christian,
Maybe you can add this patch in your next PR ?
Quoted 4 lines
Thanks,
Phil.
Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Quoted 8 lines · On Donnerstag, 5. November 2020 13:23:46 CET Greg Kurz wrote:
On Thu, 5 Nov 2020 13:15:59 +0100
Quoted 5 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Greg Kurz
On Wed, 04 Nov 2020 13:18:09 +0100
Quoted 1 line · Christian Schoenebeck
On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé
Quoted 36 lines · wrote:
Quoted 36 lines
Quoted 35 lines
Quoted 23 lines
Quoted 23 lines
Commit
b2c00bce54c("meson: convert hw/9pfs, cleanup") introducedCONFIG_9PFS(probably a wrong conflict resolution). This config is not used anywhere. Backends depend onCONFIG_FSDEV_9Pwhich itself depends onCONFIG_VIRTFS.Remove the invalid
CONFIG_9PFSand useCONFIG_FSDEV_9Pinstead, tofix the './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 toxen_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 statusQuoted 7 lines
Quoted 5 lines
Fixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")Suggested-by Paolo Bonzini <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Phil,
Same questioning as Connie. Do you intend to get this merged or should Christian or I take care of that ?
Quoted 7 lines
Quoted 1 line
Same answer too =) If you are preparing a pull request, please go ahead!
Heh I've just seen your answer.
Christian,
Maybe you can add this patch in your next PR ?
Yes, I will prepare a 9p PR today anyway, so I will include this patch.
Best regards,
Christian Schoenebeck
Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Quoted 51 lines · On Donnerstag, 5. November 2020 13:28:31 CET Christian Schoenebeck wrote:
Quoted 8 lines · On Donnerstag, 5. November 2020 13:23:46 CET Greg Kurz wrote:
On Thu, 5 Nov 2020 13:15:59 +0100
Quoted 5 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Greg Kurz
On Wed, 04 Nov 2020 13:18:09 +0100
Quoted 1 line · Christian Schoenebeck
On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé
Quoted 40 lines · wrote:
Quoted 29 lines
Quoted 29 lines
Quoted 29 lines
Quoted 28 lines
Commit
b2c00bce54c("meson: convert hw/9pfs, cleanup") introducedCONFIG_9PFS(probably a wrong conflict resolution). This config is not used anywhere. Backends depend onCONFIG_FSDEV_9Pwhich itself depends onCONFIG_VIRTFS.Remove the invalid
CONFIG_9PFSand useCONFIG_FSDEV_9Pinstead, tofix the './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 toxen_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 statusFixes b2c00bce54c ("meson: convert hw/9pfs, cleanup")Suggested-by Paolo Bonzini <[email protected]>Acked-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Phil,
Same questioning as Connie. Do you intend to get this merged or should Christian or I take care of that ?
Same answer too =) If you are preparing a pull request, please go ahead!
Heh I've just seen your answer.
Quoted 8 lines
Quoted 3 lines
Christian,
Maybe you can add this patch in your next PR ?
Yes, I will prepare a 9p PR today anyway, so I will include this patch.
Best regards,
Christian Schoenebeck
Queued on 9p.next:
https://github.com/cschoenebeck/qemu/commits/9p.next
Thanks!
Best regards,
Christian Schoenebeck
PATCH v3 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.
Also include the m68k target which works fine.
--- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+)
.gitlab-ci.yml +7 -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 check-qtest-m68k + build-clang: <<: *native_build_job_definition variables:
Signature · 1 line
2.26.2
Re: [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config
Quoted 12 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.
Also include the m68k target which works fine.
Quoted 5 lines
Reviewed-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+)
Looks good to me.
Quoted 19 lines
.gitlab-ci.yml +7
-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 check-qtest-m68k + build-clang: <<: *native_build_job_definition variables:
PATCH v3 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
@@ -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
Re: [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job
Quoted 15 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.
Reviewed-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- .travis.yml | 8 -------- 1 file changed, 8 deletions(-).travis.yml +0
-0@@ -224,14 +224,6 @@ jobs: - ${SRC_DIR}/scripts/travis/coverage-summary.sh
.travis.yml jobs: · line 234
Quoted 10 lines
.travis.yml +0
-8- # 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="" - -
Goodbye.
Quoted 3 lines
.travis.yml +0
-0# We don't need to exercise every backend with every front-end - name: "GCC trace log,simple,syslog (user)" env: