[Qemu-devel] [PATCH 0/3] Makefile: add dependencies on scripts

[Qemu-devel] [PATCH 0/3] Makefile: add dependencies on scripts

[Paolo Bonzini]

There are already many cases of generated files that depend on
the scripts that generate them.  Complete it whenever it's
missing, to avoid wrecking the build upon changes to the
scripts.

Paolo

Paolo Bonzini (3):
  Makefile: add dependency on scripts/create_config
  Makefile: add dependency on scripts/make_device_config.sh
  Makefile: add dependency on scripts/hxtool

 Makefile        | 18 +++++++++---------
 Makefile.target |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH 1/3] Makefile: add dependency on scripts/create_config

[Paolo Bonzini]

Make sure that config-host.h and config-target.h are rebuilt whenever
there is a change in the scripts that generates them.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile        | 2 +-
 Makefile.target | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 59af636..9e0e1f8 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ endif
 all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
 
 config-host.h: config-host.h-timestamp
-config-host.h-timestamp: config-host.mak
+config-host.h-timestamp: config-host.mak $(SRC_PATH)/scripts/create_config
 qemu-options.def: $(SRC_PATH)/qemu-options.hx
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
 
diff --git a/Makefile.target b/Makefile.target
index 5b80dd7..0bb5e78 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -37,7 +37,7 @@ PROGS=$(QEMU_PROG) $(QEMU_PROGW)
 STPFILES=
 
 config-target.h: config-target.h-timestamp
-config-target.h-timestamp: config-target.mak
+config-target.h-timestamp: config-target.mak $(SRC_PATH)/scripts/create_config
 
 ifdef CONFIG_TRACE_SYSTEMTAP
 stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/3] Makefile: add dependency on scripts/make_device_config.sh

[Paolo Bonzini]

Make sure that config-devices.mak is rebuilt whenever
there is a change in the scripts that generates it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9e0e1f8..72e0d74 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ endif
 
 -include $(SUBDIR_DEVICES_MAK_DEP)
 
