[Qemu-devel] [PATCH 2/8] block-migration: switch to QTAILQ

[Paolo Bonzini <pbonzini@redhat.com>]

Block migration needs to insert at tail.  Use a QTAILQ, even though
the double links are strictly not necessary.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block-migration.c |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/block-migration.c b/block-migration.c
index 2b7edbc..b0f65c3 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -49,7 +49,7 @@ typedef struct BlkMigDevState {
     int64_t completed_sectors;
     int64_t total_sectors;
     int64_t dirty;
-    QSIMPLEQ_ENTRY(BlkMigDevState) entry;
+    QTAILQ_ENTRY(BlkMigDevState) entry;
     unsigned long *aio_bitmap;
 } BlkMigDevState;
 
@@ -62,14 +62,14 @@ typedef struct BlkMigBlock {
     QEMUIOVector qiov;
     BlockDriverAIOCB *aiocb;
     int ret;
-    QSIMPLEQ_ENTRY(BlkMigBlock) entry;
+    QTAILQ_ENTRY(BlkMigBlock) entry;
 } BlkMigBlock;
 
 typedef struct BlkMigState {
     int blk_enable;
     int shared_base;
-    QSIMPLEQ_HEAD(bmds_list, BlkMigDevState) bmds_list;
-    QSIMPLEQ_HEAD(blk_list, BlkMigBlock) blk_list;
+    QTAILQ_HEAD(bmds_list, BlkMigDevState) bmds_list;
+    QTAILQ_HEAD(blk_list, BlkMigBlock) blk_list;
     int submitted;
     int read_done;
     int transferred;
@@ -101,7 +101,7 @@ static void blk_send(QEMUFile *f, BlkMigBlock * blk)
 
 int blk_mig_active(void)
 {
-    return !QSIMPLEQ_EMPTY(&block_mig_state.bmds_list);
+    return !QTAILQ_EMPTY(&block_mig_state.bmds_list);
 }
 
 uint64_t blk_mig_bytes_transferred(void)
@@ -109,7 +109,7 @@ uint64_t blk_mig_bytes_transferred(void)
     BlkMigDevState *bmds;
     uint64_t sum = 0;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         sum += bmds->completed_sectors;
     }
     return sum << BDRV_SECTOR_BITS;
@@ -125,7 +125,7 @@ uint64_t blk_mig_bytes_total(void)
     BlkMigDevState *bmds;
     uint64_t sum = 0;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         sum += bmds->total_sectors;
     }
     return sum << BDRV_SECTOR_BITS;
@@ -194,7 +194,7 @@ static void blk_mig_read_cb(void *opaque, int ret)
     block_mig_state.total_time += (curr_time - block_mig_state.prev_time_offset);
     block_mig_state.prev_time_offset = curr_time;
 
-    QSIMPLEQ_INSERT_TAIL(&block_mig_state.blk_list, blk, entry);
+    QTAILQ_INSERT_TAIL(&block_mig_state.blk_list, blk, entry);
     bmds_set_aio_inflight(blk->bmds, blk->sector, blk->nr_sectors, 0);
 
     block_mig_state.submitted--;
@@ -263,7 +263,7 @@ static void set_dirty_tracking(int enable)
 {
     BlkMigDevState *bmds;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         bdrv_set_dirty_tracking(bmds->bs, enable);
     }
 }
@@ -301,7 +301,7 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs)
                            bs->device_name);
         }
 
-        QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry);
+        QTAILQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry);
     }
 }
 
@@ -326,7 +326,7 @@ static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f)
     int progress;
     int ret = 0;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         if (bmds->bulk_completed == 0) {
             if (mig_save_device_bulk(mon, f, bmds) == 1) {
                 /* completed bulk section for this device */
@@ -361,7 +361,7 @@ static void blk_mig_reset_dirty_cursor(void)
 {
     BlkMigDevState *bmds;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         bmds->cur_dirty = 0;
     }
 }
@@ -438,7 +438,7 @@ static int blk_mig_save_dirty_block(Monitor *mon, QEMUFile *f, int is_async)
     BlkMigDevState *bmds;
     int ret = 0;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         if (mig_save_device_dirty(mon, f, bmds, is_async) == 0) {
             ret = 1;
             break;
@@ -456,7 +456,7 @@ static void flush_blks(QEMUFile* f)
             __FUNCTION__, block_mig_state.submitted, block_mig_state.read_done,
             block_mig_state.transferred);
 
-    while ((blk = QSIMPLEQ_FIRST(&block_mig_state.blk_list)) != NULL) {
+    while ((blk = QTAILQ_FIRST(&block_mig_state.blk_list)) != NULL) {
         if (qemu_file_rate_limit(f)) {
             break;
         }
@@ -466,7 +466,7 @@ static void flush_blks(QEMUFile* f)
         }
         blk_send(f, blk);
 
-        QSIMPLEQ_REMOVE_HEAD(&block_mig_state.blk_list, entry);
+        QTAILQ_REMOVE(&block_mig_state.blk_list, blk, entry);
         g_free(blk->buf);
         g_free(blk);
 
@@ -485,7 +485,7 @@ static int64_t get_remaining_dirty(void)
     BlkMigDevState *bmds;
     int64_t dirty = 0;
 
-    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
+    QTAILQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
         dirty += bdrv_get_dirty_count(bmds->bs);
     }
 
@@ -525,16 +525,16 @@ static void blk_mig_cleanup(Monitor *mon)
 
     set_dirty_tracking(0);
 
-    while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
-        QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry);
+    while ((bmds = QTAILQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
+        QTAILQ_REMOVE(&block_mig_state.bmds_list, bmds, entry);
         bdrv_set_in_use(bmds->bs, 0);
         drive_put_ref(drive_get_by_blockdev(bmds->bs));
         g_free(bmds->aio_bitmap);
         g_free(bmds);
     }
 
-    while ((blk = QSIMPLEQ_FIRST(&block_mig_state.blk_list)) != NULL) {
-        QSIMPLEQ_REMOVE_HEAD(&block_mig_state.blk_list, entry);
+    while ((blk = QTAILQ_FIRST(&block_mig_state.blk_list)) != NULL) {
+        QTAILQ_REMOVE(&block_mig_state.blk_list, blk, entry);
         g_free(blk->buf);
         g_free(blk);
     }
@@ -717,8 +717,8 @@ static void block_set_params(int blk_enable, int shared_base, void *opaque)
 
 void blk_mig_init(void)
 {
-    QSIMPLEQ_INIT(&block_mig_state.bmds_list);
-    QSIMPLEQ_INIT(&block_mig_state.blk_list);
+    QTAILQ_INIT(&block_mig_state.bmds_list);
+    QTAILQ_INIT(&block_mig_state.blk_list);
 
     register_savevm_live(NULL, "block", 0, 1, block_set_params,
                          block_save_live, NULL, block_load, &block_mig_state);
-- 
1.7.7.1