On Tue, Nov 3, 2020 at 6:01 PM Philippe Mathieu-Daudé <phi...@redhat.com> wrote: > On 11/3/20 5:52 PM, Daniel P. Berrangé wrote: > > On Tue, Nov 03, 2020 at 05:46:03PM +0100, 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. > >> > >> 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'
All these symbols are defined in hw/9pfs/meson.build's fs_ss, which is conditional on CONFIG_9PFS. So: diff --git a/accel/Kconfig b/accel/Kconfig index 2ad94a3839..d24664d736 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -7,3 +7,4 @@ config KVM config XEN bool select FSDEV_9P if VIRTFS + select 9PFS if VIRTFS or alternatively (and I think better): diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index d3ebd73730..3ae5749661 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 cc09426212..99be5d9119 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -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