diff mbox series

[PATCH-for-5.2,v3,2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen

Message ID 20201104115706.3101190-3-philmd@redhat.com (mailing list archive)
State New
Headers show
Series None | expand

Commit Message

Philippe Mathieu-Daudé Nov. 4, 2020, 11:57 a.m. UTC
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(-)

Comments

Christian Schoenebeck Nov. 4, 2020, 12:18 p.m. UTC | #1
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
Greg Kurz Nov. 4, 2020, 5:54 p.m. UTC | #2
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
> 
>
Philippe Mathieu-Daudé Nov. 5, 2020, 12:15 p.m. UTC | #3
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.
Greg Kurz Nov. 5, 2020, 12:23 p.m. UTC | #4
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.
>
Christian Schoenebeck Nov. 5, 2020, 12:28 p.m. UTC | #5
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
Christian Schoenebeck Nov. 5, 2020, 3:06 p.m. UTC | #6
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
diff mbox series

Patch

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