[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/13] savevm: add error parameter to qemu_savevm_st
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH 05/13] savevm: add error parameter to qemu_savevm_state_complete() |
Date: |
Wed, 9 Jan 2013 16:17:59 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
include/sysemu/sysemu.h | 2 +-
migration.c | 2 +-
savevm.c | 12 +++++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index afc1fe6..d02d13f 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -77,7 +77,7 @@ int qemu_savevm_state_begin(QEMUFile *f,
const MigrationParams *params,
Error **errp);
int qemu_savevm_state_iterate(QEMUFile *f, Error **errp);
-int qemu_savevm_state_complete(QEMUFile *f);
+int qemu_savevm_state_complete(QEMUFile *f, Error **errp);
void qemu_savevm_state_cancel(QEMUFile *f);
uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
int qemu_loadvm_state(QEMUFile *f);
diff --git a/migration.c b/migration.c
index 0f2d0fd..181d4a4 100644
--- a/migration.c
+++ b/migration.c
@@ -708,7 +708,7 @@ static bool migrate_fd_put_ready(MigrationState *s,
uint64_t max_size)
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
}
- if (qemu_savevm_state_complete(s->file) < 0) {
+ if (qemu_savevm_state_complete(s->file, NULL) < 0) {
migrate_fd_error(s);
} else {
migrate_fd_completed(s);
diff --git a/savevm.c b/savevm.c
index 4da2136..14f61e9 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1667,7 +1667,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, Error **errp)
return ret;
}
-int qemu_savevm_state_complete(QEMUFile *f)
+int qemu_savevm_state_complete(QEMUFile *f, Error **errp)
{
SaveStateEntry *se;
int ret;
@@ -1691,6 +1691,7 @@ int qemu_savevm_state_complete(QEMUFile *f)
ret = se->ops->save_live_complete(f, se->opaque);
trace_savevm_section_end(se->section_id);
if (ret < 0) {
+ error_setg(errp, "Failed to complete vmstate save.");
return ret;
}
}
@@ -1720,7 +1721,12 @@ int qemu_savevm_state_complete(QEMUFile *f)
qemu_put_byte(f, QEMU_VM_EOF);
- return qemu_file_get_error(f);
+ ret = qemu_file_get_error(f);
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "Failed to complete vmstate save.");
+ }
+
+ return ret;
}
uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
@@ -1776,7 +1782,7 @@ static int qemu_savevm_state(QEMUFile *f)
goto out;
} while (ret == 0);
- ret = qemu_savevm_state_complete(f);
+ ret = qemu_savevm_state_complete(f, NULL);
out:
if (ret == 0) {
--
1.8.1
- [Qemu-devel] [PATCH 00/13] convert savevm to use qapi and introduce qmp command, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 01/13] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 03/13] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 02/13] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 04/13] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 05/13] savevm: add error parameter to qemu_savevm_state_complete(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH 07/13] qapi: Convert savevm, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 10/13] savevm: update return value from qemu_savevm_state_begin, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 08/13] qemu-img: introduce qemu_img_handle_error, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 09/13] block: update return value from bdrv_snapshot_create, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 06/13] savevm: add error parameter to qemu_savevm_state(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 11/13] savevm: update return value from qemu_savevm_state_complete, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 12/13] savevm: update return value from qemu_savevm_state, Pavel Hrdina, 2013/01/09