[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] migration: handle the error condition properly
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 4/5] migration: handle the error condition properly |
Date: |
Tue, 4 Sep 2018 00:27:57 +0200 |
From: Xiao Guangrong <address@hidden>
ram_find_and_save_block() can return negative if any error hanppens,
however, it is completely ignored in current code
Signed-off-by: Xiao Guangrong <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5a54836c28..2add09174d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2372,7 +2372,8 @@ static int ram_save_host_page(RAMState *rs,
PageSearchStatus *pss,
*
* Called within an RCU critical section.
*
- * Returns the number of pages written where zero means no dirty pages
+ * Returns the number of pages written where zero means no dirty pages,
+ * or negative on error
*
* @rs: current RAM state
* @last_stage: if we are at the completion stage
@@ -3196,6 +3197,12 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
done = 1;
break;
}
+
+ if (pages < 0) {
+ qemu_file_set_error(f, pages);
+ break;
+ }
+
rs->target_page_count += pages;
/* we want to check in the 1st loop, just in case it was the 1st time
@@ -3238,7 +3245,7 @@ out:
/**
* ram_save_complete: function called to send the remaining amount of ram
*
- * Returns zero to indicate success
+ * Returns zero to indicate success or negative on error
*
* Called with iothread lock
*
@@ -3249,6 +3256,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
{
RAMState **temp = opaque;
RAMState *rs = *temp;
+ int ret = 0;
rcu_read_lock();
@@ -3269,6 +3277,10 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
if (pages == 0) {
break;
}
+ if (pages < 0) {
+ ret = pages;
+ break;
+ }
}
flush_compressed_data(rs);
@@ -3280,7 +3292,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
- return 0;
+ return ret;
}
static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,
--
2.17.1
- [Qemu-devel] [PULL 0/5] Migration queue, Juan Quintela, 2018/09/03
- [Qemu-devel] [PULL 1/5] migration/rdma: Fix uninitialised rdma_return_path, Juan Quintela, 2018/09/03
- [Qemu-devel] [PULL 3/5] migration: fix calculating xbzrle_counters.cache_miss_rate, Juan Quintela, 2018/09/03
- [Qemu-devel] [PULL 4/5] migration: handle the error condition properly,
Juan Quintela <=
- [Qemu-devel] [PULL 5/5] Add a hint message to loadvm and exits on failure, Juan Quintela, 2018/09/03
- [Qemu-devel] [PULL 2/5] tests/migration: Enable the migration test on s390x, too, Juan Quintela, 2018/09/03
- Re: [Qemu-devel] [PULL 0/5] Migration queue, Juan Quintela, 2018/09/13