[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 08/17] savevm: add error parameter to qemu_sa
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH v2 08/17] savevm: add error parameter to qemu_savevm_state_begin() |
Date: |
Fri, 14 Dec 2012 14:45:16 -0200 |
On Thu, 13 Dec 2012 16:40:42 +0100
Pavel Hrdina <address@hidden> wrote:
> Signed-off-by: Pavel Hrdina <address@hidden>
> ---
> migration.c | 2 +-
> savevm.c | 7 +++++--
> sysemu.h | 3 ++-
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index 73ce170..bf51a07 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -451,7 +451,7 @@ void migrate_fd_connect(MigrationState *s)
> s->file = qemu_fopen_ops_buffered(s);
>
> 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 3ee7da5..633a697 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -1601,7 +1601,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;
> @@ -1641,12 +1642,14 @@ int qemu_savevm_state_begin(QEMUFile *f,
>
> ret = se->ops->save_live_setup(f, se->opaque);
> if (ret < 0) {
> + error_setg(errp, "Failed to begin vmstate save.");
If possible, it would be nice to say why.
> qemu_savevm_state_cancel(f);
> return ret;
> }
> }
> ret = qemu_file_get_error(f);
> if (ret != 0) {
> + error_setg(errp, "%s", strerror(errno));
We have error_setg_errno().
> qemu_savevm_state_cancel(f);
> }
>
> @@ -1783,7 +1786,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;
>
> diff --git a/sysemu.h b/sysemu.h
> index 1b6add2..07c5322 100644
> --- a/sysemu.h
> +++ b/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);
- [Qemu-devel] [PATCH v2 00/17] qapi: Convert savevm, loadvm, delvm and info snapshots, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 01/17] error: introduce handle_error, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 08/17] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2012/12/13
- Re: [Qemu-devel] [PATCH v2 08/17] savevm: add error parameter to qemu_savevm_state_begin(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH v2 03/17] block: add error parameter to bdrv_snapshot_goto() and related functions, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 07/17] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 02/17] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 12/17] savevm: add error parameter to qemu_loadvm_state(), Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 06/17] block: add error parameter to bdrv_snapshot_find(), Pavel Hrdina, 2012/12/13