[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/13] savevm: add error parameter to qemu_savevm_st
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH 03/13] savevm: add error parameter to qemu_savevm_state_begin() |
Date: |
Wed, 9 Jan 2013 16:17:57 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
include/sysemu/sysemu.h | 3 ++-
migration.c | 2 +-
savevm.c | 7 +++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 28a783e..e50f990 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);
int qemu_savevm_state_begin(QEMUFile *f,
- const MigrationParams *params);
+ const MigrationParams *params,
+ Error **errp);
int qemu_savevm_state_iterate(QEMUFile *f);
int qemu_savevm_state_complete(QEMUFile *f);
void qemu_savevm_state_cancel(QEMUFile *f);
diff --git a/migration.c b/migration.c
index c69e864..cb38867 100644
--- a/migration.c
+++ b/migration.c
@@ -678,7 +678,7 @@ static bool migrate_fd_put_ready(MigrationState *s,
uint64_t max_size)
if (s->first_time) {
s->first_time = false;
DPRINTF("beginning savevm\n");
- ret = qemu_savevm_state_begin(s->file, &s->params);
+ ret = qemu_savevm_state_begin(s->file, &s->params, NULL);
if (ret < 0) {
DPRINTF("failed, %d\n", ret);
migrate_fd_error(s);
diff --git a/savevm.c b/savevm.c
index fae0cba..e2ecb0b 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1557,7 +1557,8 @@ bool qemu_savevm_state_blocked(Error **errp)
}
int qemu_savevm_state_begin(QEMUFile *f,
- const MigrationParams *params)
+ const MigrationParams *params,
+ Error **errp)
{
SaveStateEntry *se;
int ret;
@@ -1598,11 +1599,13 @@ int qemu_savevm_state_begin(QEMUFile *f,
ret = se->ops->save_live_setup(f, se->opaque);
if (ret < 0) {
qemu_savevm_state_cancel(f);
+ error_setg(errp, "Failed to begin vmstate save.");
return ret;
}
}
ret = qemu_file_get_error(f);
if (ret != 0) {
+ error_setg_errno(errp, errno, "Failed to begin vmstate save.");
qemu_savevm_state_cancel(f);
}
@@ -1758,7 +1761,7 @@ static int qemu_savevm_state(QEMUFile *f)
goto out;
}
- ret = qemu_savevm_state_begin(f, ¶ms);
+ ret = qemu_savevm_state_begin(f, ¶ms, NULL);
if (ret < 0)
goto out;
--
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 <=
- [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, 2013/01/09
- [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