[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/15] migration/rdma: Don't flag an error when we've
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 05/15] migration/rdma: Don't flag an error when we've been told about one |
Date: |
Fri, 14 Oct 2016 17:28:13 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
If the other side tells us there's been an error and we fail
the migration, we don't need to signal that failure to the other
side because it already knew.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael R. Hines <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/rdma.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 7271292..674ccab 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -350,6 +350,7 @@ typedef struct RDMAContext {
*/
int error_state;
int error_reported;
+ int received_error;
/*
* Description of ram blocks used throughout the code.
@@ -1676,6 +1677,9 @@ static int qemu_rdma_exchange_get_response(RDMAContext
*rdma,
", but got: %s (%d), length: %d",
control_desc[expecting], expecting,
control_desc[head->type], head->type, head->len);
+ if (head->type == RDMA_CONTROL_ERROR) {
+ rdma->received_error = true;
+ }
return -EIO;
}
if (head->len > RDMA_CONTROL_MAX_BUFFER - sizeof(*head)) {
@@ -2202,7 +2206,7 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
int ret, idx;
if (rdma->cm_id && rdma->connected) {
- if (rdma->error_state) {
+ if (rdma->error_state && !rdma->received_error) {
RDMAControlHeader head = { .len = 0,
.type = RDMA_CONTROL_ERROR,
.repeat = 1,
--
2.7.4
- [Qemu-devel] [PULL 00/15] Migration v2, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 01/15] migration: report an error giving the failed field, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 02/15] migration: Report values for comparisons, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 03/15] migration/rdma: Pass qemu_file errors across link, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 04/15] migration: Make failed migration load set file error, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 08/15] migrate: Use boxed qapi for migrate-set-parameters, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 07/15] migrate: Share common MigrationParameters struct, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 09/15] migrate: Fix bounds check for migration parameters in migration.c, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 05/15] migration/rdma: Don't flag an error when we've been told about one,
Juan Quintela <=
- [Qemu-devel] [PULL 10/15] Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8], Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 06/15] migrate: Fix cpu-throttle-increment regression in HMP, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 11/15] RAMBlocks: Store page size, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 13/15] migration: Fix seg with missing port, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 14/15] migrate: move max-bandwidth and downtime-limit to migrate_set_parameter, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 12/15] migration/postcopy: Explicitly disallow huge pages, Juan Quintela, 2016/10/14
- [Qemu-devel] [PULL 15/15] docs/xbzrle: correction, Juan Quintela, 2016/10/14
- Re: [Qemu-devel] [PULL 00/15] Migration v2, Peter Maydell, 2016/10/17