* [Qemu-devel] [PATCH] Add a stp file for usage from build directory
@ 2013-05-28 17:44 Alon Levy
2013-05-28 17:45 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Alon Levy @ 2013-05-28 17:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, stefanha
For systemtap the location of the process being tapped is crucial, as a
result the existing stp file requires installation for use.
There are now two files:
$(TARGET_DIR)/$(QEMU_PROG).stp-installed: copied to $(tapdir)/$(QEMU_PROG).stp
$(TARGET_DIR)/$(QEMU_PROG).stp: usable locally
To use:
stap -I $(TARGET_DIR) ..
Signed-off-by: Alon Levy <alevy@redhat.com>
---
Makefile.target | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index ce4391f..54687e2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -35,7 +35,7 @@ config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak
ifdef CONFIG_TRACE_SYSTEMTAP
-stap: $(QEMU_PROG).stp
+stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).local.stp
ifdef CONFIG_USER_ONLY
TARGET_TYPE=user
@@ -43,14 +43,24 @@ else
TARGET_TYPE=system
endif
-$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
+$(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
$(call quiet-command,$(TRACETOOL) \
--format=stap \
--backend=$(TRACE_BACKEND) \
--binary=$(bindir)/$(QEMU_PROG) \
--target-arch=$(TARGET_ARCH) \
--target-type=$(TARGET_TYPE) \
- < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
+ < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
+
+$(QEMU_PROG).local.stp: $(SRC_PATH)/trace-events
+ $(call quiet-command,$(TRACETOOL) \
+ --format=stap \
+ --backend=$(TRACE_BACKEND) \
+ --binary=$(realpath .)/$(QEMU_PROG) \
+ --target-arch=$(TARGET_ARCH) \
+ --target-type=$(TARGET_TYPE) \
+ < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).local.stp")
+
else
stap:
endif
@@ -186,7 +196,7 @@ endif
endif
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
- $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
+ $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"
endif
GENERATED_HEADERS += config-target.h
--
1.8.2.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] Add a stp file for usage from build directory
2013-05-28 17:44 [Qemu-devel] [PATCH] Add a stp file for usage from build directory Alon Levy
@ 2013-05-28 17:45 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2013-05-28 17:45 UTC (permalink / raw)
To: Alon Levy; +Cc: stefanha, qemu-devel
Il 28/05/2013 19:44, Alon Levy ha scritto:
> For systemtap the location of the process being tapped is crucial, as a
> result the existing stp file requires installation for use.
>
> There are now two files:
> $(TARGET_DIR)/$(QEMU_PROG).stp-installed: copied to $(tapdir)/$(QEMU_PROG).stp
> $(TARGET_DIR)/$(QEMU_PROG).stp: usable locally
The actual name of the file is $(TARGET_DIR)/$(QEMU_PROG).local.stp.
I think I prefer the one in the commit message, but anyway please respin
to make it consistent.
Paolo
> To use:
> stap -I $(TARGET_DIR) ..
>
> Signed-off-by: Alon Levy <alevy@redhat.com>
> ---
> Makefile.target | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index ce4391f..54687e2 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -35,7 +35,7 @@ config-target.h: config-target.h-timestamp
> config-target.h-timestamp: config-target.mak
>
> ifdef CONFIG_TRACE_SYSTEMTAP
> -stap: $(QEMU_PROG).stp
> +stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).local.stp
>
> ifdef CONFIG_USER_ONLY
> TARGET_TYPE=user
> @@ -43,14 +43,24 @@ else
> TARGET_TYPE=system
> endif
>
> -$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
> +$(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
> $(call quiet-command,$(TRACETOOL) \
> --format=stap \
> --backend=$(TRACE_BACKEND) \
> --binary=$(bindir)/$(QEMU_PROG) \
> --target-arch=$(TARGET_ARCH) \
> --target-type=$(TARGET_TYPE) \
> - < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
> + < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
> +
> +$(QEMU_PROG).local.stp: $(SRC_PATH)/trace-events
> + $(call quiet-command,$(TRACETOOL) \
> + --format=stap \
> + --backend=$(TRACE_BACKEND) \
> + --binary=$(realpath .)/$(QEMU_PROG) \
> + --target-arch=$(TARGET_ARCH) \
> + --target-type=$(TARGET_TYPE) \
> + < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).local.stp")
> +
> else
> stap:
> endif
> @@ -186,7 +196,7 @@ endif
> endif
> ifdef CONFIG_TRACE_SYSTEMTAP
> $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
> - $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
> + $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"
> endif
>
> GENERATED_HEADERS += config-target.h
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-28 17:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-28 17:44 [Qemu-devel] [PATCH] Add a stp file for usage from build directory Alon Levy
2013-05-28 17:45 ` Paolo Bonzini
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).