All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PULL 0/3] Tracing patches
@ 2017-03-16  7:04 Stefan Hajnoczi
  2017-03-16  7:04 ` [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables Stefan Hajnoczi
                   ` (3 more replies)
  0 siblings, 4 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2017-03-16  7:04 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi

The following changes since commit 1883ff34b540daacae948f493b0ba525edf5f642:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-15 18:44:05 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 8755b4afbdcf1c274cab7545a9f76d3d6c7f5c29:

  trace: ensure $(tracetool-y) is defined in top level makefile (2017-03-16 11:51:26 +0800)

----------------------------------------------------------------
Pull request

Tracing makefile fixes for QEMU 2.9.

----------------------------------------------------------------

Daniel P. Berrange (3):
  makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables
  makefile: generate trace-events-all upfront
  trace: ensure $(tracetool-y) is defined in top level makefile

 Makefile                   | 42 ++++++++++++++++++++++--------------------
 Makefile.target            |  6 +++---
 target/s390x/Makefile.objs |  2 +-
 tests/Makefile.include     |  2 +-
 trace/Makefile.objs        |  8 --------
 5 files changed, 27 insertions(+), 33 deletions(-)

-- 
2.9.3

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

* [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables
  2017-03-16  7:04 [Qemu-devel] [PULL 0/3] Tracing patches Stefan Hajnoczi
@ 2017-03-16  7:04 ` Stefan Hajnoczi
  2017-03-16  9:08   ` Markus Armbruster
  2017-03-16  7:04 ` [Qemu-devel] [PULL 2/3] makefile: generate trace-events-all upfront Stefan Hajnoczi
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 19+ messages in thread
From: Stefan Hajnoczi @ 2017-03-16  7:04 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Daniel P. Berrange, Stefan Hajnoczi

From: "Daniel P. Berrange" <berrange@redhat.com>

The only functional difference between the GENERATED_HEADERS
and GENERATED_SOURCES variables is that 'Makefile' has a
dependancy on GENERATED_HEADERS, causing generated header files
to be created immediatey at the start of the build process.
There is no reason why this early creation should be restricted
to the .h files, and not include .c files too. Merge both of
the variables into a single GENERATED_FILES variable to make
it clear it is for any type of generated file.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20170228122901.24520-2-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile                   | 35 +++++++++++++++++------------------
 Makefile.target            |  6 +++---
 target/s390x/Makefile.objs |  2 +-
 tests/Makefile.include     |  2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 1c4c04f..a8024c0 100644
--- a/Makefile
+++ b/Makefile
@@ -50,24 +50,24 @@ endif
 
 include $(SRC_PATH)/rules.mak
 
-GENERATED_HEADERS = qemu-version.h config-host.h qemu-options.def
-GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h
-GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
-GENERATED_HEADERS += qmp-introspect.h
-GENERATED_SOURCES += qmp-introspect.c
+GENERATED_FILES = qemu-version.h config-host.h qemu-options.def
+GENERATED_FILES += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h
+GENERATED_FILES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
+GENERATED_FILES += qmp-introspect.h
+GENERATED_FILES += qmp-introspect.c
 
-GENERATED_HEADERS += trace/generated-tcg-tracers.h
+GENERATED_FILES += trace/generated-tcg-tracers.h
 
-GENERATED_HEADERS += trace/generated-helpers-wrappers.h
-GENERATED_HEADERS += trace/generated-helpers.h
-GENERATED_SOURCES += trace/generated-helpers.c
+GENERATED_FILES += trace/generated-helpers-wrappers.h
+GENERATED_FILES += trace/generated-helpers.h
+GENERATED_FILES += trace/generated-helpers.c
 
 ifdef CONFIG_TRACE_UST
-GENERATED_HEADERS += trace-ust-all.h
-GENERATED_SOURCES += trace-ust-all.c
+GENERATED_FILES += trace-ust-all.h
+GENERATED_FILES += trace-ust-all.c
 endif
 
-GENERATED_HEADERS += module_block.h
+GENERATED_FILES += module_block.h
 
 TRACE_HEADERS = trace-root.h $(trace-events-subdirs:%=%/trace.h)
 TRACE_SOURCES = trace-root.c $(trace-events-subdirs:%=%/trace.c)
@@ -80,8 +80,8 @@ ifdef CONFIG_TRACE_UST
 TRACE_HEADERS += trace-ust-root.h $(trace-events-subdirs:%=%/trace-ust.h)
 endif
 
-GENERATED_HEADERS += $(TRACE_HEADERS)
-GENERATED_SOURCES += $(TRACE_SOURCES)
+GENERATED_FILES += $(TRACE_HEADERS)
+GENERATED_FILES += $(TRACE_SOURCES)
 
 trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
 
@@ -485,11 +485,10 @@ clean:
 	rm -f fsdev/*.pod
 	rm -f qemu-img-cmds.h
 	rm -f ui/shader/*-vert.h ui/shader/*-frag.h
-	@# May not be present in GENERATED_HEADERS
+	@# May not be present in GENERATED_FILES
 	rm -f trace/generated-tracers-dtrace.dtrace*
 	rm -f trace/generated-tracers-dtrace.h*
-	rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp)
-	rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp)
+	rm -f $(foreach f,$(GENERATED_FILES),$(f) $(f)-timestamp)
 	rm -rf qapi-generated
 	rm -rf qga/qapi-generated
 	for d in $(ALL_SUBDIRS); do \
@@ -784,7 +783,7 @@ endif # CONFIG_WIN
 # Add a dependency on the generated files, so that they are always
 # rebuilt before other object files
 ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
-Makefile: $(GENERATED_HEADERS)
+Makefile: $(GENERATED_FILES)
 endif
 
 .SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=%-timestamp) \
diff --git a/Makefile.target b/Makefile.target
index 924304c..7df2b8c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -162,7 +162,7 @@ else
 obj-y += hw/$(TARGET_BASE_ARCH)/
 endif
 
-GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h
+GENERATED_FILES += hmp-commands.h hmp-commands-info.h
 
 endif # CONFIG_SOFTMMU
 
@@ -238,5 +238,5 @@ ifdef CONFIG_TRACE_SYSTEMTAP
 	$(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-simpletrace.stp"
 endif
 
-GENERATED_HEADERS += config-target.h
-Makefile: $(GENERATED_HEADERS)
+GENERATED_FILES += config-target.h
+Makefile: $(GENERATED_FILES)
diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs
index c573633..46f6a8c 100644
--- a/target/s390x/Makefile.objs
+++ b/target/s390x/Makefile.objs
@@ -8,7 +8,7 @@ obj-$(CONFIG_KVM) += kvm.o
 feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/
 feat-dst = $(BUILD_DIR)/$(TARGET_DIR)
 ifneq ($(MAKECMDGOALS),clean)
-GENERATED_HEADERS += $(feat-dst)gen-features.h
+GENERATED_FILES += $(feat-dst)gen-features.h
 endif
 
 $(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 346345e..479dcd9 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -482,7 +482,7 @@ qapi-schema += unknown-expr-key.json
 
 check-qapi-schema-y := $(addprefix tests/qapi-schema/, $(qapi-schema))
 
-GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h \
+GENERATED_FILES += tests/test-qapi-types.h tests/test-qapi-visit.h \
 	tests/test-qmp-commands.h tests/test-qapi-event.h \
 	tests/test-qmp-introspect.h
 
-- 
2.9.3

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

* [Qemu-devel] [PULL 2/3] makefile: generate trace-events-all upfront
  2017-03-16  7:04 [Qemu-devel] [PULL 0/3] Tracing patches Stefan Hajnoczi
  2017-03-16  7:04 ` [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables Stefan Hajnoczi
@ 2017-03-16  7:04 ` Stefan Hajnoczi
  2017-03-16  7:04 ` [Qemu-devel] [PULL 3/3] trace: ensure $(tracetool-y) is defined in top level makefile Stefan Hajnoczi
  2017-03-16 15:31 ` [Qemu-devel] [PULL 0/3] Tracing patches Peter Maydell
  3 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2017-03-16  7:04 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Daniel P. Berrange, Stefan Hajnoczi

From: "Daniel P. Berrange" <berrange@redhat.com>

Files should not be created in the build dir during the
'make install' phase. List 'trace-events-all' as a
generated file so that it gets created upfront during
build.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20170228122901.24520-3-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a8024c0..6291764 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ endif
 
 GENERATED_FILES += $(TRACE_HEADERS)
 GENERATED_FILES += $(TRACE_SOURCES)
+GENERATED_FILES += $(BUILD_DIR)/trace-events-all
 
 trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
 
@@ -592,8 +593,7 @@ endif
 endif
 
 
-install: all $(if $(BUILD_DOCS),install-doc) $(BUILD_DIR)/trace-events-all \
-install-datadir install-localstatedir
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
 ifneq ($(TOOLS),)
 	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
 endif
-- 
2.9.3

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

* [Qemu-devel] [PULL 3/3] trace: ensure $(tracetool-y) is defined in top level makefile
  2017-03-16  7:04 [Qemu-devel] [PULL 0/3] Tracing patches Stefan Hajnoczi
  2017-03-16  7:04 ` [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables Stefan Hajnoczi
  2017-03-16  7:04 ` [Qemu-devel] [PULL 2/3] makefile: generate trace-events-all upfront Stefan Hajnoczi
@ 2017-03-16  7:04 ` Stefan Hajnoczi
  2017-03-16 15:31 ` [Qemu-devel] [PULL 0/3] Tracing patches Peter Maydell
  3 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2017-03-16  7:04 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Daniel P. Berrange, Stefan Hajnoczi

From: "Daniel P. Berrange" <berrange@redhat.com>

The build rules for trace files have a dependancy on $(tracetool-y).
This variable populated in the trace/Makefile.objs file and thus its
definition gets pulled into the top level makefile. This happens too
late in the process though, so by the time $(tracetool-y) is defined,
make has already evaluated $(tracetool-y) in the dependancies and
found it to be empty. The result is that when the tracetool source
is changed, the generated files are not rebuilt. The solution is to
define the variable in the top level makefile too

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Message-id: 20170315123421.28815-1-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile            | 3 +++
 trace/Makefile.objs | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 6291764..108b984 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,9 @@ GENERATED_FILES += $(BUILD_DIR)/trace-events-all
 
 trace-group-name = $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g')
 
+tracetool-y = $(SRC_PATH)/scripts/tracetool.py
+tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
+
 %/trace.h: %/trace.h-timestamp
 	@cmp $< $@ >/dev/null 2>&1 || cp $< $@
 %/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y)
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 7de840a..1b8eb4a 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -1,13 +1,5 @@
 # -*- mode: makefile -*-
 
-######################################################################
-# tracetool source files
-# Every rule that invokes tracetool must depend on this so code is regenerated
-# if tracetool itself changes.
-
-tracetool-y = $(SRC_PATH)/scripts/tracetool.py
-tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-
 $(BUILD_DIR)/trace-events-all: $(trace-events-files)
 	$(call quiet-command,cat $^ > $@)
 
-- 
2.9.3

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

* Re: [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables
  2017-03-16  7:04 ` [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables Stefan Hajnoczi
@ 2017-03-16  9:08   ` Markus Armbruster
  2017-03-21 13:48     ` Eric Blake
  0 siblings, 1 reply; 19+ messages in thread
From: Markus Armbruster @ 2017-03-16  9:08 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: qemu-devel, Peter Maydell

Sorry for chiming in late, I had missed this change.

Stefan Hajnoczi <stefanha@redhat.com> writes:

> From: "Daniel P. Berrange" <berrange@redhat.com>
>
> The only functional difference between the GENERATED_HEADERS
> and GENERATED_SOURCES variables is that 'Makefile' has a
> dependancy on GENERATED_HEADERS, causing generated header files
> to be created immediatey at the start of the build process.
> There is no reason why this early creation should be restricted
> to the .h files, and not include .c files too.

Actually, there is.

Any prerequisites of Makefile are made even by make -n.  Restricting
them to the ones make -n absolutely needs is good practice.

Generated headers must be prerequisites of Makefile, because automatic
dependency generation may fail without them.

There is no such reason for generated non-headers.

>                                                Merge both of
> the variables into a single GENERATED_FILES variable to make
> it clear it is for any type of generated file.

I don't hate this quite enough for an outright NAK at this late stage.
I do hate it enough to ask you to think about it once more.

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2017-03-16  7:04 [Qemu-devel] [PULL 0/3] Tracing patches Stefan Hajnoczi
                   ` (2 preceding siblings ...)
  2017-03-16  7:04 ` [Qemu-devel] [PULL 3/3] trace: ensure $(tracetool-y) is defined in top level makefile Stefan Hajnoczi
@ 2017-03-16 15:31 ` Peter Maydell
  3 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2017-03-16 15:31 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: QEMU Developers

On 16 March 2017 at 07:04, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 1883ff34b540daacae948f493b0ba525edf5f642:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-15 18:44:05 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 8755b4afbdcf1c274cab7545a9f76d3d6c7f5c29:
>
>   trace: ensure $(tracetool-y) is defined in top level makefile (2017-03-16 11:51:26 +0800)
>
> ----------------------------------------------------------------
> Pull request
>
> Tracing makefile fixes for QEMU 2.9.
>
> ----------------------------------------------------------------
>
> Daniel P. Berrange (3):
>   makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables
>   makefile: generate trace-events-all upfront
>   trace: ensure $(tracetool-y) is defined in top level makefile
>
>  Makefile                   | 42 ++++++++++++++++++++++--------------------
>  Makefile.target            |  6 +++---
>  target/s390x/Makefile.objs |  2 +-
>  tests/Makefile.include     |  2 +-
>  trace/Makefile.objs        |  8 --------
>  5 files changed, 27 insertions(+), 33 deletions(-)

Applied, thanks.

-- PMM

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

* Re: [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables
  2017-03-16  9:08   ` Markus Armbruster
@ 2017-03-21 13:48     ` Eric Blake
  0 siblings, 0 replies; 19+ messages in thread
From: Eric Blake @ 2017-03-21 13:48 UTC (permalink / raw)
  To: Markus Armbruster, Stefan Hajnoczi; +Cc: Peter Maydell, qemu-devel

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

On 03/16/2017 04:08 AM, Markus Armbruster wrote:
> Sorry for chiming in late, I had missed this change.
> 
> Stefan Hajnoczi <stefanha@redhat.com> writes:
> 
>> From: "Daniel P. Berrange" <berrange@redhat.com>
>>
>> The only functional difference between the GENERATED_HEADERS
>> and GENERATED_SOURCES variables is that 'Makefile' has a
>> dependancy on GENERATED_HEADERS, causing generated header files
>> to be created immediatey at the start of the build process.
>> There is no reason why this early creation should be restricted
>> to the .h files, and not include .c files too.
> 
> Actually, there is.
> 
> Any prerequisites of Makefile are made even by make -n.  Restricting
> them to the ones make -n absolutely needs is good practice.

In fact, this is part of what tripped me up in trying to get to a root
cause in why modifying scripts/tracetool/format/h.py didn't cause
trace.h to be regenerated.  When trace.h is treated as a prerequisite of
Makefile, it's rules get run automatically and don't show up in 'make
--debug' output (you have to resort to the noisier 'make -d' to see that
the rule was run).

> 
> Generated headers must be prerequisites of Makefile, because automatic
> dependency generation may fail without them.
> 
> There is no such reason for generated non-headers.
> 
>>                                                Merge both of
>> the variables into a single GENERATED_FILES variable to make
>> it clear it is for any type of generated file.
> 
> I don't hate this quite enough for an outright NAK at this late stage.
> I do hate it enough to ask you to think about it once more.
> 
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


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

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2019-09-18 13:21 Stefan Hajnoczi
@ 2019-09-19 13:37 ` Peter Maydell
  0 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2019-09-19 13:37 UTC (permalink / raw)
  To: Stefan Hajnoczi
  Cc: Fam Zheng, Qemu-block, Jason Wang, QEMU Developers, Paolo Bonzini

On Wed, 18 Sep 2019 at 14:21, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit f8c3db33a5e863291182f8862ddf81618a7c6194:
>
>   target/sparc: Switch to do_transaction_failed() hook (2019-09-17 12:01:00 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 9f7ad79c16ede0da01902b18fb32929cfbd20f87:
>
>   trace: Forbid event format ending with newline character (2019-09-18 10:20:15 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------
>
> Alexey Kardashevskiy (1):
>   loader: Trace loaded images
>
> Philippe Mathieu-Daudé (2):
>   trace: Remove trailing newline in events
>   trace: Forbid event format ending with newline character


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.

-- PMM


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

* [Qemu-devel] [PULL 0/3] Tracing patches
@ 2019-09-18 13:21 Stefan Hajnoczi
  2019-09-19 13:37 ` Peter Maydell
  0 siblings, 1 reply; 19+ messages in thread
From: Stefan Hajnoczi @ 2019-09-18 13:21 UTC (permalink / raw)
  To: qemu-devel
  Cc: Fam Zheng, Peter Maydell, qemu-block, Jason Wang,
	Stefan Hajnoczi, Paolo Bonzini

The following changes since commit f8c3db33a5e863291182f8862ddf81618a7c6194:

  target/sparc: Switch to do_transaction_failed() hook (2019-09-17 12:01:00 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 9f7ad79c16ede0da01902b18fb32929cfbd20f87:

  trace: Forbid event format ending with newline character (2019-09-18 10:20:15 +0100)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Alexey Kardashevskiy (1):
  loader: Trace loaded images

Philippe Mathieu-Daudé (2):
  trace: Remove trailing newline in events
  trace: Forbid event format ending with newline character

 docs/devel/tracing.txt        |  2 ++
 Makefile.objs                 |  1 +
 hw/core/loader.c              |  3 +++
 hw/core/trace-events          |  2 ++
 hw/misc/trace-events          | 10 +++++-----
 hw/scsi/trace-events          |  2 +-
 hw/sd/trace-events            |  2 +-
 nbd/trace-events              |  4 ++--
 net/trace-events              |  6 +++---
 scripts/tracetool/__init__.py |  3 +++
 10 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 hw/core/trace-events

-- 
2.21.0



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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2018-02-19 16:19 Stefan Hajnoczi
@ 2018-02-19 18:40 ` Peter Maydell
  0 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2018-02-19 18:40 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: QEMU Developers

On 19 February 2018 at 16:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5:
>
>   Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180216' into staging (2018-02-16 18:39:05 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 7f1d87ab0fd94cef5086e2879716958303281054:
>
>   trace: avoid SystemTap "char const" warnings (2018-02-19 13:09:44 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Jon Emil Jahren (2):
>   tracetool: Update argument format regex to non-greedy star
>   tracetool: For ust trace bool type as ctf_integer
>
> Stefan Hajnoczi (1):
>   trace: avoid SystemTap "char const" warnings

Applied, thanks.

-- PMM

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

* [Qemu-devel] [PULL 0/3] Tracing patches
@ 2018-02-19 16:19 Stefan Hajnoczi
  2018-02-19 18:40 ` Peter Maydell
  0 siblings, 1 reply; 19+ messages in thread
From: Stefan Hajnoczi @ 2018-02-19 16:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi

The following changes since commit e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5:

  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180216' into staging (2018-02-16 18:39:05 +0000)

are available in the Git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 7f1d87ab0fd94cef5086e2879716958303281054:

  trace: avoid SystemTap "char const" warnings (2018-02-19 13:09:44 +0000)

----------------------------------------------------------------

----------------------------------------------------------------

Jon Emil Jahren (2):
  tracetool: Update argument format regex to non-greedy star
  tracetool: For ust trace bool type as ctf_integer

Stefan Hajnoczi (1):
  trace: avoid SystemTap "char const" warnings

 hw/block/trace-events                    |  4 ++--
 scripts/tracetool/__init__.py            |  5 +++--
 scripts/tracetool/format/ust_events_h.py |  3 ++-
 trace-events                             | 12 ++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

-- 
2.14.3

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2018-01-29 16:14 ` no-reply
@ 2018-01-30 11:58   ` Stefan Hajnoczi
  0 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2018-01-30 11:58 UTC (permalink / raw)
  To: qemu-devel; +Cc: famz, peter.maydell

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

On Mon, Jan 29, 2018 at 08:14:46AM -0800, no-reply@patchew.org wrote:
> === OUTPUT BEGIN ===
> Checking PATCH 1/3: tracetool: prefix parse errors with line numbers...
> Checking PATCH 2/3: tracetool: clarify that "formats" means "format strings"...
> ERROR: line over 90 characters
> #39: FILE: scripts/tracetool/__init__.py:240:
> +            raise ValueError("Only events with 'tcg' property can have two format strings")
> 
> WARNING: line over 80 characters
> #42: FILE: scripts/tracetool/__init__.py:242:
> +            raise ValueError("Events with 'tcg' property must have two format strings")
> 
> total: 1 errors, 1 warnings, 27 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> 
> Checking PATCH 3/3: tracetool: report error on foo() instead of foo(void)...
> WARNING: line over 80 characters
> #26: FILE: scripts/tracetool/__init__.py:79:
> +                raise ValueError("Empty argument (did you forget to use 'void'?)")
> 
> total: 0 errors, 1 warnings, 8 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> === OUTPUT END ===

For the record, I didn't wrap these error messages so that grep(1)
works.

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2018-01-29 16:07 Stefan Hajnoczi
  2018-01-29 16:14 ` no-reply
@ 2018-01-30 10:50 ` Peter Maydell
  1 sibling, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2018-01-30 10:50 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: QEMU Developers

On 29 January 2018 at 16:07, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 6233b4a8c2a32ef6955a921246fa08705bbb3676:
>
>   Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-26' into staging (2018-01-26 17:29:14 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 24f4d3d3aeabf83445839099d6d66cbb3089c37a:
>
>   tracetool: report error on foo() instead of foo(void) (2018-01-29 10:34:55 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Stefan Hajnoczi (3):
>   tracetool: prefix parse errors with line numbers
>   tracetool: clarify that "formats" means "format strings"
>   tracetool: report error on foo() instead of foo(void)
>
>  scripts/tracetool/__init__.py | 19 +++++++++++++------
>  1 file changed, 13 insertions(+), 6 deletions(-)

Applied, thanks.

-- PMM

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2018-01-29 16:07 Stefan Hajnoczi
@ 2018-01-29 16:14 ` no-reply
  2018-01-30 11:58   ` Stefan Hajnoczi
  2018-01-30 10:50 ` Peter Maydell
  1 sibling, 1 reply; 19+ messages in thread
From: no-reply @ 2018-01-29 16:14 UTC (permalink / raw)
  To: stefanha; +Cc: famz, qemu-devel, peter.maydell

Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20180129160740.1195-1-stefanha@redhat.com
Subject: [Qemu-devel] [PULL 0/3] Tracing patches

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
   fccfcc6328..0d1442912b  master     -> master
 t [tag update]            patchew/20171130164750.47320-1-vsementsov@virtuozzo.com -> patchew/20171130164750.47320-1-vsementsov@virtuozzo.com
 * [new tag]               patchew/20180129160740.1195-1-stefanha@redhat.com -> patchew/20180129160740.1195-1-stefanha@redhat.com
Switched to a new branch 'test'
8224c195a1 tracetool: report error on foo() instead of foo(void)
511aad4f63 tracetool: clarify that "formats" means "format strings"
cda21c769c tracetool: prefix parse errors with line numbers

=== OUTPUT BEGIN ===
Checking PATCH 1/3: tracetool: prefix parse errors with line numbers...
Checking PATCH 2/3: tracetool: clarify that "formats" means "format strings"...
ERROR: line over 90 characters
#39: FILE: scripts/tracetool/__init__.py:240:
+            raise ValueError("Only events with 'tcg' property can have two format strings")

WARNING: line over 80 characters
#42: FILE: scripts/tracetool/__init__.py:242:
+            raise ValueError("Events with 'tcg' property must have two format strings")

total: 1 errors, 1 warnings, 27 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 3/3: tracetool: report error on foo() instead of foo(void)...
WARNING: line over 80 characters
#26: FILE: scripts/tracetool/__init__.py:79:
+                raise ValueError("Empty argument (did you forget to use 'void'?)")

total: 0 errors, 1 warnings, 8 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org

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

* [Qemu-devel] [PULL 0/3] Tracing patches
@ 2018-01-29 16:07 Stefan Hajnoczi
  2018-01-29 16:14 ` no-reply
  2018-01-30 10:50 ` Peter Maydell
  0 siblings, 2 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2018-01-29 16:07 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi

The following changes since commit 6233b4a8c2a32ef6955a921246fa08705bbb3676:

  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-26' into staging (2018-01-26 17:29:14 +0000)

are available in the Git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 24f4d3d3aeabf83445839099d6d66cbb3089c37a:

  tracetool: report error on foo() instead of foo(void) (2018-01-29 10:34:55 +0000)

----------------------------------------------------------------

----------------------------------------------------------------

Stefan Hajnoczi (3):
  tracetool: prefix parse errors with line numbers
  tracetool: clarify that "formats" means "format strings"
  tracetool: report error on foo() instead of foo(void)

 scripts/tracetool/__init__.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

-- 
2.14.3

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2016-09-05 19:42 Stefan Hajnoczi
@ 2016-09-06 12:32 ` Peter Maydell
  0 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2016-09-06 12:32 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: QEMU Developers

On 5 September 2016 at 20:42, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit e87d397e5ef66276ccc49b829527d605ca07d0ad:
>
>   Open 2.8 development tree (2016-09-05 11:38:54 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 8eb1b9db559e243043aaeac3a0aa97e1f4a403c4:
>
>   trace: Avoid implicit bool->integer conversions (2016-09-05 13:47:02 -0400)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Lluís Vilanova (2):
>   trace: Remove 'trace_events_dstate_init'
>   trace: Avoid implicit bool->integer conversions
>
> Paul Durrant (1):
>   trace: add syslog tracing backend

Applied, thanks.

-- PMM

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

* [Qemu-devel] [PULL 0/3] Tracing patches
@ 2016-09-05 19:42 Stefan Hajnoczi
  2016-09-06 12:32 ` Peter Maydell
  0 siblings, 1 reply; 19+ messages in thread
From: Stefan Hajnoczi @ 2016-09-05 19:42 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi

The following changes since commit e87d397e5ef66276ccc49b829527d605ca07d0ad:

  Open 2.8 development tree (2016-09-05 11:38:54 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 8eb1b9db559e243043aaeac3a0aa97e1f4a403c4:

  trace: Avoid implicit bool->integer conversions (2016-09-05 13:47:02 -0400)

----------------------------------------------------------------

----------------------------------------------------------------

Lluís Vilanova (2):
  trace: Remove 'trace_events_dstate_init'
  trace: Avoid implicit bool->integer conversions

Paul Durrant (1):
  trace: add syslog tracing backend

 configure                           | 19 ++++++++++++++++
 docs/tracing.txt                    | 12 ++++++++++
 scripts/tracetool/backend/syslog.py | 45 +++++++++++++++++++++++++++++++++++++
 stubs/trace-control.c               | 22 ++++++++++++++++--
 trace/control-target.c              | 34 ++++++++++++++++++++++++++--
 trace/control.c                     | 28 ++++++++++++++---------
 trace/control.h                     |  3 +++
 trace/event-internal.h              |  1 +
 8 files changed, 149 insertions(+), 15 deletions(-)
 create mode 100644 scripts/tracetool/backend/syslog.py

-- 
2.7.4

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

* Re: [Qemu-devel] [PULL 0/3] Tracing patches
  2012-03-30 10:58 Stefan Hajnoczi
@ 2012-04-02 15:52 ` Anthony Liguori
  0 siblings, 0 replies; 19+ messages in thread
From: Anthony Liguori @ 2012-04-02 15:52 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: qemu-devel

On 03/30/2012 05:58 AM, Stefan Hajnoczi wrote:
> The latest tracing fixes.
>
> Alon Levy (2):
>    Makefile.target: code stp dependency on trace-events
>    tracetool: dtrace: handle in and next reserved words
>
> Lee Essen (1):
>    tracetool: dtrace disabled-events fix

Pulled.  Thanks.

Regards,

Anthony Liguori

>
>   Makefile.target   |    2 +-
>   scripts/tracetool |   22 ++++++++++++++++++----
>   2 files changed, 19 insertions(+), 5 deletions(-)
>

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

* [Qemu-devel] [PULL 0/3] Tracing patches
@ 2012-03-30 10:58 Stefan Hajnoczi
  2012-04-02 15:52 ` Anthony Liguori
  0 siblings, 1 reply; 19+ messages in thread
From: Stefan Hajnoczi @ 2012-03-30 10:58 UTC (permalink / raw)
  To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi

The latest tracing fixes.

Alon Levy (2):
  Makefile.target: code stp dependency on trace-events
  tracetool: dtrace: handle in and next reserved words

Lee Essen (1):
  tracetool: dtrace disabled-events fix

 Makefile.target   |    2 +-
 scripts/tracetool |   22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

-- 
1.7.9.1

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

end of thread, other threads:[~2019-09-19 13:55 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-16  7:04 [Qemu-devel] [PULL 0/3] Tracing patches Stefan Hajnoczi
2017-03-16  7:04 ` [Qemu-devel] [PULL 1/3] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables Stefan Hajnoczi
2017-03-16  9:08   ` Markus Armbruster
2017-03-21 13:48     ` Eric Blake
2017-03-16  7:04 ` [Qemu-devel] [PULL 2/3] makefile: generate trace-events-all upfront Stefan Hajnoczi
2017-03-16  7:04 ` [Qemu-devel] [PULL 3/3] trace: ensure $(tracetool-y) is defined in top level makefile Stefan Hajnoczi
2017-03-16 15:31 ` [Qemu-devel] [PULL 0/3] Tracing patches Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2019-09-18 13:21 Stefan Hajnoczi
2019-09-19 13:37 ` Peter Maydell
2018-02-19 16:19 Stefan Hajnoczi
2018-02-19 18:40 ` Peter Maydell
2018-01-29 16:07 Stefan Hajnoczi
2018-01-29 16:14 ` no-reply
2018-01-30 11:58   ` Stefan Hajnoczi
2018-01-30 10:50 ` Peter Maydell
2016-09-05 19:42 Stefan Hajnoczi
2016-09-06 12:32 ` Peter Maydell
2012-03-30 10:58 Stefan Hajnoczi
2012-04-02 15:52 ` Anthony Liguori

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.