diff options
| author |   Avi Kivity <avi@redhat.com> | 2012-07-16 10:52:03 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-07-16 10:52:03 +0300 |
| commit | 7fa12eb15f95c269f488fce4096093c96dbaffab (patch) | |
| tree | 8ca766bebdead1ae21819bdc691b1097008ae834 /trace/simple.c | |
| parent | 6f82a5ea52302bab33287b0191538be6f9138637 (diff) | |
| parent | 785adb09b9fd0d4df6707f00247ec519c42fcfc6 (diff) | |
Merge tag 'v1.1.1' into stable-1.1qemu-kvm-1.1.1
* tag 'v1.1.1': (34 commits)
update VERSION for v1.1.1
s390x: fix s390 virtio aliases
rtl8139: validate rx ring before receiving packets
ahci: SATA FIS is 20 bytes, not 0x20
qemu-img: document qed format on qemu-img man page
virtio: Fix compiler warning for non Linux hosts
sheepdog: fix return value of do_load_save_vm_state
qemu/xendisk: set maximum number of grants to be used
build: install qmp-commands.txt
fdc: fix implied seek while there is no media in drive
qcow2: fix autoclear image header update
Prevent disk data loss when closing qemu
qcow2: fix endianness conversion
pci_bridge_dev: fix error path in pci_bridge_dev_initfn()
qdev: release parent properties on dc->init failure
intel-hda: Fix reset of MSI function
ahci: Fix reset of MSI function
rtl8139: honor RxOverflow flag in can_receive method
configure: Fix build for some versions of glibc (9pfs)
monitor: Fix memory leak with readline completion
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'trace/simple.c')
| -rw-r--r-- | trace/simple.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/trace/simple.c b/trace/simple.c index 33ae48696..b4a3c6e95 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -161,8 +161,11 @@ static void trace(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, } timestamp = get_clock(); - +#if GLIB_CHECK_VERSION(2, 30, 0) + idx = g_atomic_int_add((gint *)&trace_idx, 1) % TRACE_BUF_LEN; +#else idx = g_atomic_int_exchange_and_add((gint *)&trace_idx, 1) % TRACE_BUF_LEN; +#endif trace_buf[idx] = (TraceRecord){ .event = event, .timestamp_ns = timestamp, |