[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/11] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v3 03/11] savevm: add error parameter to qemu_savevm_state_begin() |
Date: |
Thu, 28 Mar 2013 17:47:07 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/sysemu/sysemu.h | 3 ++-
migration.c | 2 +-
savevm.c | 5 +++--
3 files changed, 6 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 7fb2147..d517dd6 100644
--- a/migration.c
+++ b/migration.c
@@ -505,7 +505,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 dc1f4a4..56da096 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1731,7 +1731,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;
@@ -1921,7 +1922,7 @@ 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) {
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/11] convert savevm to use qapi and introduce qmp command, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 01/11] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 02/11] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 04/11] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 03/11] savevm: add error parameter to qemu_savevm_state_begin(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH v3 05/11] savevm: add error parameter to qemu_savevm_state_complete(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 06/11] savevm: add error parameter to qemu_savevm_state(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 08/11] qemu-img: introduce qemu_img_handle_error, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 09/11] block: update return value from bdrv_snapshot_create, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 10/11] savevm: update return value from qemu_savevm_state, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 11/11] savevm: add force parameter to HMP command and return snapshot info, Pavel Hrdina, 2013/03/28