Patchwork [PULL,0/6,1.2] Tracing patches for QEMU 1.2

login
register
mail settings
Submitter Stefan Hajnoczi
Date Aug. 14, 2012, 12:56 p.m.
Message ID <1344948988-8627-1-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox
Permalink /patch/177250/
State New
Headers show

Pull-request

git://github.com/stefanha/qemu.git tracing

Comments

Stefan Hajnoczi - Aug. 14, 2012, 12:56 p.m.
The last pull request from 19 July was not merged.  Here it is rebased on
qemu.git/master with two additional fixes from Stefan Weil.

The following changes since commit 633decd71119a4293e5e53e6059026c517a8bef0:

  Merge remote-tracking branch 'qmp/queue/qmp' into staging (2012-08-13 16:12:35 -0500)

are available in the git repository at:


  git://github.com/stefanha/qemu.git tracing

for you to fetch changes up to 4552e41025af4694c55854448c3ae4d95e72c7f6:

  trace/simple: Replace asprintf by g_strdup_printf (2012-08-14 13:19:57 +0100)

----------------------------------------------------------------
Harsh Prateek Bora (4):
      trace: rename TraceRecordHeader to TraceLogHeader
      trace: remove unnecessary write_to_buffer() typecasting
      trace: drop unused TraceBufferRecord->next_tbuf_idx field
      trace: avoid pointer aliasing in trace_record_finish()

Stefan Weil (2):
      trace/simple: Fix compiler warning for 32 bit hosts
      trace/simple: Replace asprintf by g_strdup_printf

 scripts/tracetool/backend/simple.py |    2 +-
 trace/simple.c                      |   35 +++++++++++++----------------------
 trace/simple.h                      |    1 -
 3 files changed, 14 insertions(+), 24 deletions(-)
Anthony Liguori - Aug. 14, 2012, 6:44 p.m.
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> writes:

> The last pull request from 19 July was not merged.  Here it is rebased on
> qemu.git/master with two additional fixes from Stefan Weil.

I'm not sure what you mean:

commit 903f650b0c77827f8d92b35f61419401d648df1e
Merge: 61dc008 90a147a
Author: Anthony Liguori <aliguori@us.ibm.com>
Date:   Mon Jul 23 13:15:34 2012 -0500

    Merge remote-tracking branch 'stefanha/tracing' into staging
    
    * stefanha/tracing:
      Update simpletrace.py for new log format
      Simpletrace v2: Support multiple arguments, strings.
      monitor: remove unused do_info_trace
      trace: added ability to comment out events in the list


Your pull request was for 90a147a275da3a432bdf00238ebf438eff1d2c1b which
is what is being merged here.

What your pull request inaccurate?

Regards,

Anthony Liguori

>
> The following changes since commit 633decd71119a4293e5e53e6059026c517a8bef0:
>
>   Merge remote-tracking branch 'qmp/queue/qmp' into staging (2012-08-13 16:12:35 -0500)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git tracing
>
> for you to fetch changes up to 4552e41025af4694c55854448c3ae4d95e72c7f6:
>
>   trace/simple: Replace asprintf by g_strdup_printf (2012-08-14 13:19:57 +0100)
>
> ----------------------------------------------------------------
> Harsh Prateek Bora (4):
>       trace: rename TraceRecordHeader to TraceLogHeader
>       trace: remove unnecessary write_to_buffer() typecasting
>       trace: drop unused TraceBufferRecord->next_tbuf_idx field
>       trace: avoid pointer aliasing in trace_record_finish()
>
> Stefan Weil (2):
>       trace/simple: Fix compiler warning for 32 bit hosts
>       trace/simple: Replace asprintf by g_strdup_printf
>
>  scripts/tracetool/backend/simple.py |    2 +-
>  trace/simple.c                      |   35 +++++++++++++----------------------
>  trace/simple.h                      |    1 -
>  3 files changed, 14 insertions(+), 24 deletions(-)
>
> -- 
> 1.7.10.4
Stefan Hajnoczi - Aug. 15, 2012, 7:46 a.m.
On Tue, Aug 14, 2012 at 7:44 PM, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> writes:
>
>> The last pull request from 19 July was not merged.  Here it is rebased on
>> qemu.git/master with two additional fixes from Stefan Weil.
>
> I'm not sure what you mean:
>
> commit 903f650b0c77827f8d92b35f61419401d648df1e
> Merge: 61dc008 90a147a
> Author: Anthony Liguori <aliguori@us.ibm.com>
> Date:   Mon Jul 23 13:15:34 2012 -0500
>
>     Merge remote-tracking branch 'stefanha/tracing' into staging
>
>     * stefanha/tracing:
>       Update simpletrace.py for new log format
>       Simpletrace v2: Support multiple arguments, strings.
>       monitor: remove unused do_info_trace
>       trace: added ability to comment out events in the list
>
>
> Your pull request was for 90a147a275da3a432bdf00238ebf438eff1d2c1b which
> is what is being merged here.
>
> What your pull request inaccurate?

You are right.  I was confused and thought I previously sent a pull
request with Harsh's cleanup patches when I didn't.

The pull request I raised yesterday
(4552e41025af4694c55854448c3ae4d95e72c7f6) is good though.

Sorry,
Stefan