Merge commit 'bf1b00712375bea65f2254dea8281fa646eebbd5' into upstream-merge

* commit 'bf1b00712375bea65f2254dea8281fa646eebbd5': (36 commits)
  Introduce range.h
  linux-user: improve flatload error checking
  linux-user: fix types in a comparison
  linux-user: fix socklen_t comparisons
  Check for errors during BIOS or kernel load
  Make ARP replies at least 64 bytes long
  Accept packets with TTL=1
  cris: Avoid spurios hw_abort on recursive bus faults
  PPC: Redesign interrupt trigger path
  PPC: Enable hint bits for lwarx/ldarx
  serial: Update parameters after load
  Remove wrong semicolon in macro definition
  serial: Wrap debug prints around a DPRINTF macro
  ESP: fix ESP DMA access when DMA is not enabled
  powerpc: Avoid TLB related log spamming
  trace: fix a regex portability problem
  trace: fix a typo
  HACKING: add rules for printf-like functions
  HACKING: add string management rules
  HACKING: add memory management rules
  ...

Conflicts:
	hw/msix.c
	hw/piix_pci.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 79da853a6..a75a43afe 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -25,6 +25,7 @@
 #include "qemu-queue.h"
 #include "osdep.h"
 #include "qemu-common.h"
+#include "trace.h"
 #include "block_int.h"
 #include "compatfd.h"
 
@@ -581,6 +582,7 @@ BlockDriverAIOCB *paio_submit(BlockDriverState *bs, int fd,
     acb->next = posix_aio_state->first_aio;
     posix_aio_state->first_aio = acb;
 
+    trace_paio_submit(acb, opaque, sector_num, nb_sectors, type);
     qemu_paio_submit(acb);
     return &acb->common;
 }