[Qemu-devel] [PATCH v1 0/2] Two fixes to make rules

[Qemu-devel] [PATCH v1 0/2] Two fixes to make rules

[Daniel P. Berrange]

The primary goal of this was to fix the recent regression that made
everything done by make completely silent, causing things like
"make install" to emit no output. In doing so I noticed a small mistake
in the help text.

Daniel P. Berrange (2):
  Revert "build-sys: silence make by default or V=0"
  make: fix help message reference to bogus V=0 variable

 Makefile  | 5 +++--
 rules.mak | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

-- 
2.14.3

[Qemu-devel] [PATCH v1 1/2] Revert "build-sys: silence make by default or V=0"

[Daniel P. Berrange]

This reverts commit 42a77f1ce4934b243df003f95bda88530631387a.

The primary intention of this change was to silence messages
like

  make[1]: '/home/berrange/src/virt/qemu/capstone/libcapstone.a' is up to date.

which we get when calling make recursively with explicit
targets.

The problem is that this change affected every make target,
not merely the targets that triggered these "is up to date"
messages. As a result any targets that were not invoking
commands via "$(call quiet-command ...)" suddenly become
silent. This is particularly bad for "make install" which
now appears todo nothing.

Rather than go through every make rule and try to identify
places where we now need to explicitly print a message to
show work taking place, just revert the change.

To address the original problem of silencing "is up to date"
messages, we simply add --quiet to the SUBDIR_MAKEVARS
variable, so it only affects us on recursive make calls.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 Makefile  | 2 +-
 rules.mak | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f26ef1b1df..c263190b8d 100644
--- a/Makefile
+++ b/Makefile
@@ -280,7 +280,7 @@ else
 DOCS=
 endif
 
-SUBDIR_MAKEFLAGS=BUILD_DIR=$(BUILD_DIR)
+SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
 SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
 
diff --git a/rules.mak b/rules.mak
index 5fb4951561..6e943335f3 100644
--- a/rules.mak
+++ b/rules.mak
@@ -131,8 +131,6 @@ modules:
 # If called with only a single argument, will print nothing in quiet mode.
 quiet-command = $(if $(V),$1,$(if $(2),@printf "  %-7s %s\n" $2 $3 && $1, @$1))
 
-MAKEFLAGS += $(if $(V),,--no-print-directory --quiet)
-
 # cc-option
 # Usage: CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
 
-- 
2.14.3

Re: [Qemu-devel] [PATCH v1 1/2] Revert "build-sys: silence make by default or V=0"

[Marc-Andre Lureau]

On Tue, Jan 23, 2018 at 5:47 PM, Daniel P. Berrange <berrange@redhat.com> wrote:
> This reverts commit 42a77f1ce4934b243df003f95bda88530631387a.
>
> The primary intention of this change was to silence messages
> like
>
>   make[1]: '/home/berrange/src/virt/qemu/capstone/libcapstone.a' is up to date.
>
> which we get when calling make recursively with explicit
> targets.
>
> The problem is that this change affected every make target,
> not merely the targets that triggered these "is up to date"
> messages. As a result any targets that were not invoking
> commands via "$(call quiet-command ...)" suddenly become
> silent. This is particularly bad for "make install" which
> now appears todo nothing.
>
> Rather than go through every make rule and try to identify
> places where we now need to explicitly print a message to
> show work taking place, just revert the change.
>
> To address the original problem of silencing "is up to date"
> messages, we simply add --quiet to the SUBDIR_MAKEVARS
> variable, so it only affects us on recursive make calls.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

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


> ---
>  Makefile  | 2 +-
>  rules.mak | 2 --
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index f26ef1b1df..c263190b8d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -280,7 +280,7 @@ else
>  DOCS=
>  endif
>
> -SUBDIR_MAKEFLAGS=BUILD_DIR=$(BUILD_DIR)
> +SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
>  SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
>  SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
>
> diff --git a/rules.mak b/rules.mak
> index 5fb4951561..6e943335f3 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -131,8 +131,6 @@ modules:
>  # If called with only a single argument, will print nothing in quiet mode.
>  quiet-command = $(if $(V),$1,$(if $(2),@printf "  %-7s %s\n" $2 $3 && $1, @$1))
>
> -MAKEFLAGS += $(if $(V),,--no-print-directory --quiet)
> -
>  # cc-option
>  # Usage: CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
>
> --
> 2.14.3
>

