Re: [Qemu-devel] [PATCH v23 01/11] trace: move trace objects from Makefile to Makefile.objs

2011-03-28 Thread Jes Sorensen 
On 03/23/11 14:19, Alon Levy wrote:
 ---
  Makefile  |   32 
  Makefile.objs |   32 
  2 files changed, 32 insertions(+), 32 deletions(-)

Acked-by: Jes Sorensen jes.soren...@redhat.com

This should be able to go in as is - even other parts of ccid should stall.

Cheers,
Jes

Re: [Qemu-devel] [PATCH v23 01/11] trace: move trace objects from Makefile to Makefile.objs

2011-03-28 Thread Alon Levy 
On Mon, Mar 28, 2011 at 01:59:10PM +0200, Jes Sorensen wrote:
 On 03/23/11 14:19, Alon Levy wrote:
  ---
   Makefile  |   32 
   Makefile.objs |   32 
   2 files changed, 32 insertions(+), 32 deletions(-)
 
 Acked-by: Jes Sorensen jes.soren...@redhat.com
 
 This should be able to go in as is - even other parts of ccid should stall.
 

ok, for convenience I'm just going to send v24 with all patches, including the
acked ones - no patch name has been change, no patch added, so it should be
easy to just skip the ones you already acked.

 Cheers,
 Jes

Re: [Qemu-devel] [PATCH v23 01/11] trace: move trace objects from Makefile to Makefile.objs

2011-03-28 Thread Jes Sorensen 
On 03/28/11 16:26, Alon Levy wrote:
 On Mon, Mar 28, 2011 at 01:59:10PM +0200, Jes Sorensen wrote:
 On 03/23/11 14:19, Alon Levy wrote:
 ---
  Makefile  |   32 
  Makefile.objs |   32 
  2 files changed, 32 insertions(+), 32 deletions(-)

 Acked-by: Jes Sorensen jes.soren...@redhat.com

 This should be able to go in as is - even other parts of ccid should stall.

 
 ok, for convenience I'm just going to send v24 with all patches, including the
 acked ones - no patch name has been change, no patch added, so it should be
 easy to just skip the ones you already acked.

Thats fine - can you include a list of which are changed so it is faster
to review just those?

Cheers,
Jes

Re: [Qemu-devel] [PATCH v23 01/11] trace: move trace objects from Makefile to Makefile.objs

2011-03-28 Thread Alon Levy 
On Mon, Mar 28, 2011 at 04:30:26PM +0200, Jes Sorensen wrote:
 On 03/28/11 16:26, Alon Levy wrote:
  On Mon, Mar 28, 2011 at 01:59:10PM +0200, Jes Sorensen wrote:
  On 03/23/11 14:19, Alon Levy wrote:
  ---
   Makefile  |   32 
   Makefile.objs |   32 
   2 files changed, 32 insertions(+), 32 deletions(-)
 
  Acked-by: Jes Sorensen jes.soren...@redhat.com
 
  This should be able to go in as is - even other parts of ccid should stall.
 
  
  ok, for convenience I'm just going to send v24 with all patches, including 
  the
  acked ones - no patch name has been change, no patch added, so it should be
  easy to just skip the ones you already acked.
 
 Thats fine - can you include a list of which are changed so it is faster
 to review just those?
Yes, it will be in the cover letter.

 
 Cheers,
 Jes

[Qemu-devel] [PATCH v23 01/11] trace: move trace objects from Makefile to Makefile.objs

2011-03-23 Thread Alon Levy 
---
 Makefile  |   32 
 Makefile.objs |   32 
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 89e88b4..209e14d 100644
--- a/Makefile
+++ b/Makefile
@@ -112,38 +112,6 @@ ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
 
 bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
 
-ifeq ($(TRACE_BACKEND),dtrace)
-trace.h: trace.h-timestamp trace-dtrace.h
-else
-trace.h: trace.h-timestamp
-endif
-trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak
-   $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool 
--$(TRACE_BACKEND) -h  $  $@,  GEN   trace.h)
-   @cmp -s $@ trace.h || cp $@ trace.h
-
-trace.c: trace.c-timestamp
-trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak
-   $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool 
--$(TRACE_BACKEND) -c  $  $@,  GEN   trace.c)
-   @cmp -s $@ trace.c || cp $@ trace.c
-
-trace.o: trace.c $(GENERATED_HEADERS)
-
-trace-dtrace.h: trace-dtrace.dtrace
-   $(call quiet-command,dtrace -o $@ -h -s $,   GEN   trace-dtrace.h)
-
-# Normal practice is to name DTrace probe file with a '.d' extension
-# but that gets picked up by QEMU's Makefile as an external dependancy
-# rule file. So we use '.dtrace' instead
-trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
-trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak
-   $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool 
--$(TRACE_BACKEND) -d  $  $@,  GEN   trace-dtrace.dtrace)
-   @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
-
-trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
-   $(call quiet-command,dtrace -o $@ -G -s $,   GEN trace-dtrace.o)
-
-simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
-
 version.o: $(SRC_PATH)/version.rc config-host.mak
$(call quiet-command,$(WINDRES) -I. -o $@ $,  RC$(TARGET_DIR)$@)
 
diff --git a/Makefile.objs b/Makefile.objs
index f8cf199..1fa7a29 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -310,6 +310,38 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o
 # trace
 
 ifeq ($(TRACE_BACKEND),dtrace)
+trace.h: trace.h-timestamp trace-dtrace.h
+else
+trace.h: trace.h-timestamp
+endif
+trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak
+   $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool 
--$(TRACE_BACKEND) -h  $  $@,  GEN   trace.h)
+   @cmp -s $@ trace.h || cp $@ trace.h
+
+trace.c: trace.c-timestamp
+trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak
+   $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool 
--$(TRACE_BACKEND) -c  $  $@,  GEN   trace.c)
+   @cmp -s $@ trace.c || cp $@ trace.c
+
+trace.o: trace.c $(GENERATED_HEADERS)
+
+trace-dtrace.h: trace-dtrace.dtrace
+   $(call quiet-command,dtrace -o $@ -h -s $,   GEN   trace-dtrace.h)
+
+# Normal practice is to name DTrace probe file with a '.d' extension
+# but that gets picked up by QEMU's Makefile as an external dependancy
+# rule file. So we use '.dtrace' instead
+trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
+trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak
+   $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool 
--$(TRACE_BACKEND) -d  $  $@,  GEN   trace-dtrace.dtrace)
+   @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
+
+trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
+   $(call quiet-command,dtrace -o $@ -G -s $,   GEN trace-dtrace.o)
+
+simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
+
+ifeq ($(TRACE_BACKEND),dtrace)
 trace-obj-y = trace-dtrace.o
 else
 trace-obj-y = trace.o
-- 
1.7.4.1