Merge commit 'origin/upstream' into juha-devel

diff --cc Makefile.target
Simple merge

diff --cc block.c
index 3313dbd,fd09dff..3e281a8
--- 1/block.c
--- 2/block.c
+++ b/block.c
@@@ -1567,21 -1500,27 +1500,28 @@@ void bdrv_init(void
      bdrv_register(&bdrv_qcow2);
      bdrv_register(&bdrv_parallels);
      bdrv_register(&bdrv_nbd);
 +    bdrv_register(&bdrv_vmstate);
  }
  
- void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,
-                    void *opaque)
+ void aio_pool_init(AIOPool *pool, int aiocb_size,
+                    void (*cancel)(BlockDriverAIOCB *acb))
+ {
+     pool->aiocb_size = aiocb_size;
+     pool->cancel = cancel;
+     pool->free_aiocb = NULL;
+ }
+ 
+ void *qemu_aio_get_pool(AIOPool *pool, BlockDriverState *bs,
+                         BlockDriverCompletionFunc *cb, void *opaque)
  {
-     BlockDriver *drv;
      BlockDriverAIOCB *acb;
  
-     drv = bs->drv;
-     if (drv->free_aiocb) {
-         acb = drv->free_aiocb;
-         drv->free_aiocb = acb->next;
+     if (pool->free_aiocb) {
+         acb = pool->free_aiocb;
+         pool->free_aiocb = acb->next;
      } else {
-         acb = qemu_mallocz(drv->aiocb_size);
+         acb = qemu_mallocz(pool->aiocb_size);
+         acb->pool = pool;
      }
      acb->bs = bs;
      acb->cb = cb;

diff --cc block.h
Simple merge

diff --cc configure
Simple merge

diff --cc exec.c
Simple merge

diff --cc hw/nseries.c
Simple merge

diff --cc hw/sd.c
Simple merge

diff --cc target-arm/translate.c
Simple merge

diff --cc tcg/i386/tcg-target.c
Simple merge

diff --cc tcg/x86_64/tcg-target.c
Simple merge