]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
migration/block: rename MAX_INFLIGHT_IO to MAX_IO_BUFFERS
authorPeter Lieven <pl@kamp.de>
Thu, 8 Mar 2018 11:18:26 +0000 (12:18 +0100)
committerDr. David Alan Gilbert <dgilbert@redhat.com>
Fri, 9 Mar 2018 17:39:25 +0000 (17:39 +0000)
this actually limits (as the original commit mesage suggests) the
number of I/O buffers that can be allocated and not the number
of parallel (inflight) I/O requests.

Signed-off-by: Peter Lieven <pl@kamp.de>
Message-Id: <1520507908-16743-4-git-send-email-pl@kamp.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
migration/block.c

index 87bb35ce63513de0632dfb169ede98fa82748623..41b95d1dd83b8241391b7d20f49ca5cebe6314d3 100644 (file)
@@ -36,7 +36,7 @@
 
 #define MAX_IS_ALLOCATED_SEARCH (65536 * BDRV_SECTOR_SIZE)
 
-#define MAX_INFLIGHT_IO 512
+#define MAX_IO_BUFFERS 512
 
 //#define DEBUG_BLK_MIGRATION
 
@@ -775,9 +775,8 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
     while ((block_mig_state.submitted +
             block_mig_state.read_done) * BLOCK_SIZE <
            qemu_file_get_rate_limit(f) &&
-           (block_mig_state.submitted +
-            block_mig_state.read_done) <
-           MAX_INFLIGHT_IO) {
+           (block_mig_state.submitted + block_mig_state.read_done) <
+           MAX_IO_BUFFERS) {
         blk_mig_unlock();
         if (block_mig_state.bulk_completed == 0) {
             /* first finish the bulk phase */