Re: [Qemu-devel] [PATCH v1 1/2] Revert "build-sys: silence make by default or V=0"

[Mark Cave-Ayland]

On 23/01/18 16:47, Daniel P. Berrange wrote:

> This reverts commit 42a77f1ce4934b243df003f95bda88530631387a.
> 
> The primary intention of this change was to silence messages
> like
> 
>    make[1]: '/home/berrange/src/virt/qemu/capstone/libcapstone.a' is up to date.
> 
> which we get when calling make recursively with explicit
> targets.
> 
> The problem is that this change affected every make target,
> not merely the targets that triggered these "is up to date"
> messages. As a result any targets that were not invoking
> commands via "$(call quiet-command ...)" suddenly become
> silent. This is particularly bad for "make install" which
> now appears todo nothing.
> 
> Rather than go through every make rule and try to identify
> places where we now need to explicitly print a message to
> show work taking place, just revert the change.
> 
> To address the original problem of silencing "is up to date"
> messages, we simply add --quiet to the SUBDIR_MAKEVARS
> variable, so it only affects us on recursive make calls.

s/SUBDIR_MAKEVARS/SUBDIR_MAKEFLAGS/?

> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>   Makefile  | 2 +-
>   rules.mak | 2 --
>   2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index f26ef1b1df..c263190b8d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -280,7 +280,7 @@ else
>   DOCS=
>   endif
>   
> -SUBDIR_MAKEFLAGS=BUILD_DIR=$(BUILD_DIR)
> +SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR)
>   SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
>   SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
>   
> diff --git a/rules.mak b/rules.mak
> index 5fb4951561..6e943335f3 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -131,8 +131,6 @@ modules:
>   # If called with only a single argument, will print nothing in quiet mode.
>   quiet-command = $(if $(V),$1,$(if $(2),@printf "  %-7s %s\n" $2 $3 && $1, @$1))
>   
> -MAKEFLAGS += $(if $(V),,--no-print-directory --quiet)
> -
>   # cc-option
>   # Usage: CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)

Thanks for spending the time debugging this, Dan.


ATB,

Mark.

Re: [Qemu-devel] [PATCH v1 1/2] Revert "build-sys: silence make by default or V=0"

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]

On 01/23/2018 10:47 AM, Daniel P. Berrange wrote:
> This reverts commit 42a77f1ce4934b243df003f95bda88530631387a.
> 
> The primary intention of this change was to silence messages
> like
> 
>   make[1]: '/home/berrange/src/virt/qemu/capstone/libcapstone.a' is up to date.
> 
> which we get when calling make recursively with explicit
> targets.
> 
> The problem is that this change affected every make target,
> not merely the targets that triggered these "is up to date"
> messages. As a result any targets that were not invoking
> commands via "$(call quiet-command ...)" suddenly become
> silent. This is particularly bad for "make install" which
> now appears todo nothing.
> 
> Rather than go through every make rule and try to identify
> places where we now need to explicitly print a message to
> show work taking place, just revert the change.
> 
> To address the original problem of silencing "is up to date"
> messages, we simply add --quiet to the SUBDIR_MAKEVARS
> variable, so it only affects us on recursive make calls.

As for solving the original intended issue, this patch silences the
message about libcapstone, and reverting back to a known state is more
conservative, so I'm okay with this going in.

Tested-by: Eric Blake <eblake@redhat.com>


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]

[Qemu-devel] [PATCH v1 2/2] make: fix help message reference to bogus V=0 variable

[Daniel P. Berrange]

The make rules for building QEMU are mostly silent by default. They can
be made verbose by setting the variable V=1. The default state does not
however correspond to a V=0 setting - $(V) must be undefined / empty to
get the default quiet build.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c263190b8d..554ba69ced 100644
--- a/Makefile
+++ b/Makefile
@@ -940,4 +940,5 @@ ifdef QEMU_GA_MSI_ENABLED
 endif
 	@echo  ''
 endif
