[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/12] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v2 03/12] savevm: add error parameter to qemu_savevm_state_begin() |
Date: |
Fri, 22 Mar 2013 14:16:02 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
include/sysemu/sysemu.h | 3 ++-
migration.c | 2 +-
savevm.c | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 6578782..2f35a05 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -74,7 +74,8 @@ void qemu_announce_self(void);
bool qemu_savevm_state_blocked(Error **errp);
void qemu_savevm_state_begin(QEMUFile *f,
- const MigrationParams *params);
+ const MigrationParams *params,
+ Error **errp);
int qemu_savevm_state_iterate(QEMUFile *f);
void qemu_savevm_state_complete(QEMUFile *f);
void qemu_savevm_state_cancel(void);
diff --git a/migration.c b/migration.c
index 185d112..66cba46 100644
--- a/migration.c
+++ b/migration.c
@@ -504,7 +504,7 @@ static void *migration_thread(void *opaque)
bool old_vm_running = false;
DPRINTF("beginning savevm\n");
- qemu_savevm_state_begin(s->file, &s->params);
+ qemu_savevm_state_begin(s->file, &s->params, NULL);
while (s->state == MIG_STATE_ACTIVE) {
int64_t current_time;
diff --git a/savevm.c b/savevm.c
index 7b1867b..018e070 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1617,7 +1617,8 @@ bool qemu_savevm_state_blocked(Error **errp)
}
void qemu_savevm_state_begin(QEMUFile *f,
- const MigrationParams *params)
+ const MigrationParams *params,
+ Error **errp)
{
SaveStateEntry *se;
int ret;
@@ -1807,9 +1808,10 @@ static int qemu_savevm_state(QEMUFile *f)
}
qemu_mutex_unlock_iothread();
- qemu_savevm_state_begin(f, ¶ms);
+ 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) {
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 <=
- [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, 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