* [PATCH-for-5.2 v3 0/4] ci: Move --without-default-devices job from Travis to GitLab
@ 2020-11-04 11:57 Philippe Mathieu-Daudé
2020-11-04 11:57 ` [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices Philippe Mathieu-Daudé
` (3 more replies)
0 siblings, 4 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-04 11:57 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Alex Bennée, Cornelia Huck,
Christian Schoenebeck, Greg Kurz, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Philippe Mathieu-Daudé,
Richard Henderson
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(-)
--
2.26.2
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
2020-11-04 11:57 [PATCH-for-5.2 v3 0/4] ci: Move --without-default-devices job from Travis to GitLab Philippe Mathieu-Daudé
@ 2020-11-04 11:57 ` Philippe Mathieu-Daudé
2020-11-04 17:25 ` Cornelia Huck
2020-11-04 11:57 ` Philippe Mathieu-Daudé
` (2 subsequent siblings)
3 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-04 11:57 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Alex Bennée, Cornelia Huck,
Christian Schoenebeck, Greg Kurz, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Philippe Mathieu-Daudé,
Richard Henderson
From: Cornelia Huck <cohuck@redhat.com>
s390-pci-vfio.c calls into the vfio code, so we need it to be
built conditionally on vfio (which implies CONFIG_LINUX).
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20201103123237.718242-1-cohuck@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Greg Kurz <groug@kaod.org>
Tested-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/s390x/s390-pci-vfio.h | 3 ++-
hw/s390x/meson.build | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
index c7984905b3b..ff708aef500 100644
--- a/include/hw/s390x/s390-pci-vfio.h
+++ b/include/hw/s390x/s390-pci-vfio.h
@@ -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);
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
index f4663a83551..2a7818d94b9 100644
--- a/hw/s390x/meson.build
+++ b/hw/s390x/meson.build
@@ -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'))
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-04 11:57 [PATCH-for-5.2 v3 0/4] ci: Move --without-default-devices job from Travis to GitLab Philippe Mathieu-Daudé
@ 2020-11-04 11:57 ` Philippe Mathieu-Daudé
2020-11-04 11:57 ` Philippe Mathieu-Daudé
` (2 subsequent siblings)
3 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-04 11:57 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Alex Bennée,
Cornelia Huck, Christian Schoenebeck, Greg Kurz,
Wainer dos Santos Moschetta, Halil Pasic, Christian Borntraeger,
qemu-s390x, xen-devel, Anthony Perard, Paolo Bonzini,
Philippe Mathieu-Daudé,
Paul Durrant, Richard Henderson
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
Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Greg Kurz <groug@kaod.org>
Tested-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: Reworded description (Greg)
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Paul Durrant <paul@xen.org>
Cc: xen-devel@lists.xenproject.org
Cc: Greg Kurz <groug@kaod.org>
Cc: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
hw/9pfs/Kconfig | 4 ----
hw/9pfs/meson.build | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
index d3ebd737301..3ae57496613 100644
--- a/hw/9pfs/Kconfig
+++ b/hw/9pfs/Kconfig
@@ -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
diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
index cc094262122..99be5d91196 100644
--- a/hw/9pfs/meson.build
+++ b/hw/9pfs/meson.build
@@ -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'))
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
@ 2020-11-04 11:57 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-04 11:57 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Christian Schoenebeck, Thomas Huth, Cornelia Huck,
Matthew Rosato, Philippe Mathieu-Daudé,
Daniel P . Berrange, Paolo Bonzini, Richard Henderson, Fam Zheng,
Christian Borntraeger, Halil Pasic, Greg Kurz, Alex Bennée,
Wainer dos Santos Moschetta, David Hildenbrand,
Stefano Stabellini, Anthony Perard, Paul Durrant, xen-devel
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
Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Greg Kurz <groug@kaod.org>
Tested-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: Reworded description (Greg)
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Paul Durrant <paul@xen.org>
Cc: xen-devel@lists.xenproject.org
Cc: Greg Kurz <groug@kaod.org>
Cc: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
hw/9pfs/Kconfig | 4 ----
hw/9pfs/meson.build | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
index d3ebd737301..3ae57496613 100644
--- a/hw/9pfs/Kconfig
+++ b/hw/9pfs/Kconfig
@@ -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
diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
index cc094262122..99be5d91196 100644
--- a/hw/9pfs/meson.build
+++ b/hw/9pfs/meson.build
@@ -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'))
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config
2020-11-04 11:57 [PATCH-for-5.2 v3 0/4] ci: Move --without-default-devices job from Travis to GitLab Philippe Mathieu-Daudé
2020-11-04 11:57 ` [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices Philippe Mathieu-Daudé
2020-11-04 11:57 ` Philippe Mathieu-Daudé
@ 2020-11-04 11:57 ` Philippe Mathieu-Daudé
2020-11-04 12:12 ` Wainer dos Santos Moschetta
2020-11-04 11:57 ` [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job Philippe Mathieu-Daudé
3 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-04 11:57 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Alex Bennée, Cornelia Huck,
Christian Schoenebeck, Greg Kurz, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Philippe Mathieu-Daudé,
Richard Henderson
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.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.gitlab-ci.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b15ae5c302..e4eba96ff34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job
2020-11-04 11:57 [PATCH-for-5.2 v3 0/4] ci: Move --without-default-devices job from Travis to GitLab Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-11-04 11:57 ` [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config Philippe Mathieu-Daudé
@ 2020-11-04 11:57 ` Philippe Mathieu-Daudé
2020-11-04 12:16 ` Wainer dos Santos Moschetta
3 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-04 11:57 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Alex Bennée, Cornelia Huck,
Christian Schoenebeck, Greg Kurz, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Philippe Mathieu-Daudé,
Richard Henderson
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 <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.travis.yml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a3d78171cab..15d92291358 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config
2020-11-04 11:57 ` [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config Philippe Mathieu-Daudé
@ 2020-11-04 12:12 ` Wainer dos Santos Moschetta
0 siblings, 0 replies; 21+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-11-04 12:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Cornelia Huck, Christian Schoenebeck,
Greg Kurz, Halil Pasic, Christian Borntraeger, qemu-s390x,
Paolo Bonzini, Alex Bennée, Richard Henderson
On 11/4/20 9:57 AM, Philippe Mathieu-Daudé wrote:
> 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.
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> .gitlab-ci.yml | 7 +++++++
> 1 file changed, 7 insertions(+)
Looks good to me.
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 3b15ae5c302..e4eba96ff34 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -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:
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job
2020-11-04 11:57 ` [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job Philippe Mathieu-Daudé
@ 2020-11-04 12:16 ` Wainer dos Santos Moschetta
0 siblings, 0 replies; 21+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-11-04 12:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Cornelia Huck, Christian Schoenebeck,
Greg Kurz, Halil Pasic, Christian Borntraeger, qemu-s390x,
Paolo Bonzini, Alex Bennée, Richard Henderson
On 11/4/20 9:57 AM, Philippe Mathieu-Daudé wrote:
> 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 <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> .travis.yml | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index a3d78171cab..15d92291358 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -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=""
> -
> -
Goodbye.
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> # We don't need to exercise every backend with every front-end
> - name: "GCC trace log,simple,syslog (user)"
> env:
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-04 11:57 ` Philippe Mathieu-Daudé
(?)
@ 2020-11-04 12:18 ` Christian Schoenebeck
2020-11-04 17:54 ` Greg Kurz
-1 siblings, 1 reply; 21+ messages in thread
From: Christian Schoenebeck @ 2020-11-04 12:18 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé,
Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Alex Bennée,
Cornelia Huck, Greg Kurz, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, xen-devel,
Anthony Perard, Paolo Bonzini, Paul Durrant, Richard Henderson
On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
> 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
>
> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Acked-by: Greg Kurz <groug@kaod.org>
> Tested-by: Greg Kurz <groug@kaod.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> ---
> v2: Reworded description (Greg)
>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Paul Durrant <paul@xen.org>
> Cc: xen-devel@lists.xenproject.org
> Cc: Greg Kurz <groug@kaod.org>
> Cc: Christian Schoenebeck <qemu_oss@crudebyte.com>
> ---
> hw/9pfs/Kconfig | 4 ----
> hw/9pfs/meson.build | 2 +-
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
> index d3ebd737301..3ae57496613 100644
> --- a/hw/9pfs/Kconfig
> +++ b/hw/9pfs/Kconfig
> @@ -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
> diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
> index cc094262122..99be5d91196 100644
> --- a/hw/9pfs/meson.build
> +++ b/hw/9pfs/meson.build
> @@ -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'))
Best regards,
Christian Schoenebeck
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
2020-11-04 11:57 ` [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices Philippe Mathieu-Daudé
@ 2020-11-04 17:25 ` Cornelia Huck
2020-11-05 11:58 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 21+ messages in thread
From: Cornelia Huck @ 2020-11-04 17:25 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Christian Schoenebeck, qemu-devel,
Wainer dos Santos Moschetta, Greg Kurz, Halil Pasic,
Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Alex Bennée, Richard Henderson
On Wed, 4 Nov 2020 12:57:03 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> From: Cornelia Huck <cohuck@redhat.com>
>
> s390-pci-vfio.c calls into the vfio code, so we need it to be
> built conditionally on vfio (which implies CONFIG_LINUX).
>
> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> Message-Id: <20201103123237.718242-1-cohuck@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Acked-by: Greg Kurz <groug@kaod.org>
> Tested-by: Greg Kurz <groug@kaod.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-04 12:18 ` Christian Schoenebeck
@ 2020-11-04 17:54 ` Greg Kurz
0 siblings, 0 replies; 21+ messages in thread
From: Greg Kurz @ 2020-11-04 17:54 UTC (permalink / raw)
To: Christian Schoenebeck
Cc: Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Alex Bennée,
Cornelia Huck, qemu-devel, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Anthony Perard, xen-devel, Philippe Mathieu-Daudé,
Paul Durrant, Richard Henderson
On Wed, 04 Nov 2020 13:18:09 +0100
Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
> > 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
> >
> > Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> > Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> > Acked-by: Greg Kurz <groug@kaod.org>
> > Tested-by: Greg Kurz <groug@kaod.org>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
>
Phil,
Same questioning as Connie. Do you intend to get this merged or should
Christian or I take care of that ?
> > ---
> > v2: Reworded description (Greg)
> >
> > Cc: Stefano Stabellini <sstabellini@kernel.org>
> > Cc: Anthony Perard <anthony.perard@citrix.com>
> > Cc: Paul Durrant <paul@xen.org>
> > Cc: xen-devel@lists.xenproject.org
> > Cc: Greg Kurz <groug@kaod.org>
> > Cc: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > ---
> > hw/9pfs/Kconfig | 4 ----
> > hw/9pfs/meson.build | 2 +-
> > 2 files changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
> > index d3ebd737301..3ae57496613 100644
> > --- a/hw/9pfs/Kconfig
> > +++ b/hw/9pfs/Kconfig
> > @@ -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
> > diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
> > index cc094262122..99be5d91196 100644
> > --- a/hw/9pfs/meson.build
> > +++ b/hw/9pfs/meson.build
> > @@ -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'))
>
> Best regards,
> Christian Schoenebeck
>
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
@ 2020-11-04 17:54 ` Greg Kurz
0 siblings, 0 replies; 21+ messages in thread
From: Greg Kurz @ 2020-11-04 17:54 UTC (permalink / raw)
To: Christian Schoenebeck
Cc: qemu-devel, Philippe Mathieu-Daudé,
Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Alex Bennée,
Cornelia Huck, Wainer dos Santos Moschetta, Halil Pasic,
Christian Borntraeger, qemu-s390x, xen-devel, Anthony Perard,
Paolo Bonzini, Paul Durrant, Richard Henderson
On Wed, 04 Nov 2020 13:18:09 +0100
Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
> > 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
> >
> > Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> > Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> > Acked-by: Greg Kurz <groug@kaod.org>
> > Tested-by: Greg Kurz <groug@kaod.org>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
>
Phil,
Same questioning as Connie. Do you intend to get this merged or should
Christian or I take care of that ?
> > ---
> > v2: Reworded description (Greg)
> >
> > Cc: Stefano Stabellini <sstabellini@kernel.org>
> > Cc: Anthony Perard <anthony.perard@citrix.com>
> > Cc: Paul Durrant <paul@xen.org>
> > Cc: xen-devel@lists.xenproject.org
> > Cc: Greg Kurz <groug@kaod.org>
> > Cc: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > ---
> > hw/9pfs/Kconfig | 4 ----
> > hw/9pfs/meson.build | 2 +-
> > 2 files changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
> > index d3ebd737301..3ae57496613 100644
> > --- a/hw/9pfs/Kconfig
> > +++ b/hw/9pfs/Kconfig
> > @@ -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
> > diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
> > index cc094262122..99be5d91196 100644
> > --- a/hw/9pfs/meson.build
> > +++ b/hw/9pfs/meson.build
> > @@ -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'))
>
> Best regards,
> Christian Schoenebeck
>
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
2020-11-04 17:25 ` Cornelia Huck
@ 2020-11-05 11:58 ` Philippe Mathieu-Daudé
2020-11-05 12:01 ` Cornelia Huck
0 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-05 11:58 UTC (permalink / raw)
To: Cornelia Huck
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Christian Schoenebeck, qemu-devel,
Wainer dos Santos Moschetta, Greg Kurz, Halil Pasic,
Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Alex Bennée, Richard Henderson
Hi Cornelia,
On 11/4/20 6:25 PM, Cornelia Huck wrote:
> On Wed, 4 Nov 2020 12:57:03 +0100
> Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
>> From: Cornelia Huck <cohuck@redhat.com>
>>
>> s390-pci-vfio.c calls into the vfio code, so we need it to be
>> built conditionally on vfio (which implies CONFIG_LINUX).
>>
>> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
>> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
>> Message-Id: <20201103123237.718242-1-cohuck@redhat.com>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Acked-by: Greg Kurz <groug@kaod.org>
>> Tested-by: Greg Kurz <groug@kaod.org>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> 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?
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.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
2020-11-05 11:58 ` Philippe Mathieu-Daudé
@ 2020-11-05 12:01 ` Cornelia Huck
2020-11-05 14:43 ` Cornelia Huck
0 siblings, 1 reply; 21+ messages in thread
From: Cornelia Huck @ 2020-11-05 12:01 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Christian Schoenebeck, qemu-devel,
Wainer dos Santos Moschetta, Greg Kurz, Halil Pasic,
Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Alex Bennée, Richard Henderson
On Thu, 5 Nov 2020 12:58:01 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Hi Cornelia,
>
> On 11/4/20 6:25 PM, Cornelia Huck wrote:
> > On Wed, 4 Nov 2020 12:57:03 +0100
> > Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> >
> >> From: Cornelia Huck <cohuck@redhat.com>
> >>
> >> s390-pci-vfio.c calls into the vfio code, so we need it to be
> >> built conditionally on vfio (which implies CONFIG_LINUX).
> >>
> >> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
> >> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> >> Message-Id: <20201103123237.718242-1-cohuck@redhat.com>
> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> Acked-by: Greg Kurz <groug@kaod.org>
> >> Tested-by: Greg Kurz <groug@kaod.org>
> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >> ---
> >> 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?
>
> 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.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-04 17:54 ` Greg Kurz
@ 2020-11-05 12:15 ` Philippe Mathieu-Daudé
-1 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-05 12:15 UTC (permalink / raw)
To: Greg Kurz, Christian Schoenebeck
Cc: Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Cornelia Huck, qemu-devel,
Wainer dos Santos Moschetta, Halil Pasic, Christian Borntraeger,
qemu-s390x, Paolo Bonzini, Anthony Perard, xen-devel,
Alex Bennée, Paul Durrant, Richard Henderson
On 11/4/20 6:54 PM, Greg Kurz wrote:
> On Wed, 04 Nov 2020 13:18:09 +0100
> Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
>
>> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
>>> 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
>>>
>>> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
>>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>>> Acked-by: Greg Kurz <groug@kaod.org>
>>> Tested-by: Greg Kurz <groug@kaod.org>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
>>
>
> 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.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
@ 2020-11-05 12:15 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-05 12:15 UTC (permalink / raw)
To: Greg Kurz, Christian Schoenebeck
Cc: qemu-devel, Fam Zheng, Thomas Huth, Stefano Stabellini,
Daniel P . Berrange, Matthew Rosato, David Hildenbrand,
Alex Bennée, Cornelia Huck, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, xen-devel,
Anthony Perard, Paolo Bonzini, Paul Durrant, Richard Henderson
On 11/4/20 6:54 PM, Greg Kurz wrote:
> On Wed, 04 Nov 2020 13:18:09 +0100
> Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
>
>> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
>>> 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
>>>
>>> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
>>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>>> Acked-by: Greg Kurz <groug@kaod.org>
>>> Tested-by: Greg Kurz <groug@kaod.org>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
>>
>
> 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.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-05 12:15 ` Philippe Mathieu-Daudé
@ 2020-11-05 12:23 ` Greg Kurz
-1 siblings, 0 replies; 21+ messages in thread
From: Greg Kurz @ 2020-11-05 12:23 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Cornelia Huck,
Christian Schoenebeck, qemu-devel, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Anthony Perard, xen-devel, Alex Bennée, Paul Durrant,
Richard Henderson
On Thu, 5 Nov 2020 13:15:59 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> On 11/4/20 6:54 PM, Greg Kurz wrote:
> > On Wed, 04 Nov 2020 13:18:09 +0100
> > Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> >
> >> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
> >>> 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
> >>>
> >>> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> >>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> >>> Acked-by: Greg Kurz <groug@kaod.org>
> >>> Tested-by: Greg Kurz <groug@kaod.org>
> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >>
> >> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> >>
> >
> > 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 ?
> Thanks,
>
> Phil.
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
@ 2020-11-05 12:23 ` Greg Kurz
0 siblings, 0 replies; 21+ messages in thread
From: Greg Kurz @ 2020-11-05 12:23 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Christian Schoenebeck, qemu-devel, Fam Zheng, Thomas Huth,
Stefano Stabellini, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Alex Bennée, Cornelia Huck,
Wainer dos Santos Moschetta, Halil Pasic, Christian Borntraeger,
qemu-s390x, xen-devel, Anthony Perard, Paolo Bonzini,
Paul Durrant, Richard Henderson
On Thu, 5 Nov 2020 13:15:59 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> On 11/4/20 6:54 PM, Greg Kurz wrote:
> > On Wed, 04 Nov 2020 13:18:09 +0100
> > Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> >
> >> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé wrote:
> >>> 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
> >>>
> >>> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> >>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> >>> Acked-by: Greg Kurz <groug@kaod.org>
> >>> Tested-by: Greg Kurz <groug@kaod.org>
> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >>
> >> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> >>
> >
> > 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 ?
> Thanks,
>
> Phil.
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-05 12:23 ` Greg Kurz
(?)
@ 2020-11-05 12:28 ` Christian Schoenebeck
2020-11-05 15:06 ` Christian Schoenebeck
-1 siblings, 1 reply; 21+ messages in thread
From: Christian Schoenebeck @ 2020-11-05 12:28 UTC (permalink / raw)
To: Greg Kurz
Cc: Philippe Mathieu-Daudé,
qemu-devel, Fam Zheng, Thomas Huth, Stefano Stabellini,
Daniel P . Berrange, Matthew Rosato, David Hildenbrand,
Alex Bennée, Cornelia Huck, Wainer dos Santos Moschetta,
Halil Pasic, Christian Borntraeger, qemu-s390x, xen-devel,
Anthony Perard, Paolo Bonzini, Paul Durrant, Richard Henderson
On Donnerstag, 5. November 2020 13:23:46 CET Greg Kurz wrote:
> On Thu, 5 Nov 2020 13:15:59 +0100
>
> Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> > On 11/4/20 6:54 PM, Greg Kurz wrote:
> > > On Wed, 04 Nov 2020 13:18:09 +0100
> > >
> > > Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> > >> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé
wrote:
> > >>> 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
> > >>>
> > >>> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> > >>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> > >>> Acked-by: Greg Kurz <groug@kaod.org>
> > >>> Tested-by: Greg Kurz <groug@kaod.org>
> > >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > >>
> > >> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > >
> > > 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 ?
Yes, I will prepare a 9p PR today anyway, so I will include this patch.
Best regards,
Christian Schoenebeck
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices
2020-11-05 12:01 ` Cornelia Huck
@ 2020-11-05 14:43 ` Cornelia Huck
0 siblings, 0 replies; 21+ messages in thread
From: Cornelia Huck @ 2020-11-05 14:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrange, Matthew Rosato,
David Hildenbrand, Christian Schoenebeck, qemu-devel,
Wainer dos Santos Moschetta, Greg Kurz, Halil Pasic,
Christian Borntraeger, qemu-s390x, Paolo Bonzini,
Alex Bennée, Richard Henderson
On Thu, 5 Nov 2020 13:01:13 +0100
Cornelia Huck <cohuck@redhat.com> wrote:
> On Thu, 5 Nov 2020 12:58:01 +0100
> Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> > Hi Cornelia,
> >
> > On 11/4/20 6:25 PM, Cornelia Huck wrote:
> > > On Wed, 4 Nov 2020 12:57:03 +0100
> > > Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> > >
> > >> From: Cornelia Huck <cohuck@redhat.com>
> > >>
> > >> s390-pci-vfio.c calls into the vfio code, so we need it to be
> > >> built conditionally on vfio (which implies CONFIG_LINUX).
> > >>
> > >> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > >> Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available count")
> > >> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> > >> Message-Id: <20201103123237.718242-1-cohuck@redhat.com>
> > >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > >> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > >> Acked-by: Greg Kurz <groug@kaod.org>
> > >> Tested-by: Greg Kurz <groug@kaod.org>
> > >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > >> ---
> > >> 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?
> >
> > 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).
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
2020-11-05 12:28 ` Christian Schoenebeck
@ 2020-11-05 15:06 ` Christian Schoenebeck
0 siblings, 0 replies; 21+ messages in thread
From: Christian Schoenebeck @ 2020-11-05 15:06 UTC (permalink / raw)
To: qemu-devel
Cc: Greg Kurz, Philippe Mathieu-Daudé,
Fam Zheng, Thomas Huth, Stefano Stabellini, Daniel P . Berrange,
Matthew Rosato, David Hildenbrand, Alex Bennée,
Cornelia Huck, Wainer dos Santos Moschetta, Halil Pasic,
Christian Borntraeger, qemu-s390x, xen-devel, Anthony Perard,
Paolo Bonzini, Paul Durrant, Richard Henderson
On Donnerstag, 5. November 2020 13:28:31 CET Christian Schoenebeck wrote:
> On Donnerstag, 5. November 2020 13:23:46 CET Greg Kurz wrote:
> > On Thu, 5 Nov 2020 13:15:59 +0100
> >
> > Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> > > On 11/4/20 6:54 PM, Greg Kurz wrote:
> > > > On Wed, 04 Nov 2020 13:18:09 +0100
> > > >
> > > > Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> > > >> On Mittwoch, 4. November 2020 12:57:04 CET Philippe Mathieu-Daudé
>
> wrote:
> > > >>> 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
> > > >>>
> > > >>> Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup")
> > > >>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> > > >>> Acked-by: Greg Kurz <groug@kaod.org>
> > > >>> Tested-by: Greg Kurz <groug@kaod.org>
> > > >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > >>
> > > >> Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > > >
> > > > 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 ?
>
> 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
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2020-11-05 15:08 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-04 11:57 [PATCH-for-5.2 v3 0/4] ci: Move --without-default-devices job from Travis to GitLab Philippe Mathieu-Daudé
2020-11-04 11:57 ` [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices Philippe Mathieu-Daudé
2020-11-04 17:25 ` Cornelia Huck
2020-11-05 11:58 ` Philippe Mathieu-Daudé
2020-11-05 12:01 ` Cornelia Huck
2020-11-05 14:43 ` Cornelia Huck
2020-11-04 11:57 ` [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen Philippe Mathieu-Daudé
2020-11-04 11:57 ` Philippe Mathieu-Daudé
2020-11-04 12:18 ` Christian Schoenebeck
2020-11-04 17:54 ` Greg Kurz
2020-11-04 17:54 ` Greg Kurz
2020-11-05 12:15 ` Philippe Mathieu-Daudé
2020-11-05 12:15 ` Philippe Mathieu-Daudé
2020-11-05 12:23 ` Greg Kurz
2020-11-05 12:23 ` Greg Kurz
2020-11-05 12:28 ` Christian Schoenebeck
2020-11-05 15:06 ` Christian Schoenebeck
2020-11-04 11:57 ` [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config Philippe Mathieu-Daudé
2020-11-04 12:12 ` Wainer dos Santos Moschetta
2020-11-04 11:57 ` [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job Philippe Mathieu-Daudé
2020-11-04 12:16 ` Wainer dos Santos Moschetta
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.