[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to r
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error. |
Date: |
Wed, 23 Feb 2011 22:47:31 +0100 |
From: Yoshiaki Tamura <address@hidden>
When qemu on the receiver gets killed during live migration, if debug
is turned on, migrate_fd_put_ready() says,
migration: done iterating
and proceeds. The reason was qemu_savevm_state_iterate() returning 1
even when qemu file has error. This patch checks
qemu_file_has_error() before returning 1/0, and avoids
migrate_fd_put_ready() to proceed in case of error.
Signed-off-by: Yoshiaki Tamura <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
savevm.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/savevm.c b/savevm.c
index a50fd31..1a0be58 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1501,14 +1501,15 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)
}
}
- if (ret)
- return 1;
-
if (qemu_file_has_error(f)) {
qemu_savevm_state_cancel(mon, f);
return -EIO;
}
+ if (ret) {
+ return 1;
+ }
+
return 0;
}
--
1.7.4
- [Qemu-devel] Re: [PATCH 18/28] migration: convert current_migration from pointer to struct, (continued)
- [Qemu-devel] [PATCH 05/28] migration: Refactor MigrationState creation, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 23/28] migration: add error handling to migrate_fd_put_notify()., Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error.,
Juan Quintela <=
- [Qemu-devel] [PATCH 24/28] migration: Don't use callback on file defining it, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 25/28] migration: propagate error correctly, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 26/28] migration: qemu_savevm_iterate has three return values, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 27/28] migration: If there is one error, it makes no sense to continue, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 28/28] migration: make migration-{tcp, unix} consistent, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 11/28] migration: Introduce migrate_fd_completed() for consistenncy, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 15/28] migration: Move exported functions to the end of the file, Juan Quintela, 2011/02/23