-%/config-devices.mak: default-configs/%.mak
+%/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_device_config.sh
 	$(call quiet-command, \
             $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > $@.tmp, "  GEN   $@.tmp")
 	$(call quiet-command, if test -f $@; then \
-- 
1.8.3.1

[Qemu-devel] [PATCH 3/3] Makefile: add dependency on scripts/hxtool

[Paolo Bonzini]

Make sure that the various documentation and C code files are rebuilt
whenever there is a change in the script that splits them out of
.hx files.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile        | 14 +++++++-------
 Makefile.target |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 72e0d74..a27336d 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak $(SRC_PATH)/scripts/create_config
-qemu-options.def: $(SRC_PATH)/qemu-options.hx
+qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
@@ -241,7 +241,7 @@ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o libqemuutil.a libqemustub.a
 fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o libqemuutil.a libqemustub.a
 fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
 
-qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
+qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
 
 qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
@@ -524,19 +524,19 @@ TEXIFLAG=$(if $(V),,--quiet)
 %.pdf: %.texi
 	$(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")
 
-qemu-options.texi: $(SRC_PATH)/qemu-options.hx
+qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
 
-qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx
+qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
 
-qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx
+qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
 
-qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx
+qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  GEN   $@")
 
-qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx
+qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
 
 qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi
diff --git a/Makefile.target b/Makefile.target
index 0bb5e78..a9646d6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -206,13 +206,13 @@ endif
 gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
 	$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   $(TARGET_DIR)$@")
 
-hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
+hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
 
-hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx
+hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
 
-qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
+qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
 
 clean:
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 1/3] Makefile: add dependency on scripts/create_config

[Peter Maydell]

On 7 June 2016 at 12:48, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Make sure that config-host.h and config-target.h are rebuilt whenever
> there is a change in the scripts that generates them.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile        | 2 +-
>  Makefile.target | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 59af636..9e0e1f8 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -168,7 +168,7 @@ endif
>  all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
>
>  config-host.h: config-host.h-timestamp
> -config-host.h-timestamp: config-host.mak
> +config-host.h-timestamp: config-host.mak $(SRC_PATH)/scripts/create_config
>  qemu-options.def: $(SRC_PATH)/qemu-options.hx
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
>
> diff --git a/Makefile.target b/Makefile.target
> index 5b80dd7..0bb5e78 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -37,7 +37,7 @@ PROGS=$(QEMU_PROG) $(QEMU_PROGW)
>  STPFILES=
>
>  config-target.h: config-target.h-timestamp
> -config-target.h-timestamp: config-target.mak
> +config-target.h-timestamp: config-target.mak $(SRC_PATH)/scripts/create_config
>
>  ifdef CONFIG_TRACE_SYSTEMTAP
>  stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp
> --
> 1.8.3.1

Does it work to add the dependency on the RHS of the pattern rule
instead, like:

config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config
        $(call quiet-command, sh $(SRC_PATH)/scripts/create_config <
$< > $@, "  GEN   $(TARGET_DIR)config-$*.h")


?

thanks
-- PMM

Re: [Qemu-devel] [PATCH 2/3] Makefile: add dependency on scripts/make_device_config.sh

[Peter Maydell]

On 7 June 2016 at 12:48, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Make sure that config-devices.mak is rebuilt whenever
> there is a change in the scripts that generates it.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 9e0e1f8..72e0d74 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -117,7 +117,7 @@ endif
>
>  -include $(SUBDIR_DEVICES_MAK_DEP)
>
> -%/config-devices.mak: default-configs/%.mak
> +%/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_device_config.sh
>         $(call quiet-command, \
>              $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-config-devices.mak.d $@ > $@.tmp, "  GEN   $@.tmp")
>         $(call quiet-command, if test -f $@; then \
> --
> 1.8.3.1

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

(In this case you have added it to the pattern rule...)

thanks
-- PMM

Re: [Qemu-devel] [PATCH 3/3] Makefile: add dependency on scripts/hxtool

[Peter Maydell]

On 7 June 2016 at 12:48, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Make sure that the various documentation and C code files are rebuilt
> whenever there is a change in the script that splits them out of
> .hx files.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile        | 14 +++++++-------
>  Makefile.target |  6 +++---
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 72e0d74..a27336d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -169,7 +169,7 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
>
>  config-host.h: config-host.h-timestamp
>  config-host.h-timestamp: config-host.mak $(SRC_PATH)/scripts/create_config
> -qemu-options.def: $(SRC_PATH)/qemu-options.hx
> +qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
>
>  SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
> @@ -241,7 +241,7 @@ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o libqemuutil.a libqemustub.a
>  fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o libqemuutil.a libqemustub.a
>  fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
>
> -qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
> +qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
>
>  qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
> @@ -524,19 +524,19 @@ TEXIFLAG=$(if $(V),,--quiet)
>  %.pdf: %.texi
>         $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")
>
> -qemu-options.texi: $(SRC_PATH)/qemu-options.hx
> +qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
>
> -qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx
> +qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
>
> -qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx
> +qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
>
> -qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx
> +qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  GEN   $@")
>
> -qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx
> +qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")
>
>  qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi
> diff --git a/Makefile.target b/Makefile.target
> index 0bb5e78..a9646d6 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -206,13 +206,13 @@ endif
>  gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
>         $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   $(TARGET_DIR)$@")
>
> -hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
> +hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
>
> -hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx
> +hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
>
> -qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
> +qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

(looks like there's scope for cleaning this up with some pattern rules
later if we want to.)

thanks
-- PMM

Re: [Qemu-devel] [PATCH 1/3] Makefile: add dependency on scripts/create_config

[Paolo Bonzini]

On 07/06/2016 13:58, Peter Maydell wrote:
> Does it work to add the dependency on the RHS of the pattern rule
> instead, like:
> 
> config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config
>         $(call quiet-command, sh $(SRC_PATH)/scripts/create_config <
> $< > $@, "  GEN   $(TARGET_DIR)config-$*.h")

Yes, that works too.

Paolo

Re: [Qemu-devel] [PATCH 1/3] Makefile: add dependency on scripts/create_config

[Peter Maydell]

On 7 June 2016 at 13:05, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 07/06/2016 13:58, Peter Maydell wrote:
>> Does it work to add the dependency on the RHS of the pattern rule
>> instead, like:
>>
>> config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config
>>         $(call quiet-command, sh $(SRC_PATH)/scripts/create_config <
>> $< > $@, "  GEN   $(TARGET_DIR)config-$*.h")
>
> Yes, that works too.

Cool -- I think it's a bit clearer to add the dependency
in the same place where the rule text invoking the script is.

thanks
-- PMM

Re: [Qemu-devel] [PATCH 1/3] Makefile: add dependency on scripts/create_config

[Paolo Bonzini]

On 07/06/2016 14:09, Peter Maydell wrote:
> On 7 June 2016 at 13:05, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>>
>> On 07/06/2016 13:58, Peter Maydell wrote:
>>> Does it work to add the dependency on the RHS of the pattern rule
>>> instead, like:
>>>
>>> config-%.h-timestamp: config-%.mak $(SRC_PATH)/scripts/create_config
>>>         $(call quiet-command, sh $(SRC_PATH)/scripts/create_config <
>>> $< > $@, "  GEN   $(TARGET_DIR)config-$*.h")
>>
>> Yes, that works too.
> 
> Cool -- I think it's a bit clearer to add the dependency
> in the same place where the rule text invoking the script is.

I agree, I've sent v2.

Paolo