From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 15 Aug 2012 16:14:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/tracing' into staging
X-Git-Tag: v1.2.0-rc0~24
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8fa27d21a993e261137d15def5475ba2c4d8985b;p=qemu.git

Merge remote-tracking branch 'stefanha/tracing' into staging

* stefanha/tracing:
  trace/simple: Replace asprintf by g_strdup_printf
  trace/simple: Fix compiler warning for 32 bit hosts
  trace: avoid pointer aliasing in trace_record_finish()
  trace: drop unused TraceBufferRecord->next_tbuf_idx field
  trace: remove unnecessary write_to_buffer() typecasting
  trace: rename TraceRecordHeader to TraceLogHeader
---

8fa27d21a993e261137d15def5475ba2c4d8985b