-	@echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
+	@echo  '  $(MAKE) [targets]      (quiet build, default)'
+	@echo  '  $(MAKE) V=1 [targets]  (verbose build)'
-- 
2.14.3

Re: [Qemu-devel] [PATCH v1 2/2] make: fix help message reference to bogus V=0 variable

[Marc-Andre Lureau]

On Tue, Jan 23, 2018 at 5:47 PM, Daniel P. Berrange <berrange@redhat.com> wrote:
> The make rules for building QEMU are mostly silent by default. They can
> be made verbose by setting the variable V=1. The default state does not
> however correspond to a V=0 setting - $(V) must be undefined / empty to
> get the default quiet build.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>


(with that, qemu build-sys differs from automake & kernel at least)

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


> ---
>  Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index c263190b8d..554ba69ced 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -940,4 +940,5 @@ ifdef QEMU_GA_MSI_ENABLED
>  endif
>         @echo  ''
>  endif
> -       @echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
> +       @echo  '  $(MAKE) [targets]      (quiet build, default)'
> +       @echo  '  $(MAKE) V=1 [targets]  (verbose build)'
> --
> 2.14.3
>

Re: [Qemu-devel] [PATCH v1 2/2] make: fix help message reference to bogus V=0 variable

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]

On 01/23/2018 10:47 AM, Daniel P. Berrange wrote:
> The make rules for building QEMU are mostly silent by default. They can
> be made verbose by setting the variable V=1. The default state does not
> however correspond to a V=0 setting - $(V) must be undefined / empty to
> get the default quiet build.

Makefiles generated by automake support V=0; how hard would it be to
instead tweak things so that 'V=' and 'V=0' have the same effect?

> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index c263190b8d..554ba69ced 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -940,4 +940,5 @@ ifdef QEMU_GA_MSI_ENABLED
>  endif
>  	@echo  ''
>  endif
> -	@echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
> +	@echo  '  $(MAKE) [targets]      (quiet build, default)'
> +	@echo  '  $(MAKE) V=1 [targets]  (verbose build)'
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]

Re: [Qemu-devel] [PATCH v1 2/2] make: fix help message reference to bogus V=0 variable

[Daniel P. Berrange]

On Tue, Jan 23, 2018 at 01:05:31PM -0600, Eric Blake wrote:
> On 01/23/2018 10:47 AM, Daniel P. Berrange wrote:
> > The make rules for building QEMU are mostly silent by default. They can
> > be made verbose by setting the variable V=1. The default state does not
> > however correspond to a V=0 setting - $(V) must be undefined / empty to
> > get the default quiet build.
> 
> Makefiles generated by automake support V=0; how hard would it be to
> instead tweak things so that 'V=' and 'V=0' have the same effect?

Well it would make the various conmditionals a bit more complex because
we'd have to check three states instead of two. I'm not really convinced
it is worth it because explicitly passing V=0 doesn't do anything useful
given that we are unconditionally silent by default.

It makes more sense with autoconf, because the default behaviour may vary
based on configure setup and/or configure args, so you can't assume that
omitting 'V=' gives you silent build like we do with QEMU.

> 
> > 
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >  Makefile | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index c263190b8d..554ba69ced 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -940,4 +940,5 @@ ifdef QEMU_GA_MSI_ENABLED
> >  endif
> >  	@echo  ''
> >  endif
> > -	@echo  '  $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
> > +	@echo  '  $(MAKE) [targets]      (quiet build, default)'
> > +	@echo  '  $(MAKE) V=1 [targets]  (verbose build)'
> > 
> 
> -- 
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3266
> Virtualization:  qemu.org | libvirt.org
> 




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 :|

Re: [Qemu-devel] [PATCH v1 0/2] Two fixes to make rules

[Paolo Bonzini]

On 23/01/2018 17:47, Daniel P. Berrange wrote:
> The primary goal of this was to fix the recent regression that made
> everything done by make completely silent, causing things like
> "make install" to emit no output. In doing so I noticed a small mistake
> in the help text.
> 
> Daniel P. Berrange (2):
>   Revert "build-sys: silence make by default or V=0"
>   make: fix help message reference to bogus V=0 variable
> 
>  Makefile  | 5 +++--
>  rules.mak | 2 --
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 

Queued, thanks.

Paolo