* [Qemu-devel] [PATCH v3] 9pfs: fix dependencies
@ 2017-08-09 16:30 Cornelia Huck
2017-08-09 16:53 ` Greg Kurz
2017-08-10 3:29 ` Thomas Huth
0 siblings, 2 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-08-09 16:30 UTC (permalink / raw)
To: aneesh.kumar, groug; +Cc: borntraeger, agraf, thuth, qemu-devel, Cornelia Huck
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(-)
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/
--
2.13.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3] 9pfs: fix dependencies
2017-08-09 16:30 [Qemu-devel] [PATCH v3] 9pfs: fix dependencies Cornelia Huck
@ 2017-08-09 16:53 ` Greg Kurz
2017-08-10 7:01 ` Cornelia Huck
2017-08-10 3:29 ` Thomas Huth
1 sibling, 1 reply; 4+ messages in thread
From: Greg Kurz @ 2017-08-09 16:53 UTC (permalink / raw)
To: Cornelia Huck; +Cc: aneesh.kumar, borntraeger, agraf, thuth, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2674 bytes --]
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/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3] 9pfs: fix dependencies
2017-08-09 16:30 [Qemu-devel] [PATCH v3] 9pfs: fix dependencies Cornelia Huck
2017-08-09 16:53 ` Greg Kurz
@ 2017-08-10 3:29 ` Thomas Huth
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2017-08-10 3:29 UTC (permalink / raw)
To: Cornelia Huck, aneesh.kumar, groug; +Cc: borntraeger, agraf, qemu-devel
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3] 9pfs: fix dependencies
2017-08-09 16:53 ` Greg Kurz
@ 2017-08-10 7:01 ` Cornelia Huck
0 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-08-10 7:01 UTC (permalink / raw)
To: Greg Kurz; +Cc: aneesh.kumar, borntraeger, agraf, thuth, qemu-devel
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-10 7:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-09 16:30 [Qemu-devel] [PATCH v3] 9pfs: fix dependencies Cornelia Huck
2017-08-09 16:53 ` Greg Kurz
2017-08-10 7:01 ` Cornelia Huck
2017-08-10 3:29 ` Thomas Huth
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.