qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS
@ 2019-12-11 14:23 Paolo Bonzini
  2019-12-11 14:31 ` Daniel P. Berrangé
  2019-12-11 14:38 ` Thomas Huth
  0 siblings, 2 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-12-11 14:23 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Marc-André Lureau

From: Marc-André Lureau <marcandre.lureau@redhat.com>

vhost-user-gpu is always built and installed, but it is not part of the emulator
proper.  Cut it if --disable-tools is specified.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 53823c2..8d921c6 100644
--- a/Makefile
+++ b/Makefile
@@ -321,14 +321,10 @@ HELPERS-y =
 
 HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
 
-ifdef CONFIG_LINUX
-ifdef CONFIG_VIRGL
-ifdef CONFIG_GBM
+ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
 HELPERS-y += vhost-user-gpu$(EXESUF)
 vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
 endif
-endif
-endif
 
 # Sphinx does not allow building manuals into the same directory as
 # the source files, so if we're doing an in-tree QEMU build we must
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS
  2019-12-11 14:23 [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS Paolo Bonzini
@ 2019-12-11 14:31 ` Daniel P. Berrangé
  2019-12-11 15:27   ` Dr. David Alan Gilbert
  2019-12-11 14:38 ` Thomas Huth
  1 sibling, 1 reply; 4+ messages in thread
From: Daniel P. Berrangé @ 2019-12-11 14:31 UTC (permalink / raw)
  To: Paolo Bonzini; +Cc: qemu-trivial, Marc-André Lureau, qemu-devel

On Wed, Dec 11, 2019 at 03:23:22PM +0100, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> vhost-user-gpu is always built and installed, but it is not part of the emulator
> proper.  Cut it if --disable-tools is specified.

I don't feel like this is something that people would really
consider part of "tools" either.  This is something you'd
only ever use in conjunction with the emulators, so I don't
think controlling it with --disable-tools is appropriate.

A new --(enable|disable)-vhost-backends  arg looks more
desirable to me. Disabling the system emulators should
automatically imply --disable-vhost-backends by default
too

> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 53823c2..8d921c6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -321,14 +321,10 @@ HELPERS-y =
>  
>  HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
>  
> -ifdef CONFIG_LINUX
> -ifdef CONFIG_VIRGL
> -ifdef CONFIG_GBM
> +ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
>  HELPERS-y += vhost-user-gpu$(EXESUF)
>  vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
>  endif
> -endif
> -endif
>  
>  # Sphinx does not allow building manuals into the same directory as
>  # the source files, so if we're doing an in-tree QEMU build we must
> -- 
> 1.8.3.1
> 
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS
  2019-12-11 14:23 [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS Paolo Bonzini
  2019-12-11 14:31 ` Daniel P. Berrangé
@ 2019-12-11 14:38 ` Thomas Huth
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2019-12-11 14:38 UTC (permalink / raw)
  To: Paolo Bonzini, qemu-devel; +Cc: qemu-trivial, Marc-André Lureau

On 11/12/2019 15.23, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> vhost-user-gpu is always built and installed, but it is not part of the emulator
> proper.  Cut it if --disable-tools is specified.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 53823c2..8d921c6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -321,14 +321,10 @@ HELPERS-y =
>  
>  HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
>  
> -ifdef CONFIG_LINUX
> -ifdef CONFIG_VIRGL
> -ifdef CONFIG_GBM
> +ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
>  HELPERS-y += vhost-user-gpu$(EXESUF)
>  vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
>  endif
> -endif
> -endif

Reviewed-by: Thomas Huth <thuth@redhat.com>



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS
  2019-12-11 14:31 ` Daniel P. Berrangé
@ 2019-12-11 15:27   ` Dr. David Alan Gilbert
  0 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2019-12-11 15:27 UTC (permalink / raw)
  To: Daniel P. Berrangé
  Cc: qemu-trivial, Paolo Bonzini, qemu-devel, Marc-André Lureau

* Daniel P. Berrangé (berrange@redhat.com) wrote:
> On Wed, Dec 11, 2019 at 03:23:22PM +0100, Paolo Bonzini wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> > 
> > vhost-user-gpu is always built and installed, but it is not part of the emulator
> > proper.  Cut it if --disable-tools is specified.
> 
> I don't feel like this is something that people would really
> consider part of "tools" either.  This is something you'd
> only ever use in conjunction with the emulators, so I don't
> think controlling it with --disable-tools is appropriate.
> 
> A new --(enable|disable)-vhost-backends  arg looks more
> desirable to me. Disabling the system emulators should
> automatically imply --disable-vhost-backends by default
> too

It feels to me that vhost-backends are a subset of tools.

Dave

> > 
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> >  Makefile | 6 +-----
> >  1 file changed, 1 insertion(+), 5 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index 53823c2..8d921c6 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -321,14 +321,10 @@ HELPERS-y =
> >  
> >  HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
> >  
> > -ifdef CONFIG_LINUX
> > -ifdef CONFIG_VIRGL
> > -ifdef CONFIG_GBM
> > +ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
> >  HELPERS-y += vhost-user-gpu$(EXESUF)
> >  vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
> >  endif
> > -endif
> > -endif
> >  
> >  # Sphinx does not allow building manuals into the same directory as
> >  # the source files, so if we're doing an in-tree QEMU build we must
> > -- 
> > 1.8.3.1
> > 
> > 
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-12-11 15:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-11 14:23 [PATCH] build-sys: build vhost-user-gpu only if CONFIG_TOOLS Paolo Bonzini
2019-12-11 14:31 ` Daniel P. Berrangé
2019-12-11 15:27   ` Dr. David Alan Gilbert
2019-12-11 14:38 ` Thomas Huth

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).