mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen
Commitb2c00bce54
("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:b2c00bce54
("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> Message-Id: <20201104115706.3101190-3-philmd@redhat.com> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
This commit is contained in:
parent
22e1367587
commit
e6b99460b1
|
@ -2,12 +2,8 @@ config FSDEV_9P
|
||||||
bool
|
bool
|
||||||
depends on VIRTFS
|
depends on VIRTFS
|
||||||
|
|
||||||
config 9PFS
|
|
||||||
bool
|
|
||||||
|
|
||||||
config VIRTIO_9P
|
config VIRTIO_9P
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
depends on VIRTFS && VIRTIO
|
depends on VIRTFS && VIRTIO
|
||||||
select FSDEV_9P
|
select FSDEV_9P
|
||||||
select 9PFS
|
|
||||||
|
|
|
@ -15,6 +15,6 @@ fs_ss.add(files(
|
||||||
'coxattr.c',
|
'coxattr.c',
|
||||||
))
|
))
|
||||||
fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.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'))
|
specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c'))
|
||||||
|
|
Loading…
Reference in a new issue