[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/12] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v2 05/12] savevm: add error parameter to qemu_savevm_state_complete() |
Date: |
Fri, 22 Mar 2013 14:16:04 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
include/sysemu/sysemu.h | 2 +-
migration.c | 2 +-
savevm.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index af4f699..9e6a4a9 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -77,7 +77,7 @@ void qemu_savevm_state_begin(QEMUFile *f,
const MigrationParams *params,
Error **errp);
int qemu_savevm_state_iterate(QEMUFile *f, Error **errp);
-void qemu_savevm_state_complete(QEMUFile *f);
+void qemu_savevm_state_complete(QEMUFile *f, Error **errp);
void qemu_savevm_state_cancel(void);
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 c2bf531..c8fdfc0 100644
--- a/migration.c
+++ b/migration.c
@@ -524,7 +524,7 @@ static void *migration_thread(void *opaque)
old_vm_running = runstate_is_running();
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
qemu_file_set_rate_limit(s->file, INT_MAX);
- qemu_savevm_state_complete(s->file);
+ qemu_savevm_state_complete(s->file, NULL);
qemu_mutex_unlock_iothread();
if (!qemu_file_get_error(s->file)) {
migrate_finish_set_state(s, MIG_STATE_COMPLETED);
diff --git a/savevm.c b/savevm.c
index c5ac701..76af390 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1709,7 +1709,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, Error **errp)
return ret;
}
-void qemu_savevm_state_complete(QEMUFile *f)
+void qemu_savevm_state_complete(QEMUFile *f, Error **errp)
{
SaveStateEntry *se;
int ret;
@@ -1734,6 +1734,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
trace_savevm_section_end(se->section_id);
if (ret < 0) {
qemu_file_set_error(f, ret);
+ error_setg(errp, "Failed to complete vmstate save.");
return;
}
}
@@ -1819,7 +1820,7 @@ static int qemu_savevm_state(QEMUFile *f)
ret = qemu_file_get_error(f);
if (ret == 0) {
- qemu_savevm_state_complete(f);
+ qemu_savevm_state_complete(f, NULL);
ret = qemu_file_get_error(f);
}
if (ret != 0) {
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/12] convert savevm to use qapi and introduce qmp command, Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 01/12] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 02/12] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 03/12] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 05/12] savevm: add error parameter to qemu_savevm_state_complete(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH v2 04/12] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 07/12] qapi: Convert savevm, Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 06/12] savevm: add error parameter to qemu_savevm_state(), Pavel Hrdina, 2013/03/22
- [Qemu-devel] [PATCH v2 08/12] qemu-img: introduce qemu_img_handle_error, Pavel Hrdina, 2013/03/22