]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
migration/block-dirty-bitmap: fix dirty_bitmap_load
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Wed, 30 May 2018 11:24:24 +0000 (14:24 +0300)
committerDr. David Alan Gilbert <dgilbert@redhat.com>
Fri, 15 Jun 2018 13:40:56 +0000 (14:40 +0100)
dirty_bitmap_load_header return code is obtained but not handled. Fix
this.

Bug was introduced in b35ebdf076d697bc
"migration: add postcopy migration of dirty bitmaps" with the whole
function.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20180530112424.204835-1-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
migration/block-dirty-bitmap.c

index eeccaff34bbcd265359d0b2b88da03d8ca6ba422..3bafbbdc4c466bd2a150d479b4bca7a267795578 100644 (file)
@@ -672,6 +672,9 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id)
 
     do {
         ret = dirty_bitmap_load_header(f, &s);
+        if (ret < 0) {
+            return ret;
+        }
 
         if (s.flags & DIRTY_BITMAP_MIG_FLAG_START) {
             ret = dirty_bitmap_load_start(f, &s);