[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/15] migration: Make failed migration load set file
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 04/15] migration: Make failed migration load set file error |
Date: |
Fri, 14 Oct 2016 17:28:12 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
If an error occurs in a section load, set the file error flag
so that the transport can get notified to do a cleanup.
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/savevm.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 33a2911..a831ec2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1828,40 +1828,45 @@ qemu_loadvm_section_part_end(QEMUFile *f,
MigrationIncomingState *mis)
static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis)
{
uint8_t section_type;
- int ret;
+ int ret = 0;
while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) {
-
+ ret = 0;
trace_qemu_loadvm_state_section(section_type);
switch (section_type) {
case QEMU_VM_SECTION_START:
case QEMU_VM_SECTION_FULL:
ret = qemu_loadvm_section_start_full(f, mis);
if (ret < 0) {
- return ret;
+ goto out;
}
break;
case QEMU_VM_SECTION_PART:
case QEMU_VM_SECTION_END:
ret = qemu_loadvm_section_part_end(f, mis);
if (ret < 0) {
- return ret;
+ goto out;
}
break;
case QEMU_VM_COMMAND:
ret = loadvm_process_command(f);
trace_qemu_loadvm_state_section_command(ret);
if ((ret < 0) || (ret & LOADVM_QUIT)) {
- return ret;
+ goto out;
}
break;
default:
error_report("Unknown savevm section type %d", section_type);
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
}
- return 0;
+out:
+ if (ret < 0) {
+ qemu_file_set_error(f, ret);
+ }
+ return ret;
}
int qemu_loadvm_state(QEMUFile *f)
--
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 <=
- [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, 2016/10/14
- [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