[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/10] migration: handle the error condition prop
From: |
guangrong . xiao |
Subject: |
[Qemu-devel] [PATCH v4 10/10] migration: handle the error condition properly |
Date: |
Tue, 21 Aug 2018 16:10:29 +0800 |
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>
---
migration/ram.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 0a31767351..74899b485f 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2412,7 +2412,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
@@ -3236,6 +3237,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
@@ -3278,7 +3285,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
*
@@ -3289,6 +3296,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
{
RAMState **temp = opaque;
RAMState *rs = *temp;
+ int ret = 0;
rcu_read_lock();
@@ -3309,6 +3317,10 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
if (pages == 0) {
break;
}
+ if (pages < 0) {
+ ret = pages;
+ break;
+ }
}
flush_compressed_data(rs);
@@ -3320,7 +3332,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.14.4
- [Qemu-devel] [PATCH v4 02/10] migration: fix counting normal page for compression, (continued)
- [Qemu-devel] [PATCH v4 02/10] migration: fix counting normal page for compression, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 03/10] migration: introduce save_zero_page_to_file, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 04/10] migration: drop the return value of do_compress_ram_page, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 05/10] migration: move handle of zero page to the thread, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 01/10] migration: do not wait for free thread, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 06/10] migration: hold the lock only if it is really needed, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 07/10] migration: do not flush_compressed_data at the end of each iteration, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 08/10] migration: fix calculating xbzrle_counters.cache_miss_rate, guangrong . xiao, 2018/08/21
- [Qemu-devel] [PATCH v4 10/10] migration: handle the error condition properly,
guangrong . xiao <=
- [Qemu-devel] [PATCH v4 09/10] migration: show the statistics of compression, guangrong . xiao, 2018/08/21