| Message ID | 20170809163019.21593-1-cohuck@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 9 Aug 2017 18:30:19 +0200 Cornelia Huck <cohuck@redhat.com> wrote: > Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend > on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > I think we're ok now. Thanks for fixing that! IIUC, this patch will be needed when your zpci cleanup patches get merged. I suggest you add it to your series with my: Acked-by: Greg Kurz <groug@kaod.org> Cheers, -- Greg > v2->v3: switch dependencies to VIRTFS && (VIRTIO || XEN) > add explict VIRTIO dependency for virtio-9p-device.o > > --- > fsdev/Makefile.objs | 9 +++------ > hw/9pfs/Makefile.objs | 2 +- > hw/Makefile.objs | 2 +- > 3 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs > index 659df6e187..fb38017c0b 100644 > --- a/fsdev/Makefile.objs > +++ b/fsdev/Makefile.objs > @@ -1,10 +1,7 @@ > -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) > # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. > -# only pull in the actual virtio-9p device if we also enabled virtio. > -common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o > -else > -common-obj-y = qemu-fsdev-dummy.o > -endif > +# only pull in the actual 9p backend if we also enabled virtio or xen. > +common-obj-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o > +common-obj-$(call lnot,$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN)))) = qemu-fsdev-dummy.o > common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o > > # Toplevel always builds this; targets without virtio will put it in > diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs > index cab5e942ed..fd90b62900 100644 > --- a/hw/9pfs/Makefile.objs > +++ b/hw/9pfs/Makefile.objs > @@ -7,4 +7,4 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o > common-obj-y += 9p-proxy.o > common-obj-$(CONFIG_XEN) += xen-9p-backend.o > > -obj-y += virtio-9p-device.o > +obj-$(CONFIG_VIRTIO) += virtio-9p-device.o > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index a2c61f6b09..cf4cb2010b 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -1,4 +1,4 @@ > -devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/ > +devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) += 9pfs/ > devices-dirs-$(CONFIG_SOFTMMU) += acpi/ > devices-dirs-$(CONFIG_SOFTMMU) += adc/ > devices-dirs-$(CONFIG_SOFTMMU) += audio/
On 09.08.2017 18:30, Cornelia Huck wrote: > Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend > on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > > v2->v3: switch dependencies to VIRTFS && (VIRTIO || XEN) > add explict VIRTIO dependency for virtio-9p-device.o > > --- > fsdev/Makefile.objs | 9 +++------ > hw/9pfs/Makefile.objs | 2 +- > hw/Makefile.objs | 2 +- > 3 files changed, 5 insertions(+), 8 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On Wed, 9 Aug 2017 18:53:11 +0200 Greg Kurz <groug@kaod.org> wrote: > On Wed, 9 Aug 2017 18:30:19 +0200 > Cornelia Huck <cohuck@redhat.com> wrote: > > > Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend > > on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only. > > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > --- > > > > I think we're ok now. Thanks for fixing that! > > IIUC, this patch will be needed when your zpci cleanup patches get merged. Yes, it does not really matter before that. > I suggest you add it to your series with my: > > Acked-by: Greg Kurz <groug@kaod.org> Thanks!
diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index 659df6e187..fb38017c0b 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -1,10 +1,7 @@ -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. -# only pull in the actual virtio-9p device if we also enabled virtio. -common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o -else -common-obj-y = qemu-fsdev-dummy.o -endif +# only pull in the actual 9p backend if we also enabled virtio or xen. +common-obj-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o +common-obj-$(call lnot,$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN)))) = qemu-fsdev-dummy.o common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o # Toplevel always builds this; targets without virtio will put it in diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index cab5e942ed..fd90b62900 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -7,4 +7,4 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o common-obj-y += 9p-proxy.o common-obj-$(CONFIG_XEN) += xen-9p-backend.o -obj-y += virtio-9p-device.o +obj-$(CONFIG_VIRTIO) += virtio-9p-device.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a2c61f6b09..cf4cb2010b 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,4 +1,4 @@ -devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/ +devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) += 9pfs/ devices-dirs-$(CONFIG_SOFTMMU) += acpi/ devices-dirs-$(CONFIG_SOFTMMU) += adc/ devices-dirs-$(CONFIG_SOFTMMU) += audio/
Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only. Signed-off-by: Cornelia Huck <cohuck@redhat.com> --- v2->v3: switch dependencies to VIRTFS && (VIRTIO || XEN) add explict VIRTIO dependency for virtio-9p-device.o --- fsdev/Makefile.objs | 9 +++------ hw/9pfs/Makefile.objs | 2 +- hw/Makefile.objs | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-)