[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/12] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v2 04/12] savevm: add error parameter to qemu_savevm_state_iterate() |
Date: |
Fri, 22 Mar 2013 14:16:03 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
include/sysemu/sysemu.h | 2 +-
migration.c | 2 +-
savevm.c | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 2f35a05..af4f699 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -76,7 +76,7 @@ bool qemu_savevm_state_blocked(Error **errp);
void qemu_savevm_state_begin(QEMUFile *f,
const MigrationParams *params,
Error **errp);
-int qemu_savevm_state_iterate(QEMUFile *f);
+int qemu_savevm_state_iterate(QEMUFile *f, Error **errp);
void qemu_savevm_state_complete(QEMUFile *f);
void qemu_savevm_state_cancel(void);
uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size);
diff --git a/migration.c b/migration.c
index 66cba46..c2bf531 100644
--- a/migration.c
+++ b/migration.c
@@ -515,7 +515,7 @@ static void *migration_thread(void *opaque)
pending_size = qemu_savevm_state_pending(s->file, max_size);
DPRINTF("pending size %lu max %lu\n", pending_size, max_size);
if (pending_size && pending_size >= max_size) {
- qemu_savevm_state_iterate(s->file);
+ qemu_savevm_state_iterate(s->file, NULL);
} else {
DPRINTF("done iterating\n");
qemu_mutex_lock_iothread();
diff --git a/savevm.c b/savevm.c
index 018e070..c5ac701 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1670,7 +1670,7 @@ void qemu_savevm_state_begin(QEMUFile *f,
* 0 : We haven't finished, caller have to go again
* 1 : We have finished, we can go to complete phase
*/
-int qemu_savevm_state_iterate(QEMUFile *f)
+int qemu_savevm_state_iterate(QEMUFile *f, Error **errp)
{
SaveStateEntry *se;
int ret = 1;
@@ -1811,9 +1811,8 @@ static int qemu_savevm_state(QEMUFile *f)
qemu_savevm_state_begin(f, ¶ms, NULL);
qemu_mutex_lock_iothread();
-
while (qemu_file_get_error(f) == 0) {
- if (qemu_savevm_state_iterate(f) > 0) {
+ if (qemu_savevm_state_iterate(f, NULL) > 0) {
break;
}
}
--
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, 2013/03/22
- [Qemu-devel] [PATCH v2 04/12] savevm: add error parameter to qemu_savevm_state_iterate(),
Pavel Hrdina <=
- [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
- [Qemu-devel] [PATCH v2 10/12] savevm: update return value from qemu_savevm_state, Pavel Hrdina, 2013/03/22