|
 |
1bdc94 |
From 91c5845da64dbe85892770609c1b04dee3718506 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 22 Jun 2018 19:00:05 +0200
|
|
|
1bdc94 |
Subject: [PATCH 26/57] migration/block-dirty-bitmap: fix dirty_bitmap_load
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180622190005.21297-19-dgilbert@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81012
|
|
|
1bdc94 |
O-Subject: [RHEL7.6 qemu-kvm-rhev PATCH 18/18] migration/block-dirty-bitmap: fix dirty_bitmap_load
|
|
|
1bdc94 |
Bugzilla: 1584139
|
|
|
1bdc94 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
dirty_bitmap_load_header return code is obtained but not handled. Fix
|
|
|
1bdc94 |
this.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Bug was introduced in b35ebdf076d697bc
|
|
|
1bdc94 |
"migration: add postcopy migration of dirty bitmaps" with the whole
|
|
|
1bdc94 |
function.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
1bdc94 |
Message-Id: <20180530112424.204835-1-vsementsov@virtuozzo.com>
|
|
|
1bdc94 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit a36f6ff46f115672cf86d0e1e7cdb1c2fa4d304b)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
migration/block-dirty-bitmap.c | 3 +++
|
|
|
1bdc94 |
1 file changed, 3 insertions(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
|
|
|
1bdc94 |
index 8819aab..2c541c9 100644
|
|
|
1bdc94 |
--- a/migration/block-dirty-bitmap.c
|
|
|
1bdc94 |
+++ b/migration/block-dirty-bitmap.c
|
|
|
1bdc94 |
@@ -672,6 +672,9 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
do {
|
|
|
1bdc94 |
ret = dirty_bitmap_load_header(f, &s);
|
|
|
1bdc94 |
+ if (ret < 0) {
|
|
|
1bdc94 |
+ return ret;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
|
|
|
1bdc94 |
if (s.flags & DIRTY_BITMAP_MIG_FLAG_START) {
|
|
|
1bdc94 |
ret = dirty_bitmap_load_start(f, &s);
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|