From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1M6h-0007Bu-8H for qemu-devel@nongnu.org; Tue, 14 Aug 2012 14:44:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1M6f-0004IE-NN for qemu-devel@nongnu.org; Tue, 14 Aug 2012 14:44:46 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:48594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1M6f-0004I9-J8 for qemu-devel@nongnu.org; Tue, 14 Aug 2012 14:44:45 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Aug 2012 14:44:44 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id EE2D638C8042 for ; Tue, 14 Aug 2012 14:44:41 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7EIifTt134946 for ; Tue, 14 Aug 2012 14:44:41 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7EIie8F030223 for ; Tue, 14 Aug 2012 15:44:41 -0300 From: Anthony Liguori In-Reply-To: <1344948988-8627-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1344948988-8627-1-git-send-email-stefanha@linux.vnet.ibm.com> Date: Tue, 14 Aug 2012 13:44:37 -0500 Message-ID: <87ehn9gvoq.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PULL 0/6 1.2] Tracing patches for QEMU 1.2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org Stefan Hajnoczi 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 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