Merge commit '9257d46d55f1fe4e8209be9a6870e339ac3266fe' into upstream-merge

* commit '9257d46d55f1fe4e8209be9a6870e339ac3266fe': (132 commits)
  add win32 qemu-thread implementation
  Refactor thread retrieval and check
  use win32 timer queues
  implement win32 dynticks timer
  unlock iothread during WaitForMultipleObjects
  hw/fmopl: Fix buffer access out-of-bounds errors
  moving eeprom initialization
  pc: fix wrong CMOS values for floppy drives
  microblaze: Add PVR for writeback cache, endians
  microblaze: Fix PetaLogix company name
  vmstate: move timers to use test instead of version
  vmstate: be able to store/save a pci device from a pointer
  vmstate: Add a way to send a partial array
  vmstate: add VMSTATE_STRUCT_VARRAY_UINT32
  vmstate: add VMSTATE_INT64_ARRAY
  vmstate: add VMSTATE_STRUCT_VARRAY_INT32
  vmstate: add UINT32 VARRAYS
  vmstate: Fix varrays with uint8 indexes
  vmstate: add VMSTATE_UINT32_EQUAL
  vnc: Fix stack corruption and other bitmap related bugs
  ...

Conflicts:
	Makefile.objs

1 files changed, 5 insertions, 0 deletions

diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 07040649f..d3b5b6de5 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -456,6 +456,9 @@ static int posix_aio_process_queue(void *opaque)
                 } else {
                     ret = -ret;
                 }
+
+                trace_paio_complete(acb, acb->common.opaque, ret);
+
                 /* remove the request */
                 *pacb = acb->next;
                 /* call the callback */
@@ -535,6 +538,8 @@ static void paio_cancel(BlockDriverAIOCB *blockacb)
     struct qemu_paiocb *acb = (struct qemu_paiocb *)blockacb;
     int active = 0;
 
+    trace_paio_cancel(acb, acb->common.opaque);
+
     mutex_lock(&lock);
     if (!acb->active) {
         QTAILQ_REMOVE(&request_list, acb, node);