diff mbox

[8/8] block: use QSIMPLEQ for the AIO free list

Message ID 1325527237-24146-9-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Jan. 2, 2012, 6 p.m. UTC 
QSIMPLEQ is equivalent to an open-coded free list, use it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block.c     |    9 ++++-----
 block_int.h |    4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/block.c b/block.c
index 3f072f6..10e80d7 100644
--- a/block.c
+++ b/block.c
@@ -3242,9 +3242,9 @@  void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs,
 {
     BlockDriverAIOCB *acb;
 
-    if (pool->free_aiocb) {
-        acb = pool->free_aiocb;
-        pool->free_aiocb = acb->next;
+    if (!QSIMPLEQ_EMPTY(pool->free_aiocb)) {
+        acb = QSIMPLEQ_FIRST(pool->free_aiocb);
+        QSIMPLEQ_REMOVE_HEAD(pool->free_aiocb, next);
     } else {
         acb = g_malloc0(pool->aiocb_size);
         acb->pool = pool;
@@ -3259,8 +3259,7 @@  void qemu_aio_release(void *p)
 {
     BlockDriverAIOCB *acb = (BlockDriverAIOCB *)p;
     AIOPool *pool = acb->pool;
-    acb->next = pool->free_aiocb;
-    pool->free_aiocb = acb;
+    QSIMPLEQ_INSERT_HEAD(pool->free_aiocb, acb, next);
 }
 
 /**************************************************************/
diff --git a/block_int.h b/block_int.h
index 311bd2a..43b2d45 100644
--- a/block_int.h
+++ b/block_int.h
@@ -56,7 +56,7 @@  typedef struct BdrvTrackedRequest BdrvTrackedRequest;
 typedef struct AIOPool {
     void (*cancel)(BlockDriverAIOCB *acb);
     int aiocb_size;
-    BlockDriverAIOCB *free_aiocb;
+    QSIMPLEQ_HEAD(, BlockDriverAIOCB) *free_aiocb;
 } AIOPool;
 
 typedef struct BlockIOLimit {
@@ -268,7 +268,7 @@  struct BlockDriverAIOCB {
     BlockDriverState *bs;
     BlockDriverCompletionFunc *cb;
     void *opaque;
-    BlockDriverAIOCB *next;
+    QSIMPLEQ_ENTRY(BlockDriverAIOCB) next;
 };
 
 void get_tmp_filename(char *filename, int size);